hide more symbols

using the bin/find-can-be-private-symbols.py script
to find classes with large numbers of exported symbols
that can hidden.

before
exported       = 58104
imported       = 30810
unused_exports = 35433

after
exported       = 55094
imported       = 31073
unused_exports = 32423

Change-Id: Idd0a70ee3740afd5ca1a86771e0e2ff8090d102d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163456
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 104 insertions, 105 deletions

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index e64c1065d5c7..2dd539749766 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -372,7 +372,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
-class UNLESS_MERGELIBS(SC_DLLPUBLIC) ScCellRangesObj final : public ScCellRangesBase,
+class ScCellRangesObj final : public ScCellRangesBase,
                         public css::sheet::XSheetCellRangeContainer,
                         public css::container::XNameContainer,
                         public css::container::XEnumerationAccess
@@ -391,8 +391,7 @@ private:
     rtl::Reference<ScCellRangeObj> GetObjectByIndex_Impl(sal_Int32 nIndex) const;
 
 public:
-    IF_MERGELIBS(SC_DLLPUBLIC)
-                            ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR);
+    SC_DLLPUBLIC ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR);
     virtual                 ~ScCellRangesObj() override;
 
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 6db9dee493cf..03f8294c543c 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -28,7 +28,7 @@ struct ColumnBlockPosition;
  * nothing else.  It creates a copy of the original cell value, and manages
  * the life cycle of the copied value.
  */
