office-gobmx/sc/inc/fillinfo.hxx
Stephan Bergmann 7e403195e5 Introduce o3tl::optional as an alias for std::optional
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md).  And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.

One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3 "Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).

Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).

Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.

After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with

> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'

(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs).  It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.

Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-01 14:57:16 +01:00

208 lines
6.1 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SC_INC_FILLINFO_HXX
#define INCLUDED_SC_INC_FILLINFO_HXX
#include <sal/config.h>
#include <memory>
#include <svx/framelinkarray.hxx>
#include "colorscale.hxx"
#include "cellvalue.hxx"
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/optional.hxx>
class SfxItemSet;
class SvxBrushItem;
class SvxBoxItem;
class SvxLineItem;
class SvxShadowItem;
class ScPatternAttr;
enum class ScRotateDir : sal_uInt8 {
NONE, Standard, Left, Right, Center
};
enum class ScClipMark : sal_uInt8 {
NONE = 0x00, Left = 0x01, Right = 0x02
};
namespace o3tl {
template<> struct typed_flags<ScClipMark> : is_typed_flags<ScClipMark, 0x03> {};
}
const sal_uInt8 SC_CLIPMARK_SIZE = 64;
enum ScShadowPart
{
SC_SHADOW_HSTART,
SC_SHADOW_VSTART,
SC_SHADOW_HORIZ,
SC_SHADOW_VERT,
SC_SHADOW_CORNER
};
struct ScDataBarInfo
{
double mnZero; // 0 to 100
Color maColor;
double mnLength; // -100 to 100
bool mbGradient;
bool mbShowValue;
Color maAxisColor;
bool operator==(const ScDataBarInfo& r) const
{
if( mnZero != r.mnZero )
return false;
if( maColor != r.maColor )
return false;
if(mnLength != r.mnLength)
return false;
if (mbGradient != r.mbGradient)
return false;
return true;
}
bool operator!=(const ScDataBarInfo& r) const
{
return !(*this == r);
}
};
struct ScIconSetInfo
{
sal_Int32 nIconIndex;
ScIconSetType eIconSetType;
bool mbShowValue;
};
struct CellInfo
{
CellInfo()
: pPatternAttr(nullptr)
, pConditionSet(nullptr)
, pBackground(nullptr) // TODO: omit?
, pLinesAttr(nullptr)
, mpTLBRLine(nullptr)
, mpBLTRLine(nullptr)
, pShadowAttr(nullptr)
, pHShadowOrigin(nullptr)
, pVShadowOrigin(nullptr)
, eHShadowPart(SC_SHADOW_HSTART)
, eVShadowPart(SC_SHADOW_HSTART)
, nClipMark(ScClipMark::NONE)
, nWidth(0)
, nRotateDir(ScRotateDir::NONE)
, bEmptyCellText(false)
, bMerged(false)
, bHOverlapped(false)
, bVOverlapped(false)
, bAutoFilter(false)
, bPivotButton(false)
, bPivotPopupButton(false)
, bFilterActive(false)
, bPrinted(false) // view-internal
, bHideGrid(false) // view-internal
, bEditEngine(false) // view-internal
{
}
CellInfo(const CellInfo&) = delete;
const CellInfo& operator=(const CellInfo&) = delete;
ScRefCellValue maCell;
const ScPatternAttr* pPatternAttr;
const SfxItemSet* pConditionSet;
o3tl::optional<Color> mxColorScale;
std::unique_ptr<const ScDataBarInfo> pDataBar;
std::unique_ptr<const ScIconSetInfo> pIconSet;
const SvxBrushItem* pBackground;
const SvxBoxItem* pLinesAttr; /// original item from document.
const SvxLineItem* mpTLBRLine; /// original item from document.
const SvxLineItem* mpBLTRLine; /// original item from document.
const SvxShadowItem* pShadowAttr; // original item (internal)
const SvxShadowItem* pHShadowOrigin;
const SvxShadowItem* pVShadowOrigin;
ScShadowPart eHShadowPart : 4; // shadow effective for drawing
ScShadowPart eVShadowPart : 4;
ScClipMark nClipMark;
sal_uInt16 nWidth;
ScRotateDir nRotateDir;
bool bEmptyCellText : 1;
bool bMerged : 1;
bool bHOverlapped : 1;
bool bVOverlapped : 1;
bool bAutoFilter : 1;
bool bPivotButton:1;
bool bPivotPopupButton:1;
bool bFilterActive:1;
bool bPrinted : 1; // when required (pagebreak mode)
bool bHideGrid : 1; // output-internal
bool bEditEngine : 1; // output-internal
};
const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
struct RowInfo
{
RowInfo() = default;
RowInfo(const RowInfo&) = delete;
const RowInfo& operator=(const RowInfo&) = delete;
CellInfo* pCellInfo;
sal_uInt16 nHeight;
SCROW nRowNo;
SCCOL nRotMaxCol; // SC_ROTMAX_NONE, if nothing
bool bEmptyBack:1;
bool bAutoFilter:1;
bool bPivotButton:1;
bool bChanged:1; // TRUE, if not tested
};
struct ScTableInfo
{
svx::frame::Array maArray;
std::unique_ptr<RowInfo[]>
mpRowInfo;
SCSIZE mnArrCount;
SCSIZE const mnArrCapacity;
bool mbPageMode;
explicit ScTableInfo(const SCSIZE capacity = 1024);
~ScTableInfo();
ScTableInfo(const ScTableInfo&) = delete;
const ScTableInfo& operator=(const ScTableInfo&) = delete;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */