[Libreoffice-commits] .: Branch 'integration/dev300_m101' - writerfilter/inc writerfilter/source writerfilter/util
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Mar 14 08:11:23 PDT 2011
writerfilter/inc/resourcemodel/TagLogger.hxx | 2 -
writerfilter/inc/resourcemodel/XPathLogger.hxx | 5 +--
writerfilter/source/dmapper/CellMarginHandler.cxx | 1
writerfilter/source/dmapper/PropertyMap.cxx | 27 +++++++++---------
writerfilter/source/dmapper/StyleSheetTable.cxx | 2 -
writerfilter/source/dmapper/WrapPolygonHandler.hxx | 1
writerfilter/source/dmapper/dmapperLoggers.hxx | 2 -
writerfilter/source/filter/ImportFilter.cxx | 4 +-
writerfilter/source/ooxml/factoryimpl_ns.xsl | 15 ++++------
writerfilter/source/resourcemodel/LoggedResources.cxx | 4 +-
writerfilter/source/resourcemodel/TagLogger.cxx | 1
writerfilter/source/resourcemodel/XPathLogger.cxx | 2 +
writerfilter/source/resourcemodel/makefile.mk | 4 +-
writerfilter/util/makefile.mk | 4 +-
14 files changed, 33 insertions(+), 41 deletions(-)
New commits:
commit 5155b17b956745f9157e252e8428f3cf81177aa3
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Mar 14 15:09:33 2011 +0000
make writerfilter compile cleanly
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index ed8fe81..ce766b5 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -29,7 +29,6 @@
#ifndef INCLUDED_TAG_LOGGER_HXX
#define INCLUDED_TAG_LOGGER_HXX
-#if OSL_DEBUG_LEVEL > 1
#include <rtl/ustring.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <WriterFilterDllApi.hxx>
@@ -84,7 +83,6 @@ namespace writerfilter
};
}
-#endif // DEBUG
#endif // INCLUDED_TAG_LOGGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx
index aa5c37f..c975ac2 100644
--- a/writerfilter/inc/resourcemodel/XPathLogger.hxx
+++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx
@@ -28,23 +28,22 @@
#ifndef INCLUDED_XPATH_LOGGER_HXX
#define INCLUDED_XPATH_LOGGER_HXX
-#include <hash_map>
#include <stack>
#include <string>
#include <vector>
#include <boost/shared_ptr.hpp>
+#include <boost/unordered_map.hpp>
#include <WriterFilterDllApi.hxx>
namespace writerfilter
{
-using ::std::hash_map;
using ::std::stack;
using ::std::string;
using ::std::vector;
class WRITERFILTER_DLLPUBLIC XPathLogger
{
- typedef hash_map<string, unsigned int> TokenMap_t;
+ typedef boost::unordered_map<string, unsigned int> TokenMap_t;
typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t;
TokenMapPointer_t mp_tokenMap;
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 0528840..a8fb122 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -38,7 +38,6 @@ namespace dmapper {
using namespace ::com::sun::star;
using namespace ::writerfilter;
-
CellMarginHandler::CellMarginHandler() :
LoggedProperties(dmapper_logger, "CellMarginHandler"),
m_nValue( 0 ),
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index f330700..e004076 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -111,28 +111,30 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues()
return m_aValues;
}
-void lcl_AnyToTag(XMLTag::Pointer_t pTag, const uno::Any & rAny)
+#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+static void lcl_AnyToTag(const uno::Any & rAny)
{
try {
sal_Int32 aInt = 0;
rAny >>= aInt;
- pTag->addAttr("value", aInt);
-
+ dmapper_logger->attribute("value", aInt);
+
sal_uInt32 auInt = 0;
rAny >>= auInt;
- pTag->addAttr("unsignedValue", auInt);
-
+ dmapper_logger->attribute("unsignedValue", auInt);
+
float aFloat = 0.0f;
rAny >>= aFloat;
- pTag->addAttr("floatValue", aFloat);
-
+ dmapper_logger->attribute("floatValue", aFloat);
+
::rtl::OUString aStr;
rAny >>= aStr;
- pTag->addAttr("stringValue", aStr);
+ dmapper_logger->attribute("stringValue", aStr);
}
catch (...) {
}
}
+#endif
void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any& rAny, bool bOverwrite )
{
@@ -140,11 +142,10 @@ void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any&
const ::rtl::OUString& rInsert = PropertyNameSupplier::
GetPropertyNameSupplier().GetName(eId);
- XMLTag::Pointer_t pTag(new XMLTag("propertyMap.insert"));
- pTag->addAttr("name", rInsert);
- lcl_AnyToTag(pTag, rAny);
-
- dmapper_logger->addTag(pTag);
+ dmapper_logger->startElement("propertyMap.insert");
+ dmapper_logger->attribute("name", rInsert);
+ lcl_AnyToTag(rAny);
+ dmapper_logger->endElement();
#endif
PropertyMap::iterator aElement = find(PropertyDefinition( eId, bIsTextProperty ) );
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 5c1d0ea..0ac9560 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -533,7 +533,6 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
}
break;
}
- case NS_ooxml::LN_CT_DocDefaults_pPrDefault:
case NS_ooxml::LN_CT_PPrDefault_pPr:
case NS_ooxml::LN_CT_DocDefaults_pPrDefault:
m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultParaProps );
@@ -541,7 +540,6 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
m_pImpl->m_rDMapper.PopStyleSheetProperties();
applyDefaults( true );
break;
- case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
case NS_ooxml::LN_CT_RPrDefault_rPr:
case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultCharProps );
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index ebb4ddf..7995153 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -28,6 +28,7 @@
#ifndef WRAP_POLYGON_HANDLER_HXX
#define WRAP_POLYGON_HANDLER_HXX
+#include <deque>
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <resourcemodel/LoggedResources.hxx>
#include <resourcemodel/Fraction.hxx>
diff --git a/writerfilter/source/dmapper/dmapperLoggers.hxx b/writerfilter/source/dmapper/dmapperLoggers.hxx
index 2c776ba..9f2db4b 100644
--- a/writerfilter/source/dmapper/dmapperLoggers.hxx
+++ b/writerfilter/source/dmapper/dmapperLoggers.hxx
@@ -29,7 +29,6 @@
#ifndef INCLUDED_DMAPPER_LOGGERS_HXX
#define INCLUDED_DMAPPER_LOGGERS_HXX
-#if OSL_DEBUG_LEVEL > 1
#include <resourcemodel/TagLogger.hxx>
namespace writerfilter {
@@ -38,7 +37,6 @@ namespace writerfilter {
}
}
-#endif // DEBUG
#endif // INCLUDED_DMAPPER_LOGGERS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index c909aaf..7993282 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -130,7 +130,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
oox::StorageRef xVbaPrjStrg( new ::oox::ole::OleStorage( uno::Reference< lang::XMultiServiceFactory >( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW ), pVBAProjectStream->getDocumentStream(), false ) );
if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
{
- ::oox::ole::VbaProject aVbaProject( uno::Reference< lang::XMultiServiceFactory >( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW ), xModel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Writer" ) ) );
+ ::oox::ole::VbaProject aVbaProject( m_xContext, xModel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Writer" ) ) );
uno::Reference< frame::XFrame > xFrame = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_FRAME(), uno::Reference< frame::XFrame > () );
// if no XFrame try fallback to what we can glean from the Model
@@ -140,7 +140,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
xFrame = xController.is() ? xController->getFrame() : NULL;
}
- oox::GraphicHelper gHelper( uno::Reference< lang::XMultiServiceFactory >( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW ), xFrame, xVbaPrjStrg );
+ oox::GraphicHelper gHelper( m_xContext, xFrame, xVbaPrjStrg );
aVbaProject.importVbaProject( *xVbaPrjStrg, gHelper );
}
}
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index ddb21a0..243ca88 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -178,6 +178,12 @@ OOXMLFactory_ns::Pointer_t </xsl:text>
<xsl:for-each select=".//rng:data[@type='int']">
<xsl:text>Integer</xsl:text>
</xsl:for-each>
+ <xsl:for-each select=".//rng:data[@type='integer']">
+ <xsl:text>Integer</xsl:text>
+ </xsl:for-each>
+ <xsl:for-each select=".//rng:data[@type='string']">
+ <xsl:text>String</xsl:text>
+ </xsl:for-each>
</xsl:template>
<!--
@@ -203,15 +209,6 @@ for a rng:define
</xsl:if>
<xsl:variable name="resource">
<xsl:call-template name="resourceforattribute"/>
- <xsl:for-each select=".//rng:data[@type='boolean']">
- <xsl:text>Boolean</xsl:text>
- </xsl:for-each>
- <xsl:for-each select=".//rng:data[@type='string']">
- <xsl:text>String</xsl:text>
- </xsl:for-each>
- <xsl:for-each select=".//rng:data[@type='integer']">
- <xsl:text>Integer</xsl:text>
- </xsl:for-each>
</xsl:variable>
<xsl:choose>
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx
index 753797e..686a560 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/resourcemodel/LoggedResources.cxx
@@ -48,9 +48,9 @@ void LoggedResourcesHelper::startElement(const string & sElement)
mpLogger->startElement(msPrefix + "." + sElement);
}
-void LoggedResourcesHelper::endElement(const string & sElement)
+void LoggedResourcesHelper::endElement(const string & /*sElement*/)
{
- mpLogger->endElement(msPrefix + "." + sElement);
+ mpLogger->endElement();
}
void LoggedResourcesHelper::chars(const ::rtl::OUString & rChars)
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index d14ba13..ee97429 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-#if OSL_DEBUG_LEVEL > 1
#include <libxml/xmlstring.h>
#include <string.h>
#include <resourcemodel/TagLogger.hxx>
diff --git a/writerfilter/source/resourcemodel/XPathLogger.cxx b/writerfilter/source/resourcemodel/XPathLogger.cxx
index 469bc00..fe7e1f7 100644
--- a/writerfilter/source/resourcemodel/XPathLogger.cxx
+++ b/writerfilter/source/resourcemodel/XPathLogger.cxx
@@ -88,4 +88,6 @@ void XPathLogger::endElement()
updateCurrentPath();
}
+} // namespace writerfilter
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk
index 531209c..73e049f 100644
--- a/writerfilter/source/resourcemodel/makefile.mk
+++ b/writerfilter/source/resourcemodel/makefile.mk
@@ -73,9 +73,9 @@ SHL1STDLIBS=$(SALLIB)\
$(CPPUHELPERLIB) \
$(COMPHELPERLIB)
-.IF "$(DBG_LEVEL)">="2"
+# .IF "$(DBG_LEVEL)">="2"
SHL1STDLIBS+= $(LIBXML2LIB)
-.ENDIF
+# .ENDIF
SHL1IMPLIB=i$(SHL1TARGET)
SHL1USE_EXPORTS=name
diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk
index fe634c4..241d00e 100644
--- a/writerfilter/util/makefile.mk
+++ b/writerfilter/util/makefile.mk
@@ -62,9 +62,9 @@ SHL1STDLIBS=\
$(SALLIB) \
$(OOXLIB)
-.IF "$(DBG_LEVEL)">="2"
+# .IF "$(DBG_LEVEL)">="2"
SHL1STDLIBS+= $(LIBXML2LIB)
-.ENDIF
+# .ENDIF
SHL1DEPN=
More information about the Libreoffice-commits
mailing list