diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-04 11:11:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-05 12:18:29 +0100 |
commit | c02c4df9414ed2bef96565522238ca05013d3ac3 (patch) | |
tree | 47e2195f5f1cd183d6939fbe3e9d650b8bc4f71e /sc/inc | |
parent | 78d81c2e6ee4eb7caf2d4822657bc4eaa57bfc79 (diff) |
make some classes module-private
Change-Id: Ice9a57eedb166672dbdfae6da2a172ab77566a19
Reviewed-on: https://gerrit.libreoffice.org/81983
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/chartarr.hxx | 2 | ||||
-rw-r--r-- | sc/inc/detfunc.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dpfilteredcache.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 4 | ||||
-rw-r--r-- | sc/inc/formularesult.hxx | 12 | ||||
-rw-r--r-- | sc/inc/inputopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/postit.hxx | 2 | ||||
-rw-r--r-- | sc/inc/table.hxx | 2 | ||||
-rw-r--r-- | sc/inc/token.hxx | 8 |
9 files changed, 18 insertions, 18 deletions
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index b342be84f7ac..c06400c34c69 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -55,7 +55,7 @@ public: void SetRowText(SCROW nRow, const OUString& rText) { pRowText[nRow] = rText; } }; -class SC_DLLPUBLIC ScChartArray // only parameter-struct +class ScChartArray // only parameter-struct { ScDocument* pDocument; ScChartPositioner aPositioner; diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index aa4f88e3d685..6eb38f669c41 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -45,7 +45,7 @@ enum ScDetectiveObjType SC_DETOBJ_CIRCLE }; -class SC_DLLPUBLIC ScDetectiveFunc +class ScDetectiveFunc { static Color nArrowColor; static Color nErrorColor; diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index f110131180c5..3cf13951609a 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -42,7 +42,7 @@ struct ScQueryParam; * This class is only a wrapper to the actual cache, to provide filtering on * the raw data based on the query filter and/or page field filters. */ -class SC_DLLPUBLIC ScDPFilteredCache +class ScDPFilteredCache { typedef mdds::flat_segment_tree<SCROW, bool> RowFlagType; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 609f3e848e0d..a5eb7f74ecc1 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -291,7 +291,7 @@ public: ScDPDimension* CreateCloneObject(); ScDPHierarchies* GetHierarchiesObject(); - SC_DLLPUBLIC const boost::optional<OUString> & GetLayoutName() const; + const boost::optional<OUString> & GetLayoutName() const; const boost::optional<OUString> & GetSubtotalName() const; // XNamed @@ -622,7 +622,7 @@ public: SCROW GetItemDataId() const { return mnDataId; } bool IsNamedItem(SCROW nIndex) const; - SC_DLLPUBLIC const boost::optional<OUString> & GetLayoutName() const; + const boost::optional<OUString> & GetLayoutName() const; long GetDim() const { return nDim;} sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index d6e9293569ac..32134b460182 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -179,7 +179,7 @@ public: left result is modified instead, but only if it was of type formula::svDouble before or not set at all. */ - SC_DLLPUBLIC void SetDouble( double f ); + void SetDouble( double f ); /** Return value if type formula::svDouble or formula::svHybridCell or formula::svMatrixCell and upper left formula::svDouble, else 0.0 */ @@ -198,24 +198,24 @@ public: /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridDouble( double f ); + void SetHybridDouble( double f ); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridString( const svl::SharedString & rStr ); + void SetHybridString( const svl::SharedString & rStr ); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridFormula(), SetHybridEmptyDisplayedAsString() must be last. */ - SC_DLLPUBLIC void SetHybridEmptyDisplayedAsString(); + void SetHybridEmptyDisplayedAsString(); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridFormula( const OUString & rFormula ); + void SetHybridFormula( const OUString & rFormula ); - SC_DLLPUBLIC void SetMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); + void SetMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); /** Get the const ScMatrixFormulaCellToken* if token is of that type, else NULL. */ diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 8d312a133806..4cff5d14cf48 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -23,7 +23,7 @@ #include "scdllapi.h" #include <unotools/configitem.hxx> -class SC_DLLPUBLIC ScInputOptions +class ScInputOptions { private: sal_uInt16 nMoveDir; // enum ScDirection diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 86515562c463..367659959891 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -141,7 +141,7 @@ private: }; /** Internal data for a cell annotation. */ -struct SC_DLLPUBLIC ScNoteData +struct ScNoteData { typedef std::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 9756930b08e1..4126d4640942 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -803,7 +803,7 @@ public: sal_uInt16 GetColWidth( SCCOL nCol, bool bHiddenAsZero = true ) const; sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol ) const; - SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; + sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const; sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero = true ) const; sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; sal_uLong GetColOffset( SCCOL nCol, bool bHiddenAsZero = true ) const; diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 965d7a81485b..317dc9b25bcd 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -271,7 +271,7 @@ public: virtual FormulaToken* Clone() const override { return new ScRefListToken(*this); } }; -class SC_DLLPUBLIC ScEmptyCellToken final : public formula::FormulaToken +class ScEmptyCellToken final : public formula::FormulaToken { bool const bInherited :1; bool const bDisplayedAsString :1; @@ -289,7 +289,7 @@ public: }; /** Transports the result from the interpreter to the formula cell. */ -class SC_DLLPUBLIC ScMatrixCellResultToken : public formula::FormulaToken +class ScMatrixCellResultToken : public formula::FormulaToken { // No non-const access implemented, silence down unxsols4 complaining about // the public GetMatrix() hiding the one from FormulaToken. @@ -319,7 +319,7 @@ public: /** Stores the matrix result at the formula cell, additionally the range the matrix formula occupies. */ -class SC_DLLPUBLIC ScMatrixFormulaCellToken final : public ScMatrixCellResultToken +class ScMatrixFormulaCellToken final : public ScMatrixCellResultToken { private: SCROW nRows; @@ -373,7 +373,7 @@ private: void CloneUpperLeftIfNecessary(); }; -class SC_DLLPUBLIC ScHybridCellToken final : public formula::FormulaToken +class ScHybridCellToken final : public formula::FormulaToken { private: double const mfDouble; |