[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source

[David Tardon]

 sw/inc/IDocumentMarkAccess.hxx |    6 +++---
 sw/inc/IMark.hxx               |    8 ++++----
 sw/source/core/inc/txmsrt.hxx  |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 0e9d19d5062ad219f34fc0c37179a31846a456fc
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jun 8 08:36:40 2014 +0200

    these symbols belong to libswlo
    
    Change-Id: I04b970a58b5d138b89f4eb331b3f53ebcb55236a

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 7ae711c..fe5b608 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -265,10 +265,10 @@ class IDocumentMarkAccess
 
         /** Returns the MarkType used to create the mark
         */
-        static SAL_DLLPUBLIC_EXPORT MarkType GetType(const ::sw::mark::IMark& rMark);
+        static SW_DLLPUBLIC MarkType GetType(const ::sw::mark::IMark& rMark);
 
-        static SAL_DLLPUBLIC_EXPORT OUString GetCrossRefHeadingBookmarkNamePrefix();
-        static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM );
+        static SW_DLLPUBLIC OUString GetCrossRefHeadingBookmarkNamePrefix();
+        static SW_DLLPUBLIC bool IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM );
     protected:
         virtual ~IDocumentMarkAccess() {};
 };
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 7a03295..13c1e00 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -32,7 +32,7 @@ struct SwPosition;
 namespace sw { namespace mark
 {
 
-    class SAL_DLLPUBLIC_EXPORT IMark
+    class SW_DLLPUBLIC IMark
         : virtual public SwModify // inherited as interface
         , public ::boost::totally_ordered<IMark>
     {
@@ -70,7 +70,7 @@ namespace sw { namespace mark
             virtual OUString ToString( ) const =0;
     };
 
-    class SAL_DLLPUBLIC_EXPORT IBookmark
+    class SW_DLLPUBLIC IBookmark
         : virtual public IMark
     {
         public:
@@ -80,7 +80,7 @@ namespace sw { namespace mark
             virtual void SetKeyCode(const KeyCode&) =0;
     };
 
-    class SAL_DLLPUBLIC_EXPORT IFieldmark
+    class SW_DLLPUBLIC IFieldmark
         : virtual public IMark
     {
         public:
@@ -97,7 +97,7 @@ namespace sw { namespace mark
             virtual void Invalidate() = 0;
     };
 
-    class SAL_DLLPUBLIC_EXPORT ICheckboxFieldmark
+    class SW_DLLPUBLIC ICheckboxFieldmark
         : virtual public IFieldmark
     {
         public:
commit 6ef15c11e04e0fc28b72845bf26dc5aa08cbb648
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jun 8 08:30:36 2014 +0200

    another blind fix for windows
    
    Change-Id: I5cd5ec37ac8779901d05e573c0c227addfe8e1c3

diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 26ce41b..38da0f4 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -116,7 +116,7 @@ public:
 };
 
 // Beschreibung: Klassen fuer die Sortierung der Verzeichnisse
-struct SAL_DLLPUBLIC_EXPORT SwTOXSortTabBase
+struct SW_DLLPUBLIC SwTOXSortTabBase
 {
     SwTOXSources aTOXSources;
     ::com::sun::star::lang::Locale aLocale;