[Libreoffice-commits] .: sw/inc sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk

[Norbert Thiebaud]

 sw/Library_sw.mk    |    2 +-
 sw/Library_swd.mk   |    1 +
 sw/Library_swui.mk  |    1 +
 sw/inc/iodetect.hxx |   12 ++++++------
 sw/inc/swddllapi.h  |   16 ++++++++++++++++
 5 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit d1175f3d6a452845c3611a57fb9e852cfc895a5b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Apr 28 21:07:05 2011 -0500

    remove double objects include in sw

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 6ebc1d5..f3e5371 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     svt \
     svx \
     svxcore \
+    swd \
     tk \
     tl \
     ucbhelper \
@@ -472,7 +473,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
     sw/source/filter/ascii/wrtasc \
     sw/source/filter/basflt/docfact \
     sw/source/filter/basflt/fltini \
-    sw/source/filter/basflt/iodetect \
     sw/source/filter/basflt/shellio \
     sw/source/filter/html/SwAppletImpl \
     sw/source/filter/html/css1atr \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 97edee8..0b1ca39 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_set_include,swd,\
 
 $(eval $(call gb_Library_set_defs,swd,\
     $$(DEFS) \
+    -DSWD_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,swd,\
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 5cad4b1..0b5c708 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
     svx \
     svxcore \
     sw \
+    swd \
     tk \
     tl \
     ucbhelper \
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 1d6827f..0358632 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -34,7 +34,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <osl/endian.h>
 #include <tools/string.hxx>
-#include <swdllapi.h>
+#include <swddllapi.h>
 
 #define FILTER_RTF      "RTF"       // RTF filter
 #define sRtfWH          "WH_RTF"
@@ -86,7 +86,7 @@ enum ReaderWriterEnum {
     MAXFILTER
 };
 
-extern SwIoDetect aFilterDetect[];
+extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
 
 // The following class is a wrapper for basic i/o functions of Writer 3.0.
 // Everything is static. All filter names mentioned are Writer-internal
@@ -97,13 +97,13 @@ class SwIoSystem
 {
 public:
     // find for an internal format name the corresponding filter entry
-    SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
+    SWD_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
             const SfxFilterContainer* pCnt = 0 );
 
     // Detect for the given file which filter should be used. The filter name
     // is returned. If no filter could be found, the name of the ASCII filter
     // is returned!
-    static const SfxFilter* GetFileFilter( const String& rFileName,
+    SWD_DLLPUBLIC static const SfxFilter* GetFileFilter( const String& rFileName,
             const String& rPrefFltName,
             SfxMedium* pMedium = 0 );
 
@@ -115,12 +115,12 @@ public:
     static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
     static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
 
-    static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, 
+    SWD_DLLPUBLIC static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
             CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
 
     static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
 
-    static const String GetSubStorageName( const SfxFilter& rFltr );
+    SWD_DLLPUBLIC static const String GetSubStorageName( const SfxFilter& rFltr );
 };
 
 #endif
diff --git a/sw/inc/swddllapi.h b/sw/inc/swddllapi.h
new file mode 100644
index 0000000..c967c08
--- /dev/null
+++ b/sw/inc/swddllapi.h
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_SWDDLLAPI_H
+#define INCLUDED_SWDDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(SWD_DLLIMPLEMENTATION)
+#define SWD_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define SWD_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define SWD_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_SWDDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */