Remove SW_DLLPRIVATE -> SAL_DLLPRIVATE indirection

Change-Id: I5498266e5496f196d420a2897b804da8599917b5

22 files changed, 128 insertions, 129 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 978d6b6c642d..adf33191645a 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -232,11 +232,11 @@ private:
 
     SwFrm* m_oldColFrm;
 
-    SW_DLLPRIVATE void UpdateCrsr(
+    SAL_DLLPRIVATE void UpdateCrsr(
         sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
         sal_Bool bIdleEnd = sal_False );
 
-    SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
+    SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
 
     /** Mark a certain list level of a certain list
 
@@ -247,23 +247,23 @@ private:
 
         An empty sListId denotes that no level of a list is marked.
      */
-    SW_DLLPRIVATE void MarkListLevel( const OUString& sListId,
+    SAL_DLLPRIVATE void MarkListLevel( const OUString& sListId,
                                       const int nLevel );
 
     // private method(s) accessed from public inline method(s) must be exported.
                   sal_Bool LeftRight( sal_Bool, sal_uInt16, sal_uInt16, sal_Bool );
-    SW_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 );
-    SW_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False );
-    SW_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const;
+    SAL_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 );
+    SAL_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False );
+    SAL_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const;
 
-    SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
+    SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
 
-    SW_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
+    SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
 
 typedef sal_Bool (SwCursor:: *FNCrsr)();
-    SW_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
+    SAL_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
 
-    SW_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect );
+    SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect );
 
 protected:
 
@@ -296,7 +296,7 @@ protected:
 
     /** Updates the marked list level according to the cursor.
     */
-    SW_DLLPRIVATE void UpdateMarkedListLevel();
+    SAL_DLLPRIVATE void UpdateMarkedListLevel();
 
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index f99468db7d2c..009584f483d8 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -202,22 +202,22 @@ friend class SwConnectionDisposedListener_Impl;
     SwNewDBMgr_Impl*    pImpl;
     const SwXMailMerge* pMergeEvtSrc;   ///< != 0 if mail merge events are to be send
 
-    SW_DLLPRIVATE SwDSParam*          FindDSData(const SwDBData& rData, sal_Bool bCreate);
-    SW_DLLPRIVATE SwDSParam*          FindDSConnection(const OUString& rSource, sal_Bool bCreate);
+    SAL_DLLPRIVATE SwDSParam*          FindDSData(const SwDBData& rData, sal_Bool bCreate);
+    SAL_DLLPRIVATE SwDSParam*          FindDSConnection(const OUString& rSource, sal_Bool bCreate);
 
 
-    SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
+    SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
 
     /// Insert data record as text into document.
-    SW_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
+    SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
 
     /// Insert a single data record as text into document.
-    SW_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
+    SAL_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
 
     /// merge to file _and_ merge to e-Mail
-    SW_DLLPRIVATE sal_Bool          MergeMailFiles(SwWrtShell* pSh,
+    SAL_DLLPRIVATE sal_Bool          MergeMailFiles(SwWrtShell* pSh,
                                         const SwMergeDescriptor& rMergeDescriptor );
-    SW_DLLPRIVATE sal_Bool          ToNextRecord(SwDSParam* pParam);
+    SAL_DLLPRIVATE sal_Bool          ToNextRecord(SwDSParam* pParam);
 
 public:
     SwNewDBMgr();
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 867d1e2fbd9e..97dfe92b2b33 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType
     sal_Bool bCRLFFlag : 1;
     sal_Bool bDeleted : 1;
 
-    SW_DLLPRIVATE void _RefCntChgd();
+    SAL_DLLPRIVATE void _RefCntChgd();
 
 public:
     SwDDEFieldType( const OUString& rName, const OUString& rCmd,
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 308811ef2fa1..20dfcea30f33 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -76,39 +76,39 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
     bool                    bIsATemplate;      ///< prevent nested calls of UpdateFontList
 
     /// Methods for access to doc.
-    SW_DLLPRIVATE void                  AddLink();
-    SW_DLLPRIVATE void                  RemoveLink();
+    SAL_DLLPRIVATE void                  AddLink();
+    SAL_DLLPRIVATE void                  RemoveLink();
 
     /// Catch hint for DocInfo.
-    SW_DLLPRIVATE virtual void          Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    SAL_DLLPRIVATE virtual void          Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     /// FileIO
-    SW_DLLPRIVATE virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
-    SW_DLLPRIVATE virtual sal_Bool Load( SfxMedium& rMedium );
-    SW_DLLPRIVATE virtual sal_Bool LoadFrom( SfxMedium& rMedium );
-    SW_DLLPRIVATE virtual sal_Bool            ConvertFrom( SfxMedium &rMedium );
-    SW_DLLPRIVATE virtual sal_Bool            ConvertTo( SfxMedium &rMedium );
-    SW_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
-    SW_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    SAL_DLLPRIVATE virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    SAL_DLLPRIVATE virtual sal_Bool Load( SfxMedium& rMedium );
+    SAL_DLLPRIVATE virtual sal_Bool LoadFrom( SfxMedium& rMedium );
+    SAL_DLLPRIVATE virtual sal_Bool            ConvertFrom( SfxMedium &rMedium );
+    SAL_DLLPRIVATE virtual sal_Bool            ConvertTo( SfxMedium &rMedium );
+    SAL_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
+    SAL_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
 
-    SW_DLLPRIVATE virtual bool     PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
+    SAL_DLLPRIVATE virtual bool     PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
 
-    SW_DLLPRIVATE virtual bool     InsertGeneratedStream(SfxMedium& rMedium,
+    SAL_DLLPRIVATE virtual bool     InsertGeneratedStream(SfxMedium& rMedium,
             css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
         SAL_OVERRIDE;
 
     /// Make DocInfo known to the Doc.
-    SW_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
+    SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
                                     Window *pParent, const SfxItemSet &);
     /// OLE-stuff
-    SW_DLLPRIVATE virtual void          Draw( OutputDevice*, const JobSetup&, sal_uInt16);
+    SAL_DLLPRIVATE virtual void          Draw( OutputDevice*, const JobSetup&, sal_uInt16);
 
     /// Methods for StyleSheets
 
     // @param nSlot
     // Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
     // Used to activate certain dialog pane
-    SW_DLLPRIVATE sal_uInt16 Edit(
+    SAL_DLLPRIVATE sal_uInt16 Edit(
         const OUString &rName,
         const OUString& rParent,
         const sal_uInt16 nFamily,
@@ -118,23 +118,23 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
         SwWrtShell* pActShell = 0,
         const sal_Bool bBasic = sal_False );
 
-    SW_DLLPRIVATE sal_uInt16            Delete(const OUString &rName, sal_uInt16 nFamily);
-    SW_DLLPRIVATE sal_uInt16            Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden);
-    SW_DLLPRIVATE sal_uInt16            ApplyStyles(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
+    SAL_DLLPRIVATE sal_uInt16            Delete(const OUString &rName, sal_uInt16 nFamily);
+    SAL_DLLPRIVATE sal_uInt16            Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden);
+    SAL_DLLPRIVATE sal_uInt16            ApplyStyles(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
                                                     sal_uInt16 nMode = 0 );
-    SW_DLLPRIVATE sal_uInt16            DoWaterCan( const OUString &rName, sal_uInt16 nFamily);
-    SW_DLLPRIVATE sal_uInt16            UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
-    SW_DLLPRIVATE sal_uInt16            MakeByExample(const OUString &rName,
+    SAL_DLLPRIVATE sal_uInt16            DoWaterCan( const OUString &rName, sal_uInt16 nFamily);
+    SAL_DLLPRIVATE sal_uInt16            UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
+    SAL_DLLPRIVATE sal_uInt16            MakeByExample(const OUString &rName,
                                         sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0);
 
-    SW_DLLPRIVATE void                  InitDraw();
-    SW_DLLPRIVATE void                  SubInitNew();   ///< for InitNew and HtmlSourceMode.
+    SAL_DLLPRIVATE void                  InitDraw();
+    SAL_DLLPRIVATE void                  SubInitNew();   ///< for InitNew and HtmlSourceMode.
 
-    SW_DLLPRIVATE void                  RemoveOLEObjects();
-    SW_DLLPRIVATE void                  CalcLayoutForOLEObjects();
+    SAL_DLLPRIVATE void                  RemoveOLEObjects();
+    SAL_DLLPRIVATE void                  CalcLayoutForOLEObjects();
 
-    SW_DLLPRIVATE void                  Init_Impl();
-    SW_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
+    SAL_DLLPRIVATE void                  Init_Impl();
+    SAL_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
 
 
     using SfxObjectShell::GetVisArea;
@@ -296,8 +296,8 @@ public:
                                 GetController();
 
     SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
-    SW_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
-    SW_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
+    SAL_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
+    SAL_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
 
     virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const;
 
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index a08ff60a9c83..f213eefd10c2 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
 
 
     /// Make empty shell a real StyleSheet (Core).
-    SW_DLLPRIVATE void              Create();
+    SAL_DLLPRIVATE void              Create();
 
     /// Fill StyleSheet with data.
     enum FillStyleType {
@@ -77,7 +77,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
         FillPhysical
     };
 
-    SW_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType );
+    SAL_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType );
 
 protected:
     virtual ~SwDocStyleSheet();
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index a50b1fd15812..58bf231075ec 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -149,15 +149,15 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
     /// For the PamCorrAbs/-Rel methods.
     friend class SwUndo;
 
-    SW_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
+    SAL_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
 
     /** Returns pointer to a SwGrfNode
      that will be used by GetGraphic() and GetGraphicSize(). */
-    SW_DLLPRIVATE SwGrfNode *_GetGrfNode() const ;
+    SAL_DLLPRIVATE SwGrfNode *_GetGrfNode() const ;
 
-    SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 );
+    SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 );
 
