SD_DLLPRIVATE -> SAL_DLLPRIVATE

Change-Id: Ia5f99e3c7cb5aa11cd33ba7f00afc4b9da10f0b7

5 files changed, 10 insertions, 11 deletions

diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h
index 70a837a6a059..f2d82e42f1b5 100644
--- a/sd/inc/sddllapi.h
+++ b/sd/inc/sddllapi.h
@@ -27,7 +27,6 @@
 #else
 #define SD_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
-#define SD_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif /* INCLUDED_SDDLLAPI_H */
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index a90bd9c551d0..42e883e47968 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -72,7 +72,7 @@ public:
 };
 
 
-sal_Bool SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False;
+sal_Bool SAL_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False;
 
 sal_Bool SdPageObjsTLB::IsInDrag()
 {
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index 9f18cd2c689c..9d8582cb91bd 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -133,7 +133,7 @@ private:
             The output device to update.  When it is <null/> then the call
             is ignored.
     */
-    SD_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
+    SAL_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 5473ead9e8ea..84555318ebbb 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -84,8 +84,8 @@ private:
     sal_Bool                    mbInit          : 1;
     sal_Bool                    mbEnableModify  : 1;
 
-    SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const;
-    SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const;
+    SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const;
+    SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const;
 
 protected:
 
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 99dec073be2f..5f8cdcf3f922 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -59,7 +59,7 @@ class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox
 {
 private:
 
-    static sal_Bool  SD_DLLPRIVATE bIsInDrag;      ///< static, in the case the navigator is deleted in ExecuteDrag
+    static sal_Bool  SAL_DLLPRIVATE bIsInDrag;      ///< static, in the case the navigator is deleted in ExecuteDrag
 
 public:
 
@@ -95,13 +95,13 @@ public:
         ::sd::DrawDocShell&     mrDocShell;
         NavigatorDragType   meDragType;
         const ::com::sun::star::uno::Any maTreeListBoxData;
-        SD_DLLPRIVATE virtual               ~SdPageObjsTransferable();
+        SAL_DLLPRIVATE virtual               ~SdPageObjsTransferable();
 
-        SD_DLLPRIVATE virtual void      AddSupportedFormats();
-        SD_DLLPRIVATE virtual sal_Bool  GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
-        SD_DLLPRIVATE virtual void      DragFinished( sal_Int8 nDropAction );
+        SAL_DLLPRIVATE virtual void      AddSupportedFormats();
+        SAL_DLLPRIVATE virtual sal_Bool  GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+        SAL_DLLPRIVATE virtual void      DragFinished( sal_Int8 nDropAction );
 
-        SD_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
+        SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
     };
 
     friend class SdPageObjsTLB::SdPageObjsTransferable;