make more symbols private in writer

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

10 files changed, 53 insertions, 53 deletions

diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index c695fe07c75a..821be741fc70 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -76,7 +76,7 @@ namespace o3tl {
 
     #i26791# - inherit also from <SwAnchoredFlyFrame>
 */
-class SW_DLLPUBLIC SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject
+class SAL_DLLPUBLIC_RTTI SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject
 {
     // is allowed to lock, implemented in frmtool.cxx
     friend void AppendObj(SwFrame *const pFrame, SwPageFrame *const pPage, SwFrameFormat *const pFormat, const SwFormatAnchor & rAnch);
@@ -284,7 +284,7 @@ public:
     // (This is in order to skip on the otherwise necessary casting of the result to
     // 'SwFlyFrameFormat *' after calls to this function. The casting is now done in this function.)
     virtual const SwFlyFrameFormat *GetFormat() const override;
-    virtual       SwFlyFrameFormat *GetFormat() override;
+    SW_DLLPUBLIC virtual SwFlyFrameFormat *GetFormat() override;
 
     virtual void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
 
@@ -296,15 +296,15 @@ public:
     void InvalidateContentPos();
 
     void SelectionHasChanged(SwFEShell* pShell);
-    bool IsShowUnfloatButton(SwWrtShell* pWrtSh) const;
+    SW_DLLPUBLIC bool IsShowUnfloatButton(SwWrtShell* pWrtSh) const;
 
     // For testing only (see uiwriter)
-    void ActiveUnfloatButton(SwWrtShell* pWrtSh);
+    SW_DLLPUBLIC void ActiveUnfloatButton(SwWrtShell* pWrtSh);
 
     virtual const SwFlyFrame* DynCastFlyFrame() const override;
     virtual SwFlyFrame* DynCastFlyFrame() override;
 
-    SwFlyAtContentFrame* DynCastFlyAtContentFrame();
+    SW_DLLPUBLIC SwFlyAtContentFrame* DynCastFlyAtContentFrame();
 
 private:
     void UpdateUnfloatButton(SwWrtShell* pWrtSh, bool bShow) const;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 65f392b3eadc..eac4adff7ce6 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -311,7 +311,7 @@ namespace o3tl {
  * level: pages, headers, footers, etc. (Inside a paragraph SwLinePortion
  * instances are used.)
  */
-class SW_DLLPUBLIC SwFrame : public SwFrameAreaDefinition, public SwClient, public SfxBroadcaster
+class SAL_DLLPUBLIC_RTTI SwFrame : public SwFrameAreaDefinition, public SwClient, public SfxBroadcaster
 {
     // the hidden Frame
     friend class SwFlowFrame;
@@ -608,7 +608,7 @@ public:
     inline void ResetRetouche() const;
     bool IsRetouche() const { return mbRetouche; }
 
-    void SetInfFlags();
+    SW_DLLPUBLIC void SetInfFlags();
     void InvalidateInfFlags() { mbInfInvalid = true; }
     inline bool IsInDocBody() const;    // use InfoFlags, determine flags
     inline bool IsInFootnote() const;        // if necessary
@@ -687,13 +687,13 @@ public:
     SwFrame               *FindColFrame();
     SwRowFrame            *FindRowFrame();
     SwFootnoteBossFrame   *FindFootnoteBossFrame( bool bFootnotes = false );
-    SwTabFrame            *ImplFindTabFrame();
+    SW_DLLPUBLIC SwTabFrame *ImplFindTabFrame();
     SwFootnoteFrame       *ImplFindFootnoteFrame();
     SwFlyFrame            *ImplFindFlyFrame();
     SwSectionFrame        *ImplFindSctFrame();
     const SwBodyFrame     *ImplFindBodyFrame() const;
     SwFrame               *FindFooterOrHeader();
-    SwFrame               *GetLower();
+    SW_DLLPUBLIC SwFrame  *GetLower();
     const SwFrame         *GetNext()  const { return mpNext; }
     const SwFrame         *GetPrev()  const { return mpPrev; }
     const SwLayoutFrame   *GetUpper() const { return mpUpper; }
@@ -735,7 +735,7 @@ public:
     const SwFrame* GetIndNext() const { return const_cast<SwFrame*>(this)->GetIndNext(); }
 
     sal_uInt16 GetPhyPageNum() const;   // page number without offset
-    sal_uInt16 GetVirtPageNum() const;  // page number with offset
+    SW_DLLPUBLIC sal_uInt16 GetVirtPageNum() const;  // page number with offset
     bool OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
     bool WannaRightPage() const;
     bool OnFirstPage() const;
@@ -752,7 +752,7 @@ public:
 
     // PaintArea is the area where content might be displayed.
     // The margin of a page or the space between columns belongs to it.
-    SwRect GetPaintArea() const;
+    SW_DLLPUBLIC SwRect GetPaintArea() const;
 
     // UnionFrame is the union of Frame- and PrtArea, normally identical
     // to the FrameArea except in case of negative Prt margins.
@@ -875,9 +875,9 @@ public:
     inline bool IsCellFrame() const;
     inline bool IsContentFrame() const;
     inline bool IsTextFrame() const;
-    SwTextFrame* DynCastTextFrame();
+    SW_DLLPUBLIC SwTextFrame* DynCastTextFrame();
     const SwTextFrame* DynCastTextFrame() const;
-    SwPageFrame* DynCastPageFrame();
+    SW_DLLPUBLIC SwPageFrame* DynCastPageFrame();
     const SwPageFrame* DynCastPageFrame() const;
     inline bool IsNoTextFrame() const;
     // Frames where its PrtArea depends on their neighbors and that are
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 109c9df74e29..172225bfda06 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -46,7 +46,7 @@ enum class SwNeighbourAdjust {
 
 typedef std::vector<SwFootnoteFrame*> SwFootnoteFrames;
 
-class SW_DLLPUBLIC SwFootnoteBossFrame: public SwLayoutFrame
+class SAL_DLLPUBLIC_RTTI SwFootnoteBossFrame: public SwLayoutFrame
 {
     // for private footnote operations
     friend class SwFrame;
@@ -73,7 +73,7 @@ public:
         , m_nMaxFootnoteHeight(0)
         {}
 
-                 SwLayoutFrame *FindBodyCont();
+    SW_DLLPUBLIC SwLayoutFrame *FindBodyCont();
     inline const SwLayoutFrame *FindBodyCont() const;
     void SetMaxFootnoteHeight( const SwTwips nNewMax ) { m_nMaxFootnoteHeight = nNewMax; }
 
@@ -81,7 +81,7 @@ public:
     void AppendFootnote( SwContentFrame *, SwTextFootnote * );
     bool RemoveFootnote(const SwContentFrame *, const SwTextFootnote *, bool bPrep = true);
     static       SwFootnoteFrame     *FindFootnote( const SwContentFrame *, const SwTextFootnote * );
-                 SwFootnoteContFrame *FindFootnoteCont();
+    SW_DLLPUBLIC SwFootnoteContFrame *FindFootnoteCont();
     inline const SwFootnoteContFrame *FindFootnoteCont() const;
            const SwFootnoteFrame     *FindFirstFootnote( SwContentFrame const * ) const;
                  SwFootnoteContFrame *FindNearestFootnoteCont( bool bDontLeave = false );
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 4774257d3a63..bd2c446125b8 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -32,7 +32,7 @@ class SwFormatFrameSize;
 class SwCellFrame;
 
 /// A layout frame is a frame that contains other frames (m_pLower), e.g. SwPageFrame or SwTabFrame.
-class SW_DLLPUBLIC SwLayoutFrame: public SwFrame
+class SAL_DLLPUBLIC_RTTI SwLayoutFrame: public SwFrame
 {
     // The SwFrame in disguise
     friend class SwFlowFrame;
@@ -100,7 +100,7 @@ public:
     const SwFrame *Lower() const { return m_pLower; }
           SwFrame *Lower()       { return m_pLower; }
     bool ContainsDeleteForbiddenLayFrame() const;
-    const SwContentFrame *ContainsContent() const;
+    SW_DLLPUBLIC const SwContentFrame *ContainsContent() const;
     inline SwContentFrame *ContainsContent();
     const SwCellFrame *FirstCell() const;
     inline SwCellFrame *FirstCell();
@@ -165,7 +165,7 @@ public:
     */
     bool IsBefore( const SwLayoutFrame* _pCheckRefLayFrame ) const;
 
-    const SwFrame* GetLastLower() const;
+    SW_DLLPUBLIC const SwFrame* GetLastLower() const;
     inline SwFrame* GetLastLower();
 
     virtual void PaintBreak() const;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 5938bcfc7a4d..96c5d0843f57 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -82,7 +82,7 @@ using SwFlyDestroyList = o3tl::sorted_vector<SwFlyFrame*>;
 
 /// The root element of a Writer document layout. Lower frames are expected to
 /// be SwPageFrame instances.
-class SW_DLLPUBLIC SwRootFrame final : public SwLayoutFrame
+class SAL_DLLPUBLIC_RTTI SwRootFrame final : public SwLayoutFrame
 {
     // Needs to disable the Superfluous temporarily
     friend void AdjustSizeChgNotify( SwRootFrame *pRoot );
@@ -237,10 +237,10 @@ public:
           SdrPage* GetDrawPage()       { return mpDrawPage; }
           void     SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; }
 
-    virtual bool  GetModelPositionForViewPoint( SwPosition *, Point&,
+    SW_DLLPUBLIC virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
                                SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override;
 
-    virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const& ) const override;
+    SW_DLLPUBLIC virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect const& ) const override;
     virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override;
     virtual SwTwips GrowFrame  ( SwTwips, bool bTst = false, bool bInfo = false ) override;
 #ifdef DBG_UTIL
@@ -434,13 +434,13 @@ public:
      * (this is layout-level redline hiding).
      */
     bool IsHideRedlines() const { return mbHideRedlines; }
-    void SetHideRedlines(bool);
+    SW_DLLPUBLIC void SetHideRedlines(bool);
     sw::FieldmarkMode GetFieldmarkMode() const { return m_FieldmarkMode; }
     void SetFieldmarkMode(sw::FieldmarkMode, sw::ParagraphBreakMode);
     sw::ParagraphBreakMode GetParagraphBreakMode() const { return m_ParagraphBreakMode; }
     bool HasMergedParas() const;
 
-    void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
+    SW_DLLPUBLIC void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
 };
 
 inline tools::Long SwRootFrame::GetBrowseWidth() const
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 52c4f856095f..6da1895d0161 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -75,7 +75,7 @@ public:
 
 /// Collection of SwLinePortion instances, representing one line of text.
 /// Typically owned by an SwParaPortion.
-class SW_DLLPUBLIC SwLineLayout : public SwTextPortion
+class SwLineLayout : public SwTextPortion
 {
 private:
     SwLineLayout *m_pNext;                // The next Line
@@ -114,7 +114,7 @@ public:
     // From SwLinePortion
     virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override;
     virtual SwLinePortion *Append( SwLinePortion *pPortion ) override;
-    SwLinePortion *GetFirstPortion() const;
+    SW_DLLPUBLIC SwLinePortion *GetFirstPortion() const;
 
     // Flags
     void ResetFlags();
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 51bd462d08d3..9b0d145cad86 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -269,7 +269,7 @@ enum class Css1Background
 };
 }
 
-class SW_DLLPUBLIC SwHTMLWriter : public Writer
+class SwHTMLWriter : public Writer
 {
     SwHTMLPosFlyFrames m_aHTMLPosFlyFrames;
     std::unique_ptr<SwHTMLNumRuleInfo> m_pNumRuleInfo;// current numbering
@@ -441,7 +441,7 @@ public:
 
     /// Construct an instance of SwHTMLWriter and optionally give it
     /// the filter options directly, which can also be set via SetupFilterOptions().
-    explicit SwHTMLWriter( const OUString& rBaseURL, std::u16string_view rFilterOptions = std::u16string_view() );
+    SW_DLLPUBLIC explicit SwHTMLWriter( const OUString& rBaseURL, std::u16string_view rFilterOptions = std::u16string_view() );
     virtual ~SwHTMLWriter() override;
 
     void Out_SwDoc( SwPaM* );       // write the marked range
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ec2df846c8ee..a40e6d03d322 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -56,7 +56,7 @@ class SwTextFrame;
     To translate the pixel positions from the buffer OutputDevice to the real
     pixel positions, use the PixelToLogic methods of this class.
   */
-class SW_DLLPUBLIC SwEditWin final : public vcl::DocWindow,
+class SwEditWin final : public vcl::DocWindow,
                 public DropTargetHelper, public DragSourceHelper
 {
     friend class SwEditWinUIObject;
@@ -161,16 +161,16 @@ class SW_DLLPUBLIC SwEditWin final : public vcl::DocWindow,
      * The selection is regularly increased towards the mouse
      * position.
      */
-    DECL_DLLPRIVATE_LINK( TimerHandler, Timer *, void );
+    DECL_LINK( TimerHandler, Timer *, void );
     void            StartDDTimer();
     void            StopDDTimer(SwWrtShell *, const Point &);
-    DECL_DLLPRIVATE_LINK( DDHandler, Timer *, void );
+    DECL_LINK( DDHandler, Timer *, void );
 
     // timer for ANY-KeyInut question without a following KeyInputEvent
-    DECL_DLLPRIVATE_LINK( KeyInputFlushHandler, Timer *, void );
+    DECL_LINK( KeyInputFlushHandler, Timer *, void );
 
     // timer for ApplyTemplates via mouse (in disguise Drag&Drop)
-    DECL_DLLPRIVATE_LINK( TemplateTimerHdl, Timer *, void );
+    DECL_LINK( TemplateTimerHdl, Timer *, void );
 
     void            MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
                                 const bool bOnlyText, bool bLockView );
@@ -207,7 +207,7 @@ class SW_DLLPUBLIC SwEditWin final : public vcl::DocWindow,
     bool    IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& rControl, bool& bOverFly, bool& bPageAnchored ) const;
 
 public:
-    virtual void    KeyInput(const KeyEvent &rKEvt) override;
+    SW_DLLPUBLIC virtual void KeyInput(const KeyEvent &rKEvt) override;
     void            UpdatePointer(const Point &, sal_uInt16 nButtons = 0);
 
     bool            IsDrawSelMode() const;
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 70e66d9bf139..ed77c2322bfb 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -47,7 +47,7 @@ enum class Frmmgr_Type
     ENVELP  = 0x10
 };
 
-class SW_DLLPUBLIC SwFlyFrameAttrMgr
+class SwFlyFrameAttrMgr
 {
     SfxItemSet  m_aSet;
     Point       m_aAbsPos;
@@ -60,18 +60,18 @@ class SW_DLLPUBLIC SwFlyFrameAttrMgr
     bool    m_bIsInVerticalL2R;
 
     // internal calculation for borders
-    SAL_DLLPRIVATE SwTwips           CalcTopSpace();
-    SAL_DLLPRIVATE SwTwips           CalcBottomSpace();
-    SAL_DLLPRIVATE SwTwips           CalcLeftSpace();
-    SAL_DLLPRIVATE SwTwips           CalcRightSpace();
+    SwTwips           CalcTopSpace();
+    SwTwips           CalcBottomSpace();
+    SwTwips           CalcLeftSpace();
+    SwTwips           CalcRightSpace();
 
-    SAL_DLLPRIVATE void UpdateFlyFrame_(); // post-treatment after insert or update
+    void UpdateFlyFrame_(); // post-treatment after insert or update
 
 public:
-    SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type nType, const SvGlobalName* pName );
+    SW_DLLPUBLIC SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type nType, const SvGlobalName* pName );
 
     //CopyCtor for dialogs to check the metrics
-    SwFlyFrameAttrMgr( bool bNew, SwWrtShell *pSh, SfxItemSet aSet );
+    SW_DLLPUBLIC SwFlyFrameAttrMgr( bool bNew, SwWrtShell *pSh, SfxItemSet aSet );
 
     void                SetAnchor(RndStdIds eId);
     inline RndStdIds    GetAnchor()  const;
@@ -109,12 +109,12 @@ public:
 
     // create new frame
     void                InsertFlyFrame();
-    void                InsertFlyFrame(RndStdIds      eAnchorType,
+    SW_DLLPUBLIC void   InsertFlyFrame(RndStdIds      eAnchorType,
                                    const Point    &rPos,
                                    const Size     &rSize);
 
     // check and change metrics
-    void                ValidateMetrics(SvxSwFrameValidation& rVal,
+    SW_DLLPUBLIC void   ValidateMetrics(SvxSwFrameValidation& rVal,
                             const SwFormatAnchor* pToCharContentPos,
                             bool bOnlyPercentRefValue = false);
 
@@ -126,7 +126,7 @@ public:
     void                     SetAttrSet(const SfxItemSet& rSet);
     void SetFrameSizeFromTable();
     /// Checks if we have a table selection and that covers exactly 1 full table.
-    static const SwTableFormat* SingleTableSelected(SwWrtShell& rWrtShell);
+    SW_DLLPUBLIC static const SwTableFormat* SingleTableSelected(SwWrtShell& rWrtShell);
 
     inline const SwFormatVertOrient &GetVertOrient() const;
     inline const SwFormatHoriOrient &GetHoriOrient() const;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 18c9bc0c44b9..ce42a13bd010 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -75,7 +75,7 @@ enum class PasteTableType
 
 class SwTransferDdeLink;
 
-class SW_DLLPUBLIC SwTransferable final : public TransferableHelper
+class SwTransferable final : public TransferableHelper
 {
     friend class SwView_Impl;
     SfxObjectShellLock              m_aDocShellRef;
@@ -168,7 +168,7 @@ class SW_DLLPUBLIC SwTransferable final : public TransferableHelper
     using TransferableHelper::StartDrag;
 
 public:
-    SwTransferable( SwWrtShell& );
+    SW_DLLPUBLIC SwTransferable( SwWrtShell& );
     virtual ~SwTransferable() override;
 
     static SotExchangeDest GetSotDestination( const SwWrtShell& rSh );
@@ -178,8 +178,8 @@ public:
     static void InitOle( SfxObjectShell* pDoc );
 
     // copy - methods and helper methods for the copy
-    int  Cut();
-    int  Copy( bool bIsCut = false );
+    SW_DLLPUBLIC int  Cut();
+    SW_DLLPUBLIC int  Copy( bool bIsCut = false );
     int  PrepareForCopy( bool bIsCut = false );
     void PrepareForCopyTextRange(SwPaM & rPaM);
     void  CalculateAndCopy();                // special for Calculator
@@ -192,7 +192,7 @@ public:
 
     // paste - methods and helper methods for the paste
     static bool IsPaste( const SwWrtShell&, const TransferableDataHelper& );
-    static bool Paste( SwWrtShell&, TransferableDataHelper&, RndStdIds nAnchorType = RndStdIds::FLY_AT_PARA,
+    SW_DLLPUBLIC static bool Paste( SwWrtShell&, TransferableDataHelper&, RndStdIds nAnchorType = RndStdIds::FLY_AT_PARA,
                           bool bIgnoreComments = false, PasteTableType ePasteTable = PasteTableType::PASTE_DEFAULT );
     static bool PasteData( const TransferableDataHelper& rData,
                           SwWrtShell& rSh, sal_uInt8 nAction, SotExchangeActionFlags nActionFlags,
@@ -215,7 +215,7 @@ public:
      * @param rFormatUsed
      */
     static void PrePasteSpecial( const SwWrtShell& rSh, const TransferableDataHelper&, const VclPtr<SfxAbstractPasteDialog>& pDlg );
-    static bool PasteFormat( SwWrtShell& rSh, const TransferableDataHelper& rData,
+    SW_DLLPUBLIC static bool PasteFormat( SwWrtShell& rSh, const TransferableDataHelper& rData,
                              SotClipboardFormatId nFormat );
 
     static void FillClipFormatItem( const SwWrtShell& rSh,
@@ -229,7 +229,7 @@ public:
     void SetCleanUp( bool bFlag )       { m_bCleanUp = bFlag; }
 
     // public only for testing
-    bool PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool bMove,
+    SW_DLLPUBLIC bool PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool bMove,
                         bool bIsXSelection );
 
     // Interfaces for Selection
@@ -242,7 +242,7 @@ public:
     // the related SwView is being closed and the SwTransferable is invalid now
     void    Invalidate() {m_pWrtShell = nullptr;}
 
-    static void SelectPasteFormat(TransferableDataHelper& rData, sal_uInt8& nAction,
+    SW_DLLPUBLIC static void SelectPasteFormat(TransferableDataHelper& rData, sal_uInt8& nAction,
                                   SotClipboardFormatId& nFormat);
 };