Remove needless WRITERFILTER_DLLPRIVATE annotations

Change-Id: I8149471775d623f52231d12f05a28e98b33fae6a

21 files changed, 22 insertions, 25 deletions

diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx
index b9caa741df45..6c9425b313f5 100644
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@ -58,9 +58,6 @@
 #define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 
-// This one can be shared
-#define WRITERFILTER_DLLPRIVATE SAL_DLLPRIVATE
-
 #endif /* INCLUDED_WRITERFILTERDLLAPI_H */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 692d7ca40988..7b52962352ee 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -29,7 +29,7 @@ namespace writerfilter {
 namespace dmapper
 {
 class PropertyMap;
-class WRITERFILTER_DLLPRIVATE BorderHandler : public LoggedProperties
+class BorderHandler : public LoggedProperties
 {
 public:
     //todo: order is a guess
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index e3e1c0b59a7f..1683d509ffbc 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -29,7 +29,7 @@ namespace writerfilter {
 namespace dmapper
 {
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellColorHandler : public LoggedProperties
+class CellColorHandler : public LoggedProperties
 {
 public:
     enum OutputFormat { Form, Paragraph, Character }; // for what part of the document
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index abde1688b403..902ef80fdec1 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -28,7 +28,7 @@ namespace writerfilter {
 namespace dmapper
 {
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellMarginHandler : public LoggedProperties
+class CellMarginHandler : public LoggedProperties
 {
 private:
     sal_Int32   m_nValue; ///< Converted value.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 7e248debadb4..3bc66fac72d7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -256,7 +256,7 @@ void lcl_debug_TableBorder(table::TableBorder & rBorder)
 }
 #endif
 
-struct WRITERFILTER_DLLPRIVATE TableInfo
+struct TableInfo
 {
     sal_Int32 nLeftBorderDistance;
     sal_Int32 nRightBorderDistance;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 4536aac3cf35..320fcc495b5d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -65,7 +65,7 @@ struct HorizontallyMergedCell
     }
 };
 
-class WRITERFILTER_DLLPRIVATE DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
+class DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropertyMapPtr >
 {
     TextReference_t         m_xText;
     DomainMapper_Impl&      m_rDMapper_Impl;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index c1025064feb6..0a14054b8e8a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -285,7 +285,7 @@ struct FloatingTableInfo
 };
 
 class DomainMapper;
-class WRITERFILTER_DLLPRIVATE DomainMapper_Impl
+class DomainMapper_Impl
 {
 public:
     typedef TableManager< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >, PropertyMapPtr > TableManager_t;
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 2cb7e3f00cd3..9ea59aef2218 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -54,7 +54,7 @@ struct FontEntry
         {}
 };
 
-class WRITERFILTER_DLLPRIVATE FontTable : public LoggedProperties, public LoggedTable
+class FontTable : public LoggedProperties, public LoggedTable
     /*,public BinaryObj*/, public LoggedStream
 {
     FontTable_Impl   *m_pImpl;
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 97b2652bed52..88d09dede652 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -31,7 +31,7 @@ namespace writerfilter {
 namespace dmapper
 {
 
-class WRITERFILTER_DLLPRIVATE PositionHandler: public LoggedProperties
+class PositionHandler: public LoggedProperties
 {
 public:
     PositionHandler( bool vertical );
@@ -54,7 +54,7 @@ public:
 };
 typedef boost::shared_ptr<PositionHandler> PositionHandlerPtr;
 
-class WRITERFILTER_DLLPRIVATE WrapHandler: public LoggedProperties
+class WrapHandler: public LoggedProperties
 {
 public:
     WrapHandler( );
@@ -71,7 +71,7 @@ public:
 };
 typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr;
 
-class WRITERFILTER_DLLPRIVATE GraphicZOrderHelper
+class GraphicZOrderHelper
 {
 public:
     void addItem( uno::Reference< beans::XPropertySet > props, sal_Int32 relativeHeight );
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 7e4cef259848..a3ffbe49a01e 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -60,7 +60,7 @@ enum GraphicImportType
     IMPORT_AS_DETECTED_ANCHOR
 };
 
-class WRITERFILTER_DLLPRIVATE GraphicImport : public LoggedProperties, public LoggedTable
+class GraphicImport : public LoggedProperties, public LoggedTable
                     ,public BinaryObj, public LoggedStream
 {
     GraphicImport_Impl* m_pImpl;
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index b1e7c57a0edd..619532bbf289 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -31,7 +31,7 @@ namespace dmapper
     - Left indent of tables
     - Preferred width of tables
  */
-class WRITERFILTER_DLLPRIVATE MeasureHandler : public LoggedProperties
+class MeasureHandler : public LoggedProperties
 {
     sal_Int32 m_nMeasureValue;
     sal_Int32 m_nUnit;
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index e10be8837aba..dd18c132cb1c 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -27,7 +27,7 @@ namespace writerfilter {
 namespace dmapper{
 
 
-class WRITERFILTER_DLLPRIVATE ModelEventListener :
+class ModelEventListener :
     public cppu::WeakImplHelper1< ::com::sun::star::document::XEventListener >
 {
     bool m_bIndexes;
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 63e920781982..d3e3b1f5a135 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -43,7 +43,7 @@ namespace dmapper
 {
 /** Handler for OLE objects
  */
-class WRITERFILTER_DLLPRIVATE OLEHandler : public LoggedProperties
+class OLEHandler : public LoggedProperties
 {
     OUString     m_sObjectType;
     OUString     m_sProgId;
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index b6aebf569581..6e9d5985806d 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -46,7 +46,7 @@ public:
     ~_PgBorder( );
 };
 
-class WRITERFILTER_DLLPRIVATE PageBordersHandler : public LoggedProperties
+class PageBordersHandler : public LoggedProperties
 {
 private:
 
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index 43f70a1f19ad..317e98dd63a2 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -34,7 +34,7 @@ struct _Column
 };
 
 
-class WRITERFILTER_DLLPRIVATE SectionColumnHandler : public LoggedProperties
+class SectionColumnHandler : public LoggedProperties
 {
     bool        bEqualWidth;
     sal_Int32   nSpace;
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 16799447a56e..6c619c9f79d6 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -42,7 +42,7 @@ using namespace std;
 
 struct SettingsTable_Impl;
 
-class WRITERFILTER_DLLPRIVATE SettingsTable : public LoggedProperties, public LoggedTable
+class SettingsTable : public LoggedProperties, public LoggedTable
 {
     SettingsTable_Impl *m_pImpl;
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index e9faba7fc023..f483eef87105 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -122,7 +122,7 @@ private:
 typedef boost::shared_ptr< StyleSheetTable >    StyleSheetTablePtr;
 
 
-class WRITERFILTER_DLLPRIVATE TableStyleSheetEntry :
+class TableStyleSheetEntry :
     public StyleSheetEntry
 {
 private:
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 11be96634bc7..ebfc54563c0c 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -37,7 +37,7 @@ namespace dmapper
 {
 class PropertyMap;
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE TDefTableHandler : public LoggedProperties
+class TDefTableHandler : public LoggedProperties
 {
 public:
 
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index bfd636e81fed..b04b09093f49 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -20,7 +20,7 @@ namespace dmapper
 {
 
 /// Handler for floating table positioning
-class WRITERFILTER_DLLPRIVATE TablePositionHandler
+class TablePositionHandler
     : public LoggedProperties
 {
     OUString m_aVertAnchor;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index a7abf776e3ea..eed2c0ed5464 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -50,7 +50,7 @@ enum TblStyleType
     TBL_STYLE_SWCELL
 };
 
-class WRITERFILTER_DLLPRIVATE TblStylePrHandler : public LoggedProperties
+class TblStylePrHandler : public LoggedProperties
 {
 private:
     DomainMapper &              m_rDMapper;
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 190da8504e21..dedcede6b4e4 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -33,7 +33,7 @@ namespace dmapper
 
 struct ThemeTable_Impl;
 
-class WRITERFILTER_DLLPRIVATE ThemeTable : public LoggedProperties, public LoggedTable
+class ThemeTable : public LoggedProperties, public LoggedTable
 {
     ThemeTable_Impl *m_pImpl;