diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-09-12 00:30:37 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-09-12 10:38:36 +0200 |
| commit | d44c7ffda598d4d4e8a3963133735a771ba3fe30 (patch) | |
| tree | 9943f90dbbeda87b2261c78e99a57bd1788d7099 /sc/source | |
| parent | a185ea4ec12898574d52ebdf4a1017005745df7d (diff) | |
tdf#112337: Pivot table: empty / blank item is not imported from XLS
Change-Id: I7ed9e5cacdf6df80b2f100d040cbbeda33b085d3
Reviewed-on: https://gerrit.libreoffice.org/42181
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xipivot.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index d045eccb4041..ae68e9fe016c 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -920,7 +920,11 @@ void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim, ScDPObject* pObj, c { sItemName = pObj->GetFormattedString(rSaveDim.GetName(), rRoot.GetDoubleFromDateTime(*pCacheItem->GetDateTime())); } - else // EXC_PCITEM_EMPTY || EXC_PCITEM_INVALID + else if (pCacheItem->GetType() == EXC_PCITEM_EMPTY) + { + // sItemName is an empty string + } + else // EXC_PCITEM_INVALID return; // Find member and set properties @@ -1392,6 +1396,8 @@ void XclImpPivotTable::Convert() aSaveData.SetColumnGrand( ::get_flag( maPTInfo.mnFlags, EXC_SXVIEW_COLGRAND ) ); aSaveData.SetFilterButton( false ); aSaveData.SetDrillDown( ::get_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN ) ); + aSaveData.SetIgnoreEmptyRows( false ); + aSaveData.SetRepeatIfEmpty( false ); // *** fields *** |