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

[Cédric Bosdonnat]

 sw/inc/IMark.hxx                 |    9 +++++----
 sw/inc/crsrsh.hxx                |    2 +-
 sw/source/filter/ww8/makefile.mk |    1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 5e13f5238dc5d4534eabdf2dd95c39f97bab98d2
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Wed Oct 27 14:25:40 2010 +0200

    Fixed some fields import bug: symbol visibility problem

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index acddcaf..5ef17eb 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -33,6 +33,7 @@
 #include <pam.hxx>
 #include <boost/operators.hpp>
 #include <map>
+#include "swdll.hxx"
 
 #ifndef SW_DECL_SWSERVEROBJECT_DEFINED
 #define SW_DECL_SWSERVEROBJECT_DEFINED
@@ -44,7 +45,7 @@ struct SwPosition;
 
 namespace sw { namespace mark
 {
-    class IMark
+    class SAL_DLLPUBLIC_EXPORT IMark
         : virtual public SwModify // inherited as interface
         , public ::boost::totally_ordered<IMark>
     {
@@ -82,7 +83,7 @@ namespace sw { namespace mark
             virtual rtl::OUString ToString( ) const =0;
     };
 
-    class IBookmark
+    class SAL_DLLPUBLIC_EXPORT IBookmark
         : virtual public IMark
     {
         public:
@@ -92,7 +93,7 @@ namespace sw { namespace mark
             virtual void SetKeyCode(const KeyCode&) =0;
     };
 
-    class IFieldmark
+    class SAL_DLLPUBLIC_EXPORT IFieldmark
         : virtual public IMark
     {
         public:
@@ -109,7 +110,7 @@ namespace sw { namespace mark
             virtual void Invalidate() = 0;
     };
 
-    class ICheckboxFieldmark
+    class SAL_DLLPUBLIC_EXPORT ICheckboxFieldmark
         : virtual public IFieldmark
     {
         public:
diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk
index 730a67d..ca9116c 100644
--- a/sw/source/filter/ww8/makefile.mk
+++ b/sw/source/filter/ww8/makefile.mk
@@ -60,6 +60,7 @@ EXCEPTIONSFILES = \
         $(SLO)$/wrtww8.obj \
         $(SLO)$/docxattributeoutput.obj \
         $(SLO)$/docxexportfilter.obj \
+        $(SLO)$/docxexport.obj \
         $(SLO)$/ww8atr.obj \
         $(SLO)$/ww8par.obj \
         $(SLO)$/ww8par6.obj \
commit c6e22d722aa520b71b0019553f4eea91948fe1ce
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Oct 26 15:51:46 2010 +0200

    Fixed a warning due to stupid unchecked changes (from me)

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index a9fa6f3..35d27e6 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -112,7 +112,7 @@ struct SwContentAtPos
         SW_CONTENT_CHECK    = 0x0400, // #i43742#
         SW_SMARTTAG         = 0x0800,
         SW_FORMCTRL         = 0x1000
-#ifdef OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
         ,SW_CURR_ATTRS      = 0x4000        // only for debugging
         ,SW_TABLEBOXVALUE   = 0x8000        // only for debugging
 #endif