diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 20:38:45 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 20:38:45 +0200 |
commit | ff2f7926a5f818981e77869bf41a45e4fa56f521 (patch) | |
tree | 3bbccec1edbe9d8c90603e2f0eff921ff29b27a2 /writerfilter/inc | |
parent | 68ef83dbd75b7f25466e007140aedb9ed3694e50 (diff) |
gnumake4: switching gbuildization
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
Diffstat (limited to 'writerfilter/inc')
-rw-r--r-- | writerfilter/inc/WriterFilterDllApi.hxx | 35 | ||||
-rw-r--r-- | writerfilter/inc/dmapper/DomainMapper.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/doctok/WW8Document.hxx | 14 | ||||
-rw-r--r-- | writerfilter/inc/ooxml/OOXMLDocument.hxx | 6 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/Fraction.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/LoggedResources.hxx | 8 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/QNameToString.hxx | 4 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/ResourceModelHelper.hxx | 4 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/TagLogger.hxx | 3 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 38 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/XPathLogger.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/exceptions.hxx | 6 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/util.hxx | 4 |
14 files changed, 49 insertions, 81 deletions
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx index 98cb5d3776e0..dff806017c8a 100644 --- a/writerfilter/inc/WriterFilterDllApi.hxx +++ b/writerfilter/inc/WriterFilterDllApi.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,39 +30,11 @@ #include "sal/types.h" -#if defined(WRITERFILTER_DOCTOK_DLLIMPLEMENTATION) -#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#if defined(WRITERFILTER_DLLIMPLEMENTATION) +#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define WRITERFILTER_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 */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index 31f5a667e4e3..d9d40aa32ad9 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_OOXML_DLLPUBLIC DomainMapper : public LoggedProperties, public LoggedTable, +class WRITERFILTER_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 8fc3d1aca1f3..5ae1e5890c57 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_DOCTOK_DLLPUBLIC WW8Stream +class WRITERFILTER_DLLPUBLIC WW8Stream { public: /** @@ -107,7 +107,7 @@ public: A property. */ -class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Property +class WRITERFILTER_DLLPUBLIC WW8Property { public: /** @@ -154,7 +154,7 @@ public: } \endcode */ -class WRITERFILTER_DOCTOK_DLLPUBLIC WW8PropertySetIterator +class WRITERFILTER_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_DOCTOK_DLLPUBLIC WW8PropertySet +class WRITERFILTER_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_DOCTOK_DLLPUBLIC WW8DocumentIterator +class WRITERFILTER_DLLPUBLIC WW8DocumentIterator { public: typedef boost::shared_ptr<WW8DocumentIterator> Pointer_t; @@ -393,7 +393,7 @@ public: /** A Word 8 document. */ -class WRITERFILTER_DOCTOK_DLLPUBLIC WW8Document : +class WRITERFILTER_DLLPUBLIC WW8Document : public writerfilter::Reference<Stream> { public: @@ -425,7 +425,7 @@ public: virtual WW8DocumentIterator::Pointer_t end() = 0; }; -class WRITERFILTER_DOCTOK_DLLPUBLIC WW8DocumentFactory +class WRITERFILTER_DLLPUBLIC WW8DocumentFactory { public: static WW8Stream::Pointer_t diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx index 7ce8052da2a5..6a8d7df80a7d 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_OOXML_DLLPUBLIC OOXMLStream +class WRITERFILTER_DLLPUBLIC OOXMLStream { public: enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, FONTTABLE, NUMBERING, @@ -124,7 +124,7 @@ public: }; -class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream> +class WRITERFILTER_DLLPUBLIC OOXMLDocument : public writerfilter::Reference<Stream> { public: /** @@ -251,7 +251,7 @@ public: }; -class WRITERFILTER_OOXML_DLLPUBLIC OOXMLDocumentFactory +class WRITERFILTER_DLLPUBLIC OOXMLDocumentFactory { public: static OOXMLStream::Pointer_t diff --git a/writerfilter/inc/resourcemodel/Fraction.hxx b/writerfilter/inc/resourcemodel/Fraction.hxx index 152e6a694d6d..9fc07b316946 100644 --- a/writerfilter/inc/resourcemodel/Fraction.hxx +++ b/writerfilter/inc/resourcemodel/Fraction.hxx @@ -35,7 +35,7 @@ namespace writerfilter { namespace resourcemodel { -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Fraction +class WRITERFILTER_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 23129b8b4c93..8b5aadb3e3a1 100644 --- a/writerfilter/inc/resourcemodel/LoggedResources.hxx +++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx @@ -36,7 +36,7 @@ namespace writerfilter { -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedResourcesHelper +class WRITERFILTER_DLLPUBLIC LoggedResourcesHelper { public: explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix); @@ -56,7 +56,7 @@ private: string msPrefix; }; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedStream : public Stream +class WRITERFILTER_DLLPUBLIC LoggedStream : public Stream { public: explicit LoggedStream(TagLogger::Pointer_t pLogger, const string & sPrefix); @@ -96,7 +96,7 @@ protected: LoggedResourcesHelper mHelper; }; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedProperties : public Properties +class WRITERFILTER_DLLPUBLIC LoggedProperties : public Properties { public: explicit LoggedProperties(TagLogger::Pointer_t pLogger, const string & sPrefix); @@ -112,7 +112,7 @@ protected: LoggedResourcesHelper mHelper; }; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC LoggedTable : public Table +class WRITERFILTER_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 7a8932b13bcb..580dade8a423 100644 --- a/writerfilter/inc/resourcemodel/QNameToString.hxx +++ b/writerfilter/inc/resourcemodel/QNameToString.hxx @@ -39,7 +39,7 @@ namespace writerfilter { using namespace ::std; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString +class WRITERFILTER_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_RESOURCEMODEL_DLLPUBLIC SprmIdToString +class WRITERFILTER_DLLPUBLIC SprmIdToString { typedef boost::shared_ptr<SprmIdToString> Pointer_t; diff --git a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx index 0289085dbe79..f581dad2a49c 100644 --- a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx +++ b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx @@ -33,8 +33,8 @@ namespace writerfilter { namespace resourcemodel { -void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm); -void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue); +void WRITERFILTER_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm); +void WRITERFILTER_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue); }} diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index a0525d1b45d9..ad43cd998de5 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_RESOURCEMODEL_DLLPUBLIC TableDataHandler +class WRITERFILTER_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 cbee3a8ae05d..ffe3daca71e0 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -45,10 +45,9 @@ namespace writerfilter public: typedef boost::shared_ptr<IdToString> Pointer_t; virtual std::string toString(const Id & id) const = 0; - string toTree(const string & sIndent = "") const; }; - class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC TagLogger + class WRITERFILTER_DLLPUBLIC TagLogger { public: typedef TagLogger* Pointer_t; diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx index 32cffdd35490..9acec7f4fee8 100644 --- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx +++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +25,8 @@ * ************************************************************************/ -#ifndef INCLUDED_WW8RESOURCEMODEL_HXX -#define INCLUDED_WW8RESOURCEMODEL_HXX +#ifndef INCLUDED_WW8_EVENT_HANDLER_HXX +#define INCLUDED_WW8_EVENT_HANDLER_HXX #include <string> #include <memory> @@ -90,7 +89,7 @@ using namespace ::std; */ template <class T> -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Reference +class WRITERFILTER_DLLPUBLIC Reference { public: /** @@ -125,7 +124,7 @@ class Sprm; /** Handler for properties. */ -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Properties +class WRITERFILTER_DLLPUBLIC Properties { public: /** @@ -148,7 +147,7 @@ public: /** Handler for tables. */ -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Table +class WRITERFILTER_DLLPUBLIC Table { public: typedef boost::shared_ptr<Table> Pointer_t; @@ -164,7 +163,7 @@ public: /** Handler for binary objects. */ -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC BinaryObj +class WRITERFILTER_DLLPUBLIC BinaryObj { public: /** @@ -181,7 +180,7 @@ public: /** Handler for a stream. */ -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Stream +class WRITERFILTER_DLLPUBLIC Stream { public: /** @@ -285,7 +284,7 @@ public: makes no sense for a certain value, e.g. the integer value of a string. */ -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Value +class WRITERFILTER_DLLPUBLIC Value { public: /** @@ -333,7 +332,7 @@ public: An SPRM. */ -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Sprm +class WRITERFILTER_DLLPUBLIC Sprm { public: typedef auto_ptr<Sprm> Pointer_t; @@ -383,18 +382,18 @@ public: /** Creates handler for a stream. */ -Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createStreamHandler(); +Stream::Pointer_t WRITERFILTER_DLLPUBLIC createStreamHandler(); - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds(); - Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createAnalyzer(); +void WRITERFILTER_DLLPUBLIC analyzerIds(); +Stream::Pointer_t WRITERFILTER_DLLPUBLIC createAnalyzer(); - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC logger(string prefix, string message); +void WRITERFILTER_DLLPUBLIC logger(string prefix, string message); - 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*/, +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*/, const rtl::OUString & /*str*/); - void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary); +void WRITERFILTER_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary); class Token_t { @@ -426,6 +425,5 @@ struct TokenHash } -#endif // INCLUDED_WW8RESOURCEMODEL_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +#endif // INCLUDED_WW8_EVENT_HANDLER_HXX diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx index d5e97a2be563..0173e9c8cdde 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_RESOURCEMODEL_DLLPUBLIC XPathLogger +class WRITERFILTER_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 c6d3b5821758..d09e23bf1e6f 100644 --- a/writerfilter/inc/resourcemodel/exceptions.hxx +++ b/writerfilter/inc/resourcemodel/exceptions.hxx @@ -35,7 +35,7 @@ namespace writerfilter { using namespace ::std; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Exception +class WRITERFILTER_DLLPUBLIC Exception { string mText; @@ -45,13 +45,13 @@ public: const string & getText() const { return mText; } }; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionNotFound : public Exception +class WRITERFILTER_DLLPUBLIC ExceptionNotFound : public Exception { public: ExceptionNotFound(string text) : Exception(text) {} }; -class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC ExceptionOutOfBounds : public Exception +class WRITERFILTER_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 d89a4c063a91..be7dae0150a7 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_RESOURCEMODEL_DLLPUBLIC xmlify(const string & str); + string WRITERFILTER_DLLPUBLIC xmlify(const string & str); #if OSL_DEBUG_LEVEL > 1 - string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC propertysetToString + string WRITERFILTER_DLLPUBLIC propertysetToString (uno::Reference<beans::XPropertySet> const & rProps); string toString(uno::Reference< text::XTextRange > textRange); |