diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-10-09 07:46:06 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-10-09 20:20:58 +0200 |
| commit | db481dd30521f9ce498873cdc945cf9544bf983c (patch) | |
| tree | 2099be10fdbfca8e2275a9e8a9affbaf6a3aa501 /sc/source/filter/inc | |
| parent | Updated core (diff) | |
| download | core-db481dd30521f9ce498873cdc945cf9544bf983c.tar.gz core-db481dd30521f9ce498873cdc945cf9544bf983c.zip | |
Pivot table XLSX import: PivotCache is not handled as a const object.
Change-Id: I226902205e977deb1a4a73db33e3bf7671067bc8
Diffstat (limited to 'sc/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/pivotcachebuffer.hxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/inc/pivottablebuffer.hxx | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 3bf5406c62f3..6b35a11ffa07 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -405,6 +405,7 @@ public: /** Returns the number of pivot cache fields. */ sal_Int32 getCacheFieldCount() const; /** Returns the cache field with the specified index. */ + PivotCacheField* getCacheField( sal_Int32 nFieldIdx ); const PivotCacheField* getCacheField( sal_Int32 nFieldIdx ) const; /** Returns the source column index of the field with the passed index. */ sal_Int32 getCacheDatabaseIndex( sal_Int32 nFieldIdx ) const; diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 37ee04edf586..dfe52206ad6f 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -175,7 +175,7 @@ private: PivotTable& mrPivotTable; /// The parent pivot table object. ItemModelVector maItems; /// All items of this field. PTFieldModel maModel; /// Pivot field settings. - OUString maDPFieldName; /// Name of the field in DataPilot field collection. + OUString maDPFieldName; /// Name of the field in DataPilot field collection. sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; @@ -338,6 +338,7 @@ public: getDataLayoutField() const; /** Returns the cache field with the specified index. */ + PivotCacheField* getCacheField( sal_Int32 nFieldIdx ); const PivotCacheField* getCacheField( sal_Int32 nFieldIdx ) const; /** Returns the base cache field of the data field item with the specified index. */ const PivotCacheField* getCacheFieldOfDataField( sal_Int32 nDataItemIdx ) const; @@ -373,7 +374,7 @@ private: PivotTableFilterVector maFilters; /// All field filters. PTDefinitionModel maDefModel; /// Global pivot table settings. PTLocationModel maLocationModel; /// Location settings of the pivot table. - const PivotCache* mpPivotCache; /// The pivot cache this table is based on. + PivotCache* mpPivotCache; /// The pivot cache this table is based on. css::uno::Reference< css::sheet::XDataPilotDescriptor > mxDPDescriptor; /// Descriptor of the DataPilot object. }; |