-    SW_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
+    SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
 
     using SwViewShell::UpdateFlds;
     using SwModify::GetInfo;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 8f16c0de0382..7877ac996622 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -171,41 +171,41 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
     SdrDropMarkerOverlay *pChainFrom, *pChainTo;
     sal_Bool bCheckForOLEInCaption;
 
-    SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
-    SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&  ) const;
+    SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
+    SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&  ) const;
 
     /// Terminate actions for all shells and call ChangeLink.
-    SW_DLLPRIVATE void EndAllActionAndCall();
+    SAL_DLLPRIVATE void EndAllActionAndCall();
 
-    SW_DLLPRIVATE void ScrollTo( const Point &rPt );
+    SAL_DLLPRIVATE void ScrollTo( const Point &rPt );
 
-    SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
+    SAL_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
 
     /** Used for mouse operations on a table:
      @return a cell frame that is 'close' to rPt. */
-    SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const;
+    SAL_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const;
 
     // 0 == not in any column.
-    SW_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
+    SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
                           SwGetCurColNumPara* pPara ) const;
 
-    SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
-    SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
+    SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
+    SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
 
-    SW_DLLPRIVATE sal_Bool ImpEndCreate();
+    SAL_DLLPRIVATE sal_Bool ImpEndCreate();
 
-    SW_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
+    SAL_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
 
     /// Methods for copying of draw objects.
-    SW_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
+    SAL_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                                 const Point& rInsPt, sal_Bool bIsMove,
                                 sal_Bool bSelectInsert );
 
     /// Get list of marked SdrObjects;
     /// helper method for GetSelFrmType, IsSelContainsControl.
-    SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
+    SAL_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
 
-    SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
+    SAL_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
 
     using SwEditShell::Copy;
 
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 1e2091840207..29dae274d1a1 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -252,10 +252,10 @@ protected:
 
 public:
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+    SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::beans::XPropertySet> const& GetXObject() const
             { return m_wXFieldMaster; }
-    SW_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
                     ::com::sun::star::beans::XPropertySet> const& xFieldMaster)
             { m_wXFieldMaster = xFieldMaster; }
 
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index e20aee540dfc..0e733d7dec9d 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
                              When it is set (again) the visual arrangement is recalculated.
                              The flag is initially set. */
 
-    SW_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
+    SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
 
 public:
     SwFmtCol();
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index b545328fe072..46021a44cf01 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -106,10 +106,10 @@ public:
     bool IsFldInDoc() const;
     sal_Bool IsProtect() const;
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+    SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextField> const& GetXTextField() const
             { return m_wXTextField; }
