[Libreoffice-commits] core.git: writerfilter/source

[Stephan Bergmann]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx     |    2 +-
 writerfilter/source/dmapper/NumberingManager.cxx      |    2 +-
 writerfilter/source/dmapper/PropertyMapHelper.cxx     |   14 --------------
 writerfilter/source/dmapper/PropertyMapHelper.hxx     |    4 ----
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    2 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |    2 +-
 writerfilter/source/resourcemodel/TagLogger.cxx       |    7 ++-----
 7 files changed, 6 insertions(+), 27 deletions(-)

New commits:
commit 5f0721a359a265b6b4b33560c979e8c60d2cbab0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 17 09:51:50 2014 +0200

    writerfilter: Fix various Clang warnings
    
    Change-Id: I733bcf8e02e659ef18ee9c2be4ad4e9f107fe7c6

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3a86394..bf48b43 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1006,7 +1006,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
     PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
 
 #ifdef DEBUG_WRITERFILTER
-    dmapper_logger->attribute("isTextAppend", xTextAppend.is());
+    dmapper_logger->attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
 #endif
 
     if (xTextAppend.is() && !getTableManager( ).isIgnore() && pParaContext != NULL)
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 825ccaa..66689ec 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -49,7 +49,7 @@ namespace dmapper {
 //---------------------------------------------------  Utility functions
 
 #ifdef DEBUG_WRITERFILTER
-void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
+void lcl_printProperties( uno::Sequence< beans::PropertyValue > const & aProps )
 {
     sal_Int32 nLen = aProps.getLength( );
     for ( sal_Int32 i = 0; i < nLen; i++ )
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index be20db9..4e2921f 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -97,20 +97,6 @@ void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger, PropertyValueS
 
     pLogger->endElement();
 }
-
-void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger, PropertyValueSeqSeq_t rPropValSeqSeq)
-{
-    pLogger->startElement("PropertyValueSeq");
-
-    PropertyValueSeq_t * pValues = rPropValSeqSeq.getArray();
-
-    for (sal_Int32 n = 0; n < rPropValSeqSeq.getLength(); ++n)
-    {
-        lcl_DumpPropertyValueSeq(pLogger, pValues[n]);
-    }
-
-    pLogger->endElement();
-}
 #endif // DEBUG_WRITERFILTER
 
 }
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index a102fc8..43620eb 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -37,10 +37,6 @@ void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger,
 typedef css::uno::Sequence<css::beans::PropertyValues> PropertyValueSeq_t;
 void lcl_DumpPropertyValueSeq(const TagLogger::Pointer_t pLogger,
      PropertyValueSeq_t & rPropValSeq);
-
-typedef css::uno::Sequence<PropertyValueSeq_t> PropertyValueSeqSeq_t;
-void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t pLogger,
-        PropertyValueSeqSeq_t & rPropValSeqSeq);
 #endif // DEBUG_WRITERFILTER
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 4b1c36a..1eb6ff8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -93,7 +93,7 @@ public:
     OOXMLIdToString() : IdToString() {}
     virtual ~OOXMLIdToString() {}
 
-    virtual string toString(const Id & rId) const
+    virtual string toString(const Id & rId) const SAL_OVERRIDE
     {
         string s((*QNameToString::Instance())(rId));
 
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 0dc54bb..7dfb793 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -307,7 +307,7 @@ public:
     virtual OOXMLPropertySet::Pointer_t getPropertySet() const SAL_OVERRIDE;
 
 #ifdef DEBUG_WRITERFILTER
-    virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
+    virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const SAL_OVERRIDE;
 #endif
 
 protected:
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 6a6fa19..104c361 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -193,9 +193,6 @@ namespace writerfilter
     {
         if (!pWriter)
             return;
-        std::string aTmpStrInt;
-        std::string aTmpStrFloat;
-        std::string aTmpStrString;
 
         sal_Int32 nInt = 0;
         float nFloat = 0.0;
@@ -252,8 +249,8 @@ namespace writerfilter
 
         void resolve(writerfilter::Reference<Properties>::Pointer_t props);
 
-        virtual void attribute(Id name, Value & val);
-        virtual void sprm(Sprm & sprm);
+        virtual void attribute(Id name, Value & val) SAL_OVERRIDE;
+        virtual void sprm(Sprm & sprm) SAL_OVERRIDE;
     };
 
     PropertySetDumpHandler::PropertySetDumpHandler(TagLogger* pLogger,