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

[Caolán McNamara]

 oox/source/export/chartexport.cxx |    6 +-----
 oox/source/export/drawingml.cxx   |    5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 0c75ccb527dac3c7d221f9cb2eb21ec7cda3ea6a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 19 09:19:48 2015 +0100

    coverity#1298896 dead code
    
    Change-Id: I27b27b4f6ca4b443ebbfb0898cef7481b47658f9

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 36c0a96..832914f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1786,8 +1786,6 @@ sal_Int32 DrawingML::getBulletMarginIndentation (Reference< XPropertySet > rXPro
 
     const PropertyValue* pPropValue = aPropertySequence.getArray();
 
-    sal_Int16 nNumberingType = SVX_NUM_NUMBER_NONE;
-
     for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
     {
         const void* pValue = pPropValue[ i ].Value.getValue();
@@ -1800,9 +1798,6 @@ sal_Int32 DrawingML::getBulletMarginIndentation (Reference< XPropertySet > rXPro
         }
     }
 
-    if (nNumberingType == SVX_NUM_NUMBER_NONE)
-        return 0;
-
     return 0;
 }
 
commit 7c78bcc6f115ad43a064b0be11d9bcc2aa7bdd00
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 19 09:14:33 2015 +0100

    coverity#1298897 deadcode
    
    Change-Id: I61892eeeb3d90e50f23cb1dbaf303aabaa1225fa

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index b9b9be5..2f0853b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -122,12 +122,8 @@ namespace {
 sal_Int32 translateFromChart2AxisIndexToOox(sal_Int32 nIndex)
 {
     assert(nIndex == 0 || nIndex == 1);
-    if (nIndex == 0)
-        return AXIS_PRIMARY_Y;
-    else if (nIndex == 1)
+    if (nIndex == 1)
         return AXIS_SECONDARY_Y;
-
-    // good default value for release builds
     return AXIS_PRIMARY_Y;
 }