-    SW_DLLPRIVATE void SetXTextField(::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE void SetXTextField(::com::sun::star::uno::Reference<
                     ::com::sun::star::text::XTextField> const& xTextField)
             { m_wXTextField = xTextField; }
 };
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 1b26316d7ee6..636f0cb1e869 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -129,10 +129,10 @@ public:
     void SetCaptionFmt(SwFrmFmt* pFmt);
     SwFrmFmt* GetCaptionFmt() const;
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+    SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::uno::XInterface> const& GetXObject() const
             { return m_wXObject; }
-    SW_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
                     ::com::sun::star::uno::XInterface> const& xObject)
             { m_wXObject = xObject; }
 
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index ea5982812185..683d15456a01 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -115,25 +115,25 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextContent> m_wXParagraph;
 
-    SW_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
+    SAL_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
                              const SfxItemSet* pAutoAttr = 0 );
 
     /// Copies the attributes at nStart to pDest.
-    SW_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
+    SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
 
-    SW_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True,
+    SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True,
                                 sal_Bool bChgFollow = sal_True );
 
-    SW_DLLPRIVATE void CutImpl(
+    SAL_DLLPRIVATE void CutImpl(
           SwTxtNode * const pDest, const SwIndex & rDestStart,
           const SwIndex & rStart, /*const*/ sal_Int32 nLen,
           const bool bUpdate = true );
 
     /// Move all comprising hard attributes to the AttrSet of the paragraph.
-    SW_DLLPRIVATE void MoveTxtAttr_To_AttrSet();  // Called by SplitNode.
+    SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet();  // Called by SplitNode.
 
     /// Create the specific AttrSet.
-    SW_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& );
+    SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& );
 
     /// Optimization: Asking for information about hidden characters at SwScriptInfo
     /// updates these flags.
@@ -146,25 +146,25 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
         m_bRecalcHiddenCharFlags = false;
     }
 
-    SW_DLLPRIVATE void CalcHiddenCharFlags() const;
+    SAL_DLLPRIVATE void CalcHiddenCharFlags() const;
 
-    SW_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const;
+    SAL_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const;
 
-    SW_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM,
+    SAL_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM,
             LanguageType nLang, sal_uInt16 nLangWhichId,
             const Font *pFont,  sal_uInt16 nFontWhichId );
 
     /// Start: Data collected during idle time
 
-    SW_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const;
-    SW_DLLPRIVATE sal_uLong GetParaNumberOfWords() const;
-    SW_DLLPRIVATE void SetParaNumberOfAsianWords( sal_uLong nTmpAsianWords ) const;
-    SW_DLLPRIVATE sal_uLong GetParaNumberOfAsianWords() const;
-    SW_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const;
-    SW_DLLPRIVATE sal_uLong GetParaNumberOfChars() const;
-    SW_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( sal_uLong nTmpChars ) const;
-    SW_DLLPRIVATE sal_uLong GetParaNumberOfCharsExcludingSpaces() const;
-    SW_DLLPRIVATE void InitSwParaStatistics( bool bNew );
+    SAL_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const;
+    SAL_DLLPRIVATE sal_uLong GetParaNumberOfWords() const;
+    SAL_DLLPRIVATE void SetParaNumberOfAsianWords( sal_uLong nTmpAsianWords ) const;
+    SAL_DLLPRIVATE sal_uLong GetParaNumberOfAsianWords() const;
+    SAL_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const;
+    SAL_DLLPRIVATE sal_uLong GetParaNumberOfChars() const;
+    SAL_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( sal_uLong nTmpChars ) const;
+    SAL_DLLPRIVATE sal_uLong GetParaNumberOfCharsExcludingSpaces() const;
+    SAL_DLLPRIVATE void InitSwParaStatistics( bool bNew );
 
     /** create number for this text node, if not already existing
 
@@ -174,7 +174,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     inline void TryDeleteSwpHints();
 
-    SW_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
+    SAL_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
 
     const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const;
 
@@ -772,10 +772,10 @@ public:
 
     sal_uInt16 GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd ) const;
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+    SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextContent> const& GetXParagraph() const
             { return m_wXParagraph; }
-    SW_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference<
                     ::com::sun::star::text::XTextContent> const& xParagraph)
             { m_wXParagraph = xParagraph; }
 
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 1dbfbfc9fcb9..68c9f282832b 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -52,8 +52,8 @@ class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
     SwFmtVertOrient* pVertOrient;
     //For i120928,record the cp info of graphic within bullet
     sal_Unicode     cGrfBulletCP;
-    SW_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
-    SW_DLLPRIVATE virtual void NotifyGraphicArrived();
+    SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
+    SAL_DLLPRIVATE virtual void NotifyGraphicArrived();
 
     using SvxNumberFormat::operator ==;
     using SvxNumberFormat::operator !=;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index b0bcceccc489..9d72b6c8be45 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -151,11 +151,11 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 
     /** Called for mirroring of Chg (doc).
        No adjustment at any other place. */
