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

[Caolán McNamara (via logerrit)]

 sc/source/filter/xml/XMLExportDataPilot.cxx |   38 +++++++++++-----------------
 sc/source/filter/xml/XMLExportDataPilot.hxx |    4 +-
 2 files changed, 18 insertions(+), 24 deletions(-)

New commits:
commit 01fac859a5a2a5e65baca8052456ab7ae5bd95d7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jun 23 11:31:17 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 24 09:45:02 2022 +0200

    can pass by ref without nullptr check
    
    as a follow up change
    
    Change-Id: I5251841618b154f14a2931bf5e65097e9b1bbfc9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136306
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx 
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index cd6f26b1135e..da0c9c57e9cf 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -594,33 +594,27 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const 
ScDPNumGroupInfo& rGroupInfo)
     rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STEP, sValue);
 }
 
-void ScXMLExportDataPilot::WriteGroupDimAttributes(const 
ScDPSaveGroupDimension* pGroupDim)
+void ScXMLExportDataPilot::WriteGroupDimAttributes(const 
ScDPSaveGroupDimension& rGroupDim)
 {
-    if (pGroupDim)
+    OUString aSrcFieldName = 
ScDPUtil::getSourceDimensionName(rGroupDim.GetSourceDimName());
+    rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, 
aSrcFieldName);
+    if (rGroupDim.GetDatePart())
     {
-        OUString aSrcFieldName = 
ScDPUtil::getSourceDimensionName(pGroupDim->GetSourceDimName());
-        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, 
aSrcFieldName);
-        if (pGroupDim->GetDatePart())
-        {
-            WriteDatePart(pGroupDim->GetDatePart());
-            WriteNumGroupInfo(pGroupDim->GetDateInfo());
-        }
+        WriteDatePart(rGroupDim.GetDatePart());
+        WriteNumGroupInfo(rGroupDim.GetDateInfo());
     }
 }
 
-void ScXMLExportDataPilot::WriteNumGroupDim(const ScDPSaveNumGroupDimension* 
pNumGroupDim)
+void ScXMLExportDataPilot::WriteNumGroupDim(const ScDPSaveNumGroupDimension& 
rNumGroupDim)
 {
-    if (pNumGroupDim)
+    if (rNumGroupDim.GetDatePart())
     {
-        if (pNumGroupDim->GetDatePart())
-        {
-            WriteDatePart(pNumGroupDim->GetDatePart());
-            WriteNumGroupInfo(pNumGroupDim->GetDateInfo());
-        }
-        else
-        {
-            WriteNumGroupInfo(pNumGroupDim->GetInfo());
-        }
+        WriteDatePart(rNumGroupDim.GetDatePart());
+        WriteNumGroupInfo(rNumGroupDim.GetDateInfo());
+    }
+    else
+    {
+        WriteNumGroupInfo(rNumGroupDim.GetInfo());
     }
 }
 
@@ -634,9 +628,9 @@ void ScXMLExportDataPilot::WriteGroupDimElements(const 
ScDPSaveDimension* pDim,
         pNumGroupDim = pDimData->GetNumGroupDim(pDim->GetName());
         OSL_ENSURE((!pGroupDim || !pNumGroupDim), "there should be no NumGroup 
and Group at the same field");
         if (pGroupDim)
-            WriteGroupDimAttributes(pGroupDim);
+            WriteGroupDimAttributes(*pGroupDim);
         else if (pNumGroupDim)
-            WriteNumGroupDim(pNumGroupDim);
+            WriteNumGroupDim(*pNumGroupDim);
     }
     if (!(pGroupDim || pNumGroupDim))
         return;
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx 
b/sc/source/filter/xml/XMLExportDataPilot.hxx
index dcf4ff34443f..04717aa10e1a 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -58,9 +58,9 @@ class ScXMLExportDataPilot
     void WriteLevels(const ScDPSaveDimension* pDim);
     void WriteDatePart(sal_Int32 nPart);
     void WriteNumGroupInfo(const ScDPNumGroupInfo& pGroupInfo);
-    void WriteGroupDimAttributes(const ScDPSaveGroupDimension* pGroupDim);
+    void WriteGroupDimAttributes(const ScDPSaveGroupDimension& rGroupDim);
     void WriteGroupDimElements(const ScDPSaveDimension* pDim, const 
ScDPDimensionSaveData* pDimData);
-    void WriteNumGroupDim(const ScDPSaveNumGroupDimension* pNumGroupDim);
+    void WriteNumGroupDim(const ScDPSaveNumGroupDimension& rNumGroupDim);
     void WriteDimension(const ScDPSaveDimension* pDim, const 
ScDPDimensionSaveData* pDimData);
     void WriteDimensions(const ScDPSaveData* pDPSave);