diff options
author | Kohei Yoshida <kohei@openoffice.org> | 2009-09-02 03:53:11 +0000 |
---|---|---|
committer | Kohei Yoshida <kohei@openoffice.org> | 2009-09-02 03:53:11 +0000 |
commit | e862adfa2e024d63ad86c6ad043b7d073598bf69 (patch) | |
tree | 611f4d7dada43248af57bbcc27492c1ae35fbf5b /sc/inc/dpobject.hxx | |
parent | When assigning a display name to subtotal output, we should allow it only whe... (diff) | |
download | core-e862adfa2e024d63ad86c6ad043b7d073598bf69.tar.gz core-e862adfa2e024d63ad86c6ad043b7d073598bf69.zip |
Initial work toward showing the display names (aka layout names) for field and field members when appropriate. Refactored ScDPLabelData quite a bit. I'm not entirely done with this yet.
Diffstat (limited to 'sc/inc/dpobject.hxx')
-rw-r--r-- | sc/inc/dpobject.hxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index f86cafdf81fd..a2e8c3f9e7e2 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -36,6 +36,7 @@ #include "address.hxx" #include "collect.hxx" #include "dpoutput.hxx" +#include "pivot.hxx" #include <com/sun/star/sheet/XDimensionsSupplier.hpp> #include <boost/shared_ptr.hpp> @@ -212,16 +213,10 @@ public: sal_Int32 GetUsedHierarchy( sal_Int32 nDim ); BOOL GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); - BOOL GetMembers( sal_Int32 nDim, - com::sun::star::uno::Sequence< rtl::OUString >& rMembers, - com::sun::star::uno::Sequence< sal_Bool >* pVisible = 0, - com::sun::star::uno::Sequence< sal_Bool >* pShowDet = 0 ); - BOOL GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers ); - BOOL GetMembers( sal_Int32 nDim, sal_Int32 nHier, - com::sun::star::uno::Sequence< rtl::OUString >& rMembers, - com::sun::star::uno::Sequence< sal_Bool >* pVisible = 0, - com::sun::star::uno::Sequence< sal_Bool >* pShowDet = 0 ); + + bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); + bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); |