summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-04 11:11:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-05 12:18:29 +0100
commitc02c4df9414ed2bef96565522238ca05013d3ac3 (patch)
tree47e2195f5f1cd183d6939fbe3e9d650b8bc4f71e /sc
parent78d81c2e6ee4eb7caf2d4822657bc4eaa57bfc79 (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')
-rw-r--r--sc/inc/chartarr.hxx2
-rw-r--r--sc/inc/detfunc.hxx2
-rw-r--r--sc/inc/dpfilteredcache.hxx2
-rw-r--r--sc/inc/dptabsrc.hxx4
-rw-r--r--sc/inc/formularesult.hxx12
-rw-r--r--sc/inc/inputopt.hxx2
-rw-r--r--sc/inc/postit.hxx2
-rw-r--r--sc/inc/table.hxx2
-rw-r--r--sc/inc/token.hxx8
-rw-r--r--sc/source/core/inc/grouptokenconverter.hxx2
-rw-r--r--sc/source/core/inc/interpre.hxx4
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx2
-rw-r--r--sc/source/ui/inc/condformatdlg.hxx4
-rw-r--r--sc/source/ui/inc/csvruler.hxx40
-rw-r--r--sc/source/ui/inc/datatableview.hxx2
-rw-r--r--sc/source/ui/inc/docsh.hxx2
-rw-r--r--sc/source/ui/inc/hdrcont.hxx2
-rw-r--r--sc/source/ui/inc/protectiondlg.hxx2
-rw-r--r--sc/source/ui/inc/reffact.hxx2
-rw-r--r--sc/source/ui/inc/sharedocdlg.hxx2
20 files changed, 50 insertions, 50 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;
diff --git a/sc/source/core/inc/grouptokenconverter.hxx b/sc/source/core/inc/grouptokenconverter.hxx
index cc09addfe609..6f43f9b14cdf 100644
--- a/sc/source/core/inc/grouptokenconverter.hxx
+++ b/sc/source/core/inc/grouptokenconverter.hxx
@@ -19,7 +19,7 @@ class ScFormulaCell;
class ScTokenArray;
namespace sc { struct FormulaGroupContext; }
-class SC_DLLPUBLIC ScGroupTokenConverter
+class ScGroupTokenConverter
{
ScTokenArray& mrGroupTokens;
ScDocument& mrDoc;
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index d5e3d85ec20d..3b902524d901 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -148,8 +148,8 @@ class ScInterpreter
friend class ScChiSqDistFunction;
public:
- static SC_DLLPUBLIC void SetGlobalConfig(const ScCalcConfig& rConfig);
- static SC_DLLPUBLIC const ScCalcConfig& GetGlobalConfig();
+ static void SetGlobalConfig(const ScCalcConfig& rConfig);
+ static const ScCalcConfig& GetGlobalConfig();
static void GlobalExit(); // called by ScGlobal::Clear()
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 4684bdaf2031..2aa5b84ceee7 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -81,7 +81,7 @@ public:
bool CanInputDone(bool bForced) { return m_pRefEdit && (bForced || !m_pRefBtn); }
};
-class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog
+class ScRefHandler : public IAnyRefDialog
{
weld::DialogController* m_pController;
bool m_bInRefMode;
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index cca33ba9094f..a244e9816504 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -110,11 +110,11 @@ protected:
void CancelPressed();
public:
- SC_DLLPUBLIC ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pWindow,
+ ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pWindow,
ScViewData* pViewData, const ScCondFormatDlgItem* pDlgItem);
virtual ~ScCondFormatDlg() override;
- SC_DLLPUBLIC std::unique_ptr<ScConditionalFormat> GetConditionalFormat() const;
+ std::unique_ptr<ScConditionalFormat> GetConditionalFormat() const;
virtual void SetReference(const ScRange&, ScDocument*) override;
virtual bool IsRefInputMode() const override;
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index 1d5f0784efed..32d72ef93b8f 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -31,7 +31,7 @@ class ScCsvTableBox;
/** A ruler control for the CSV import dialog. Supports setting and moving
splits (which divide lines of data into several columns). */
-class SC_DLLPUBLIC ScCsvRuler : public ScCsvControl
+class ScCsvRuler : public ScCsvControl
{
private:
ScCsvTableBox* mpTableBox; /// Grid Parent
@@ -70,19 +70,19 @@ public:
private:
/** Reads colors from system settings. */
- SAL_DLLPRIVATE void InitColors();
+ void InitColors();
/** Initializes all data dependent from the control's size. */
- SAL_DLLPRIVATE void InitSizeData();
+ void InitSizeData();
/** Moves cursor to a new position.
@param bScroll sal_True = The method may scroll the ruler. */
- SAL_DLLPRIVATE void MoveCursor( sal_Int32 nPos, bool bScroll = true );
+ void MoveCursor( sal_Int32 nPos, bool bScroll = true );
/** Moves cursor to the given direction. */
- SAL_DLLPRIVATE void MoveCursorRel( ScMoveMode eDir );
+ void MoveCursorRel( ScMoveMode eDir );
/** Sets cursor to an existing split, according to eDir. */
- SAL_DLLPRIVATE void MoveCursorToSplit( ScMoveMode eDir );
+ void MoveCursorToSplit( ScMoveMode eDir );
/** Scrolls data grid vertically. */
- SAL_DLLPRIVATE void ScrollVertRel( ScMoveMode eDir );
+ void ScrollVertRel( ScMoveMode eDir );
// split handling ---------------------------------------------------------
public:
@@ -110,12 +110,12 @@ public:
private:
/** Finds next position without a split. */
- SAL_DLLPRIVATE sal_Int32 FindEmptyPos( sal_Int32 nPos, ScMoveMode eDir ) const;
+ sal_Int32 FindEmptyPos( sal_Int32 nPos, ScMoveMode eDir ) const;
/** Moves split and cursor to nNewPos and commits event. */
- SAL_DLLPRIVATE void MoveCurrSplit( sal_Int32 nNewPos );
+ void MoveCurrSplit( sal_Int32 nNewPos );
/** Moves split and cursor to the given direction and commits event. */
- SAL_DLLPRIVATE void MoveCurrSplitRel( ScMoveMode eDir );
+ void MoveCurrSplitRel( ScMoveMode eDir );
// event handling ---------------------------------------------------------
protected:
@@ -134,12 +134,12 @@ protected:
private:
/** Starts tracking at the specified position. */
- SAL_DLLPRIVATE void StartMouseTracking( sal_Int32 nPos );
+ void StartMouseTracking( sal_Int32 nPos );
/** Moves tracking to a new position. */
- SAL_DLLPRIVATE void MoveMouseTracking( sal_Int32 nPos );
+ void MoveMouseTracking( sal_Int32 nPos );
/** Applies tracking action for the current tracking position.
@param bApply sal_True = apply action, sal_False = cancel action. */
- SAL_DLLPRIVATE void EndMouseTracking( bool bApply );
+ void EndMouseTracking( bool bApply );
// painting ---------------------------------------------------------------
protected:
@@ -156,22 +156,22 @@ private:
sal_Int32 GetHeight() const { return maWinSize.Height(); }
/** Draws the background and active area to maBackgrDev (only the given X range). */
- SAL_DLLPRIVATE void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth );
+ void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth );
/** Draws the entire ruler background with scaling to maBackgrDev. */
- SAL_DLLPRIVATE void ImplDrawBackgrDev();
+ void ImplDrawBackgrDev();
/** Draws a split to maRulerDev. */
- SAL_DLLPRIVATE void ImplDrawSplit( sal_Int32 nPos );
+ void ImplDrawSplit( sal_Int32 nPos );
/** Erases a split from maRulerDev. */
- SAL_DLLPRIVATE void ImplEraseSplit( sal_Int32 nPos );
+ void ImplEraseSplit( sal_Int32 nPos );
/** Draws the ruler background, all splits and the cursor to maRulerDev. */
- SAL_DLLPRIVATE void ImplDrawRulerDev();
+ void ImplDrawRulerDev();
/** Inverts the cursor bar at the specified position in maRulerDev. */
- SAL_DLLPRIVATE void ImplInvertCursor( sal_Int32 nPos );
+ void ImplInvertCursor( sal_Int32 nPos );
/** Sets arrow or horizontal split pointer. */
- SAL_DLLPRIVATE void ImplSetMousePointer( sal_Int32 nPos );
+ void ImplSetMousePointer( sal_Int32 nPos );
// accessibility ----------------------------------------------------------
protected:
diff --git a/sc/source/ui/inc/datatableview.hxx b/sc/source/ui/inc/datatableview.hxx
index 690a088368f4..df0bf376885e 100644
--- a/sc/source/ui/inc/datatableview.hxx
+++ b/sc/source/ui/inc/datatableview.hxx
@@ -78,7 +78,7 @@ public:
* This class should only depend on ScDocument and not
* on some of the Calc view shells.
*/
-class SC_DLLPUBLIC ScDataTableView : public Control
+class ScDataTableView : public Control
{
std::shared_ptr<ScDocument> mpDoc;
std::unique_ptr<SelectionEngine> mpSelectionEngine;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 528f85e3a830..a519f4c87d04 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -447,7 +447,7 @@ typedef tools::SvRef<ScDocShell> ScDocShellRef;
methods to avoid multiple modified status changes, only the last instance
destroyed calls ScDocShell::SetDocumentModified().
*/
-class SC_DLLPUBLIC ScDocShellModificator
+class ScDocShellModificator
{
ScDocShell& rDocShell;
std::unique_ptr<ScRefreshTimerProtector> mpProtector;
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index a1b4260ac3d3..f3d7ee0b6638 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -32,7 +32,7 @@
class ScTabView;
class SelectionEngine;
-class SC_DLLPUBLIC ScHeaderControl : public vcl::Window
+class ScHeaderControl : public vcl::Window
{
private:
SelectionEngine* pSelEngine;
diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
index ff3a41f4d797..b3db92440d1b 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -29,7 +29,7 @@ class ScTableProtectionDlg : public weld::GenericDialogController
{
public:
ScTableProtectionDlg() = delete;
- explicit SC_DLLPUBLIC ScTableProtectionDlg(weld::Window* pParent);
+ explicit ScTableProtectionDlg(weld::Window* pParent);
virtual ~ScTableProtectionDlg() override;
void SetDialogData(const ScTableProtection& rData);
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 1aa2bd37eedd..f30cdf73c077 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -181,7 +181,7 @@ public:
void StartRefInput();
};
-class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow
+class ScValidityRefChildWin : public SfxChildWindow
{
bool m_bVisibleLock:1;
bool m_bFreeWindowLock:1;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 02bdfd4a414b..bda896e25a66 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -45,7 +45,7 @@ private:
DECL_LINK(SizeAllocated, const Size&, void);
public:
- SC_DLLPUBLIC ScShareDocumentDlg(weld::Window* pParent, const ScViewData* pViewData);
+ ScShareDocumentDlg(weld::Window* pParent, const ScViewData* pViewData);
virtual ~ScShareDocumentDlg() override;
bool IsShareDocumentChecked() const;