unused WRITERFILTER_RESOURCEMODEL_DLLPUBLIC

Change-Id: Ia09cd8738e7bfbb942690efb193c0de30e93f69c

writerfilter/inc/WriterFilterDllApi.hxx

@@ -40,12 +40,6 @@
 #define WRITERFILTER_RTFTOK_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
 
-#if defined(WRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION)
-#define WRITERFILTER_RESOURCEMODEL_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_RESOURCEMODEL_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-#endif
-
 #if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION)
 #define WRITERFILTER_WRITERFILTER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
 #else

writerfilter/inc/resourcemodel/Fraction.hxx

@@ -26,7 +26,7 @@
 namespace writerfilter {
 namespace resourcemodel {
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Fraction
+class Fraction
 {
 public:
     explicit Fraction(sal_Int32 nNumerator, sal_Int32 nDenominator = 1);

writerfilter/inc/resourcemodel/LoggedResources.hxx

@@ -29,7 +29,7 @@ namespace writerfilter
 {
 
 #ifdef DEBUG_LOGGING
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedResourcesHelper
+class LoggedResourcesHelper
 {
 public:
     explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -48,7 +48,7 @@ private:
 };
 #endif
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedStream : public Stream
+class LoggedStream : public Stream
 {
 public:
     explicit LoggedStream(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -92,7 +92,7 @@ protected:
 #endif
 };
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedProperties : public Properties
+class LoggedProperties : public Properties
 {
 public:
     explicit LoggedProperties(TagLogger::Pointer_t pLogger, const string & sPrefix);
@@ -110,7 +110,7 @@ protected:
 #endif
 };
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedTable : public Table
+class LoggedTable : public Table
 {
 public:
     explicit LoggedTable(TagLogger::Pointer_t pLogger, const string & sPrefix);

writerfilter/inc/resourcemodel/QNameToString.hxx

@@ -31,7 +31,7 @@ namespace writerfilter
 {
 using namespace ::std;
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString
+class QNameToString
 {
     typedef boost::shared_ptr<QNameToString> Pointer_t;
     typedef map < Id, string > Map;
@@ -54,7 +54,7 @@ public:
     string operator()(Id qName);
 };
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SprmIdToString
+class SprmIdToString
 {
     typedef boost::shared_ptr<SprmIdToString> Pointer_t;
 

writerfilter/inc/resourcemodel/ResourceModelHelper.hxx

@@ -24,7 +24,7 @@
 namespace writerfilter {
 namespace resourcemodel {
 
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm);
+void resolveSprmProps(Properties & rHandler, Sprm & rSprm);
 
 }}
 

writerfilter/inc/resourcemodel/TagLogger.hxx

@@ -41,7 +41,7 @@ namespace writerfilter
         ~IdToString() {}
     };
 
-    class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TagLogger
+    class TagLogger
     {
     public:
         typedef boost::shared_ptr<TagLogger> Pointer_t;

writerfilter/inc/resourcemodel/WW8ResourceModel.hxx

@@ -116,7 +116,7 @@ class Sprm;
 /**
    Handler for properties.
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Properties
+class Properties
 {
 public:
     /**
@@ -141,7 +141,7 @@ protected:
 /**
    Handler for tables.
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Table
+class Table
 {
 public:
     typedef boost::shared_ptr<Table> Pointer_t;
@@ -161,7 +161,7 @@ protected:
 /**
    Handler for binary objects.
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC BinaryObj
+class BinaryObj
 {
 public:
     /**
@@ -181,7 +181,7 @@ protected:
 /**
    Handler for a stream.
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Stream
+class Stream
 {
 public:
 
@@ -291,7 +291,7 @@ protected:
    makes no sense for a certain value, e.g. the integer value of a
    string.
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Value
+class Value
 {
 public:
     /**
@@ -343,7 +343,7 @@ public:
    An SPRM.
 
  */
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Sprm
+class Sprm
 {
 public:
     SAL_WNODEPRECATED_DECLARATIONS_PUSH

writerfilter/inc/resourcemodel/XPathLogger.hxx

@@ -34,7 +34,7 @@ using ::std::stack;
 using ::std::string;
 using ::std::vector;
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC XPathLogger
+class XPathLogger
 {
     typedef boost::unordered_map<string, unsigned int> TokenMap_t;
     typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t;

writerfilter/inc/resourcemodel/exceptions.hxx

@@ -26,7 +26,7 @@
 namespace writerfilter {
 using namespace ::std;
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Exception
+class Exception
 {
     string mText;
 
@@ -36,13 +36,13 @@ public:
     const string & getText() const { return mText; }
 };
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionNotFound : public Exception
+class ExceptionNotFound : public Exception
 {
 public:
     ExceptionNotFound(string text) : Exception(text) {}
 };
 
-class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionOutOfBounds : public Exception
+class ExceptionOutOfBounds : public Exception
 {
 public:
     ExceptionOutOfBounds(string text) : Exception(text) {}

writerfilter/inc/resourcemodel/util.hxx

@@ -29,10 +29,10 @@ namespace writerfilter
     using namespace ::std;
     using namespace ::com::sun::star;
 
-    string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC xmlify(const string & str);
+    string xmlify(const string & str);
 
 #if OSL_DEBUG_LEVEL > 1
-    string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC toString(uno::Reference< text::XTextRange > textRange);
+    string toString(uno::Reference< text::XTextRange > textRange);
 #endif
 }
 #endif // INCLUDED_RESOURCEMODEL_UTIL_HXX

writerfilter/source/resourcemodel/qnametostrcore.cxx

@@ -23,7 +23,7 @@ namespace writerfilter
 
 QNameToString::Pointer_t QNameToString::pInstance;
 
-QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Instance()
+QNameToString::Pointer_t QNameToString::Instance()
 {
     if (pInstance.get() == NULL)
         pInstance = QNameToString::Pointer_t(new QNameToString());
@@ -31,7 +31,7 @@ QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Ins
     return pInstance;
 }
 
-string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName)
+string QNameToString::operator()(Id qName)
 {
     string sResult;