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

[Tor Lillqvist]

 oox/source/export/drawingml.cxx                  |    4 ++--
 writerfilter/source/dmapper/NumberingManager.cxx |    3 ---
 writerfilter/source/dmapper/NumberingManager.hxx |    5 -----
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 160db96a882a2be8c3307e8a04beda4ae93a13c4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Jan 19 10:45:47 2014 +0200

    WaE: private field is not used
    
    Change-Id: I8eb322b4868e7895700b492b2f630d0fcc77e02d

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index b9fa83f..6622fe5 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -443,9 +443,6 @@ uno::Reference<drawing::XShape> NumPicBullet::GetShape()
 
 AbstractListDef::AbstractListDef( ) :
     m_nTmpl( -1 )
-    ,m_nSimpleList( -1 )
-    ,m_nRestart( -1 )
-    ,m_nUnsigned( -1 )
     ,m_nId( -1 )
 {
 }
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index eef50e6..7fe054a 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -46,7 +46,6 @@ class ListLevel : public PropertyMap
     sal_Int32                                     m_nNFC;            //LN_CT_Lvl_numFmt
     sal_Int32                                     m_nJC;             //LN_JC
     sal_Int32                                     m_nFLegal;         //LN_FLEGAL
-    sal_Int32                                     m_nFNoRestart;     //LN_FNORESTART
     sal_Int32                                     m_nFPrev;          //LN_FPREV
     sal_Int32                                     m_nFPrevSpace;     //LN_FPREVSPACE
     sal_Int32                                     m_nFWord6;         //LN_FWORD6
@@ -68,7 +67,6 @@ public:
         ,m_nNFC(-1)
         ,m_nJC(-1)
         ,m_nFLegal(-1)
-        ,m_nFNoRestart(-1)
         ,m_nFPrev(-1)
         ,m_nFPrevSpace(-1)
         ,m_nFWord6(-1)
@@ -134,9 +132,6 @@ class AbstractListDef
 private:
     sal_Int32                            m_nTmpl;
     OUString                      m_sRGISTD;        //LN_RGISTD
-    sal_Int32                            m_nSimpleList;    //LN_FSIMPLELIST
-    sal_Int32                            m_nRestart;       //LN_FRESTARTHDN
-    sal_Int32                            m_nUnsigned;      //LN_UNSIGNED26_2
 
     // The ID member reflects either the abstractNumId or the numId
     // depending on the use of the class
commit fee08317d9d57de897dcf7a7201062fc3309a8de
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Jan 19 10:11:59 2014 +0200

    WaE: variable is used uninitialized whenever 'for' loop exits
    
    Change-Id: I5e3db7eaf284718a1e313401b18ee6665d2837a1

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index ebcfb16..6c03b22 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -193,7 +193,7 @@ void DrawingML::WriteSolidFill( Reference< XPropertySet > rXPropSet )
 
     // get InteropGrabBag and search the relevant attributes
     OUString sColorFillScheme;
-    sal_uInt32 nOriginalColor;
+    sal_uInt32 nOriginalColor = 0;
     Sequence< PropertyValue > aStyleProperties;
     if ( GetProperty( rXPropSet, "InteropGrabBag" ) )
     {
@@ -217,7 +217,7 @@ void DrawingML::WriteSolidFill( Reference< XPropertySet > rXPropSet )
         WriteSolidFill( sColorFillScheme );
     else if ( aStyleProperties.hasElements() )
     {
-        sal_uInt32 nThemeColor;
+        sal_uInt32 nThemeColor = 0;
         for( sal_Int32 i=0; i < aStyleProperties.getLength(); ++i )
             if( aStyleProperties[i].Name == "Color" )
             {