diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-09-13 07:22:41 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-09-14 16:04:52 +0200 |
| commit | da033662525304b3351b0ed6b38363380b905bd5 (patch) | |
| tree | e236449b1ca0b5d0d38c658c1297a8d0c760d424 /sc/source/filter/inc | |
| parent | tdf#112337: Pivot table: empty / blank item is not imported from XLS (diff) | |
| download | core-da033662525304b3351b0ed6b38363380b905bd5.tar.gz core-da033662525304b3351b0ed6b38363380b905bd5.zip | |
tdf#112348: Pivot table: page field filtering is not imported from XLS
Reviewed-on: https://gerrit.libreoffice.org/42201
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 55a43f30a54816e13eb6704a8ec5952a63b01a64)
Change-Id: I3477cd17f679bdfefb9340656999630380713d3f
Reviewed-on: https://gerrit.libreoffice.org/42225
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sc/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/xipivot.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 28ca9da91991..898726adf46f 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -202,6 +202,8 @@ public: /** Returns the internal name of the item or 0, if no name could be found. */ const OUString* GetItemName() const; + /** Returns the internal name of the item. */ + std::pair<bool, OUString> GetItemName(const ScDPSaveDimension& rSaveDim, ScDPObject* pObj, const XclImpRoot& rRoot) const; /** Reads an SXVI record containing data of this item. */ void ReadSxvi( XclImpStream& rStrm ); @@ -268,7 +270,7 @@ public: void AddDataFieldInfo( const XclPTDataFieldInfo& rDataInfo ); void ConvertDataField( ScDPSaveData& rSaveData ) const; - void ConvertFieldInfo( const ScDPSaveData& rSaveData, ScDPObject* pObj, const XclImpRoot& rRoot ) const; + void ConvertFieldInfo( const ScDPSaveData& rSaveData, ScDPObject* pObj, const XclImpRoot& rRoot, bool bPageField = false ) const; private: ScDPSaveDimension* ConvertRCPField( ScDPSaveData& rSaveData ) const; |