summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/chgtrack.hxx4
-rw-r--r--sc/inc/colorscale.hxx2
-rw-r--r--sc/inc/conditio.hxx4
-rw-r--r--sc/inc/dpsave.hxx18
-rw-r--r--sc/inc/dptabsrc.hxx18
-rw-r--r--sc/inc/editutil.hxx6
-rw-r--r--sc/inc/fillinfo.hxx4
-rw-r--r--sc/inc/fonthelper.hxx30
-rw-r--r--sc/inc/funcdesc.hxx6
-rw-r--r--sc/inc/paramisc.hxx4
-rw-r--r--sc/inc/patattr.hxx2
-rw-r--r--sc/inc/pch/precompiled_sc.hxx4
-rw-r--r--sc/inc/pch/precompiled_scfilt.hxx2
-rw-r--r--sc/inc/sheetevents.hxx4
14 files changed, 54 insertions, 54 deletions
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index fcaef910b69c..fc15a982acd1 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -32,7 +32,7 @@
#include <tools/link.hxx>
#include <tools/solar.h>
#include <unotools/options.hxx>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
#include "global.hxx"
#include "bigrange.hxx"
#include "scdllapi.h"
@@ -849,7 +849,7 @@ class SAL_DLLPUBLIC_RTTI ScChangeTrack : public utl::ConfigurationListener
ScChangeActionLinkEntry* pLinkInsertRow;
ScChangeActionLinkEntry* pLinkInsertTab;
ScChangeActionLinkEntry* pLinkMove;
- boost::optional<ScChangeTrackMsgInfo> xBlockModifyMsg;
+ o3tl::optional<ScChangeTrackMsgInfo> xBlockModifyMsg;
ScDocument* pDoc;
sal_uLong nActionMax;
sal_uLong nGeneratedMin;
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 861ff5e8e2fa..dea9de5c6d72 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -268,7 +268,7 @@ public:
virtual void SetParent(ScConditionalFormat* pParent) override;
- boost::optional<Color> GetColor(const ScAddress& rAddr) const;
+ o3tl::optional<Color> GetColor(const ScAddress& rAddr) const;
void AddEntry(ScColorScaleEntry* pEntry);
virtual void UpdateReference( sc::RefUpdateContext& rCxt ) override;
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 40cfdffc2f21..4ddb17c5573a 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -37,7 +37,7 @@
#include <tools/date.hxx>
#include <tools/link.hxx>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
#include <map>
#include <memory>
#include <set>
@@ -216,7 +216,7 @@ struct ScCondFormatData
ScCondFormatData(ScCondFormatData&&);
~ScCondFormatData();
- boost::optional<Color> mxColorScale;
+ o3tl::optional<Color> mxColorScale;
std::unique_ptr<ScDataBarInfo> pDataBar;
std::unique_ptr<ScIconSetInfo> pIconSet;
OUString aStyleName;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 49cb240ffd24..e7c9d0b8462c 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -32,7 +32,7 @@
#include <unordered_map>
#include <unordered_set>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
namespace com { namespace sun { namespace star { namespace sheet {
class XDimensionsSupplier;
@@ -52,7 +52,7 @@ class ScDPSaveMember
{
private:
OUString aName;
- boost::optional<OUString> mpLayoutName; // custom name to be displayed in the table.
+ o3tl::optional<OUString> mpLayoutName; // custom name to be displayed in the table.
sal_uInt16 nVisibleMode;
sal_uInt16 nShowDetailsMode;
@@ -79,7 +79,7 @@ public:
void SetName( const OUString& rNew ); // used if the source member was renamed (groups)
SC_DLLPUBLIC void SetLayoutName( const OUString& rName );
- SC_DLLPUBLIC const boost::optional<OUString> & GetLayoutName() const;
+ SC_DLLPUBLIC const o3tl::optional<OUString> & GetLayoutName() const;
void RemoveLayoutName();
void WriteToSource( const css::uno::Reference<css::uno::XInterface>& xMember,
@@ -94,8 +94,8 @@ class SC_DLLPUBLIC ScDPSaveDimension
{
private:
OUString aName;
- boost::optional<OUString> mpLayoutName;
- boost::optional<OUString> mpSubtotalName;
+ o3tl::optional<OUString> mpLayoutName;
+ o3tl::optional<OUString> mpSubtotalName;
bool bIsDataLayout;
bool bDupFlag;
css::sheet::DataPilotFieldOrientation nOrientation;
@@ -170,10 +170,10 @@ public:
{ return nUsedHierarchy; }
void SetLayoutName(const OUString& rName);
- const boost::optional<OUString> & GetLayoutName() const;
+ const o3tl::optional<OUString> & GetLayoutName() const;
void RemoveLayoutName();
void SetSubtotalName(const OUString& rName);
- const boost::optional<OUString> & GetSubtotalName() const;
+ const o3tl::optional<OUString> & GetSubtotalName() const;
void RemoveSubtotalName();
bool IsMemberNameInUse(const OUString& rName) const;
@@ -252,7 +252,7 @@ private:
* created. */
bool mbDimensionMembersBuilt;
- boost::optional<OUString> mpGrandTotalName;
+ o3tl::optional<OUString> mpGrandTotalName;
mutable std::unique_ptr<DimOrderType> mpDimOrder; // dimension order for row and column dimensions, to traverse result tree.
public:
@@ -265,7 +265,7 @@ public:
bool operator== ( const ScDPSaveData& r ) const;
SC_DLLPUBLIC void SetGrandTotalName(const OUString& rName);
- SC_DLLPUBLIC const boost::optional<OUString> & GetGrandTotalName() const;
+ SC_DLLPUBLIC const o3tl::optional<OUString> & GetGrandTotalName() const;
const DimsType& GetDimensions() const { return m_DimList; }
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index a5eb7f74ecc1..a6ddf33e5c12 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -48,7 +48,7 @@
#include <unordered_map>
#include <unordered_set>
#include <vector>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
namespace com { namespace sun { namespace star {
namespace sheet {
@@ -109,7 +109,7 @@ private:
bool bResultOverflow;
bool bPageFiltered; // set if page field filters have been applied to cache table
- boost::optional<OUString> mpGrandTotalName;
+ o3tl::optional<OUString> mpGrandTotalName;
void CreateRes_Impl();
void FillMemberResults();
@@ -144,7 +144,7 @@ public:
ScDPTableData* GetData() { return pData; }
const ScDPTableData* GetData() const { return pData; }
- const boost::optional<OUString> &
+ const o3tl::optional<OUString> &
GetGrandTotalName() const;
css::sheet::DataPilotFieldOrientation
@@ -268,8 +268,8 @@ class ScDPDimension : public cppu::WeakImplHelper<
rtl::Reference<ScDPHierarchies> mxHierarchies;
ScGeneralFunction nFunction;
OUString aName; // if empty, take from source
- boost::optional<OUString> mpLayoutName;
- boost::optional<OUString> mpSubtotalName;
+ o3tl::optional<OUString> mpLayoutName;
+ o3tl::optional<OUString> mpSubtotalName;
long nSourceDim; // >=0 if dup'ed
css::sheet::DataPilotFieldReference
aReferenceValue; // settings for "show data as" / "displayed value"
@@ -291,8 +291,8 @@ public:
ScDPDimension* CreateCloneObject();
ScDPHierarchies* GetHierarchiesObject();
- const boost::optional<OUString> & GetLayoutName() const;
- const boost::optional<OUString> & GetSubtotalName() const;
+ const o3tl::optional<OUString> & GetLayoutName() const;
+ const o3tl::optional<OUString> & GetSubtotalName() const;
// XNamed
virtual OUString SAL_CALL getName() override;
@@ -604,7 +604,7 @@ private:
long const nLev;
SCROW const mnDataId;
- boost::optional<OUString> mpLayoutName;
+ o3tl::optional<OUString> mpLayoutName;
sal_Int32 nPosition; // manual sorting
bool bVisible;
@@ -622,7 +622,7 @@ public:
SCROW GetItemDataId() const { return mnDataId; }
bool IsNamedItem(SCROW nIndex) const;
- const boost::optional<OUString> & GetLayoutName() const;
+ const o3tl::optional<OUString> & GetLayoutName() const;
long GetDim() const { return nDim;}
sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 86d579bd1016..a3e4949ea9ba 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -74,7 +74,7 @@ public:
static std::unique_ptr<EditTextObject> Clone( const EditTextObject& rSrc, ScDocument& rDestDoc );
static OUString GetCellFieldValue(
- const SvxFieldData& rFieldData, const ScDocument* pDoc, boost::optional<Color>* ppTextColor );
+ const SvxFieldData& rFieldData, const ScDocument* pDoc, o3tl::optional<Color>* ppTextColor );
public:
ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
@@ -186,7 +186,7 @@ public:
void SetExecuteURL(bool bSet) { bExecuteURL = bSet; }
virtual void FieldClicked( const SvxFieldItem& rField ) override;
- virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor ) override;
+ virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, o3tl::optional<Color>& rTxtColor, o3tl::optional<Color>& rFldColor ) override;
};
// 1/100 mm
@@ -223,7 +223,7 @@ private:
public:
ScHeaderEditEngine( SfxItemPool* pEnginePool );
- virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor ) override;
+ virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, o3tl::optional<Color>& rTxtColor, o3tl::optional<Color>& rFldColor ) override;
void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; }
void SetData(const ScHeaderFieldData& rNew) { aData = rNew; }
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 850fb4738ae0..d15537c33607 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -28,7 +28,7 @@
#include "colorscale.hxx"
#include "cellvalue.hxx"
#include <o3tl/typed_flags_set.hxx>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
class SfxItemSet;
class SvxBrushItem;
@@ -134,7 +134,7 @@ struct CellInfo
const ScPatternAttr* pPatternAttr;
const SfxItemSet* pConditionSet;
- boost::optional<Color> mxColorScale;
+ o3tl::optional<Color> mxColorScale;
std::unique_ptr<const ScDataBarInfo> pDataBar;
std::unique_ptr<const ScIconSetInfo> pIconSet;
diff --git a/sc/inc/fonthelper.hxx b/sc/inc/fonthelper.hxx
index abc2bf5a508a..f3ecf2bfb9c5 100644
--- a/sc/inc/fonthelper.hxx
+++ b/sc/inc/fonthelper.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_SC_INC_FONTHELPER_HXX
#include "scdllapi.h"
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
#include <tools/fontenum.hxx>
#include <tools/color.hxx>
#include <vcl/fntstyle.hxx>
@@ -21,20 +21,20 @@ class SvxFontItem;
struct SC_DLLPUBLIC ScDxfFont
{
- boost::optional<const SvxFontItem*> pFontAttr;
- boost::optional<sal_uInt32> nFontHeight;
- boost::optional<FontWeight> eWeight;
- boost::optional<FontItalic> eItalic;
- boost::optional<FontLineStyle> eUnder;
- boost::optional<FontLineStyle> eOver;
- boost::optional<bool> bWordLine;
- boost::optional<FontStrikeout> eStrike;
- boost::optional<bool> bOutline;
- boost::optional<bool> bShadow;
- boost::optional<FontEmphasisMark> eEmphasis;
- boost::optional<FontRelief> eRelief;
- boost::optional<Color> aColor;
- boost::optional<LanguageType> eLang;
+ o3tl::optional<const SvxFontItem*> pFontAttr;
+ o3tl::optional<sal_uInt32> nFontHeight;
+ o3tl::optional<FontWeight> eWeight;
+ o3tl::optional<FontItalic> eItalic;
+ o3tl::optional<FontLineStyle> eUnder;
+ o3tl::optional<FontLineStyle> eOver;
+ o3tl::optional<bool> bWordLine;
+ o3tl::optional<FontStrikeout> eStrike;
+ o3tl::optional<bool> bOutline;
+ o3tl::optional<bool> bShadow;
+ o3tl::optional<FontEmphasisMark> eEmphasis;
+ o3tl::optional<FontRelief> eRelief;
+ o3tl::optional<Color> aColor;
+ o3tl::optional<LanguageType> eLang;
bool isEmpty() const
{
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index cb7f8f759b9e..10d57b221a50 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -27,7 +27,7 @@
#include <formula/IFunctionDescription.hxx>
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
#include <map>
#include <memory>
@@ -207,8 +207,8 @@ public:
ParameterFlags() : bOptional(false) {}
};
- boost::optional<OUString> mxFuncName; /**< Function name */
- boost::optional<OUString> mxFuncDesc; /**< Description of function */
+ o3tl::optional<OUString> mxFuncName; /**< Function name */
+ o3tl::optional<OUString> mxFuncDesc; /**< Description of function */
std::vector<OUString> maDefArgNames; /**< Parameter name(s) */
std::vector<OUString> maDefArgDescs; /**< Description(s) of parameter(s) */
ParameterFlags *pDefArgFlags; /**< Flags for each parameter */
diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx
index 0c8432f4fdca..992c4fcc2bca 100644
--- a/sc/inc/paramisc.hxx
+++ b/sc/inc/paramisc.hxx
@@ -21,13 +21,13 @@
#define INCLUDED_SC_INC_PARAMISC_HXX
#include "address.hxx"
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
struct ScSolveParam
{
ScAddress aRefFormulaCell;
ScAddress aRefVariableCell;
- boost::optional<OUString> pStrTargetVal;
+ o3tl::optional<OUString> pStrTargetVal;
ScSolveParam();
ScSolveParam( const ScSolveParam& r );
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 19c4df01c345..7c6b6058520d 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -51,7 +51,7 @@ enum ScAutoFontColorMode
class SC_DLLPUBLIC ScPatternAttr final : public SfxSetItem
{
- boost::optional<OUString> pName;
+ o3tl::optional<OUString> pName;
ScStyleSheet* pStyle;
sal_uInt64 mnKey;
public:
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index bb380644fcdb..04a20a9c8076 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -52,8 +52,8 @@
#include <vector>
#include <boost/functional/hash.hpp>
#include <boost/intrusive_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional.hpp>
+#include <o3tl/optional.hxx>
+#include <o3tl/optional.hxx>
#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>
#endif // PCH_LEVEL >= 1
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index aa18ffafa27a..d13e9f4a854a 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -44,7 +44,7 @@
#include <unordered_set>
#include <utility>
#include <vector>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
#include <boost/property_tree/ptree.hpp>
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx
index 3fb0e28d1568..fb9d5dfcdd66 100644
--- a/sc/inc/sheetevents.hxx
+++ b/sc/inc/sheetevents.hxx
@@ -23,7 +23,7 @@
#include <rtl/ustring.hxx>
#include <memory>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
enum class ScSheetEventId {
FOCUS, UNFOCUS, SELECT, DOUBLECLICK, RIGHTCLICK, CHANGE, CALCULATE, COUNT,
@@ -32,7 +32,7 @@ enum class ScSheetEventId {
class ScSheetEvents
{
- std::unique_ptr<boost::optional<OUString>[]> mpScriptNames;
+ std::unique_ptr<o3tl::optional<OUString>[]> mpScriptNames;
void Clear();
generated by cgit (git 2.34.1) at 2024-08-02 12:32:51 +0000