-struct SC_DLLPUBLIC ScCellValue
+struct ScCellValue
 {
 private:
     /// std::monostate is there to indicate CellType::NONE
@@ -37,24 +37,24 @@ private:
     void reset_to_empty();
 public:
 
-    ScCellValue();
+    SC_DLLPUBLIC ScCellValue();
     ScCellValue( const ScRefCellValue& rCell );
     ScCellValue( double fValue );
     ScCellValue( const svl::SharedString& rString );
     ScCellValue( std::unique_ptr<EditTextObject> );
     ScCellValue( const ScCellValue& r );
     ScCellValue(ScCellValue&& r) noexcept;
-    ~ScCellValue();
+    SC_DLLPUBLIC ~ScCellValue();
 
-    void clear() noexcept;
+    SC_DLLPUBLIC void clear() noexcept;
 
-    void set( double fValue );
-    void set( const svl::SharedString& rStr );
+    SC_DLLPUBLIC void set( double fValue );
+    SC_DLLPUBLIC void set( const svl::SharedString& rStr );
     void set( const EditTextObject& rEditText );
-    void set( std::unique_ptr<EditTextObject> );
-    void set( ScFormulaCell* pFormula );
+    SC_DLLPUBLIC void set( std::unique_ptr<EditTextObject> );
+    SC_DLLPUBLIC void set( ScFormulaCell* pFormula );
 
-    CellType getType() const;
+    SC_DLLPUBLIC CellType getType() const;
     double getDouble() const { return std::get<double>(maData); }
     ScFormulaCell* getFormula() const { return std::get<ScFormulaCell*>(maData); }
     const svl::SharedString* getSharedString() const { return &std::get<svl::SharedString>(maData); }
@@ -87,7 +87,7 @@ public:
 
     OUString getString( const ScDocument& rDoc ) const;
 
-    bool isEmpty() const;
+    SC_DLLPUBLIC bool isEmpty() const;
 
     bool equalsWithoutFormat( const ScCellValue& r ) const;
 
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index a8ac4422464e..24cc0c3d0f8e 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -53,7 +53,7 @@ namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
 class ScDocument;
 
 // DataProvider
-class SC_DLLPUBLIC ScChart2DataProvider final : public
+class ScChart2DataProvider final : public
                 ::cppu::WeakImplHelper<
                     css::chart2::data::XDataProvider,
                     css::chart2::data::XSheetDataProvider,
@@ -64,7 +64,7 @@ class SC_DLLPUBLIC ScChart2DataProvider final : public
 {
 public:
 
-    explicit ScChart2DataProvider( ScDocument* pDoc );
+    SC_DLLPUBLIC explicit ScChart2DataProvider( ScDocument* pDoc );
     virtual ~ScChart2DataProvider() override;
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 5617dc482af9..5430c3e3c3ba 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -38,10 +38,10 @@ class Timer;
 class ScDocument;
 class ScChartUnoData;
 
-class SC_DLLPUBLIC ScChartListener final : public SvtListener
+class ScChartListener final : public SvtListener
 {
 public:
-    class SAL_DLLPRIVATE ExternalRefListener final : public ScExternalRefManager::LinkListener
+    class ExternalRefListener final : public ScExternalRefManager::LinkListener
     {
     public:
         ExternalRefListener(ScChartListener& rParent, ScDocument& rDoc);
@@ -75,10 +75,10 @@ private:
 public:
     ScChartListener( OUString aName, ScDocument& rDoc,
                      const ScRangeListRef& rRangeListRef );
-    ScChartListener( OUString aName, ScDocument& rDoc,
+    SC_DLLPUBLIC ScChartListener( OUString aName, ScDocument& rDoc,
                      ::std::vector<ScTokenRef> aTokens );
     ScChartListener( const ScChartListener& ) = delete;
-    virtual ~ScChartListener() override;
+    SC_DLLPUBLIC virtual ~ScChartListener() override;
 
     const OUString& GetName() const { return maName;}
 
@@ -90,7 +90,7 @@ public:
     bool            IsUno() const   { return (pUnoData != nullptr); }
 
     virtual void Notify( const SfxHint& rHint ) override;
-    void            StartListeningTo();
+    SC_DLLPUBLIC void StartListeningTo();
     void            EndListeningTo();
     void            ChangeListening( const ScRangeListRef& rRangeListRef,
                                     bool bDirty );
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index b3ce874a6a7f..4efa4fb8382d 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -44,7 +44,7 @@ public:
     ColumnBlockPositionSet* getBlockPositionSet() { return mpSet.get(); }
 };
 
-class SC_DLLPUBLIC CopyFromClipContext final : public ClipContextBase
+class CopyFromClipContext final : public ClipContextBase
 {
     /** Tracks modified formula group spans. */
     sc::ColumnSpanSet maListeningFormulaSpans;
@@ -83,18 +83,18 @@ public:
     };
 
     CopyFromClipContext() = delete;
-    CopyFromClipContext(ScDocument& rDoc,
+    SC_DLLPUBLIC CopyFromClipContext(ScDocument& rDoc,
         ScDocument* pRefUndoDoc, ScDocument* pClipDoc, InsertDeleteFlags nInsertFlag,
         bool bAsLink, bool bSkipAttrForEmptyCells);
 
-    virtual ~CopyFromClipContext() override;
+    SC_DLLPUBLIC virtual ~CopyFromClipContext() override;
 
-    void setTabRange(SCTAB nStart, SCTAB nEnd);
+    SC_DLLPUBLIC void setTabRange(SCTAB nStart, SCTAB nEnd);
 
     SCTAB getTabStart() const;
     SCTAB getTabEnd() const;
 
-    void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
+    SC_DLLPUBLIC void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
     Range getDestRange() const;
 
     ScDocument* getUndoDoc();
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index f43f533e8f60..6c1165670603 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -39,7 +39,7 @@ enum ScColorScaleEntryType
     COLORSCALE_FORMULA,
 };
 
-class SC_DLLPUBLIC ScColorScaleEntry
+class ScColorScaleEntry
 {
 private:
     double mnVal;
@@ -52,17 +52,17 @@ private:
     void setListener();
 
 public:
-    ScColorScaleEntry(double nVal, const Color& rCol, ScColorScaleEntryType eType = COLORSCALE_VALUE);
-    ScColorScaleEntry();
+    SC_DLLPUBLIC ScColorScaleEntry(double nVal, const Color& rCol, ScColorScaleEntryType eType = COLORSCALE_VALUE);
+    SC_DLLPUBLIC ScColorScaleEntry();
     ScColorScaleEntry(const ScColorScaleEntry& rEntry);
     ScColorScaleEntry(ScDocument* pDoc, const ScColorScaleEntry& rEntry);
-    ~ScColorScaleEntry() COVERITY_NOEXCEPT_FALSE;
+    SC_DLLPUBLIC ~ScColorScaleEntry() COVERITY_NOEXCEPT_FALSE;
 
     const Color& GetColor() const { return maColor;}
     void SetColor(const Color&);
-    double GetValue() const;
-    void SetValue(double nValue);
-    void SetFormula(const OUString& rFormula, ScDocument& rDoc, const ScAddress& rAddr,
+    SC_DLLPUBLIC double GetValue() const;
+    SC_DLLPUBLIC void SetValue(double nValue);
+    SC_DLLPUBLIC void SetFormula(const OUString& rFormula, ScDocument& rDoc, const ScAddress& rAddr,
             formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT);
 
     void UpdateReference( const sc::RefUpdateContext& rCxt );
@@ -70,11 +70,11 @@ public:
     void UpdateDeleteTab( const sc::RefUpdateDeleteTabContext& rCxt );
     void UpdateMoveTab( const sc::RefUpdateMoveTabContext& rCxt );
 
-    const ScTokenArray* GetFormula() const;
-    OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const;
+    SC_DLLPUBLIC const ScTokenArray* GetFormula() const;
+    SC_DLLPUBLIC OUString GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const;
 
     ScColorScaleEntryType GetType() const { return meType;}
-    void SetType( ScColorScaleEntryType eType );
+    SC_DLLPUBLIC void SetType( ScColorScaleEntryType eType );
 
     void SetRepaintCallback(ScConditionalFormat* pParent);
     void SetRepaintCallback(const std::function<void()>& func);
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 9cff881db62d..3de13eccb665 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -177,7 +177,7 @@ public:
     formula::FormulaToken* CreateToken(ScSheetLimits& rLimits) const;   // create typified token
 };
 
-class SC_DLLPUBLIC ScCompiler final : public formula::FormulaCompiler
+class ScCompiler final : public formula::FormulaCompiler
 {
 public:
 
@@ -188,7 +188,7 @@ public:
         EXTENDED_ERROR_DETECTION_NAME_NO_BREAK  // name error on unknown symbols, don't break, continue
     };
 
-    struct SAL_DLLPRIVATE Convention
+    struct Convention
     {
         const formula::FormulaGrammar::AddressConvention meConv;
 
@@ -388,26 +388,26 @@ public:
 
     /** If eGrammar == GRAM_UNSPECIFIED then the grammar of rDocument is used,
      */
-    ScCompiler( ScDocument& rDocument, const ScAddress&,
+    SC_DLLPUBLIC ScCompiler( ScDocument& rDocument, const ScAddress&,
             formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED,
             bool bComputeII = false, bool bMatrixFlag = false, const ScInterpreterContext* pContext = nullptr );
 
-    ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, ScTokenArray& rArr,
+    SC_DLLPUBLIC ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, ScTokenArray& rArr,
             bool bComputeII = false, bool bMatrixFlag = false, const ScInterpreterContext* pContext = nullptr );
 
     /** If eGrammar == GRAM_UNSPECIFIED then the grammar of rDocument is used,
      */
-    ScCompiler( ScDocument& rDocument, const ScAddress&, ScTokenArray& rArr,
+    SC_DLLPUBLIC ScCompiler( ScDocument& rDocument, const ScAddress&, ScTokenArray& rArr,
             formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED,
             bool bComputeII = false, bool bMatrixFlag = false, const ScInterpreterContext* pContext = nullptr );
 
-    virtual ~ScCompiler() override;
+    SC_DLLPUBLIC virtual ~ScCompiler() override;
 
 public:
     static void DeInit();               /// all
 
     // for ScAddress::Format()
-    static void CheckTabQuotes( OUString& aTabName,
+    SC_DLLPUBLIC static void CheckTabQuotes( OUString& aTabName,
                                 const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO );
 
     /** Analyzes a string for a 'Doc'#Tab construct, or 'Do''c'#Tab etc...
@@ -417,7 +417,7 @@ public:
     static sal_Int32 GetDocTabPos( const OUString& rString );
 
     // Check if it is a valid english function name
-    static bool IsEnglishSymbol( const OUString& rName );
+    SC_DLLPUBLIC static bool IsEnglishSymbol( const OUString& rName );
 
     bool ParseErrorConstant( const OUString& );
     bool ParseTableRefItem( const OUString& );
@@ -445,9 +445,9 @@ public:
     /// Set symbol map if not empty.
     void            SetFormulaLanguage( const OpCodeMapPtr & xMap );
 
-    void            SetGrammar( const formula::FormulaGrammar::Grammar eGrammar );
+    SC_DLLPUBLIC void SetGrammar( const formula::FormulaGrammar::Grammar eGrammar );
 
-    void SetNumberFormatter( SvNumberFormatter* pFormatter );
+    SC_DLLPUBLIC void SetNumberFormatter( SvNumberFormatter* pFormatter );
 
 private:
     /** Set grammar and reference convention from within SetFormulaLanguage()
@@ -487,18 +487,18 @@ public:
      * @return heap allocated token array object. The caller <i>must</i>
      *         manage the life cycle of this object.
      */
-    std::unique_ptr<ScTokenArray> CompileString( const OUString& rFormula );
+    SC_DLLPUBLIC std::unique_ptr<ScTokenArray> CompileString( const OUString& rFormula );
     std::unique_ptr<ScTokenArray> CompileString( const OUString& rFormula, const OUString& rFormulaNmsp );
     const ScAddress& GetPos() const { return aPos; }
 
     void MoveRelWrap();
-    static void MoveRelWrap( const ScTokenArray& rArr, const ScDocument& rDoc, const ScAddress& rPos,
+    SC_DLLPUBLIC static void MoveRelWrap( const ScTokenArray& rArr, const ScDocument& rDoc, const ScAddress& rPos,
                              SCCOL nMaxCol, SCROW nMaxRow );
 
     /** If the character is allowed as tested by nFlags (SC_COMPILER_C_...
         bits) for all known address conventions. If more than one bit is given
         in nFlags, all bits must match. */
-    static bool IsCharFlagAllConventions(
+    SC_DLLPUBLIC static bool IsCharFlagAllConventions(
         OUString const & rStr, sal_Int32 nPos, ScCharFlags nFlags );
 
     /** TODO : Move this to somewhere appropriate. */
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index ba5e0289bab8..ee4e030d0bab 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -553,7 +553,7 @@ public:
 };
 
 //  complete conditional formatting
-class SC_DLLPUBLIC ScConditionalFormat
+class ScConditionalFormat
 {
     ScDocument*         pDoc;
     sal_uInt32          nKey;               // Index in attributes
@@ -564,23 +564,23 @@ class SC_DLLPUBLIC ScConditionalFormat
     mutable std::unique_ptr<ScColorFormatCache> mpCache;
 
 public:
-    ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
-    ~ScConditionalFormat();
+    SC_DLLPUBLIC ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
+    SC_DLLPUBLIC ~ScConditionalFormat();
      ScConditionalFormat(const ScConditionalFormat&) = delete;
      const ScConditionalFormat& operator=(const ScConditionalFormat&) = delete;
 
     // true copy of formulas (for Ref-Undo / between documents)
-    std::unique_ptr<ScConditionalFormat> Clone(ScDocument* pNewDoc = nullptr) const;
+    SC_DLLPUBLIC std::unique_ptr<ScConditionalFormat> Clone(ScDocument* pNewDoc = nullptr) const;
 
-    void            AddEntry( ScFormatEntry* pNew );
+    SC_DLLPUBLIC void AddEntry( ScFormatEntry* pNew );
     void RemoveEntry(size_t nIndex);
-    void            SetRange( const ScRangeList& rRanges );
+    SC_DLLPUBLIC void SetRange( const ScRangeList& rRanges );
     const ScRangeList&  GetRange() const  { return maRanges; }
     // don't use the same name as for the const version
     ScRangeList& GetRangeList() { return maRanges; }
 
     bool IsEmpty() const;
-    size_t size() const;
+    SC_DLLPUBLIC size_t size() const;
 
     ScDocument* GetDocument();
 
@@ -597,11 +597,11 @@ public:
     void            DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
     void            RenameCellStyle( std::u16string_view rOld, const OUString& rNew );
 
-    const ScFormatEntry* GetEntry( sal_uInt16 nPos ) const;
+    SC_DLLPUBLIC const ScFormatEntry* GetEntry( sal_uInt16 nPos ) const;
 
-    OUString GetCellStyle( ScRefCellValue& rCell, const ScAddress& rPos ) const;
+    SC_DLLPUBLIC OUString GetCellStyle( ScRefCellValue& rCell, const ScAddress& rPos ) const;
 
-    ScCondFormatData GetData( ScRefCellValue& rCell, const ScAddress& rPos ) const;
+    SC_DLLPUBLIC ScCondFormatData GetData( ScRefCellValue& rCell, const ScAddress& rPos ) const;
 
     bool            EqualEntries( const ScConditionalFormat& r, bool bIgnoreSrcPos = false ) const;
 
@@ -664,7 +664,7 @@ struct CompareScConditionalFormat
 };
 
 //  List of all conditional formats in a sheet
-class SC_DLLPUBLIC ScConditionalFormatList
+class ScConditionalFormatList
 {
 private:
     typedef std::set<std::unique_ptr<ScConditionalFormat>,
@@ -675,7 +675,7 @@ private:
 
 public:
     ScConditionalFormatList() {}
-    ScConditionalFormatList(const ScConditionalFormatList& rList);
+    SC_DLLPUBLIC ScConditionalFormatList(const ScConditionalFormatList& rList);
     ScConditionalFormatList(ScDocument& rDoc, const ScConditionalFormatList& rList);
 
     void    InsertNew( std::unique_ptr<ScConditionalFormat> pNew );
@@ -688,7 +688,7 @@ public:
      */
     bool    CheckAllEntries(const Link<ScConditionalFormat*,void>& rLink = Link<ScConditionalFormat*,void>());
 
-    ScConditionalFormat* GetFormat( sal_uInt32 nKey );
+    SC_DLLPUBLIC ScConditionalFormat* GetFormat( sal_uInt32 nKey );
     const ScConditionalFormat* GetFormat( sal_uInt32 nKey ) const;
 
     void    CompileAll();
@@ -712,15 +712,15 @@ public:
     void RemoveFromDocument(ScDocument& rDoc) const;
     void AddToDocument(ScDocument& rDoc) const;
 
-    iterator begin();
-    const_iterator begin() const;
-    iterator end();
-    const_iterator end() const;
+    SC_DLLPUBLIC iterator begin();
+    SC_DLLPUBLIC const_iterator begin() const;
+    SC_DLLPUBLIC iterator end();
+    SC_DLLPUBLIC const_iterator end() const;
 
-    size_t size() const;
-    bool empty() const;
+    SC_DLLPUBLIC size_t size() const;
+    SC_DLLPUBLIC bool empty() const;
 
-    void erase(sal_uLong nIndex);
+    SC_DLLPUBLIC void erase(sal_uLong nIndex);
     void clear();
 
     void startRendering();
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index df235ec52619..c1164b064b17 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -232,7 +232,7 @@ private:
     void InvalidateTableColumnNames( bool bSwapToEmptyNames );
 };
 
-class SC_DLLPUBLIC ScDBCollection
+class ScDBCollection
 {
 public:
     enum RangeType { GlobalNamed, GlobalAnonymous, SheetAnonymous };
@@ -282,7 +282,7 @@ public:
     /**
      * Stores global anonymous database ranges.
      */
-    class SAL_DLLPRIVATE AnonDBs
+    class AnonDBs
     {
         typedef ::std::vector<std::unique_ptr<ScDBData>> DBsType;
         DBsType m_DBs;
@@ -331,9 +331,9 @@ public:
     const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const;
     ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion);
     const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
-    ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
-    ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
-    std::vector<ScDBData*> GetAllDBsFromTab(SCTAB nTab);
+    SC_DLLPUBLIC ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
+    SC_DLLPUBLIC ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
+    SC_DLLPUBLIC std::vector<ScDBData*> GetAllDBsFromTab(SCTAB nTab);
 
     void RefreshDirtyTableColumnNames();
 
@@ -349,7 +349,7 @@ public:
                         { aRefreshHandler = rLink; }
     const Link<Timer *, void>& GetRefreshHandler() const { return aRefreshHandler; }
 
-    bool empty() const;
+    SC_DLLPUBLIC bool empty() const;
     bool operator== (const ScDBCollection& r) const;
 };
 
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index 8da12e378511..a764b7178fc9 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -219,7 +219,7 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar
 }
 
 /** Base class for the CSV ruler and the data grid control. Implements command handling. */
-class SC_DLLPUBLIC ScCsvControl : public weld::CustomWidgetController
+class ScCsvControl : public weld::CustomWidgetController
 {
 private:
     Link<ScCsvControl&,void>    maCmdHdl;           /// External command handler.
@@ -284,7 +284,7 @@ public:
     const ScCsvCmd&      GetCmd() const { return maCmd; }
 
     /** Executes a command by calling command handler. */
-    void                        Execute(
+    SC_DLLPUBLIC void    Execute(
                                     ScCsvCmdType eType,
                                     sal_Int32 nParam1 = CSV_POS_INVALID,
                                     sal_Int32 nParam2 = CSV_POS_INVALID );
@@ -330,7 +330,7 @@ public:
     /** Returns the number of data lines. */
     sal_Int32            GetLineCount() const { return mrData.mnLineCount; }
     /** Returns the number of visible lines (including partly visible bottom line). */
-    sal_Int32                   GetVisLineCount() const;
+    SC_DLLPUBLIC sal_Int32      GetVisLineCount() const;
     /** Returns index of first visible line. */
     sal_Int32            GetFirstVisLine() const { return mrData.mnLineOffset; }
     /** Returns index of last visible line. */
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index c729d9815fa7..ba0affd10133 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -54,7 +54,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec;
 
 /** A data grid control for the CSV import dialog. The design of this control
     simulates a Calc spreadsheet with row and column headers. */
-class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
+class ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
 {
 private:
     ScCsvTableBox*              mpTableBox;         /// Grid Parent
@@ -116,11 +116,11 @@ public:
 
 private:
     /** Reads colors from system settings. */
-    SAL_DLLPRIVATE void                        InitColors();
+    void                        InitColors();
     /** Initializes all font settings. */
-    SAL_DLLPRIVATE void                        InitFonts();
+    void                        InitFonts();
     /** Initializes all data dependent from the control's size. */
-    SAL_DLLPRIVATE void                        InitSizeData();
+    void                        InitSizeData();
 
     // split handling ---------------------------------------------------------
 public:
@@ -137,11 +137,11 @@ public:
 
 private:
     /** Inserts a split and adjusts column data. */
-    SAL_DLLPRIVATE bool                        ImplInsertSplit( sal_Int32 nPos );
+    bool                        ImplInsertSplit( sal_Int32 nPos );
     /** Removes a split and adjusts column data. */
-    SAL_DLLPRIVATE bool                        ImplRemoveSplit( sal_Int32 nPos );
+    bool                        ImplRemoveSplit( sal_Int32 nPos );
     /** Clears the split array and re-inserts boundary splits. */
-    SAL_DLLPRIVATE void                        ImplClearSplits();
+    void                        ImplClearSplits();
 
     // columns/column types ---------------------------------------------------
 public:
@@ -174,7 +174,7 @@ public:
     /** Sets all column states to the values in the passed vector. */
     void                        SetColumnStates( ScCsvColStateVec&& rColStates );
     /** Returns the data type of the selected columns. */
-    sal_Int32                   GetSelColumnType() const;
+    SC_DLLPUBLIC sal_Int32      GetSelColumnType() const;
     /** Changes the data type of all selected columns. */
     void                        SetSelColumnType( sal_Int32 nType );
     /** Sets new UI data type names. */
@@ -189,14 +189,14 @@ public:
 
 private:
     /** Returns the data type of the specified column. */
-    SAL_DLLPRIVATE sal_Int32                   GetColumnType( sal_uInt32 nColIndex ) const;
+    sal_Int32                   GetColumnType( sal_uInt32 nColIndex ) const;
     /** Sets the data type of the specified column. */
-    SAL_DLLPRIVATE void                        SetColumnType( sal_uInt32 nColIndex, sal_Int32 nColType );
+    void                        SetColumnType( sal_uInt32 nColIndex, sal_Int32 nColType );
 
     /** Scrolls data grid vertically. */
-    SAL_DLLPRIVATE void                        ScrollVertRel( ScMoveMode eDir );
+    void                        ScrollVertRel( ScMoveMode eDir );
     /** Executes the data type popup menu. */
-    SAL_DLLPRIVATE void                        ExecutePopup( const Point& rPos );
+    void                        ExecutePopup( const Point& rPos );
 
     // selection handling -----------------------------------------------------
 public:
@@ -220,15 +220,15 @@ public:
 
 private:
     /** Moves column cursor to a new position. */
-    SAL_DLLPRIVATE void                        MoveCursor( sal_uInt32 nColIndex );
+    void                        MoveCursor( sal_uInt32 nColIndex );
     /** Moves column cursor to the given direction. */
-    SAL_DLLPRIVATE void                        MoveCursorRel( ScMoveMode eDir );
+    void                        MoveCursorRel( ScMoveMode eDir );
 
     /** Clears the entire selection without notify. */
-    SAL_DLLPRIVATE void                        ImplClearSelection();
+    void                        ImplClearSelection();
 
     /** Executes selection action for a specific column. */
-    SAL_DLLPRIVATE void                        DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier );
+    void                        DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier );
 
     // cell contents ----------------------------------------------------------
 public:
@@ -277,34 +277,34 @@ private:
     sal_Int32            GetHeight() const { return maWinSize.Height(); }
 
     /** Sets a clip region in the specified output device for the specified column. */
-    SAL_DLLPRIVATE void                        ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
+    void                        ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
     /** Draws the header of the specified column to the specified output device. */
-    SAL_DLLPRIVATE void                        ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor );
+    void                        ImplDrawColumnHeader( OutputDevice& rOutDev, sal_uInt32 nColIndex, Color aFillColor );
 
     /** Draws the text at the specified position to maBackgrDev. */
-    SAL_DLLPRIVATE void                        ImplDrawCellText( const Point& rPos, const OUString& rText );
+    void                        ImplDrawCellText( const Point& rPos, const OUString& rText );
     /** Draws the "first imported line" separator to maBackgrDev (or erases, if bSet is false). */
-    SAL_DLLPRIVATE void                        ImplDrawFirstLineSep( bool bSet );
+    void                        ImplDrawFirstLineSep( bool bSet );
     /** Draws the column with index nColIndex to maBackgrDev. */
-    SAL_DLLPRIVATE void                        ImplDrawColumnBackgr( sal_uInt32 nColIndex );
+    void                        ImplDrawColumnBackgr( sal_uInt32 nColIndex );
     /** Draws the row headers column to maBackgrDev. */
-    SAL_DLLPRIVATE void                        ImplDrawRowHeaders();
+    void                        ImplDrawRowHeaders();
     /** Draws all columns and the row headers column to maBackgrDev. */
-    SAL_DLLPRIVATE void                        ImplDrawBackgrDev();
+    void                        ImplDrawBackgrDev();
 
     /** Draws the column with index nColIndex with its selection state to maGridDev. */
-    SAL_DLLPRIVATE void                        ImplDrawColumnSelection( sal_uInt32 nColIndex );
+    void                        ImplDrawColumnSelection( sal_uInt32 nColIndex );
     /** Draws all columns with selection and cursor to maGridDev. */
-    SAL_DLLPRIVATE void                        ImplDrawGridDev();
+    void                        ImplDrawGridDev();
 
     /** Redraws the entire column (background and selection). */
-    SAL_DLLPRIVATE void                        ImplDrawColumn( sal_uInt32 nColIndex );
+    void                        ImplDrawColumn( sal_uInt32 nColIndex );
 
     /** Optimized drawing: Scrolls horizontally and redraws only missing parts. */
-    SAL_DLLPRIVATE void                        ImplDrawHorzScrolled( sal_Int32 nOldPos );
+    void                        ImplDrawHorzScrolled( sal_Int32 nOldPos );
 
     /** Inverts the cursor bar at the specified position in maGridDev. */
-    SAL_DLLPRIVATE void                        ImplInvertCursor( sal_Int32 nPos );
+    void                        ImplInvertCursor( sal_Int32 nPos );
 
     // accessibility ----------------------------------------------------------
 protected: