summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/moduldlg.cxx14
-rw-r--r--basctl/source/basicide/moduldlg.hxx6
-rw-r--r--cui/source/customize/cfg.cxx26
-rw-r--r--cui/source/inc/cfg.hxx8
-rw-r--r--include/svtools/treelistbox.hxx8
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx8
-rw-r--r--sc/source/ui/inc/PivotLayoutTreeListBase.hxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx12
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx8
-rw-r--r--sfx2/source/inc/templdgi.hxx2
-rw-r--r--svtools/source/contnr/treelistbox.cxx30
-rw-r--r--sw/source/core/uibase/inc/conttree.hxx8
-rw-r--r--sw/source/core/uibase/inc/glossary.hxx6
-rw-r--r--sw/source/core/uibase/utlui/content.cxx8
-rw-r--r--sw/source/core/uibase/utlui/glbltree.cxx9
-rw-r--r--sw/source/ui/misc/glossary.cxx8
17 files changed, 77 insertions, 90 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:
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 20ea893bb3a4..f39107b764d8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1434,7 +1434,7 @@ bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvTreeListEntry* )
return true;
}
-sal_Bool SvxMenuEntriesListBox::NotifyMoving(
+TriState SvxMenuEntriesListBox::NotifyMoving(
SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
@@ -1445,11 +1445,11 @@ sal_Bool SvxMenuEntriesListBox::NotifyMoving(
{
SvTreeListBox::NotifyMoving(
pTarget, pSource, rpNewParent, rNewChildPos );
- return sal_True;
+ return TRISTATE_TRUE;
}
else
{
- return sal_False;
+ return TRISTATE_FALSE;
}
}
else
@@ -1458,7 +1458,7 @@ sal_Bool SvxMenuEntriesListBox::NotifyMoving(
}
}
-sal_Bool SvxMenuEntriesListBox::NotifyCopying(
+TriState SvxMenuEntriesListBox::NotifyCopying(
SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
@@ -1471,13 +1471,13 @@ sal_Bool SvxMenuEntriesListBox::NotifyCopying(
// if the target is NULL then add function to the start of the list
pPage->AddFunction( pTarget, pTarget == NULL );
- // AddFunction already adds the listbox entry so return FALSE
+ // AddFunction already adds the listbox entry so return TRISTATE_FALSE
// to stop another listbox entry being added
- return sal_False;
+ return TRISTATE_FALSE;
}
// Copying is only allowed from external controls, not within the listbox
- return sal_False;
+ return TRISTATE_FALSE;
}
void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
@@ -4660,11 +4660,11 @@ void SvxToolbarEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
}
}
-sal_Bool SvxToolbarEntriesListBox::NotifyMoving(
+TriState SvxToolbarEntriesListBox::NotifyMoving(
SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
- bool result = SvxMenuEntriesListBox::NotifyMoving(
+ TriState result = SvxMenuEntriesListBox::NotifyMoving(
pTarget, pSource, rpNewParent, rNewChildPos );
if ( result )
@@ -4682,7 +4682,7 @@ sal_Bool SvxToolbarEntriesListBox::NotifyMoving(
return result;
}
-sal_Bool SvxToolbarEntriesListBox::NotifyCopying(
+TriState SvxToolbarEntriesListBox::NotifyCopying(
SvTreeListEntry* pTarget,
SvTreeListEntry* pSource,
SvTreeListEntry*& rpNewParent,
@@ -4706,13 +4706,13 @@ sal_Bool SvxToolbarEntriesListBox::NotifyCopying(
pSaveInData->ApplyToolbar( pToolbar );
}
- // AddFunction already adds the listbox entry so return FALSE
+ // AddFunction already adds the listbox entry so return TRISTATE_FALSE
// to stop another listbox entry being added
- return sal_False;
+ return TRISTATE_FALSE;
}
// Copying is only allowed from external controls, not within the listbox
- return sal_False;
+ return TRISTATE_FALSE;
}
SvxNewToolbarDialog::SvxNewToolbarDialog(Window* pWindow, const OUString& rName)
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 3cda9e4c623c..839461762d89 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -328,10 +328,10 @@ public:
virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE;
- virtual sal_Bool NotifyMoving( SvTreeListEntry*, SvTreeListEntry*,
+ virtual TriState NotifyMoving( SvTreeListEntry*, SvTreeListEntry*,
SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE;
- virtual sal_Bool NotifyCopying( SvTreeListEntry*, SvTreeListEntry*,
+ virtual TriState NotifyCopying( SvTreeListEntry*, SvTreeListEntry*,
SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE;
virtual DragDropMode NotifyStartDrag(
@@ -553,10 +553,10 @@ public:
Size GetCheckBoxPixelSize() const
{ return m_aCheckBoxImageSizePixel; }
- virtual sal_Bool NotifyMoving(
+ virtual TriState NotifyMoving(
SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE;
- virtual sal_Bool NotifyCopying(
+ virtual TriState NotifyCopying(
SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE;
void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE;
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index a8c072e3b343..188cfb67f0a6 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -473,15 +473,15 @@ public:
virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
virtual SvTreeListEntry* CreateEntry() const; // To create new Entries
- // Return value: sal_True == Ok, sal_False == Cancel, 2==some hack
- virtual sal_Bool NotifyMoving(
+ // Return value: TRISTATE_TRUE == Ok, TRISTATE_FALSE == Cancel, TRISTATE_INDET == Ok and Make visible moved entry
+ virtual TriState NotifyMoving(
SvTreeListEntry* pTarget, // D'n'D DropPosition in this->GetModel()
SvTreeListEntry* pEntry, // Entry to be moved from GetSourceListBox()->GetModel()
SvTreeListEntry*& rpNewParent, // New TargetParent
sal_uLong& rNewChildPos); // The TargetParent's position in Childlist
- // Return value: sal_True == Ok, sal_False == Cancel, 2==some hack
- virtual sal_Bool NotifyCopying(
+ // Return value: TRISTATE_TRUE == Ok, TRISTATE_FALSE == Cancel, TRISTATE_INDET == Ok and Make visible moved entry
+ virtual TriState NotifyCopying(
SvTreeListEntry* pTarget, // D'n'D DropPosition in this->GetModel()
SvTreeListEntry* pEntry, // Entry to be copied from GetSourceListBox()->GetModel()
SvTreeListEntry*& rpNewParent, // New TargetParent
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index 5e1f320296e9..0ca94a7a5566 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -53,17 +53,17 @@ bool ScPivotLayoutTreeListBase::NotifyAcceptDrop(SvTreeListEntry* /*pEntry*/)
return true;
}
-sal_Bool ScPivotLayoutTreeListBase::NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+TriState ScPivotLayoutTreeListBase::NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/)
{
InsertEntryForSourceTarget(pSource, pTarget);
- return sal_False;
+ return TRISTATE_FALSE;
}
-sal_Bool ScPivotLayoutTreeListBase::NotifyCopying(SvTreeListEntry* /*pTarget*/, SvTreeListEntry* /*pSource*/,
+TriState ScPivotLayoutTreeListBase::NotifyCopying(SvTreeListEntry* /*pTarget*/, SvTreeListEntry* /*pSource*/,
SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/)
{
- return sal_False;
+ return TRISTATE_FALSE;
}
bool ScPivotLayoutTreeListBase::HasEntry(SvTreeListEntry* pEntry)
diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
index 26d94a12282d..7564d36ecf86 100644
--- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
@@ -46,9 +46,9 @@ public:
virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvent) SAL_OVERRIDE;
virtual bool NotifyAcceptDrop(SvTreeListEntry* pEntry) SAL_OVERRIDE;
- virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+ virtual TriState NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) SAL_OVERRIDE;
- virtual sal_Bool NotifyCopying(SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+ virtual TriState NotifyCopying(SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) SAL_OVERRIDE;
virtual DragDropMode NotifyStartDrag(TransferDataContainer& aTransferDataContainer,
SvTreeListEntry* pEntry) SAL_OVERRIDE;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 3282ba231259..5849589de0af 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1455,10 +1455,7 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const
return bBelongsToShow;
}
-
-
-
-sal_Bool SdPageObjsTLB::NotifyMoving(
+TriState SdPageObjsTLB::NotifyMoving(
SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
@@ -1499,15 +1496,12 @@ sal_Bool SdPageObjsTLB::NotifyMoving(
rNewChildPos += nCurEntrySelPos;
nCurEntrySelPos++;
}
- return sal_True;
+ return TRISTATE_TRUE;
}
else
- return sal_False;
+ return TRISTATE_FALSE;
}
-
-
-
SvTreeListEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
{
SvTreeListEntry* pEntry = SvTreeListBox::GetDropTarget(rLocation);
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index b43366862474..396352b239aa 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -173,7 +173,7 @@ protected:
reorders both the involved shapes in their page as well as the
associated list box entries.
*/
- virtual sal_Bool NotifyMoving(
+ virtual TriState NotifyMoving(
SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
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;
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 8114e455709e..d27f7b601b68 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -561,14 +561,14 @@ void SvTreeListBox::NotifyRemoving( SvTreeListEntry* )
- entry is inserted at the end of the target childlist
*/
#ifdef DBG_UTIL
-sal_Bool SvTreeListBox::NotifyMoving(
+TriState SvTreeListBox::NotifyMoving(
SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel()
SvTreeListEntry* pEntry, // entry that we want to move, from
// GetSourceListBox()->GetModel()
SvTreeListEntry*& rpNewParent, // new target parent
sal_uLong& rNewChildPos) // position in childlist of target parent
#else
-sal_Bool SvTreeListBox::NotifyMoving(
+TriState SvTreeListBox::NotifyMoving(
SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel()
SvTreeListEntry*, // entry that we want to move, from
// GetSourceListBox()->GetModel()
@@ -581,7 +581,7 @@ sal_Bool SvTreeListBox::NotifyMoving(
{
rpNewParent = 0;
rNewChildPos = 0;
- return true;
+ return TRISTATE_TRUE;
}
if ( !pTarget->HasChildren() && !pTarget->HasChildrenOnDemand() )
{
@@ -600,10 +600,10 @@ sal_Bool SvTreeListBox::NotifyMoving(
else
rNewChildPos = TREELIST_APPEND;
}
- return true;
+ return TRISTATE_TRUE;
}
-sal_Bool SvTreeListBox::NotifyCopying(
+TriState SvTreeListBox::NotifyCopying(
SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel()
SvTreeListEntry* pEntry, // entry that we want to move, from
// GetSourceListBox()->GetModel()
@@ -655,8 +655,8 @@ bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTar
pSourceEntry = *it;
SvTreeListEntry* pNewParent = 0;
sal_uLong nInsertionPos = TREELIST_APPEND;
- sal_Bool bOk=NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos);
- if ( bOk )
+ TriState nOk = NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos);
+ if ( nOk )
{
if ( bClone )
{
@@ -673,7 +673,7 @@ bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTar
else
bSuccess = false;
- if( bOk == (sal_Bool)2 ) // HACK: make visible moved entry?
+ if (nOk == TRISTATE_INDET) // HACK: make visible moved entry
MakeVisible( pSourceEntry );
}
pModel->SetCloneLink( aCloneLink );
@@ -712,15 +712,15 @@ bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, S
SvTreeListEntry* pNewParent = 0;
sal_uLong nInsertionPos = TREELIST_APPEND;
- sal_Bool bOk = NotifyMoving(pTarget,pSourceEntry,pNewParent,nInsertionPos);
- sal_Bool bCopyOk = bOk;
- if ( !bOk && bAllowCopyFallback )
+ TriState nOk = NotifyMoving(pTarget,pSourceEntry,pNewParent,nInsertionPos);
+ TriState nCopyOk = nOk;
+ if ( !nOk && bAllowCopyFallback )
{
nInsertionPos = TREELIST_APPEND;
- bCopyOk = NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos);
+ nCopyOk = NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos);
}
- if ( bOk || bCopyOk )
+ if ( nOk || nCopyOk )
{
if ( bClone )
{
@@ -730,7 +730,7 @@ bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, S
}
else
{
- if ( bOk )
+ if ( nOk )
pModel->Move(pSourceEntry, pNewParent, nInsertionPos);
else
pModel->Copy(pSourceEntry, pNewParent, nInsertionPos);
@@ -739,7 +739,7 @@ bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, S
else
bSuccess = false;
- if( bOk == (sal_Bool)2 ) // HACK: make moved entry visible?
+ if (nOk == TRISTATE_INDET) // HACK: make moved entry visible
MakeVisible( pSourceEntry );
}
pModel->SetCloneLink( aCloneLink );
diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
index 91da8b46ffa7..8ff250978ef0 100644
--- a/sw/source/core/uibase/inc/conttree.hxx
+++ b/sw/source/core/uibase/inc/conttree.hxx
@@ -118,12 +118,12 @@ protected:
SvTreeListEntry* ) SAL_OVERRIDE;
virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE;
- virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget,
+ virtual TriState NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
) SAL_OVERRIDE;
- virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget,
+ virtual TriState NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
@@ -260,12 +260,12 @@ protected:
virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE;
- virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget,
+ virtual TriState NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
) SAL_OVERRIDE;
- virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget,
+ virtual TriState NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
index af8a8cefb5b1..d44f5df18342 100644
--- a/sw/source/core/uibase/inc/glossary.hxx
+++ b/sw/source/core/uibase/inc/glossary.hxx
@@ -61,17 +61,17 @@ class SwGlTreeListBox : public SvTreeListBox
SvTreeListEntry* ) SAL_OVERRIDE;
virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE;
- virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget,
+ virtual TriState NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos
) SAL_OVERRIDE;
- virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget,
+ virtual TriState NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent,
sal_uLong& rNewChildPos) SAL_OVERRIDE;
- sal_Bool NotifyCopyingOrMoving( SvTreeListEntry* pTarget,
+ TriState NotifyCopyingOrMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
bool bIsMove);
public:
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 06adfaf02ca6..3225525f9919 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -2483,7 +2483,7 @@ DragDropMode SwContentTree::NotifyStartDrag(
}
// After the drag the current paragraph will be moved w i t h the children.
-sal_Bool SwContentTree::NotifyMoving( SvTreeListEntry* pTarget,
+TriState SwContentTree::NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry, SvTreeListEntry*& , sal_uLong& )
{
if(!bDocChgdInDragging)
@@ -2515,12 +2515,12 @@ sal_Bool SwContentTree::NotifyMoving( SvTreeListEntry* pTarget,
Display(true);
}
//TreeListBox will be reloaded from the document
- return sal_False;
+ return TRISTATE_FALSE;
}
// After the drag the current paragraph will be moved w i t h o u t the children.
-sal_Bool SwContentTree::NotifyCopying( SvTreeListEntry* pTarget,
+TriState SwContentTree::NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry, SvTreeListEntry*& , sal_uLong& )
{
if(!bDocChgdInDragging)
@@ -2551,7 +2551,7 @@ sal_Bool SwContentTree::NotifyCopying( SvTreeListEntry* pTarget,
aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
Display(true);
}
- return sal_False;
+ return TRISTATE_FALSE;
}
// No drop before the first entry - it's a SwContentType
diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx
index b72dfb352676..e6e4ee078435 100644
--- a/sw/source/core/uibase/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
@@ -533,7 +533,7 @@ sal_IntPtr SwGlobalTree::GetTabPos( SvTreeListEntry*, SvLBoxTab* pTab)
return pTab->GetPos() - GLBL_TABPOS_SUB;
}
-sal_Bool SwGlobalTree::NotifyMoving( SvTreeListEntry* pTarget,
+TriState SwGlobalTree::NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pSource,
SvTreeListEntry*&,
sal_uLong&
@@ -547,16 +547,17 @@ sal_Bool SwGlobalTree::NotifyMoving( SvTreeListEntry* pTarget,
*pSwGlblDocContents, nSource, nSource + 1, nDest ) &&
Update( sal_False ))
Display();
- return sal_False;
+
+ return TRISTATE_FALSE;
}
-sal_Bool SwGlobalTree::NotifyCopying( SvTreeListEntry* /*pTarget*/,
+TriState SwGlobalTree::NotifyCopying( SvTreeListEntry* /*pTarget*/,
SvTreeListEntry* /*pEntry*/,
SvTreeListEntry*& /*rpNewParent*/,
sal_uLong& /*rNewChildPos*/
)
{
- return sal_False;
+ return TRISTATE_FALSE;
}
bool SwGlobalTree::NotifyAcceptDrop( SvTreeListEntry* pEntry)
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 098983600a5c..b2485084ede8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -936,7 +936,7 @@ bool SwGlTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry)
}
-sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget,
+TriState SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& /*rpNewParent*/,
sal_uLong& /*rNewChildPos*/
@@ -945,7 +945,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget,
return NotifyCopyingOrMoving(pTarget, pEntry, true);
}
-sal_Bool SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget,
+TriState SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
SvTreeListEntry*& /*rpNewParent*/,
sal_uLong& /*rNewChildPos*/
@@ -954,7 +954,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget,
return NotifyCopyingOrMoving(pTarget, pEntry, false);
}
-sal_Bool SwGlTreeListBox::NotifyCopyingOrMoving(
+TriState SwGlTreeListBox::NotifyCopyingOrMoving(
SvTreeListEntry* pTarget,
SvTreeListEntry* pEntry,
bool bIsMove)
@@ -1001,7 +1001,7 @@ sal_Bool SwGlTreeListBox::NotifyCopyingOrMoving(
}
}
}
- return sal_False; // otherwise the entry is being set automatically
+ return TRISTATE_FALSE; // otherwise the entry is being set automatically
}
OUString SwGlossaryDlg::GetCurrGrpName() const
generated by cgit (git 2.34.1) at 2024-12-28 15:17:43 +0000