summaryrefslogtreecommitdiff
path: root/svtools/inc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-11-29 17:58:01 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-11-29 19:13:18 -0500
commitd99a7f66f42fb007ed625222812247a1f4650ffe (patch)
treefc2244a48524d8dab0f4a467f1f156fec594577a /svtools/inc
parent74a16a90ff3befd7fc336cf203a9b797df9fc5b6 (diff)
More on removing direct access to tree entry's view flags.
It turns out that this flag value was used only to check for expanded/ collapsed status, in which case, substituting it with one boolean should suffice. Change-Id: I2071ec83613d2206643db8681bebcfab7d1213a3
Diffstat (limited to 'svtools/inc')
-rw-r--r--svtools/inc/svtools/svlbitm.hxx7
-rw-r--r--svtools/inc/svtools/treelistbox.hxx5
2 files changed, 5 insertions, 7 deletions
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index c65d87ebd7b1..21a7fc3b5449 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -221,9 +221,10 @@ class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
{
SvLBoxContextBmp_Impl* m_pImpl;
public:
- SvLBoxContextBmp( SvTreeListEntry*,sal_uInt16 nFlags,Image,Image,
- sal_uInt16 nEntryFlagsBmp1);
- SvLBoxContextBmp();
+ SvLBoxContextBmp(
+ SvTreeListEntry* pEntry, sal_uInt16 nItemFlags, Image aBmp1, Image aBmp2, bool bExpanded);
+ SvLBoxContextBmp();
+
virtual ~SvLBoxContextBmp();
virtual sal_uInt16 GetType() const;
virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 26476f4a0741..3aa876918500 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -234,9 +234,8 @@ class SVT_DLLPUBLIC SvTreeListBox
short nFocusWidth;
sal_uInt16 nFirstSelTab;
sal_uInt16 nLastSelTab;
- sal_uInt16 aContextBmpMode;
-
long mnCheckboxItemWidth;
+ bool mbContextBmpExpanded;
SvTreeListEntry* pHdlEntry;
SvLBoxItem* pHdlItem;
@@ -638,8 +637,6 @@ public:
void SetCheckButtonState( SvTreeListEntry*, SvButtonState );
SvButtonState GetCheckButtonState( SvTreeListEntry* ) const;
- sal_Bool IsExpandBitmapOnCursor() const { return (sal_Bool)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; }
-
void SetEntryText(SvTreeListEntry*, const XubString& );
void SetExpandedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage );
void SetCollapsedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage );