diff options
32 files changed, 92 insertions, 210 deletions
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk index 13b6896bd26f..f7935ca1d18d 100644 --- a/writerfilter/Library_doctok.mk +++ b/writerfilter/Library_doctok.mk @@ -42,7 +42,7 @@ include $(SRCDIR)/writerfilter/debug_setup.mk $(eval $(call gb_Library_set_defs,doctok,\ $$(DEFS) \ - -DWRITERFILTER_DLLIMPLEMENTATION \ + -DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \ )) diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk index 053c1d59d7aa..4663a2170e1b 100644 --- a/writerfilter/Library_ooxml.mk +++ b/writerfilter/Library_ooxml.mk @@ -43,7 +43,7 @@ include $(SRCDIR)/writerfilter/debug_setup.mk $(eval $(call gb_Library_set_defs,ooxml,\ $$(DEFS) \ - -DWRITERFILTER_DLLIMPLEMENTATION \ + -DWRITERFILTER_OOXML_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \ )) diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk index 8d1852ac360d..1ee3c9e2a248 100644 --- a/writerfilter/Library_resourcemodel.mk +++ b/writerfilter/Library_resourcemodel.mk @@ -40,7 +40,7 @@ include $(SRCDIR)/writerfilter/debug_setup.mk $(eval $(call gb_Library_set_defs,resourcemodel,\ $$(DEFS) \ - -DWRITERFILTER_DLLIMPLEMENTATION \ + -DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \ )) diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk index 670f4b773120..60081f855a6d 100644 --- a/writerfilter/Library_rtftok.mk +++ b/writerfilter/Library_rtftok.mk @@ -37,7 +37,7 @@ include debug_setup.mk $(eval $(call gb_Library_set_defs,rtftok,\ $$(DEFS) \ - -DWRITERFILTER_DLLIMPLEMENTATION \ + -DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ )) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 6e424417fadb..bb0817325013 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -41,7 +41,7 @@ include $(SRCDIR)/writerfilter/debug_setup.mk $(eval $(call gb_Library_set_defs,writerfilter,\ $$(DEFS) \ - -DWRITERFILTER_DLLIMPLEMENTATION \ + -DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \ )) diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index c8f801bd7c94..436cd3a0fb69 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,writerfilter_uno,\ $(eval $(call gb_Library_set_defs,writerfilter_uno,\ $$(DEFS) \ - -DWRITERFILTER_DLLIMPLEMENTATION \ + -DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \ )) diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx index 37fa8b8f6560..98cb5d3776e0 100644 --- a/writerfilter/inc/WriterFilterDllApi.hxx +++ b/writerfilter/inc/WriterFilterDllApi.hxx @@ -31,11 +31,37 @@ #include "sal/types.h" -#if defined(WRITERFILTER_DLLIMPLEMENTATION) -#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#if defined(WRITERFILTER_DOCTOK_DLLIMPLEMENTATION) +#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#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_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 +#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#if defined(WRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION) +#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +// This one can be shared #define WRITERFILTER_DLLPRIVATE SAL_DLLPRIVATE #endif /* INCLUDED_WRITERFILTERDLLAPI_H */ diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index d9d40aa32ad9..31f5a667e4e3 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -78,7 +78,7 @@ enum SourceDocumentType DOCUMENT_OOXML, DOCUMENT_RTF }; -class WRITERFILTER_DLLPUBLIC DomainMapper : public LoggedProperties, public LoggedTable, +class WRITERFILTER_OOXML_DLLPUBLIC DomainMapper : public LoggedProperties, public LoggedTable, public BinaryObj, public LoggedStream { DomainMapper_Impl *m_pImpl; diff --git a/writerfilter/inc/doctok/WW8Document.hxx b/writerfilter/inc/doctok/WW8Document.hxx index 6bb0049d90d9..8fc3d1aca1f3 100644 --- a/writerfilter/inc/doctok/WW8Document.hxx +++ b/writerfilter/inc/doctok/WW8Document.hxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star; stream consists of substreams that are identified by string identifiers. */ -class WRITERFILTER_DLLPUBLIC WW8Stream +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Stream { public: /** @@ -107,7 +107,7 @@ public: A property. */ -class WRITERFILTER_DLLPUBLIC WW8Property +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Property { public: /** @@ -154,7 +154,7 @@ public: } \endcode */ -class WRITERFILTER_DLLPUBLIC WW8PropertySetIterator +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8PropertySetIterator { public: typedef boost::shared_ptr<WW8PropertySetIterator> Pointer_t; @@ -191,7 +191,7 @@ bool operator != (const WW8PropertySetIterator & rA, /** A set of properties. */ -class WRITERFILTER_DLLPUBLIC WW8PropertySet +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8PropertySet { public: typedef boost::shared_ptr<WW8PropertySet> Pointer_t; @@ -278,7 +278,7 @@ enum PropertyType { The use of the iterator is analogous to WW8PropertySetIterator. */ -class WRITERFILTER_DLLPUBLIC WW8DocumentIterator +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8DocumentIterator { public: typedef boost::shared_ptr<WW8DocumentIterator> Pointer_t; @@ -371,7 +371,7 @@ public: bool operator == (const WW8DocumentIterator & rA, const WW8DocumentIterator & rB); -class WRITERFILTER_DLLPUBLIC SubDocumentId +class SubDocumentId { public: enum eType { FOOTNOTES, HEADERS, FOOTERS }; @@ -393,7 +393,7 @@ public: /** A Word 8 document. */ -class WRITERFILTER_DLLPUBLIC WW8Document : +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Document : public writerfilter::Reference<Stream> { public: @@ -425,7 +425,7 @@ public: virtual WW8DocumentIterator::Pointer_t end() = 0; }; -class WRITERFILTER_DLLPUBLIC WW8DocumentFactory +class WRITERFILTER_DOCTOK_DLLPUBLIC WW8DocumentFactory { public: static WW8Stream::Pointer_t diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx index 6a8d7df80a7d..7ce8052da2a5 100644 --- a/writerfilter/inc/ooxml/OOXMLDocument.hxx +++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx @@ -80,7 +80,7 @@ namespace ooxml using namespace com::sun::star; -class WRITERFILTER_DLLPUBLIC OOXMLStream +class WRITERFILTER_OOXML_DLLPUBLIC OOXMLStream { public: enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, FONTTABLE, NUMBERING, @@ -124,7 +124,7 @@ public: }; -class WRITERFILTER_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream> +class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream> { public: /** @@ -251,7 +251,7 @@ public: }; -class WRITERFILTER_DLLPUBLIC OOXMLDocumentFactory +class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocumentFactory { public: static OOXMLStream::Pointer_t diff --git a/writerfilter/inc/resourcemodel/Fraction.hxx b/writerfilter/inc/resourcemodel/Fraction.hxx index 9fc07b316946..152e6a694d6d 100644 --- a/writerfilter/inc/resourcemodel/Fraction.hxx +++ b/writerfilter/inc/resourcemodel/Fraction.hxx @@ -35,7 +35,7 @@ namespace writerfilter { namespace resourcemodel { -class WRITERFILTER_DLLPUBLIC Fraction +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Fraction { public: explicit Fraction(sal_Int32 nNumerator, sal_Int32 nDenominator = 1); diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx index 8b5aadb3e3a1..23129b8b4c93 100644 --- a/writerfilter/inc/resourcemodel/LoggedResources.hxx +++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx @@ -36,7 +36,7 @@ namespace writerfilter { -class WRITERFILTER_DLLPUBLIC LoggedResourcesHelper +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedResourcesHelper { public: explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix); @@ -56,7 +56,7 @@ private: string msPrefix; }; -class WRITERFILTER_DLLPUBLIC LoggedStream : public Stream +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedStream : public Stream { public: explicit LoggedStream(TagLogger::Pointer_t pLogger, const string & sPrefix); @@ -96,7 +96,7 @@ protected: LoggedResourcesHelper mHelper; }; -class WRITERFILTER_DLLPUBLIC LoggedProperties : public Properties +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedProperties : public Properties { public: explicit LoggedProperties(TagLogger::Pointer_t pLogger, const string & sPrefix); @@ -112,7 +112,7 @@ protected: LoggedResourcesHelper mHelper; }; -class WRITERFILTER_DLLPUBLIC LoggedTable : public Table +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedTable : public Table { public: explicit LoggedTable(TagLogger::Pointer_t pLogger, const string & sPrefix); diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx index 580dade8a423..7a8932b13bcb 100644 --- a/writerfilter/inc/resourcemodel/QNameToString.hxx +++ b/writerfilter/inc/resourcemodel/QNameToString.hxx @@ -39,7 +39,7 @@ namespace writerfilter { using namespace ::std; -class WRITERFILTER_DLLPUBLIC QNameToString +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString { typedef boost::shared_ptr<QNameToString> Pointer_t; typedef map < Id, string > Map; @@ -63,7 +63,7 @@ public: string operator()(Id qName); }; -class WRITERFILTER_DLLPUBLIC SprmIdToString +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SprmIdToString { typedef boost::shared_ptr<SprmIdToString> Pointer_t; diff --git a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx index f581dad2a49c..0289085dbe79 100644 --- a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx +++ b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx @@ -33,8 +33,8 @@ namespace writerfilter { namespace resourcemodel { -void WRITERFILTER_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm); -void WRITERFILTER_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue); +void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm); +void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue); }} diff --git a/writerfilter/inc/resourcemodel/SubSequence.hxx b/writerfilter/inc/resourcemodel/SubSequence.hxx index 69af89428d86..930d3c690f16 100644 --- a/writerfilter/inc/resourcemodel/SubSequence.hxx +++ b/writerfilter/inc/resourcemodel/SubSequence.hxx @@ -50,7 +50,7 @@ void dumpLine(OutputWithDepth<string> & o, SubSequence<T> & rSeq, sal_uInt32 nOffset, sal_uInt32 nStep); template <class T> -class WRITERFILTER_DLLPUBLIC SubSequence +class SubSequence { typedef boost::shared_ptr<com::sun::star::uno::Sequence<T> > SequencePointer; diff --git a/writerfilter/inc/resourcemodel/TableData.hxx b/writerfilter/inc/resourcemodel/TableData.hxx index aa083354473b..9caa1654bffc 100644 --- a/writerfilter/inc/resourcemodel/TableData.hxx +++ b/writerfilter/inc/resourcemodel/TableData.hxx @@ -41,7 +41,7 @@ template <typename T, typename PropertiesPointer> /** Class containing the data to describe a table cell. */ -class WRITERFILTER_DLLPUBLIC CellData +class CellData { /** Handle to start of cell. @@ -126,7 +126,7 @@ template <typename T, typename PropertiesPointer> /** Class to handle data of a table row. */ -class WRITERFILTER_DLLPUBLIC RowData +class RowData { typedef typename CellData<T, PropertiesPointer>::Pointer_t CellDataPointer_t; @@ -275,7 +275,7 @@ template <typename T, typename PropertiesPointer> /** Class that holds the data of a table. */ -class WRITERFILTER_DLLPUBLIC TableData +class TableData { typedef typename RowData<T, PropertiesPointer>::Pointer_t RowPointer_t; typedef ::std::vector<RowPointer_t> Rows; diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index 5d5d819b8581..c22ea5090a72 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -53,7 +53,7 @@ template <typename T, typename PropertiesPointer> /** Class to handle events generated by TableManager::resolveCurrentTable */ -class WRITERFILTER_DLLPUBLIC TableDataHandler +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TableDataHandler { public: typedef boost::shared_ptr<TableDataHandler> Pointer_t; diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx index ffe3daca71e0..4f47c67ca694 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -47,7 +47,7 @@ namespace writerfilter virtual std::string toString(const Id & id) const = 0; }; - class WRITERFILTER_DLLPUBLIC TagLogger + class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TagLogger { public: typedef TagLogger* Pointer_t; diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx index 306ba9ec23f8..246b203ce120 100644 --- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx +++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef INCLUDED_WW8_EVENT_HANDLER_HXX -#define INCLUDED_WW8_EVENT_HANDLER_HXX +#ifndef INCLUDED_WW8RESOURCEMODEL_HXX +#define INCLUDED_WW8RESOURCEMODEL_HXX #include <string> #include <memory> @@ -90,7 +90,7 @@ using namespace ::std; */ template <class T> -class WRITERFILTER_DLLPUBLIC Reference +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Reference { public: /** @@ -125,7 +125,7 @@ class Sprm; /** Handler for properties. */ -class WRITERFILTER_DLLPUBLIC Properties +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Properties { public: /** @@ -148,7 +148,7 @@ public: /** Handler for tables. */ -class WRITERFILTER_DLLPUBLIC Table +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Table { public: typedef boost::shared_ptr<Table> Pointer_t; @@ -164,7 +164,7 @@ public: /** Handler for binary objects. */ -class WRITERFILTER_DLLPUBLIC BinaryObj +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC BinaryObj { public: /** @@ -181,7 +181,7 @@ public: /** Handler for a stream. */ -class WRITERFILTER_DLLPUBLIC Stream +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Stream { public: /** @@ -285,7 +285,7 @@ public: makes no sense for a certain value, e.g. the integer value of a string. */ -class WRITERFILTER_DLLPUBLIC Value +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Value { public: /** @@ -333,7 +333,7 @@ public: An SPRM. */ -class WRITERFILTER_DLLPUBLIC Sprm +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Sprm { public: typedef auto_ptr<Sprm> Pointer_t; @@ -383,22 +383,21 @@ public: /** Creates handler for a stream. */ -Stream::Pointer_t WRITERFILTER_DLLPUBLIC createStreamHandler(); +Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createStreamHandler(); - void WRITERFILTER_DLLPUBLIC analyzerIds(); - Stream::Pointer_t WRITERFILTER_DLLPUBLIC createAnalyzer(); + void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds(); + Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createAnalyzer(); - void WRITERFILTER_DLLPUBLIC logger(string prefix, string message); + void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC logger(string prefix, string message); - void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props); - void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n); - void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, + void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props); + void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n); + void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, const rtl::OUString & /*str*/); - void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary); + void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary); } - -#endif // INCLUDED_WW8_EVENT_HANDLER_HXX +#endif // INCLUDED_WW8RESOURCEMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx index 0173e9c8cdde..d5e97a2be563 100644 --- a/writerfilter/inc/resourcemodel/XPathLogger.hxx +++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx @@ -41,7 +41,7 @@ using ::std::stack; using ::std::string; using ::std::vector; -class WRITERFILTER_DLLPUBLIC XPathLogger +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC XPathLogger { typedef boost::unordered_map<string, unsigned int> TokenMap_t; typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t; diff --git a/writerfilter/inc/resourcemodel/exceptions.hxx b/writerfilter/inc/resourcemodel/exceptions.hxx index d09e23bf1e6f..c6d3b5821758 100644 --- a/writerfilter/inc/resourcemodel/exceptions.hxx +++ b/writerfilter/inc/resourcemodel/exceptions.hxx @@ -35,7 +35,7 @@ namespace writerfilter { using namespace ::std; -class WRITERFILTER_DLLPUBLIC Exception +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Exception { string mText; @@ -45,13 +45,13 @@ public: const string & getText() const { return mText; } }; -class WRITERFILTER_DLLPUBLIC ExceptionNotFound : public Exception +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionNotFound : public Exception { public: ExceptionNotFound(string text) : Exception(text) {} }; -class WRITERFILTER_DLLPUBLIC ExceptionOutOfBounds : public Exception +class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionOutOfBounds : public Exception { public: ExceptionOutOfBounds(string text) : Exception(text) {} diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx index be7dae0150a7..d89a4c063a91 100644 --- a/writerfilter/inc/resourcemodel/util.hxx +++ b/writerfilter/inc/resourcemodel/util.hxx @@ -38,10 +38,10 @@ namespace writerfilter using namespace ::std; using namespace ::com::sun::star; - string WRITERFILTER_DLLPUBLIC xmlify(const string & str); + string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC xmlify(const string & str); #if OSL_DEBUG_LEVEL > 1 - string WRITERFILTER_DLLPUBLIC propertysetToString + string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC propertysetToString (uno::Reference<beans::XPropertySet> const & rProps); string toString(uno::Reference< text::XTextRange > textRange); diff --git a/writerfilter/inc/writerfilter.mk b/writerfilter/inc/writerfilter.mk deleted file mode 100644 index b53e58ca977b..000000000000 --- a/writerfilter/inc/writerfilter.mk +++ /dev/null @@ -1,37 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION -.IF "$(DBG_LEVEL)">="2" -CDEFS+=-DDEBUG_DOMAINMAPPER -DDEBUG_ELEMENT -DDEBUG_RESOLVE \ - -DDEBUG_CONTEXT_STACK -DDEBUG_ATTRIBUTES -DDEBUG_PROPERTIES \ - -DDEBUG_CONTEXT_HANDLER -DDEBUG_IMPORT -CFLAGS += $(LIBXML_CFLAGS) -.ENDIF -.IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -.ENDIF diff --git a/writerfilter/source/doctok/genqnametostr b/writerfilter/source/doctok/genqnametostr deleted file mode 100644 index a7cd32db5296..000000000000 --- a/writerfilter/source/doctok/genqnametostr +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/tcsh -#************************************************************************ -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -# ***********************************************************************/ - -xalan -xsl qnametostr.xsl -in resources.xmi > qnametostr.tmp -cat qnametostrheader > qnametostr.cxx -cat qnametostr.tmp >> qnametostr.cxx -cat ../ooxml/qnametostr.tmp >> qnametostr.cxx -cat qnametostrfooter >> qnametostr.cxx diff --git a/writerfilter/source/doctok/qnametostrfooter b/writerfilter/source/doctok/qnametostrfooter deleted file mode 100644 index 1ec35ed30254..000000000000 --- a/writerfilter/source/doctok/qnametostrfooter +++ /dev/null @@ -1,2 +0,0 @@ -} -} diff --git a/writerfilter/source/doctok/qnametostrheader b/writerfilter/source/doctok/qnametostrheader deleted file mode 100644 index 07ce47387153..000000000000 --- a/writerfilter/source/doctok/qnametostrheader +++ /dev/null @@ -1,36 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <doctok/resourceids.hxx> -#include <ooxml/resourceids.hxx> -#include "WW8ResourceModelImpl.hxx" - -namespace doctok -{ - -QNameToString::QNameToString() -{ diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx index aada3c609f72..03488db64ff1 100644 --- a/writerfilter/source/filter/RtfFilter.hxx +++ b/writerfilter/source/filter/RtfFilter.hxx @@ -39,7 +39,7 @@ #include <WriterFilterDllApi.hxx> /// Common RTF filter, calls RtfImportFilter and RtfExportFilter via UNO. -class WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5 +class WRITERFILTER_WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelper5 < com::sun::star::document::XFilter, com::sun::star::document::XImporter, diff --git a/writerfilter/source/filter/WriterFilter.hxx b/writerfilter/source/filter/WriterFilter.hxx index b883ca1e91d7..a2b2fb7a4b5b 100644 --- a/writerfilter/source/filter/WriterFilter.hxx +++ b/writerfilter/source/filter/WriterFilter.hxx @@ -39,7 +39,7 @@ #include <WriterFilterDllApi.hxx> /// Common DOC/DOCX filter, calls DocxExportFilter via UNO or does the DOC (currently unused) / DOCX import. -class WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5 +class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHelper5 < com::sun::star::document::XFilter, com::sun::star::document::XImporter, diff --git a/writerfilter/source/filter/WriterFilterDetection.hxx b/writerfilter/source/filter/WriterFilterDetection.hxx index f84252e05d1a..f7caa549d6d8 100644 --- a/writerfilter/source/filter/WriterFilterDetection.hxx +++ b/writerfilter/source/filter/WriterFilterDetection.hxx @@ -35,7 +35,7 @@ #include <WriterFilterDllApi.hxx> /// File format detection service for DOC (unused) / DOCX. -class WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2 +class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilterDetection : public cppu::WeakImplHelper2 < com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo diff --git a/writerfilter/source/resourcemodel/genqnametostr b/writerfilter/source/resourcemodel/genqnametostr deleted file mode 100755 index 12bad07b9b85..000000000000 --- a/writerfilter/source/resourcemodel/genqnametostr +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/tcsh -#************************************************************************ -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -# ***********************************************************************/ - -cat qnametostrheader > qnametostr.cxx -cat ../doctok/qnametostr.tmp >> qnametostr.cxx -cat ../ooxml/qnametostr.tmp >> qnametostr.cxx -cat qnametostrfooter >> qnametostr.cxx -cat sprmcodetostrheader > sprmcodetostr.cxx -cat ../doctok/sprmcodetostr.tmp >> sprmcodetostr.cxx -echo "}" >> sprmcodetostr.cxx diff --git a/writerfilter/source/resourcemodel/qnametostrfooter b/writerfilter/source/resourcemodel/qnametostrfooter index d0af0f6fa30f..4cba68b6f852 100644 --- a/writerfilter/source/resourcemodel/qnametostrfooter +++ b/writerfilter/source/resourcemodel/qnametostrfooter @@ -4,7 +4,7 @@ QNameToString::QNameToString() init_ooxml(); } -void WRITERFILTER_DLLPUBLIC analyzerIds() +void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds() { cout << "<ids type=\"sprm\">" << endl; diff --git a/writerfilter/source/resourcemodel/qnametostrheader b/writerfilter/source/resourcemodel/qnametostrheader index 6cbd0b3fec10..2705bb30cc73 100644 --- a/writerfilter/source/resourcemodel/qnametostrheader +++ b/writerfilter/source/resourcemodel/qnametostrheader @@ -35,7 +35,7 @@ namespace writerfilter QNameToString::Pointer_t QNameToString::pInstance; -QNameToString::Pointer_t WRITERFILTER_DLLPUBLIC QNameToString::Instance() +QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Instance() { if (pInstance.get() == NULL) pInstance = QNameToString::Pointer_t(new QNameToString()); @@ -43,7 +43,7 @@ QNameToString::Pointer_t WRITERFILTER_DLLPUBLIC QNameToString::Instance() return pInstance; } -string WRITERFILTER_DLLPUBLIC QNameToString::operator()(Id qName) +string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName) { string sResult; |