summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel/xepivot.cxx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-08-30 16:32:10 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-08-30 19:27:37 +0200
commita2f2a40e37aadc0a32435a33402a21a678464ba4 (patch)
tree06ba43d28a182010bebe2fef236a1e7bb7f64d02 /sc/source/filter/excel/xepivot.cxx
parentdce78f9caae194da13fa5399298d57701abc8744 (diff)
tdf#112106: Corrupted pivot table after XLSX -> XLS conversion in Calc
Always write out a data layout name. Change-Id: Ic0b43d9c0365eca5e417fe9f2fe4b77b538f3278 Reviewed-on: https://gerrit.libreoffice.org/41739 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sc/source/filter/excel/xepivot.cxx')
-rw-r--r--sc/source/filter/excel/xepivot.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 171837c8cac5..d28348aabf0b 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1304,10 +1304,8 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
::set_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN, rSaveData.GetDrillDown() );
mbFilterBtn = rSaveData.GetFilterButton();
const ScDPSaveDimension* pDim = rSaveData.GetExistingDataLayoutDimension();
- if (!pDim)
- return;
- const OUString* pLayoutName = pDim->GetLayoutName();
+ const OUString* pLayoutName = pDim ? pDim->GetLayoutName() : nullptr;
if (pLayoutName)
maPTInfo.maDataName = *pLayoutName;
else