-    SW_DLLPRIVATE void Mirror();
+    SAL_DLLPRIVATE void Mirror();
 
-    SW_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft );
+    SAL_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft );
 
-    SW_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
+    SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
 
 protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue );
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 603ad1e608e7..5a483636b9bf 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -106,10 +106,10 @@ public:
     void SetHidden(bool const bFlag = true) { m_bHidden = bFlag; }
 
     bool IsHiddenFlag() const { return m_bHiddenFlag; }
-    SW_DLLPRIVATE void
+    SAL_DLLPRIVATE void
         SetHiddenFlag(bool const bFlag) { m_bHiddenFlag = bFlag; }
     bool IsProtectFlag() const { return m_bProtectFlag; }
-    SW_DLLPRIVATE void
+    SAL_DLLPRIVATE void
         SetProtectFlag(bool const bFlag) { m_bProtectFlag = bFlag; }
     bool IsEditInReadonlyFlag() const { return m_bEditInReadonlyFlag; }
     void SetEditInReadonlyFlag(bool const bFlag)
@@ -158,7 +158,7 @@ private:
     SwServerObjectRef m_RefObj; // Set if DataServer.
     ::sfx2::SvBaseLinkRef m_RefLink;
 
-    SW_DLLPRIVATE void ImplSetHiddenFlag(
+    SAL_DLLPRIVATE void ImplSetHiddenFlag(
             bool const bHidden, bool const bCondition);
 
 protected:
@@ -295,7 +295,7 @@ class SW_DLLPUBLIC SwSectionFmt
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextSection> m_wXTextSection;
 
-    SW_DLLPRIVATE void UpdateParent();      // Parent has been changed.
+    SAL_DLLPRIVATE void UpdateParent();      // Parent has been changed.
 
 protected:
     SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc );
@@ -337,10 +337,10 @@ public:
     // Is section a valid one for global document?
     const SwSection* GetGlobalDocSection() const;
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+    SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XTextSection> const& GetXTextSection() const
             { return m_wXTextSection; }
