writerfilter/inc/ooxml/OOXMLDocument.hxx | 2 --
writerfilter/inc/resourcemodel/util.hxx | 2 --
writerfilter/source/dmapper/PropertyMap.cxx | 4 ++--
writerfilter/source/dmapper/PropertyMap.hxx | 2 +-
writerfilter/source/dmapper/PropertyMapHelper.cxx | 6 ++++--
writerfilter/source/dmapper/PropertyMapHelper.hxx | 4 ++--
writerfilter/source/ooxml/factoryimpl.py | 4 ++--
writerfilter/source/resourcemodel/qnametostrcore.cxx | 4 ++--
writerfilter/source/resourcemodel/util.cxx | 4 ++--
9 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 585fea6e3e92a312921bb1bff119f731ca0e87cb
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Oct 17 07:47:02 2014 +0200
fix incremental build
Change-Id: I28dd6c72c665abd95be6d14dc629296850e03e1d
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index ab932c6..8032f60 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -273,9 +273,7 @@ public:
void ooxmlidsToXML(::std::iostream & out);
-#ifdef DEBUG_DOMAINMAPPER
std::string fastTokenToId(sal_uInt32 nToken);
-#endif
}}
#endif // INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
diff --git a/writerfilter/inc/resourcemodel/util.hxx
b/writerfilter/inc/resourcemodel/util.hxx
index b176cd82..18e424f 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -26,9 +26,7 @@
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
std::string toString(css::uno::Reference< css::text::XTextRange >
textRange);
-#endif
}
#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 8f3594c..2d9c77d 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 c496f97..2369cf3 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 b35145b..0c22146 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 a92bc10..fe22298 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 c2a627d..3e18083 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 7f1b0ef..d9f7ace 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 1eff140..e8e973a 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
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
