[Libreoffice-commits] .: writerfilter/source

Julien Nabet serval2412 at kemper.freedesktop.org
Sun Jun 12 13:41:15 PDT 2011


 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  |    2 +-
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |    2 +-
 writerfilter/source/ooxml/OOXMLParserState.cxx         |   12 ++++++------
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx     |    2 +-
 writerfilter/source/resourcemodel/TagLogger.cxx        |    2 +-
 writerfilter/source/resourcemodel/resourcemodel.cxx    |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5ac4918abb220dcadb167215dd7cb43289c281cf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jun 12 22:37:52 2011 +0200

    Some cppcheck cleaning

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6cd244d..06b4b66 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1666,7 +1666,7 @@ void OOXMLFastContextHandlerTable::newPropertySet
 
 OOXMLFastContextHandlerXNote::OOXMLFastContextHandlerXNote
 (OOXMLFastContextHandler * pContext)
-: OOXMLFastContextHandler(pContext)
+: OOXMLFastContextHandler(pContext), mbForwardEventsSaved(false)
 {
 }
 
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index c0252f4..0a422b9 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -46,7 +46,7 @@ using namespace ::std;
 
 OOXMLFastDocumentHandler::OOXMLFastDocumentHandler
 (uno::Reference< uno::XComponentContext > const & context)
-: m_xContext(context)
+: m_xContext(context), mpStream(0), mpDocument(0)
 {}
 
 // ::com::sun::star::xml::sax::XFastContextHandler:
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 2bd89f0..943b643 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -172,7 +172,7 @@ void OOXMLParserState::setCharacterProperties
 void OOXMLParserState::setCellProperties
 (OOXMLPropertySet::Pointer_t pProps)
 {
-    if (mCellProps.size() > 0)
+    if (!mCellProps.empty())
     {
         OOXMLPropertySet::Pointer_t & rCellProps = mCellProps.top();
 
@@ -186,7 +186,7 @@ void OOXMLParserState::setCellProperties
 void OOXMLParserState::setRowProperties
 (OOXMLPropertySet::Pointer_t pProps)
 {
-    if (mRowProps.size() > 0)
+    if (!mRowProps.empty())
     {
         OOXMLPropertySet::Pointer_t & rRowProps = mRowProps.top();
 
@@ -199,7 +199,7 @@ void OOXMLParserState::setRowProperties
 
 void OOXMLParserState::resolveCellProperties(Stream & rStream)
 {
-    if (mCellProps.size() > 0)
+    if (!mCellProps.empty())
     {
         OOXMLPropertySet::Pointer_t & rCellProps = mCellProps.top();
 
@@ -213,7 +213,7 @@ void OOXMLParserState::resolveCellProperties(Stream & rStream)
 
 void OOXMLParserState::resolveRowProperties(Stream & rStream)
 {
-    if (mRowProps.size() > 0)
+    if (!mRowProps.empty())
     {
         OOXMLPropertySet::Pointer_t & rRowProps = mRowProps.top();
 
@@ -227,7 +227,7 @@ void OOXMLParserState::resolveRowProperties(Stream & rStream)
 
 void OOXMLParserState::resolveTableProperties(Stream & rStream)
 {
-    if (mTableProps.size() > 0)
+    if (!mTableProps.empty())
     {
         OOXMLPropertySet::Pointer_t & rTableProps = mTableProps.top();
 
@@ -242,7 +242,7 @@ void OOXMLParserState::resolveTableProperties(Stream & rStream)
 void OOXMLParserState::setTableProperties
 (OOXMLPropertySet::Pointer_t pProps)
 {
-    if (mTableProps.size() > 0)
+    if (!mTableProps.empty())
     {
         OOXMLPropertySet::Pointer_t & rTableProps = mTableProps.top();
         if (rTableProps.get() == NULL)
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 488b77c..a739c3b 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -772,7 +772,7 @@ const ::rtl::OUString & OOXMLPropertySetEntryToString::getString() const
 }
 
 OOXMLPropertySetEntryToInteger::OOXMLPropertySetEntryToInteger(Id nId)
-: mnId(nId)
+: mnId(nId), mnValue(0)
 {
 }
 
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 3efb9d0..2d4aa11 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -291,7 +291,7 @@ namespace writerfilter
             {
                 attribute( "value", rPropSet->getPropertyValue( sName ) );
             }
-            catch (uno::Exception aException)
+            catch (uno::Exception)
             {
                 startElement( "exception" );
 
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 3eb53fb..ba1b0ed 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -544,7 +544,7 @@ void WW8TableHandler::entry(int /*pos*/,
         output.addItem("<exception>" + e.getText() + "</exception>");
         output.addItem("</tableentry>");
 
-        throw e;
+        throw;
     }
 
     output.addItem("</tableentry>");


More information about the Libreoffice-commits mailing list