summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-04-03 20:20:05 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-04-03 20:35:28 +0200
commit338f0eb554594b2a5da3a1a60cd620c5e49b0fa5 (patch)
tree38f05a41742d40ab0e0cd4125adcfed625fdf949
parent036b1fccbfb87a1aab36632843deb29e0a70630f (diff)
writerfilter: unused WRITERFILTER_OOXML_DLLPUBLIC
Change-Id: I3f14017d6816d59b951c947827ca9497f2cd97fc
-rw-r--r--writerfilter/inc/WriterFilterDllApi.hxx6
-rw-r--r--writerfilter/inc/dmapper/DomainMapper.hxx2
-rw-r--r--writerfilter/inc/ooxml/OOXMLDocument.hxx6
3 files changed, 4 insertions, 10 deletions
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx
index 62c5e22a13d9..df89c70c1ab1 100644
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@ -28,12 +28,6 @@
#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#if defined(WRITERFILTER_OOXML_DLLIMPLEMENTATION)
-#define WRITERFILTER_OOXML_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_OOXML_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#if defined(WRITERFILTER_RTFTOK_DLLIMPLEMENTATION)
#define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index f0a6430714c2..c820d167635f 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -71,7 +71,7 @@ enum SourceDocumentType
DOCUMENT_OOXML,
DOCUMENT_RTF
};
-class WRITERFILTER_OOXML_DLLPUBLIC DomainMapper : public LoggedProperties, public LoggedTable,
+class DomainMapper : public LoggedProperties, public LoggedTable,
public BinaryObj, public LoggedStream
{
DomainMapper_Impl *m_pImpl;
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 73a62fe7079f..7aead9ec9ea8 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -73,7 +73,7 @@ namespace ooxml
using namespace com::sun::star;
-class WRITERFILTER_OOXML_DLLPUBLIC OOXMLStream
+class OOXMLStream
{
public:
enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, WEBSETTINGS, FONTTABLE, NUMBERING,
@@ -117,7 +117,7 @@ public:
};
-class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream>
+class OOXMLDocument : public writerfilter::Reference<Stream>
{
public:
/**
@@ -253,7 +253,7 @@ public:
};
-class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocumentFactory
+class OOXMLDocumentFactory
{
public:
static OOXMLStream::Pointer_t