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 /basctl | |
| parent | 21c3f6ac12877bcd512aff0255078afaf4880f6a (diff) | |
use TriState instead of sal_Bool as there's three possibilities
Change-Id: If24d4cec9ef4369f20419fe70de7392614a35316
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 14 | ||||
| -rw-r--r-- | basctl/source/basicide/moduldlg.hxx | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 3f2d2d2cc7ac..ff1f06b66468 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -247,17 +247,16 @@ bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry ) return bValid; } -sal_Bool ExtTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, +TriState ExtTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) { return NotifyCopyingMoving( pTarget, pEntry, rpNewParent, rNewChildPos, true ); } -sal_Bool ExtTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, +TriState ExtTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) { -// return false; // how do I copy an SBX?! return NotifyCopyingMoving( pTarget, pEntry, rpNewParent, rNewChildPos, false ); } @@ -318,8 +317,7 @@ void Shell::CopyDialogResources( } } - -sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, +TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove ) { (void)pEntry; @@ -460,14 +458,10 @@ sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi } } - return 2; // open... + return TRISTATE_INDET; // open... } - // OrganizeDialog - - - OrganizeDialog::OrganizeDialog(Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ) : TabDialog( pParent, "OrganizeDialog", diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index aa5d6512a8a8..d01c940869c8 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -103,11 +103,11 @@ protected: virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry ) SAL_OVERRIDE; virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE; - virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) SAL_OVERRIDE; - virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) SAL_OVERRIDE; - sal_Bool NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, + TriState NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove ); public: |