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

[Tamás Zolnai]

 sc/source/filter/excel/xipivot.cxx |   10 ++++------
 sc/source/filter/inc/xipivot.hxx   |    2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 39f4a8a60b0d0d2075369adf750f159bf73b0fa3
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Wed Sep 13 09:13:19 2017 +0200

    This return value is unused now
    
    Change-Id: I6145e9bd5736b5c48683d0a85d13ad02d66d5084
    Reviewed-on: https://gerrit.libreoffice.org/42227
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index b382c6f088fe..b756f273aca5 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1103,19 +1103,19 @@ static OUString lcl_convertExcelSubtotalName(const OUString& rName)
     return aBuf.makeStringAndClear();
 }
 
-ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) const
+void XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) const
 {
     const OUString& rFieldName = GetFieldName();
     if( rFieldName.isEmpty() )
-        return nullptr;
+        return;
 
     const XclImpPCField* pCacheField = GetCacheField();
     if( !pCacheField || !pCacheField->IsSupportedField() )
-        return nullptr;
+        return;
 
     ScDPSaveDimension* pTest = rSaveData.GetNewDimensionByName(rFieldName);
     if (!pTest)
-        return nullptr;
+        return;
 
     ScDPSaveDimension& rSaveDim = *pTest;
 
@@ -1163,8 +1163,6 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
         OUString aSubName = lcl_convertExcelSubtotalName(*maFieldExtInfo.mpFieldTotalName);
         rSaveDim.SetSubtotalName(aSubName);
     }
-
-    return &rSaveDim;
 }
 
 void XclImpPTField::ConvertFieldInfo( const ScDPSaveData& rSaveData, ScDPObject* pObj, const XclImpRoot& rRoot, bool bPageField ) const
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 3fd656cee83a..93425806f69d 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -273,7 +273,7 @@ public:
     void                ConvertFieldInfo( const ScDPSaveData& rSaveData, ScDPObject* pObj, const XclImpRoot& rRoot, bool bPageField = false ) const;
 
 private:
-    ScDPSaveDimension*  ConvertRCPField( ScDPSaveData& rSaveData ) const;
+    void                ConvertRCPField( ScDPSaveData& rSaveData ) const;
 
     void                ConvertDataField( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const;
     void                ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const;