-    SW_DLLPRIVATE void SetXTextSection(::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE void SetXTextSection(::com::sun::star::uno::Reference<
                     ::com::sun::star::text::XTextSection> const& xTextSection)
             { m_wXTextSection = xTextSection; }
 
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx
index 69fa86eedbc1..923835acd278 100644
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.hxx
@@ -34,12 +34,12 @@ private:
     ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion >   m_xAccessTypeConversion;
     ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >     m_xDataAccessFactory;
 
-    SW_DLLPRIVATE static void registerClient();
-    SW_DLLPRIVATE static void revokeClient();
-    SW_DLLPRIVATE void getFactory();
+    SAL_DLLPRIVATE static void registerClient();
+    SAL_DLLPRIVATE static void revokeClient();
+    SAL_DLLPRIVATE void getFactory();
 
-    SW_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTools >    getDataAccessTools();
-    SW_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > getAccessTypeConversion();
+    SAL_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTools >    getDataAccessTools();
+    SAL_DLLPRIVATE ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > getAccessTypeConversion();
 
 public:
     SwDbtoolsClient();
diff --git a/sw/inc/swdllapi.h b/sw/inc/swdllapi.h
index f719ff7fcbd7..91108f7e45a0 100644
--- a/sw/inc/swdllapi.h
+++ b/sw/inc/swdllapi.h
@@ -27,7 +27,6 @@
 #else
 #define SW_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
-#define SW_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif // INCLUDED_SW_INC_SWDLLAPI_H
 
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index edf87d1cf53a..d85d5e50138a 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -302,8 +302,8 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl
     struct Impl;
     ::boost::scoped_ptr<Impl> m_pImpl;
 
-    SW_DLLPRIVATE sal_Bool Load( SvStream& rStream );
-    SW_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const;
+    SAL_DLLPRIVATE sal_Bool Load( SvStream& rStream );
+    SAL_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const;
 
 public:
     explicit SwTableAutoFmtTbl();
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 9e4efebfe05a..d87198c2caeb 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -131,10 +131,10 @@ public:
     const SwTxtTOXMark* GetTxtTOXMark() const   { return pTxtAttr; }
           SwTxtTOXMark* GetTxtTOXMark()         { return pTxtAttr; }
 
-    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+    SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
             { return m_wXDocumentIndexMark; }
-    SW_DLLPRIVATE void SetXTOXMark(::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE void SetXTOXMark(::com::sun::star::uno::Reference<
                     ::com::sun::star::text::XDocumentIndexMark> const& xMark)
             { m_wXDocumentIndexMark = xMark; }
     void DeRegister() { GetRegisteredInNonConst()->Remove( this ); }
@@ -269,7 +269,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
 
        @return the token
      */
-    SW_DLLPRIVATE SwFormToken BuildToken( const OUString & sPattern,
+    SAL_DLLPRIVATE SwFormToken BuildToken( const OUString & sPattern,
                                           sal_Int32 & nCurPatternPos ) const;
 
     /**
@@ -280,7 +280,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
 
        @return   the string representation of the token
     */
-    SW_DLLPRIVATE OUString SearchNextToken( const OUString & sPattern,
+    SAL_DLLPRIVATE OUString SearchNextToken( const OUString & sPattern,
                                             sal_Int32 nStt ) const;
 
     /**
@@ -294,7 +294,7 @@ class SW_DLLPUBLIC SwFormTokensHelper
 
        @return the type of the token
     */
-    SW_DLLPRIVATE FormTokenType GetTokenType(const OUString & sToken,
+    SAL_DLLPRIVATE FormTokenType GetTokenType(const OUString & sToken,
                                              sal_Int32 * pTokenLen) const;
 
 public:
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 2c879250d2fb..c8bd9e648d5a 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -97,7 +97,7 @@ public:
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const;
 
-    SW_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
+    SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
 
     /// Get and set TxtNode pointer.
            const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index f2d78460584f..85f6cc4377be 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -44,7 +44,7 @@ public:
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const;
 
-    SW_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
+    SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
 
     // get and set TxtNode pointer
     const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index ccd63e557fa6..a5f142d3efaa 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -167,23 +167,23 @@ class SW_DLLPUBLIC SwViewShell : public Ring
     SwRootFrmPtr            mpLayout;
 
     // Initialization; called by the diverse constructors.
-    SW_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
+    SAL_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
 
     inline void ResetInvalidRect();
 
-    SW_DLLPRIVATE void Reformat();          // Invalidates complete Layout (ApplyViewOption).
+    SAL_DLLPRIVATE void Reformat();          // Invalidates complete Layout (ApplyViewOption).
 
-    SW_DLLPRIVATE void PaintDesktop( const SwRect & );  // Collect values for painting of desktop
+    SAL_DLLPRIVATE void PaintDesktop( const SwRect & );  // Collect values for painting of desktop
                                                         // and calling.
     // PaintDesktop split. This pars is also used by PreviewPage.
-    SW_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion );
+    SAL_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion );
 
-    SW_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & );  // Direct Paint or rather
+    SAL_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & );  // Direct Paint or rather
                                                                     // trigger an action.
 
-    SW_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions );
+    SAL_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions );
 
-    SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
+    SAL_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
 
 protected:
     static ShellResource*   mpShellRes;      ///< Resources for the Shell.