diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-17 23:37:45 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-22 14:02:05 -0500 |
| commit | 057d4db997796fa47f71c31b3bcda892c97d65c7 (patch) | |
| tree | 19defcabedfd982011e14dfadb2408250bd229a3 /sc/inc | |
| parent | Reduce scope level. (diff) | |
| download | core-057d4db997796fa47f71c31b3bcda892c97d65c7.tar.gz core-057d4db997796fa47f71c31b3bcda892c97d65c7.zip | |
Properly transfer layout and subtotal names before and after the dialog.
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/dpobject.hxx | 16 | ||||
| -rw-r--r-- | sc/inc/dpsave.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/pivot.hxx | 10 |
3 files changed, 16 insertions, 11 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 121b6149a4d1..407e559fb9a2 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -238,13 +238,15 @@ public: static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> CreateSource( const ScDPServiceDesc& rDesc ); - static void ConvertOrientation( ScDPSaveData& rSaveData, - const ::std::vector<PivotField>& rFields, sal_uInt16 nOrient, - const com::sun::star::uno::Reference< - com::sun::star::sheet::XDimensionsSupplier>& xSource, - ::std::vector<PivotField>* pRefColFields = NULL, - ::std::vector<PivotField>* pRefRowFields = NULL, - ::std::vector<PivotField>* pRefPageFields = NULL ); + static void ConvertOrientation( + ScDPSaveData& rSaveData, + const ::std::vector<PivotField>& rFields, sal_uInt16 nOrient, + const com::sun::star::uno::Reference< + com::sun::star::sheet::XDimensionsSupplier>& xSource, + const ScDPLabelDataVec& rLabels, + std::vector<PivotField>* pRefColFields = NULL, + std::vector<PivotField>* pRefRowFields = NULL, + std::vector<PivotField>* pRefPageFields = NULL ); static bool IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags ); }; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 987f232d491b..65d04984cbac 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -181,6 +181,7 @@ public: void RemoveLayoutName(); void SetSubtotalName(const ::rtl::OUString& rName); const ::rtl::OUString* GetSubtotalName() const; + void RemoveSubtotalName(); bool IsMemberNameInUse(const ::rtl::OUString& rName) const; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index c346aefcc00b..f97c47536a2b 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -128,15 +128,17 @@ struct ScDPName struct ScDPLabelData { - ::rtl::OUString maName; /// Original name of the dimension. - ::rtl::OUString maLayoutName; /// Layout name (display name) + rtl::OUString maName; /// Original name of the dimension. + rtl::OUString maLayoutName; /// Layout name (display name) + rtl::OUString maSubtotalName; SCCOL mnCol; /// 0-based field index (not the source column index) long mnOriginalDim; /// original dimension index (>= 0 for duplicated dimension) sal_uInt16 mnFuncMask; /// Page/Column/Row subtotal function. sal_Int32 mnUsedHier; /// Used hierarchy. sal_Int32 mnFlags; /// Flags from the DataPilotSource dimension - bool mbShowAll; /// true = Show all (also empty) results. - bool mbIsValue; /// true = Sum or count in data field. + bool mbShowAll:1; /// true = Show all (also empty) results. + bool mbIsValue:1; /// true = Sum or count in data field. + bool mbDataLayout:1; struct Member { |