diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-17 07:47:02 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-17 07:48:15 +0200 |
commit | 585fea6e3e92a312921bb1bff119f731ca0e87cb (patch) | |
tree | 9a9fa520e7b6340e0308e63ef903e8a8c21e8f03 /writerfilter/source | |
parent | 51b215902d8e1f415b5fef49fc50c7167f0c7787 (diff) |
fix incremental build
Change-Id: I28dd6c72c665abd95be6d14dc629296850e03e1d
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMapHelper.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMapHelper.hxx | 4 | ||||
-rw-r--r-- | writerfilter/source/ooxml/factoryimpl.py | 4 | ||||
-rw-r--r-- | writerfilter/source/resourcemodel/qnametostrcore.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/resourcemodel/util.cxx | 4 |
7 files changed, 15 insertions, 13 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 8f3594cb097c..2d9c77d814cd 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -368,9 +368,9 @@ void PropertyMap::insertTableProperties( const PropertyMap* ) #endif } -#ifdef DEBUG_DOMAINMAPPER void PropertyMap::printProperties() { +#ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("properties"); MapIterator aMapIter = m_vMap.begin(); @@ -399,8 +399,8 @@ void PropertyMap::printProperties() } dmapper_logger->endElement(); -} #endif +} SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) : m_bIsFirstSection( bIsFirstSection ) diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index c496f9788c78..2369cf319ab9 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -170,8 +170,8 @@ public: const std::vector< RedlineParamsPtr >& Redlines() const { return m_aRedlines; } std::vector< RedlineParamsPtr >& Redlines() { return m_aRedlines; } -#ifdef DEBUG_DOMAINMAPPER void printProperties(); +#ifdef DEBUG_DOMAINMAPPER virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const; #endif static com::sun::star::table::ShadowFormat getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder); diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx index b35145b75865..0c2214601d89 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.cxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx @@ -21,7 +21,6 @@ #include <resourcemodel/TagLogger.hxx> #include "PropertyMapHelper.hxx" -#ifdef DEBUG_DOMAINMAPPER namespace writerfilter { namespace dmapper @@ -31,6 +30,7 @@ using namespace ::com::sun::star; void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger, const uno::Any & rTableColumnSeparators) { +#ifdef DEBUG_DOMAINMAPPER uno::Sequence<text::TableColumnSeparator> aSeq; rTableColumnSeparators >>= aSeq; @@ -48,8 +48,10 @@ void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger, const uno } pLogger->endElement(); +#endif // DEBUG_DOMAINMAPPER } +#ifdef DEBUG_DOMAINMAPPER void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyValues & rValues) { pLogger->startElement("propertyValues"); @@ -109,9 +111,9 @@ void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, PropertyVal pLogger->endElement(); } +#endif // DEBUG_DOMAINMAPPER } } -#endif // DEBUG_DOMAINMAPPER /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx index a92bc10c862f..fe22298e1b1f 100644 --- a/writerfilter/source/dmapper/PropertyMapHelper.hxx +++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX -#ifdef DEBUG_DOMAINMAPPER #include "PropertyMap.hxx" #include <com/sun/star/beans/PropertyValues.hpp> @@ -31,6 +30,7 @@ namespace dmapper void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger, const css::uno::Any & rTableColumnSeparators); +#ifdef DEBUG_DOMAINMAPPER void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, css::beans::PropertyValues & rValues); @@ -41,9 +41,9 @@ void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger, typedef css::uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t; void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, PropertyValueSeqSeq_t & rPropValSeqSeq); +#endif // DEBUG_DOMAINMAPPER } } -#endif // DEBUG_DOMAINMAPPER #endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX diff --git a/writerfilter/source/ooxml/factoryimpl.py b/writerfilter/source/ooxml/factoryimpl.py index c2a627d2a106..3e1808373233 100644 --- a/writerfilter/source/ooxml/factoryimpl.py +++ b/writerfilter/source/ooxml/factoryimpl.py @@ -116,10 +116,10 @@ public: }; } -#ifdef DEBUG_DOMAINMAPPER std::string fastTokenToId(sal_uInt32 nToken) { +#ifdef DEBUG_DOMAINMAPPER std::string sResult; switch (oox::getNamespace(nToken)) @@ -147,9 +147,9 @@ std::string fastTokenToId(sal_uInt32 nToken) print(""" } +#endif return sResult; } -#endif """) diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx index 7f1b0ef36acf..d9f7ace77708 100644 --- a/writerfilter/source/resourcemodel/qnametostrcore.cxx +++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx @@ -32,17 +32,17 @@ QNameToString::Pointer_t QNameToString::Instance() return pInstance; } -#ifdef DEBUG_DOMAINMAPPER std::string QNameToString::operator()(Id qName) { +#ifdef DEBUG_DOMAINMAPPER Map::const_iterator aIt = mMap.find(qName); if (aIt != mMap.end()) return aIt->second; +#endif return std::string(); } -#endif QNameToString::QNameToString() { diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx index 1eff14012d9b..e8e973a66c67 100644 --- a/writerfilter/source/resourcemodel/util.cxx +++ b/writerfilter/source/resourcemodel/util.cxx @@ -36,11 +36,11 @@ namespace writerfilter using namespace com::sun::star; using namespace std; -#ifdef DEBUG_DOMAINMAPPER string toString(uno::Reference< text::XTextRange > textRange) { string result; +#ifdef DEBUG_DOMAINMAPPER if (textRange.get()) { OUString aOUStr = textRange->getString(); @@ -52,10 +52,10 @@ string toString(uno::Reference< text::XTextRange > textRange) { result="(nil)"; } +#endif return result; } -#endif } |