diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-04-07 17:04:46 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-08 09:18:33 +0100 |
commit | 380d4600d73a2f57a93d841d5fdfdd0a042d5d39 (patch) | |
tree | 94c4326f0ac9e3197da5b7b03450e27f23b9a471 /sfx2 | |
parent | 21c3f6ac12877bcd512aff0255078afaf4880f6a (diff) |
use TriState instead of sal_Bool as there's three possibilities
Change-Id: If24d4cec9ef4369f20419fe70de7392614a35316
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 0c8594029249..d1a91fbe745a 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -563,7 +563,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) -sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, +TriState StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uIntPtr& lPos) @@ -574,7 +574,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, */ { if(!pTarget || !pEntry) - return sal_False; + return TRISTATE_FALSE; aParent = GetEntryText(pTarget); aStyle = GetEntryText(pEntry); const bool bRet = (bool)aDropLink.Call(this); @@ -587,11 +587,9 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, GetEntryText(pTmpEntry),GetEntryText(pEntry)) < 0; pTmpEntry=NextSibling(pTmpEntry),lPos++) ; - return bRet ? (sal_Bool)2 : sal_False; + return bRet ? TRISTATE_INDET : TRISTATE_FALSE; } - - bool StyleTreeListBox_Impl::ExpandingHdl() /* [Description] diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index d5cc46fe0c75..3a3495338f8a 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -103,7 +103,7 @@ protected: virtual bool DoubleClickHdl() SAL_OVERRIDE; virtual bool ExpandingHdl() SAL_OVERRIDE; virtual void ExpandedHdl() SAL_OVERRIDE; - virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget, + virtual TriState NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uIntPtr& rNewChildPos) SAL_OVERRIDE; |