[Libreoffice-commits] .: 9 commits - accessibility/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source formula/source reportdesign/source sc/source sd/source sfx2/inc sfx2/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source svx/inc svx/source svx/workben sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 11 20:35:11 PDT 2012
accessibility/source/extended/accessiblelistbox.cxx | 2
accessibility/source/extended/accessiblelistboxentry.cxx | 2
accessibility/source/extended/listboxaccessible.cxx | 2
basctl/source/basicide/bastype2.hxx | 2
basctl/source/basicide/moduldl2.cxx | 7
chart2/source/controller/dialogs/tp_DataSource.hxx | 2
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 2
cui/source/customize/acccfg.cxx | 14
cui/source/customize/cfg.cxx | 3
cui/source/customize/macropg.cxx | 5
cui/source/dialogs/thesdlg.cxx | 4
cui/source/dialogs/thesdlg_impl.hxx | 2
cui/source/inc/acccfg.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/cfgutil.hxx | 2
cui/source/inc/hlmarkwn.hxx | 2
cui/source/inc/scriptdlg.hxx | 2
cui/source/inc/selector.hxx | 2
cui/source/options/fontsubs.cxx | 1
cui/source/options/optHeaderTabListbox.cxx | 5
cui/source/options/optfltr.cxx | 2
cui/source/options/optlingu.cxx | 10
cui/source/options/radiobtnbox.cxx | 2
cui/source/tabpages/autocdlg.cxx | 4
cui/source/tabpages/macroass.cxx | 1
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/app/AppControllerDnD.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
dbaccess/source/ui/app/AppDetailView.hxx | 2
dbaccess/source/ui/browser/dbtreemodel.hxx | 2
dbaccess/source/ui/browser/dbtreeview.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/control/listviewitems.cxx | 6
dbaccess/source/ui/dlg/sqlmessage.cxx | 2
dbaccess/source/ui/inc/TableWindowListBox.hxx | 2
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2
dbaccess/source/ui/inc/indexdialog.hxx | 2
dbaccess/source/ui/inc/listviewitems.hxx | 4
dbaccess/source/ui/inc/marktree.hxx | 1
dbaccess/source/ui/misc/WNameMatch.cxx | 4
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2
extensions/source/propctrlr/selectlabeldialog.hxx | 2
extensions/source/propctrlr/taborder.hxx | 2
extensions/source/scanner/sanedlg.hxx | 2
formula/source/ui/dlg/formula.cxx | 2
formula/source/ui/dlg/funcpage.hxx | 2
formula/source/ui/dlg/structpg.hxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/inc/AddField.hxx | 2
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/inc/content.hxx | 2
sc/source/ui/inc/funcpage.hxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/navipi/content.cxx | 1
sc/source/ui/optdlg/calcoptionsdlg.cxx | 4
sc/source/ui/view/gridwin.cxx | 1
sd/source/ui/animations/CustomAnimationList.cxx | 18
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/dlg/RemoteDialog.hxx | 2
sd/source/ui/dlg/dlgassim.cxx | 1
sd/source/ui/dlg/dlgassim.hxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/inc/custsdlg.hxx | 2
sd/source/ui/inc/sdtreelb.hxx | 4
sfx2/inc/docvor.hxx | 8
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/docvor.cxx | 44
sfx2/source/inc/templdgi.hxx | 4
sfx2/source/view/orgmgr.cxx | 6
svtools/Library_svt.mk | 3
svtools/Package_inc.mk | 3
svtools/inc/svtools/svlbitm.hxx | 33
svtools/inc/svtools/svlbox.hxx | 641 -
svtools/inc/svtools/svtabbx.hxx | 2
svtools/inc/svtools/svtreebx.hxx | 403
svtools/inc/svtools/treelistbox.hxx | 945 ++
svtools/source/contnr/svimpbox.cxx | 6
svtools/source/contnr/svlbitm.cxx | 22
svtools/source/contnr/svlbox.cxx | 1794 ----
svtools/source/contnr/svtabbx.cxx | 5
svtools/source/contnr/svtreebx.cxx | 2494 ------
svtools/source/contnr/treelistbox.cxx | 4085 ++++++++++
svtools/source/uno/treecontrolpeer.cxx | 20
svtools/source/uno/treecontrolpeer.hxx | 14
svtools/source/uno/unoiface.cxx | 2
svx/inc/svx/checklbx.hxx | 2
svx/inc/svx/ctredlin.hxx | 3
svx/inc/svx/fontlb.hxx | 5
svx/source/dialog/ctredlin.cxx | 3
svx/source/dialog/docrecovery.cxx | 2
svx/source/dialog/fontlb.cxx | 8
svx/source/dialog/simptabl.cxx | 1
svx/source/form/filtnav.cxx | 21
svx/source/form/fmexch.cxx | 2
svx/source/inc/datanavi.hxx | 2
svx/source/inc/docrecovery.hxx | 9
svx/source/inc/filtnav.hxx | 2
svx/source/inc/fmexpl.hxx | 2
svx/source/inc/tabwin.hxx | 6
svx/source/tbxctrls/extrusioncontrols.hxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 1
svx/workben/msview/msview.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/envelp/labimp.hxx | 2
sw/source/ui/fldui/FldRefTreeListBox.hxx | 2
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/inc/changedb.hxx | 2
sw/source/ui/inc/cnttab.hxx | 2
sw/source/ui/inc/conttree.hxx | 11
sw/source/ui/inc/dbtree.hxx | 2
sw/source/ui/inc/glossary.hxx | 2
sw/source/ui/inc/regionsw.hxx | 2
sw/source/ui/inc/swuicnttab.hxx | 2
sw/source/ui/utlui/content.cxx | 4
sw/source/ui/utlui/glbltree.cxx | 2
116 files changed, 5265 insertions(+), 5571 deletions(-)
New commits:
commit 1dfc4542377cb427945a9461da6fffa7d3742884
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 23:31:31 2012 -0400
Remove this boundary comment.
Change-Id: Idc7c252a273dd600e05742f075c84421e0ffb23b
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 452936a..06113cc 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1603,8 +1603,6 @@ Link SvTreeListBox::GetDragFinishedHdl() const
return STATIC_LINK( this, SvTreeListBox, DragFinishHdl_Impl );
}
-// --- boundary of former SvLBox ---
-
/*
Bugs/TODO
commit d1ce7aaa5ac3c8cd851826d6164db93a9a486609
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 23:18:39 2012 -0400
Re-organize the data members of SvTreeListBox.
Change-Id: Iefe8182dc20f22fa65299d9253fba3830cd1a9c5
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 534c178..8637efa 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1081,7 +1081,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
{
ImplShowTargetEmphasis( pTargetEntry, sal_False );
}
- else if( !nDragDropMode )
+ else if( !GetDragDropMode() )
{
SAL_WARN( "sc.ui", "SdPageObjsTLB::AcceptDrop(): no target" );
}
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index cc66637..0ab9a32 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -313,7 +313,61 @@ class SVT_DLLPUBLIC SvTreeListBox
,public ::vcl::ISearchableStringList
{
friend class SvLBoxEntry;
+ friend class SvImpLBox;
+ friend class ImpLBSelEng;
+ friend class TreeControlPeer;
+ SvLBox_Impl* pLBoxImpl;
+ SvImpLBox* pImp;
+ Link aCheckButtonHdl;
+ Link aScrolledHdl;
+ Link aExpandedHdl;
+ Link aExpandingHdl;
+ Link aSelectHdl;
+ Link aDeselectHdl;
+
+ Accelerator aInpEditAcc;
+ Image aPrevInsertedExpBmp;
+ Image aPrevInsertedColBmp;
+ Image aCurInsertedExpBmp;
+ Image aCurInsertedColBmp;
+
+ short nContextBmpWidthMax;
+ short nEntryHeight;
+ short nEntryHeightOffs;
+ short nIndent;
+ short nFocusWidth;
+ sal_uInt16 nFirstSelTab;
+ sal_uInt16 nLastSelTab;
+ sal_uInt16 aContextBmpMode;
+
+ long mnCheckboxItemWidth;
+
+ SvLBoxEntry* pHdlEntry;
+ SvLBoxItem* pHdlItem;
+
+ DragDropMode nDragDropMode;
+ DragDropMode nOldDragMode;
+ SelectionMode eSelMode;
+ sal_Int8 nDragOptions;
+
+ SvLBoxEntry* pEdEntry;
+ SvLBoxItem* pEdItem;
+
+protected:
+ Link aDoubleClickHdl;
+ SvLBoxEntry* pTargetEntry;
+ SvLBoxButtonData* pCheckButtonData;
+ std::vector<SvLBoxTab*> aTabs;
+ sal_uInt16 nTreeFlags;
+ sal_uInt16 nImpFlags;
+ // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste
+ sal_uInt16 nCurEntrySelPos;
+
+private:
+ void SetBaseModel(SvLBoxTreeList* pNewModel);
+
+ DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * );
// Handler, der von TreeList zum Clonen eines Entries aufgerufen wird
DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* );
@@ -328,32 +382,8 @@ class SVT_DLLPUBLIC SvTreeListBox
SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB );
DECL_DLLPRIVATE_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8* );
- DragDropMode nOldDragMode;
-
-private:
- void SetBaseModel(SvLBoxTreeList* pNewModel);
-
protected:
- Link aExpandedHdl;
- Link aExpandingHdl;
- Link aSelectHdl;
- Link aDeselectHdl;
- Link aDoubleClickHdl;
- SvLBoxEntry* pHdlEntry;
- SvLBoxItem* pHdlItem;
- SvLBoxEntry* pTargetEntry;
-
- SvLBox_Impl* pLBoxImpl;
-
- sal_uInt16 nImpFlags;
- // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste
- sal_uInt16 nCurEntrySelPos;
-
- DragDropMode nDragDropMode;
- SelectionMode eSelMode;
- sal_Int8 nDragOptions;
-
sal_Bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 );
void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow);
void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True,
@@ -600,33 +630,6 @@ protected:
using SvListView::Select;
using SvListView::SelectAll;
-// boundary ----- former SvTreeListBox ends here.
-
- friend class SvImpLBox;
- friend class ImpLBSelEng;
- friend class TreeControlPeer;
-
- SvImpLBox* pImp;
- Link aCheckButtonHdl;
- Link aScrolledHdl;
- Accelerator aInpEditAcc;
- Image aPrevInsertedExpBmp;
- Image aPrevInsertedColBmp;
- Image aCurInsertedExpBmp;
- Image aCurInsertedColBmp;
-
- short nContextBmpWidthMax;
- sal_uInt16 nFirstSelTab, nLastSelTab;
- short nEntryHeight;
- short nEntryHeightOffs;
- short nIndent;
- short nFocusWidth;
- sal_uInt16 aContextBmpMode;
-
- long mnCheckboxItemWidth;
-
- DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
-
SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);
SVT_DLLPRIVATE short GetHeightOffset( const Font& rFont, Size& rLogicSize);
@@ -645,11 +648,6 @@ protected:
SVT_DLLPRIVATE void ImplInitStyle();
protected:
- SvLBoxButtonData* pCheckButtonData;
- sal_uInt16 nTreeFlags;
-
- SvLBoxEntry* pEdEntry;
- SvLBoxItem* pEdItem;
void EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
const Selection& );
@@ -657,8 +655,6 @@ protected:
void EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
const Point& rMousePos );
- std::vector<SvLBoxTab*> aTabs;
-
// berechnet abhaengig von TreeList-Style & Bitmap-Groessen
// alle Tabulatoren neu; wird beim Einfuegen/Austauschen von
// Bitmaps, beim Wechsel des Models usw. automatisch gerufen
commit b9640634d0cf698dba1c07d9c89a6246360df792
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 22:18:53 2012 -0400
Let's make these calls explicit too to prevent infinite recursions.
Change-Id: I9671715ce9ed06b032cf236e843c9ea0f09513a9
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index eaaee5f..99388a6 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -85,9 +85,9 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry,
{
DBG_CHKTHIS( SvLBoxFontString, 0 );
Font aOldFont( pView->GetFont() );
- pView->SetFont( maFont );
+ pView->Control::SetFont( maFont );
SvLBoxString::InitViewData( pView, pEntry, pViewData);
- pView->SetFont( aOldFont );
+ pView->Control::SetFont( aOldFont );
}
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 9a9fba9..4cde508 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1120,10 +1120,10 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvV
Font aOldFont( pView->GetFont());
Font aFont( aOldFont );
aFont.SetWeight(WEIGHT_BOLD);
- pView->SetFont( aFont );
+ pView->Control::SetFont( aFont );
Size aSize(pView->GetTextWidth(m_aName), pView->GetTextHeight());
- pView->SetFont( aOldFont );
+ pView->Control::SetFont( aOldFont );
aSize.Width() += pView->GetTextWidth(GetText()) + nxD;
pViewData->aSize = aSize;
}
commit e1aab195e3c8f0d592d522f0a8b1ebc08cf8e195
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 22:12:56 2012 -0400
Prevent infinite recursion during make check.
Change-Id: Ib807c54195c867d5f54e48ae2a1fe7694dfa4882
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 56b19f2..aaf208d 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -38,7 +38,7 @@ namespace dbaui
pView->Push(PUSH_ALL);
Font aFont( pView->GetFont());
aFont.SetWeight(WEIGHT_BOLD);
- pView->SetFont( aFont );
+ pView->Control::SetFont( aFont );
_pViewData->aSize = Size(pView->GetTextWidth(GetText()), pView->GetTextHeight());
pView->Pop();
}
commit 121e93215f157fd8c05812829a65d86a23a56747
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 21:42:23 2012 -0400
Another crasher.
Change-Id: I36f537618ae04e651e98fd9e9b0f4cf170faac33
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 42d926f..452936a 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -602,8 +602,8 @@ SvTreeListBox::SvTreeListBox( Window* pParent, WinBits nWinStyle ) :
pModel->InsertView( this );
pHdlEntry = 0;
pEdCtrl = 0;
- SetSelectionMode( SINGLE_SELECTION ); // check if TreeListBox is called
- SetDragDropMode( SV_DRAGDROP_NONE );
+ eSelMode = SINGLE_SELECTION;
+ nDragDropMode = SV_DRAGDROP_NONE;
SetType(WINDOW_TREELISTBOX);
InitTreeView();
commit 9de0d5c43eefd1b4a7224a649c96f1b2b296b88f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 21:35:18 2012 -0400
Fix another crash on exit.
Change-Id: If0f26e2e81e7f22c63b5eaba1e51bf10a7d3b603
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 13ae15d..42d926f 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1651,6 +1651,12 @@ void SvTreeListBox::InitTreeView()
SvTreeListBox::~SvTreeListBox()
{
DBG_DTOR(SvTreeListBox,0);
+
+ pImp->CallEventListeners( VCLEVENT_OBJECT_DYING );
+ delete pImp;
+ delete pLBoxImpl->m_pLink;
+ ClearTabList();
+
delete pEdCtrl;
pEdCtrl = 0;
pModel->RemoveView( this );
@@ -1668,11 +1674,6 @@ SvTreeListBox::~SvTreeListBox()
if( this == pDDTarget )
pDDTarget = 0;
delete pLBoxImpl;
-
- pImp->CallEventListeners( VCLEVENT_OBJECT_DYING );
- delete pImp;
- delete pLBoxImpl->m_pLink;
- ClearTabList();
}
void SvTreeListBox::SetExtendedWinBits( ExtendedWinBits _nBits )
commit beae1309b98510d2a1dc8f58a287881560ee1a7f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 21:25:11 2012 -0400
Fix a crash on tree list instantiation.
Change-Id: Ibef33f15223ba568a2626c74f102ecc022a3ab13
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index ced8c5c..cc66637 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -330,6 +330,9 @@ class SVT_DLLPUBLIC SvTreeListBox
DragDropMode nOldDragMode;
+private:
+ void SetBaseModel(SvLBoxTreeList* pNewModel);
+
protected:
Link aExpandedHdl;
@@ -423,7 +426,7 @@ public:
SvLBoxTreeList* GetModel() const { return (SvLBoxTreeList*)pModel; }
using SvListView::SetModel;
- void SetModel( SvLBoxTreeList* );
+ void SetModel(SvLBoxTreeList* pNewModel);
sal_uInt16 IsA();
sal_uLong GetEntryCount() const {return pModel->GetEntryCount();}
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index ad75c64..13ae15d 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -597,7 +597,7 @@ SvTreeListBox::SvTreeListBox( Window* pParent, WinBits nWinStyle ) :
pLBoxImpl = new SvLBox_Impl( *this );
SvLBoxTreeList* pTempModel = new SvLBoxTreeList;
pTempModel->SetRefCount( 0 );
- SetModel( pTempModel );
+ SetBaseModel(pTempModel);
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
pModel->InsertView( this );
pHdlEntry = 0;
@@ -623,7 +623,7 @@ SvTreeListBox::SvTreeListBox( Window* pParent, const ResId& rResId ) :
nDragDropMode = 0;
SvLBoxTreeList* pTempModel = new SvLBoxTreeList;
pTempModel->SetRefCount( 0 );
- SetModel( pTempModel );
+ SetBaseModel(pTempModel);
pModel->InsertView( this );
pHdlEntry = 0;
pEdCtrl = 0;
@@ -1614,9 +1614,6 @@ Link SvTreeListBox::GetDragFinishedHdl() const
#define TREEFLAG_FIXEDHEIGHT 0x0010
-
-DBG_NAME(SvTreeListBox)
-
#define SV_LBOX_DEFAULT_INDENT_PIXEL 20
void SvTreeListBox::InitTreeView()
@@ -1687,7 +1684,11 @@ void SvTreeListBox::SetModel( SvLBoxTreeList* pNewModel )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetModel( pNewModel );
+ SetBaseModel(pNewModel);
+}
+void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel )
+{
// does the CleanUp
SvListView::SetModel( pNewModel );
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
commit ac7acb0ab1329913b0cec79790adcde0263960be
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 11 16:13:12 2012 -0400
Merged SvTreeListBox and SvLBox.
There is no reason to keep SvLBox separate.
Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 6f8a464..4a43b6c 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -19,7 +19,7 @@
#include <accessibility/extended/accessiblelistbox.hxx>
#include <accessibility/extended/accessiblelistboxentry.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 68f0563..16ef81d 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -18,7 +18,7 @@
*/
#include "accessibility/extended/accessiblelistboxentry.hxx"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/stringtransfer.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index 077ae5f..d5ea35f 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -18,7 +18,7 @@
*/
#include <accessibility/extended/listboxaccessible.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
//........................................................................
namespace accessibility
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index b718ce2..1c0de30 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -24,7 +24,7 @@
#include <memory>
#include "tools/solar.h"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svl/lstner.hxx>
#include <basic/sbstar.hxx>
#include <sbxitem.hxx>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 931e727..4986ad2 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -40,6 +40,7 @@
#include <sfx2/request.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
+#include <svtools/svlbitm.hxx>
#include <sot/storage.hxx>
#include <com/sun/star/io/Pipe.hpp>
@@ -121,12 +122,12 @@ public:
LibLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
SvLBoxString( pEntry, nFlags, rTxt ) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
//----------------------------------------------------------------------------
-void LibLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
{
// Change text color if library is read only:
bool bReadOnly = false;
@@ -1445,7 +1446,7 @@ void LibPage::DeleteCurrent()
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) )
xDlgLibContainer->removeLibrary( aOULibName );
- static_cast<SvLBox&>(aLibBox).GetModel()->Remove( pCurEntry );
+ static_cast<SvTreeListBox&>(aLibBox).GetModel()->Remove( pCurEntry );
MarkDocumentModified( m_aCurDocument );
}
}
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index c7edca5..8eed40c 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -35,7 +35,7 @@
// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
// header for class SvTreeListBox
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 72f9697..c2f0b79 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -26,7 +26,7 @@
// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
// header for class SvTreeListBox
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
namespace chart
{
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a3dbed0..1bfbfd4 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -628,10 +628,8 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
virtual ~SfxAccCfgLBoxString_Impl();
- virtual void Paint(const Point& aPos ,
- SvLBox& rDevice,
- sal_uInt16 nFlags ,
- SvLBoxEntry* pEntry );
+ virtual void Paint(
+ const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
};
//-----------------------------------------------
@@ -647,13 +645,9 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
{
}
-//-----------------------------------------------
-void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos ,
- SvLBox& rDevice,
- sal_uInt16 /*nFlags*/,
- SvLBoxEntry* pEntry )
+void SfxAccCfgLBoxString_Impl::Paint(
+ const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry)
{
-
if (!pEntry)
return;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2f1945c..50e21ff 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -43,6 +43,7 @@
#include <sfx2/filedlghelper.hxx>
#include <svl/stritem.hxx>
#include <svtools/miscopt.hxx>
+#include <svtools/svlbitm.hxx>
#include <tools/diagnose_ex.h>
#include <toolkit/unohlp.hxx>
@@ -1358,7 +1359,7 @@ public:
~PopupPainter() { }
- void Paint( const Point& rPos, SvLBox& rOutDev,
+ void Paint( const Point& rPos, SvTreeListBox& rOutDev,
sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry )
{
SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index c4d90cf..7aa0c95 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -22,6 +22,7 @@
#include "macropg.hxx"
#include <vcl/msgbox.hxx>
#include <svtools/svmedit.hxx>
+#include <svtools/svlbitm.hxx>
#include <svl/eitem.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/app.hxx>
@@ -434,7 +435,7 @@ class IconLBoxString : public SvLBoxString
public:
IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText,
Image* pMacroImg, Image* pComponentImg );
- virtual void Paint(const Point& aPos, SvLBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
@@ -448,7 +449,7 @@ IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const St
}
//===============================================
-void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice,
+void IconLBoxString::Paint( const Point& aPos, SvTreeListBox& aDevice,
sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
{
String aTxt( GetText() );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index fea6127..47a3965 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -26,7 +26,7 @@
#include <svl/lngmisc.hxx>
#include <svtools/filter.hxx>
#include <svtools/svlbitm.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
@@ -139,7 +139,7 @@ AlternativesString::AlternativesString(
void AlternativesString::Paint(
const Point& rPos,
- SvLBox& rDev, sal_uInt16,
+ SvTreeListBox& rDev, sal_uInt16,
SvLBoxEntry* pEntry )
{
AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 5269cb3..8c827fd 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -56,7 +56,7 @@ public:
AlternativesString( ThesaurusAlternativesCtrl &rControl,
SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr );
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
};
#endif
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 6686cb3..ca4a8c5 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -40,7 +40,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/group.hxx>
#include <svtools/svtabbx.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/minarray.hxx>
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index d37911c..3db2a55 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -24,7 +24,7 @@
#include <vcl/group.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/toolbox.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/svmedit2.hxx>
#include <svtools/svmedit.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index fe869d9..52584eb 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <vcl/timer.hxx>
#include <svtools/svtabbx.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <vcl/image.hxx>
class SfxMacroInfoItem;
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index de683b4..eb51856 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "hlmarkwn_def.hxx"
class SvxHyperlinkTabPageBase;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 514089c..9aef16f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -24,7 +24,7 @@
#include "tools/solar.h"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 4da182f..c282811 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -23,7 +23,7 @@
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <vcl/menubtn.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index c250a2d..13ef512 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -22,6 +22,7 @@
#include <officecfg/Office/Common.hxx>
#include <tools/shl.hxx>
#include <svtools/ctrltool.hxx>
+#include <svtools/svlbitm.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <svtools/fontsubstconfig.hxx>
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 49cb985..a479751 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -20,6 +20,7 @@
#include "optHeaderTabListbox.hxx"
#include <vcl/svapp.hxx>
#include <svtools/headbar.hxx>
+#include <svtools/svlbitm.hxx>
namespace svx
{
@@ -31,12 +32,12 @@ public:
OptLBoxString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
SvLBoxString( pEntry, nFlags, rTxt ) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
// -----------------------------------------------------------------------
-void OptLBoxString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
{
Font aOldFont( rDev.GetFont() );
Font aFont( aOldFont );
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index fc6a218..6afeba5 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -25,6 +25,8 @@
#include "helpid.hrc"
#include <dialmgr.hxx>
+#include "svtools/svlbitm.hxx"
+
enum MSFltrPg2_CheckBoxEntries {
Math,
Writer,
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3ea970e..cae5377 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <unotools/extendedsecurityoptions.hxx>
-#include <svtools/svlbox.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/langhelp.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
@@ -283,11 +283,11 @@ public:
BrwStringDic_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry);
};
-void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16,
+void BrwStringDic_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16,
SvLBoxEntry* pEntry )
{
ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData();
@@ -450,11 +450,11 @@ public:
BrwString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry);
};
-void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16,
+void BrwString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16,
SvLBoxEntry* pEntry )
{
Point aPos(rPos);
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 76b1a4f..dd5fb59 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -20,6 +20,8 @@
#include "radiobtnbox.hxx"
#include <dialmgr.hxx>
+#include "svtools/svlbitm.hxx"
+
namespace svx {
// class SvxRadioButtonListBox ----------------------------------------------------
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 8d839d0..646e48b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -333,11 +333,11 @@ public:
OfaImpBrwString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr){}
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry);
};
-void OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/,
+void OfaImpBrwString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/,
SvLBoxEntry* pEntry )
{
rDev.DrawText( rPos, GetText() );
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 881e59a..6fa7420 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -36,6 +36,7 @@
#include "cuires.hrc"
#include <vcl/fixed.hxx>
#include "headertablistbox.hxx"
+#include "svtools/svlbitm.hxx"
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index aaa71c3..72520aa 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -66,7 +66,7 @@
#include <svl/urihelper.hxx>
#include <svl/filenotation.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/transfer.hxx>
#include <svtools/cliplistener.hxx>
#include <svtools/svlbitm.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 0225c00..6ed5db0 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -69,7 +69,7 @@
#include "dbexchange.hxx"
#include "UITools.hxx"
#include <algorithm>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <unotools/pathoptions.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 00a2725..8b34d8c 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include "AppElementType.hxx"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/DocumentInfoPreview.hxx>
#include <vcl/fixed.hxx>
#include <vcl/toolbox.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 497c050..220b31f 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -30,7 +30,7 @@
#include "IClipBoardTest.hxx"
#include "AppTitleWindow.hxx"
#include "AppElementType.hxx"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "VertSplitView.hxx"
#include <vector>
diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx
index 5da08ba..b939ac3 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.hxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.hxx
@@ -21,8 +21,6 @@
#define DBAUI_DBTREEMODEL_HXX
#include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svlbox.hxx>
-#include <svtools/svlbitm.hxx>
#include "unodatbr.hxx"
#include "commontypes.hxx"
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index b557766..6f26f6c 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -19,7 +19,7 @@
#include "dbtreeview.hxx"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "dbtreelistbox.hxx"
#include "dbtreemodel.hxx"
#include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 058aaef..5e0b007 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -106,7 +106,7 @@
#include <svl/intitem.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/svlbitm.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svx/algitem.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <svx/databaseregistrationui.hxx>
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 0e884a8..56b19f2 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -28,7 +28,7 @@ namespace dbaui
// class OBoldListboxString
//========================================================================
//------------------------------------------------------------------------
- void OBoldListboxString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData)
+ void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData)
{
SvLBoxString::InitViewData( pView, pEntry, _pViewData );
if ( !m_bEmphasized )
@@ -50,7 +50,7 @@ namespace dbaui
}
//------------------------------------------------------------------------
- void OBoldListboxString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry )
+ void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry )
{
if (m_bEmphasized)
{
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index af4f3e3..323d819 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/sdb/SQLContext.hpp>
#include <vcl/fixed.hxx>
#include <osl/diagnose.h>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/svmedit.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/sqlerror.hxx>
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 1bec975..890f698 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -19,7 +19,7 @@
#ifndef DBAUI_TABLEWINDOWLISTBOX_HXX
#define DBAUI_TABLEWINDOWLISTBOX_HXX
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "callbacks.hxx"
struct AcceptDropEvent;
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 7ef0cd1..f5948ba 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <vcl/timer.hxx>
#include <set>
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 1a0ab7e..61ae429 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/toolbox.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <unotools/viewoptions.hxx>
#include "indexes.hxx"
#include "ToolBoxHelper.hxx"
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 6fb05f0..99aca20 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -45,8 +45,8 @@ namespace dbaui
virtual sal_uInt16 IsA();
- virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
- virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData);
+ virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+ virtual void InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData);
sal_Bool isEmphasized() const { return m_bEmphasized; }
void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; }
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index 12db887..adda689 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -22,6 +22,7 @@
#include "dbtreelistbox.hxx"
+#include "svtools/svlbitm.hxx"
//.........................................................................
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 569a7a7..b68b329 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -335,10 +335,10 @@ public:
{
}
- virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+ virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
};
//------------------------------------------------------------------------
-void OColumnString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
+void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
{
if(m_bReadOnly)
{
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e224633..0b6a8df 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -93,7 +93,7 @@
#include "sal/types.h"
#include "salhelper/thread.hxx"
#include "svtools/svlbitm.hxx"
-#include "svtools/svlbox.hxx"
+#include "svtools/treelistbox.hxx"
#include <svtools/controldims.hrc>
#include "svx/checklbx.hxx"
#include "tools/gen.hxx"
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 3c62009..314b7c4 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -21,7 +21,7 @@
#define _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_
#include <vcl/fixed.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <vcl/button.hxx>
#include <vcl/image.hxx>
#include <vcl/dialog.hxx>
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 3bc732a..6e3d969 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -20,7 +20,7 @@
#ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
#define EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <com/sun/star/awt/XTabControllerModel.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index e1aae9e..8b8f93f 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -35,7 +35,7 @@
#include <vcl/group.hxx>
#include <vcl/field.hxx>
#include <vcl/edit.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <sane.hxx>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 26473c0..03f41dc 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -30,7 +30,7 @@
#include <svtools/stdctrl.hxx>
#include <svtools/svmedit.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svl/eitem.hxx>
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 0316171..bcd59f3 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -28,7 +28,7 @@
#include <vcl/tabctrl.hxx>
#include <vcl/button.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 38a4b86..151c57e 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -26,7 +26,7 @@
#include <svtools/svmedit.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "formula/IFunctionDescription.hxx"
#include "formula/omoduleclient.hxx"
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 26baf9f..28b7604 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -40,7 +40,7 @@
#include <comphelper/types.hxx>
#include "cppuhelper/basemutex.hxx"
#include "comphelper/SelectionMultiplex.hxx"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svl/solar.hrc>
#include "ReportVisitor.hxx"
#include "ModuleHelper.hxx"
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 81198a2..bcbb844 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -27,7 +27,7 @@
#include <svtools/transfer.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svtools/transfer.hxx>
#include <vcl/floatwin.hxx>
#include <comphelper/propmultiplex.hxx>
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index e5cdf92..b969192 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -32,7 +32,7 @@
#include <sfx2/objsh.hxx>
#include <svl/zforlist.hxx>
#include <svl/stritem.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index c0451d6..f6f757f 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -29,7 +29,7 @@
#ifndef SC_CONTENT_HXX
#define SC_CONTENT_HXX
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "global.hxx"
#include "address.hxx"
#include <tools/solar.h>
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index bcfa2dc..f3e7c51 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -30,7 +30,7 @@
#include <vcl/tabctrl.hxx>
#include "parawin.hxx"
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "compiler.hxx"
#include "cell.hxx"
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 90f3e28..4465052 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -85,10 +85,10 @@ public:
void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; }
void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; }
- virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
-void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ )
+void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ )
{
//! move position? (SvxLinguTabPage: aPos.X() += 20)
String aNormalStr( GetText() );
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 86bc545..1eac9d3 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -39,6 +39,7 @@
#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
#include <svl/urlbmk.hxx>
+#include "svtools/svlbitm.hxx"
#include <stdlib.h>
#include "content.hxx"
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 69bd2a8..c4df06a 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -42,10 +42,10 @@ public:
OptionString(const rtl::OUString& rDesc, const rtl::OUString& rValue) :
maDesc(rDesc), maValue(rValue) {}
- virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+ virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
};
-void OptionString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/)
+void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/)
{
Point aPos = rPos;
rtl::OUString aDesc = maDesc + rtl::OUString(": ");
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index f4e317e..3899b2d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -42,7 +42,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/docfile.hxx>
#include <svl/stritem.hxx>
-#include <svtools/svlbox.hxx>
#include <svtools/svtabbx.hxx>
#include <svl/urlbmk.hxx>
#include <vcl/cursor.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 55393d8..a937869 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -45,6 +45,8 @@
#include <vcl/svapp.hxx>
#include "sdresid.hxx"
+#include "svtools/svlbitm.hxx"
+
#include "res_bmp.hrc"
#include "glob.hrc"
@@ -210,8 +212,8 @@ class CustomAnimationListEntryItem : public SvLBoxString
public:
CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent );
virtual ~CustomAnimationListEntryItem();
- void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+ void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
+ void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
@@ -239,7 +241,7 @@ CustomAnimationListEntryItem::~CustomAnimationListEntryItem()
// --------------------------------------------------------------------
-void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
+void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
{
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
@@ -252,7 +254,7 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn
// --------------------------------------------------------------------
-void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
{
SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
@@ -361,8 +363,8 @@ public:
CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription );
virtual ~CustomAnimationTriggerEntryItem();
virtual sal_uInt16 IsA();
- void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+ void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
+ void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
@@ -392,7 +394,7 @@ sal_uInt16 CustomAnimationTriggerEntryItem::IsA()
// --------------------------------------------------------------------
-void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
+void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
{
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
@@ -405,7 +407,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry*
// --------------------------------------------------------------------
-void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* )
+void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* )
{
Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() );
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 914e29e..693d6e3 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -30,7 +30,7 @@
#define _SD_CUSTOMANIMATIONLIST_HXX
#include <com/sun/star/drawing/XShape.hpp>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <CustomAnimationEffect.hxx>
#include "CustomAnimationPreset.hxx"
#include "CustomAnimation.hrc"
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index 3ef7de1..bc4831b 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -14,7 +14,7 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/field.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "RemoteDialogClientBox.hxx"
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 321605e..c5dcc2c 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -38,6 +38,7 @@
#include "res_bmp.hrc"
#include <vcl/svapp.hxx>
+#include "svtools/svlbitm.hxx"
#include "dlgassim.hxx"
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index aec9c1d..f6f9b79 100644
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -29,7 +29,7 @@
#include <svl/dateitem.hxx>
#include "drawdoc.hxx"
#include <svx/svdotext.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include "sdresid.hxx"
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index 7744976..a176707 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -34,7 +34,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <vcl/dialog.hxx>
class SdDrawDocument;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 63ac738..21d89c9 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -35,7 +35,7 @@
#include "pres.hxx"
#include "sddllapi.h"
#include <tools/string.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svl/urlbmk.hxx>
#include <tools/ref.hxx>
#include "sdxfer.hxx"
@@ -223,7 +223,7 @@ public:
sal_Bool IsLinkableSelected() const { return mbLinkableSelected; }
static sal_Bool IsInDrag();
- using SvLBox::ExecuteDrop;
+ using SvTreeListBox::ExecuteDrop;
using SvTreeListBox::SelectEntry;
private:
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 86e6d18..4bdc1c7 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -21,7 +21,7 @@
#include <vcl/dialog.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <sfx2/objsh.hxx>
#include "orgmgr.hxx"
@@ -68,7 +68,7 @@ protected:
virtual long ExpandingHdl();
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- using SvLBox::ExecuteDrop;
+ using SvTreeListBox::ExecuteDrop;
// new d&d
virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* );
virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* );
@@ -97,13 +97,13 @@ public:
private:
sal_Bool IsStandard_Impl( SvLBoxEntry *) const;
- sal_Bool MoveOrCopyTemplates(SvLBox *pSourceBox,
+ sal_Bool MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
sal_uIntPtr &rIdx,
sal_Bool bCopy);
- sal_Bool MoveOrCopyContents(SvLBox *pSourceBox,
+ sal_Bool MoveOrCopyContents(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 6b60bb8..74d73a3 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/dialog.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <unotools/moduleoptions.hxx>
#include "srchdlg.hxx"
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index df3a812..e501569 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -442,7 +442,7 @@ public:
void SetDoubleClickHdl(const Link &rLink) { aDoubleClickLink = rLink; }
void SetDropHdl(const Link &rLink) { aDropLink = rLink; }
- using SvLBox::GetParent;
+ using SvTreeListBox::GetParent;
const String& GetParent() const { return aParent; }
const String& GetStyle() const { return aStyle; }
void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 2c28cd3..e976a39 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -114,7 +114,7 @@ friend class SfxOrganizeListBox_Impl;
Printer* pPrt;
// save pointer for asynchronous D&D
- SvLBox* pSourceView;
+ SvTreeListBox* pSourceView;
SvLBoxEntry* pTargetEntry;
SfxOrganizeListBox_Impl* pFinishedBox;
sal_Int8 nDropAction;
@@ -391,7 +391,7 @@ class Path
{
ImpPath_Impl *pData;
public:
- Path(SvLBox *pBox, SvLBoxEntry *pEntry);
+ Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry);
Path(const Path &rPath):
pData(rPath.pData)
{
@@ -422,7 +422,7 @@ public:
//-------------------------------------------------------------------------
-Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
+Path::Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry) :
pData(new ImpPath_Impl)
{
DBG_ASSERT(pEntry != 0, "EntryPtr ist NULL");
@@ -441,7 +441,7 @@ Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
//-------------------------------------------------------------------------
-SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
+SvLBoxEntry *GetIndices_Impl(SvTreeListBox *pBox,
SvLBoxEntry *pEntry,
sal_uInt16 &rRegion,
sal_uInt16 &rOffset)
@@ -451,7 +451,7 @@ SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
[Parameter]
- SvLBox *pBox Listbox where the event occurred
+ SvTreeListBox *pBox Listbox where the event occurred
SvLBoxEntry *pEntry Entry whose position is to be determined
sal_uInt16 &rRegion the region within the region of the
document template (Out-Parameter)
@@ -504,7 +504,7 @@ sal_Bool SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, sal_Bool bSelect
//-------------------------------------------------------------------------
-sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
@@ -516,7 +516,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
[Parameter]
- SvLBox *pSourceBox Source Listbox, at which the event occurred
+ SvTreeListBox *pSourceBox Source Listbox, at which the event occurred
SvLBoxEntry* pTarget Target entry, to where it will be moved
SvLBoxEntry *pSource Source entry, to be copied / moved
SvLBoxEntry *&pNewParent the parent of the target position generated
@@ -529,7 +529,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
[Cross-references]
- <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+ <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
@@ -577,7 +577,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
rIdx = 0;
}
else
- SvLBox::NotifyCopying(
+ SvTreeListBox::NotifyCopying(
pTarget, pSource, pNewParent, rIdx);
}
}
@@ -595,7 +595,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
//-------------------------------------------------------------------------
-sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
@@ -607,7 +607,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
[Parameter]
- SvLBox *pSourceBox Source Listbox, at which the event occurred
+ SvTreeListBox *pSourceBox Source Listbox, at which the event occurred
SvLBoxEntry* pTarget Target entry, to where it will be moved
SvLBoxEntry *pSource Source entry, to be copied / moved
SvLBoxEntry *&pNewParent the parent of the target position generated
@@ -620,7 +620,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
[Cross-references]
- <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+ <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
@@ -769,13 +769,13 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
[Cross-references]
- <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+ <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
sal_uIntPtr &rIdx,
sal_Bool bCopy)>
- <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+ <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
@@ -789,7 +789,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
{
sal_Bool bOk = sal_False;
- SvLBox* pSourceBox = GetSourceView();
+ SvTreeListBox* pSourceBox = GetSourceView();
if ( !pSourceBox )
pSourceBox = pDlg->pSourceView;
DBG_ASSERT( pSourceBox, "no source view" );
@@ -828,13 +828,13 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
[Cross-references]
- <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+ <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
sal_uIntPtr &rIdx,
sal_Bool bCopy)>
- <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+ <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent,
@@ -847,7 +847,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
*/
{
sal_Bool bOk = sal_False;
- SvLBox* pSourceBox = GetSourceView();
+ SvTreeListBox* pSourceBox = GetSourceView();
if ( !pSourceBox )
pSourceBox = pDlg->pSourceView;
DBG_ASSERT( pSourceBox, "no source view" );
@@ -963,7 +963,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry )
{
if(!pEntry)
return sal_False;
- SvLBox *pSource = GetSourceView();
+ SvTreeListBox *pSource = GetSourceView();
SvLBoxEntry *pSourceEntry = pSource->FirstSelected();
if(pEntry == pSourceEntry)
return sal_False;
@@ -1203,11 +1203,11 @@ long SfxOrganizeListBox_Impl::ExpandingHdl()
else
pMgr->DeleteObjectShell(aPath[0], aPath[1]);
// Delete all SubEntries
- SvLBoxEntry *pToDel = SvLBox::GetEntry(pEntry, 0);
+ SvLBoxEntry *pToDel = SvTreeListBox::GetEntry(pEntry, 0);
while(pToDel)
{
GetModel()->Remove(pToDel);
- pToDel = SvLBox::GetEntry(pEntry, 0);
+ pToDel = SvTreeListBox::GetEntry(pEntry, 0);
}
}
}
@@ -1333,7 +1333,7 @@ IMPL_LINK( SfxOrganizeListBox_Impl, OnAsyncExecuteDrop, ExecuteDropEvent*, pEven
DBG_ASSERT( pEvent, "invalid DropEvent" );
if ( pEvent )
{
- SvLBox* pSourceView = GetSourceView();
+ SvTreeListBox* pSourceView = GetSourceView();
if ( !pSourceView )
pSourceView = pDlg->pSourceView;
pDlg->bExecDropFinished = false;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 0cc98f3..12fe315 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -25,7 +25,7 @@ class SfxTemplateControllerItem;
#include <vcl/toolbox.hxx>
#include <vcl/lstbox.hxx>
#include <svl/lstner.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
#include <svl/eitem.hxx>
#include <rsc/rscsfx.hxx>
@@ -68,7 +68,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- using SvLBox::ExecuteDrop;
+ using SvTreeListBox::ExecuteDrop;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
sal_uInt16 GetModifier() const { return nModifier; }
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index e224d55..a2d6862 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -467,7 +467,7 @@ sal_Bool SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
{
// deleting of a group
- SvLBoxEntry *pGroupToDelete = pCaller->SvLBox::GetEntry(nRegion);
+ SvLBoxEntry *pGroupToDelete = pCaller->GetEntry(nRegion);
if ( pGroupToDelete )
{
sal_uInt16 nItemNum = (sal_uInt16)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) );
@@ -481,7 +481,7 @@ sal_Bool SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
if ( pTemplates->Delete( nRegion, nInd ) )
{
bModified = 1;
- pEntriesToDelete.push_back( pCaller->SvLBox::GetEntry( pGroupToDelete, nInd ) );
+ pEntriesToDelete.push_back( pCaller->GetEntry( pGroupToDelete, nInd ) );
}
}
@@ -504,7 +504,7 @@ sal_Bool SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
{
bModified = 1;
// Entry to be deleted.
- SvLBoxEntry *pEntryToDelete = pCaller->SvLBox::GetEntry(pCaller->SvLBox::GetEntry(nRegion), nIdx);
+ SvLBoxEntry *pEntryToDelete = pCaller->GetEntry(pCaller->GetEntry(nRegion), nIdx);
pCaller->GetModel()->Remove(pEntryToDelete);
}
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index d78caa2..89d3f18 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -101,11 +101,10 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/contnr/ivctrl \
svtools/source/contnr/svimpbox \
svtools/source/contnr/svlbitm \
- svtools/source/contnr/svlbox \
svtools/source/contnr/svtabbx \
- svtools/source/contnr/svtreebx \
svtools/source/contnr/templwin \
svtools/source/contnr/treelist \
+ svtools/source/contnr/treelistbox \
svtools/source/control/asynclink \
svtools/source/control/calendar \
svtools/source/control/collatorres \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index d06053c..c1ed7e1 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -138,7 +138,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/st
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistbox.hxx,svtools/treelistbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
@@ -146,7 +146,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/sv
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtresid.hxx,svtools/svtresid.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrolinterface.hxx,svtools/table/tablecontrolinterface.hxx))
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 727a0a5..6bca37e 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -35,16 +35,10 @@
#include <tools/link.hxx>
#include <vcl/image.hxx>
-#include <svtools/svlbox.hxx>
+#include <svtools/treelistbox.hxx>
class SvLBoxEntry;
-#define SV_ITEM_ID_LBOXSTRING 1
-#define SV_ITEM_ID_LBOXBMP 2
-#define SV_ITEM_ID_LBOXBUTTON 3
-#define SV_ITEM_ID_LBOXCONTEXTBMP 4
-
-enum SvButtonState { SV_BUTTON_UNCHECKED, SV_BUTTON_CHECKED, SV_BUTTON_TRISTATE };
#define SV_BMP_UNCHECKED 0
#define SV_BMP_CHECKED 1
@@ -129,10 +123,10 @@ public:
SvLBoxString();
virtual ~SvLBoxString();
virtual sal_uInt16 IsA();
- virtual void InitViewData(SvLBox*, SvLBoxEntry*, SvViewDataItem*);
+ virtual void InitViewData(SvTreeListBox*, SvLBoxEntry*, SvViewDataItem*);
rtl::OUString GetText() const { return maText; }
void SetText( const rtl::OUString& rText ) { maText = rText; }
- virtual void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
};
@@ -144,8 +138,8 @@ public:
SvLBoxBmp();
virtual ~SvLBoxBmp();
virtual sal_uInt16 IsA();
- virtual void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- virtual void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
+ virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
};
@@ -157,13 +151,6 @@ public:
#define SV_ITEMSTATE_HILIGHTED 0x0008
#define SV_STATE_MASK 0xFFF8 // zum Loeschen von UNCHECKED,CHECKED,TRISTATE
-enum SvLBoxButtonKind
-{
- SvLBoxButtonKind_enabledCheckbox,
- SvLBoxButtonKind_disabledCheckbox,
- SvLBoxButtonKind_staticImage
-};
-
class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
{
SvLBoxButtonData* pData;
@@ -183,10 +170,10 @@ public:
SvLBoxButtonData* pBData );
SvLBoxButton();
virtual ~SvLBoxButton();
- virtual void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
+ virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
virtual sal_uInt16 IsA();
- virtual sal_Bool ClickHdl(SvLBox* pView, SvLBoxEntry* );
- virtual void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvLBoxEntry* );
+ virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
sal_uInt16 GetButtonFlags() const { return nItemFlags; }
@@ -243,8 +230,8 @@ public:
SvLBoxContextBmp();
virtual ~SvLBoxContextBmp();
virtual sal_uInt16 IsA();
- virtual void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- virtual void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
+ virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
deleted file mode 100644
index b582806..0000000
--- a/svtools/inc/svtools/svlbox.hxx
+++ /dev/null
@@ -1,641 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVLBOX_HXX
-#define _SVLBOX_HXX
-
-#include "svtools/svtdllapi.h"
-
-#include <deque>
-
-#include <vcl/ctrl.hxx>
-#include <vcl/seleng.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/accel.hxx>
-#include <vcl/mnemonicengine.hxx>
-#include <vcl/quickselectionengine.hxx>
-#include <tools/gen.hxx>
-#include <tools/contnr.hxx>
-#include <svtools/treelist.hxx>
-#include <svtools/transfer.hxx>
-
-class Application;
-class SvLBox;
-class SvLBoxEntry;
-class SvViewDataItem;
-class SvViewDataEntry;
-class SvInplaceEdit2;
-class SvLBoxString;
-class SvLBoxButton;
-class SvLBoxContextBmp;
-class SvLBoxBmp;
-struct SvLBoxDDInfo;
-
-namespace utl {
- class AccessibleStateSetHelper;
-}
-
-// *********************************************************************
-// *************************** Tabulatoren *****************************
-// *********************************************************************
-
-#define SV_LBOXTAB_DYNAMIC 0x0001 // Ausgabespalte des Items verschiebt
- // sich entsprechend Child-Tiefe
-#define SV_LBOXTAB_ADJUST_RIGHT 0x0002 // rechter Rand des Items am Tabulator
-#define SV_LBOXTAB_ADJUST_LEFT 0x0004 // linker Rand ...
-#define SV_LBOXTAB_ADJUST_CENTER 0x0008 // Item am Tabulator zentrieren
-#define SV_LBOXTAB_ADJUST_NUMERIC 0x0010 // Dezimalpunkt am Tabulator (Strings)
-
-// wird nicht mehr unterstuetzt! Fokus richtet sich jetzt nach Selektion!
-#define SV_LBOXTAB_SHOW_FOCUS 0x0020 // Fokus visualisieren
-
-#define SV_LBOXTAB_SHOW_SELECTION 0x0040 // Selektionszustand visualisieren
- // Item muss umschliessendes Polygon
- // zurueckgeben koennen (D&D-Cursor)
-#define SV_LBOXTAB_EDITABLE 0x0100 // Item an Tabulator editierbar
-#define SV_LBOXTAB_PUSHABLE 0x0200 // Item verhaelt sich wie ein Button
-#define SV_LBOXTAB_INV_ALWAYS 0x0400 // Hintergrund immer loeschen
-#define SV_LBOXTAB_FORCE 0x0800 // Default-Berechnung des ersten Tabulators
- // (auf die sich Abo-Tabpage, Extras/Optionen/Anpassen,
- // etc. verlassen) ausschalten. Die Position des ersten
- // Tabs entspricht jetzt exakt den eingestellten Flags &
- // Spaltenbreiten.
-
-class SvLBoxTab
-{
- long nPos;
- void* pUserData;
-public:
- SvLBoxTab();
- SvLBoxTab( long nPos, sal_uInt16 nFlags=SV_LBOXTAB_ADJUST_LEFT );
- SvLBoxTab( const SvLBoxTab& );
- ~SvLBoxTab();
-
- sal_uInt16 nFlags;
-
- void SetUserData( void* pPtr ) { pUserData = pPtr; }
- void* GetUserData() const { return pUserData; }
- sal_Bool IsDynamic() const { return (sal_Bool)((nFlags & SV_LBOXTAB_DYNAMIC)!=0); }
- void SetPos( long nNewPos) { nPos = nNewPos; }
- long GetPos() const { return nPos; }
- long CalcOffset( long nItemLength, long nTabWidth );
- // long CalcOffset( const String&, const OutputDevice& );
- sal_Bool IsEditable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_EDITABLE)!=0); }
- sal_Bool IsPushable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); }
-};
-
-// *********************************************************************
-// *********************** View-abhaengige Daten ***********************
-// *********************************************************************
-
-class SvViewDataItem
-{
-public:
- Size aSize;
- SvViewDataItem();
- ~SvViewDataItem();
-};
-
-// View-abhaengige Daten fuer einen Entry werden in virtueller Fkt.
-// SvLBox::CreateViewData erzeugt. Die ViewDaten-Erzeugung von
-// Items kann nicht veraendert werden (wg. Array)
-class SvViewDataEntry : public SvViewData
-{
-public:
- SvViewDataItem* pItemData; // ein Array von SvViewDataItems
- sal_uInt16 nItmCnt; // Anzahl Items fuer delete-operator
-
- SvViewDataEntry();
- virtual ~SvViewDataEntry();
-};
-
-// *********************************************************************
-// ****************************** Items ********************************
-// *********************************************************************
-
-class SVT_DLLPUBLIC SvLBoxItem
-{
-public:
- SvLBoxItem( SvLBoxEntry*, sal_uInt16 nFlags );
- SvLBoxItem();
- virtual ~SvLBoxItem();
- virtual sal_uInt16 IsA() = 0;
- const Size& GetSize( SvLBox* pView, SvLBoxEntry* pEntry );
- const Size& GetSize( SvViewDataEntry* pData, sal_uInt16 nItemPos )
- {
- SvViewDataItem* pIData=pData->pItemData+nItemPos;
- return pIData->aSize;
- }
-
- virtual void Paint( const Point& rPos, SvLBox& rOutDev,
- sal_uInt16 nViewDataEntryFlags,
- SvLBoxEntry* pEntry ) = 0;
-
- virtual void InitViewData( SvLBox* pView, SvLBoxEntry* pEntry,
- // wenn != 0 muss dieser Pointer benutzt werden!
- // wenn == 0 muss er ueber die View geholt werden
- SvViewDataItem* pViewData = 0) = 0;
- virtual SvLBoxItem* Create() const = 0;
- // view-abhaengige Daten werden nicht geklont
- virtual void Clone( SvLBoxItem* pSource ) = 0;
-};
-
-// Flags, die am Model haengen
-#define SV_ENTRYFLAG_CHILDREN_ON_DEMAND 0x0001
-#define SV_ENTRYFLAG_DISABLE_DROP 0x0002
-#define SV_ENTRYFLAG_IN_USE 0x0004
-// wird gesetzt, wenn RequestingChildren keine Children gestzt hat
-#define SV_ENTRYFLAG_NO_NODEBMP 0x0008
-// Eintrag hatte oder hat Kinder
-#define SV_ENTRYFLAG_HAD_CHILDREN 0x0010
-
-#define SV_ENTRYFLAG_USER_FLAGS 0xF000
-#define SV_ENTRYFLAG_SEMITRANSPARENT 0x8000 // draw semi-transparent entry bitmaps
-
-class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry
-{
- friend class SvLBox;
-
- std::vector<SvLBoxItem*> aItems;
- void* pUserData;
- sal_uInt16 nEntryFlags;
- SVT_DLLPRIVATE void DeleteItems_Impl();
-public:
-
- SvLBoxEntry();
- virtual ~SvLBoxEntry();
-
- sal_uInt16 ItemCount() const { return (sal_uInt16)aItems.size(); }
- // DARF NUR GERUFEN WERDEN, WENN DER EINTRAG NOCH NICHT IM MODEL
- // EINGEFUEGT IST, DA SONST FUER DAS ITEM KEINE VIEW-ABHAENGIGEN
- // DATEN ALLOZIERT WERDEN!
- void AddItem( SvLBoxItem* pItem );
- void ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos );
- SvLBoxItem* GetItem( sal_uInt16 nPos ) const { return aItems[nPos]; }
- SvLBoxItem* GetFirstItem( sal_uInt16 nId );
- sal_uInt16 GetPos( SvLBoxItem* pItem ) const
- {
- std::vector<SvLBoxItem*>::const_iterator it = std::find( aItems.begin(), aItems.end(), pItem );
- return it == aItems.end() ? USHRT_MAX : it - aItems.begin();
- }
- void* GetUserData() const { return pUserData; }
- void SetUserData( void* pPtr ) { pUserData = pPtr; }
- virtual void Clone( SvListEntry* pSource );
- void EnableChildrenOnDemand( sal_Bool bEnable=sal_True );
- sal_Bool HasChildrenOnDemand() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); }
- sal_Bool HasInUseEmphasis() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); }
-
- sal_uInt16 GetFlags() const { return nEntryFlags; }
- void SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; }
-};
-
-class SVT_DLLPUBLIC SvLBoxTreeList : public SvTreeList
-{
-public:
- SvLBoxEntry* First() const;
- SvLBoxEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvLBoxEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvLBoxEntry* Last() const;
- SvLBoxEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const;
- SvLBoxEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const;
- SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const;
- SvLBoxEntry* GetParent( SvListEntry* pEntry ) const;
- SvLBoxEntry* FirstChild( SvLBoxEntry* pParent ) const;
- SvLBoxEntry* NextSibling( SvLBoxEntry* pEntry ) const;
- SvLBoxEntry* PrevSibling( SvLBoxEntry* pEntry ) const;
- SvLBoxEntry* LastSibling( SvLBoxEntry* pEntry ) const;
- SvLBoxEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
-};
-
-// *********************************************************************
-// ****************************** SvLBox *******************************
-// *********************************************************************
-
-#define WB_FORCE_SELECTION ((WinBits)0x8000)
-
-#define DragDropMode sal_uInt16
-#define SV_DRAGDROP_NONE (DragDropMode)0x0000
-#define SV_DRAGDROP_CTRL_MOVE (DragDropMode)0x0001
-#define SV_DRAGDROP_CTRL_COPY (DragDropMode)0x0002
-#define SV_DRAGDROP_APP_MOVE (DragDropMode)0x0004
-#define SV_DRAGDROP_APP_COPY (DragDropMode)0x0008
-#define SV_DRAGDROP_APP_DROP (DragDropMode)0x0010
-// Entries duerfen ueber den obersten Eintrag gedroppt werden.
-// Das Drop-Target ist in diesem Fall 0
-#define SV_DRAGDROP_ENABLE_TOP (DragDropMode)0x0020
-
-#define SVLISTBOX_ID_LBOX 0 // fuer SvLBox::IsA()
-
-#define SVLBOX_IN_EDT 0x0001
-#define SVLBOX_EDT_ENABLED 0x0002
-#define SVLBOX_IS_EXPANDING 0x0004
-#define SVLBOX_IS_TRAVELSELECT 0x0008
-#define SVLBOX_TARGEMPH_VIS 0x0010
-#define SVLBOX_EDTEND_CALLED 0x0020
-
-class SvLBox;
-struct SvLBox_Impl
-{
- bool m_bIsEmptyTextAllowed;
- bool m_bEntryMnemonicsEnabled;
- bool m_bDoingQuickSelection;
- Link* m_pLink;
- ::vcl::MnemonicEngine m_aMnemonicEngine;
- ::vcl::QuickSelectionEngine m_aQuickSelectionEngine;
-
- SvLBox_Impl( SvLBox& _rBox );
-};
-
-class SVT_DLLPUBLIC SvLBox
- :public Control
- ,public SvListView
- ,public DropTargetHelper
- ,public DragSourceHelper
- ,public ::vcl::IMnemonicEntryList
- ,public ::vcl::ISearchableStringList
-{
- friend class SvLBoxEntry;
-
- DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * );
- // Handler, der von TreeList zum Clonen eines Entries aufgerufen wird
- DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* );
-
- // handler and methods for Drag - finished handler.
- // The with get GetDragFinishedHdl() get link can set on the
- // TransferDataContainer. This link is a callback for the DragFinished
- // call. AddBox method is called from the GetDragFinishedHdl() and the
- // remove is called in link callback and in the destructor. So it can't
- // called to a deleted object.
- SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvLBox& rB );
- SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvLBox& rB );
- DECL_DLLPRIVATE_STATIC_LINK( SvLBox, DragFinishHdl_Impl, sal_Int8* );
-
- DragDropMode nOldDragMode;
-
-protected:
-
- Link aExpandedHdl;
- Link aExpandingHdl;
- Link aSelectHdl;
- Link aDeselectHdl;
- Link aDoubleClickHdl;
- SvLBoxEntry* pHdlEntry;
- SvLBoxItem* pHdlItem;
- SvLBoxEntry* pTargetEntry;
-
- SvLBox_Impl* pLBoxImpl;
-
- sal_uInt16 nImpFlags;
- // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste
- sal_uInt16 nCurEntrySelPos;
-
- DragDropMode nDragDropMode;
- SelectionMode eSelMode;
- sal_Int8 nDragOptions;
-
- sal_Bool CheckDragAndDropMode( SvLBox* pSource, sal_Int8 );
- void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow);
- void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True,
- sal_Bool bWithChildren = sal_True );
- // standard impl gibt 0 zurueck; muss von abgeleiteten Klassen, die
- // D&D unterstuetzen, ueberladen werden
- using Window::GetDropTarget;
- virtual SvLBoxEntry* GetDropTarget( const Point& );
-
- // view-spezifische Daten in den Dragserver stellen
- // wird an der Source-View aufgerufen (im BeginDrag-Handler)
- virtual void WriteDragServerInfo( const Point&, SvLBoxDDInfo* );
- // wird an der Target-View aufgerufen (im Drop-Handler)
- virtual void ReadDragServerInfo( const Point&,SvLBoxDDInfo* );
-
- // invalidate children on enable/disable
- virtual void StateChanged( StateChangedType );
-
- virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND);
- virtual sal_uLong Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos = LIST_APPEND );
-
- // Inplace-Editing
- SvInplaceEdit2* pEdCtrl;
- void EnableInplaceEditing( sal_Bool bEnable){if(bEnable)nImpFlags|=SVLBOX_EDT_ENABLED; else nImpFlags&=~SVLBOX_EDT_ENABLED;}
- sal_Bool IsInplaceEditingEnabled() const { return (sal_Bool)((nImpFlags&SVLBOX_EDT_ENABLED)!=0); }
- virtual void EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
- const Point& rMousePos );
- void EditText( const String&, const Rectangle&,const Selection&);
- void EditText( const String&, const Rectangle&,const Selection&, sal_Bool bMulti);
- void EditTextMultiLine( const String&, const Rectangle&,const Selection&);
- void CancelTextEditing();
- sal_Bool IsEditingActive() const { return (sal_Bool)((nImpFlags & SVLBOX_IN_EDT)!=0); }
- sal_Bool EditingCanceled() const;
- void EndEditing( sal_Bool bCancel = sal_False );
- bool IsEmptyTextAllowed() const;
- void ForbidEmptyText();
- // Callback EditText
- virtual void EditedText( const String& );
-
- // Rueckgabewert muss von SvViewDataEntry abgeleitet sein!
- virtual SvViewData* CreateViewData( SvListEntry* );
- // InitViewData wird direkt nach CreateViewData aufgerufen
- // In InitViewData ist der Entry noch nicht in die View eingefuegt!
- virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
- // ruft fuer Items aller Entries InitViewData auf
- void RecalcViewData();
- // Callback von RecalcViewData
- virtual void ViewDataInitialized( SvLBoxEntry* );
-
- virtual void Command( const CommandEvent& rCEvt );
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual SvLBoxEntry* GetEntry( const Point& rPos, sal_Bool bHit=sal_False ) const;
- virtual void ModelHasEntryInvalidated( SvListEntry* pEntry );
-
- // handler and methods for Drag - finished handler. This link can be set
- // to the TransferDataContainer. The AddBox/RemoveBox methods must be
- // called before the StartDrag call.
- // The Remove will be called from the handler, which then called
- // DragFinish method. The Remove also called in the DTOR of the SvLBox -
- // so it can't called to a deleted object.
- Link GetDragFinishedHdl() const;
-
- // for asynchronous D&D
- sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SvLBox* pSourceView );
-
- void OnCurrentEntryChanged();
-
- // IMnemonicEntryList
- virtual const void* FirstSearchEntry( String& _rEntryText ) const;
- virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const;
- virtual void SelectSearchEntry( const void* _pEntry );
- virtual void ExecuteSearchEntry( const void* _pEntry ) const;
-
- // ISearchableStringList
- virtual ::vcl::StringEntryIdentifier CurrentEntry( String& _out_entryText ) const;
- virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const;
- virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry );
-
-public:
-
- SvLBox( Window* pParent, WinBits nWinStyle=0 );
- SvLBox( Window* pParent, const ResId& rResId );
- ~SvLBox();
-
- SvLBoxTreeList* GetModel() const { return (SvLBoxTreeList*)pModel; }
- using SvListView::SetModel;
- void SetModel( SvLBoxTreeList* );
- void DisconnectFromModel();
-
- virtual sal_uInt16 IsA();
- sal_uLong GetEntryCount() const {return pModel->GetEntryCount();}
- SvLBoxEntry* First() const { return (SvLBoxEntry*)(pModel->First()); }
- SvLBoxEntry* Next( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));}
- SvLBoxEntry* Prev( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));}
- SvLBoxEntry* Last() const { return (SvLBoxEntry*)(pModel->Last()); }
-
- SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
- SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
- SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); }
-
- SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); }
- using SvListView::NextSelected;
- SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); }
- using SvListView::PrevSelected;
- SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
- SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
-
- sal_Bool CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget );
- sal_Bool MoveSelection( SvLBox* pSource, SvLBoxEntry* pTarget );
- sal_Bool MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback );
- void RemoveSelection();
-
- DragDropMode GetDragDropMode() const { return nDragDropMode; }
- virtual void SetDragDropMode( DragDropMode );
- SelectionMode GetSelectionMode() const { return eSelMode; }
- virtual void SetSelectionMode( SelectionMode );
-
- // pParent==0 -> Root-Ebene
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
- SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
-
- SvLBoxEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const;
- void FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const;
- virtual String GetEntryText( SvLBoxEntry* pEntry ) const;
-
- using Window::GetParent;
- SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
- SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
-
- using Window::GetChildCount;
- sal_uLong GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); }
- sal_uLong GetLevelChildCount( SvLBoxEntry* pParent ) const;
-
- SvViewDataEntry* GetViewDataEntry( SvListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); }
- SvViewDataItem* GetViewDataItem( SvListEntry*, SvLBoxItem* ) const;
-
- virtual void MakeVisible( SvLBoxEntry* pEntry );
- void Clear();
-
- /** enables or disables mnemonic characters in the entry texts.
-
- If mnemonics are enabled, then entries are selected and made current when
- there mnemonic character is pressed. If there are multiple entries with the
- same mnemonic, the selection cycles between them.
-
- Entries with an collapsed ancestor are not included in the calculation of
- mnemonics. That is, if you press the accelerator key of an invisible
- entry, then this entry is *not* selected.
-
- Be aware that enabling mnemonics is the more expensive the more
- entries you have in your list.
- */
- void EnableEntryMnemonics( bool _bEnable = true );
- bool IsEntryMnemonicsEnabled() const;
-
- /** handles the given key event.
-
- At the moment, this merely checks for accelerator keys, if entry mnemonics
- are enabled.
-
- The method might come handy when you want to use keyboard acceleration
- while the control does not have the focus.
-
- When the key event describes the pressing of a shortcut for an entry,
- then SelectSearchEntry resp. ExecuteSearchEntry are called.
-
- @see IMnemonicEntryList
- @see MnemonicEngine
-
- @return
- <TRUE/> if the event has been consumed, <FALSE/> otherwise.
- */
- bool HandleKeyInput( const KeyEvent& rKEvt );
-
- virtual sal_Bool Expand( SvLBoxEntry* pParent );
- virtual sal_Bool Collapse( SvLBoxEntry* pParent );
- virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- virtual sal_uLong SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
- virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint=sal_True );
-
- virtual void SetCurEntry( SvLBoxEntry* _pEntry ) = 0;
- virtual SvLBoxEntry*
- GetCurEntry() const = 0;
-
- void SetSelectHdl( const Link& rNewHdl ) {aSelectHdl=rNewHdl; }
- void SetDeselectHdl( const Link& rNewHdl ) {aDeselectHdl=rNewHdl; }
- void SetDoubleClickHdl(const Link& rNewHdl) {aDoubleClickHdl=rNewHdl;}
- const Link& GetSelectHdl() const { return aSelectHdl; }
- const Link& GetDeselectHdl() const { return aDeselectHdl; }
- const Link& GetDoubleClickHdl() const { return aDoubleClickHdl; }
- void SetExpandingHdl(const Link& rNewHdl){aExpandingHdl=rNewHdl;}
- void SetExpandedHdl(const Link& rNewHdl){aExpandedHdl=rNewHdl;}
- const Link& GetExpandingHdl() const { return aExpandingHdl; }
-
- virtual void ExpandedHdl();
- virtual long ExpandingHdl();
- virtual void SelectHdl();
- virtual void DeselectHdl();
- virtual sal_Bool DoubleClickHdl();
- sal_Bool IsTravelSelect() const { return (sal_Bool)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);}
- SvLBoxEntry* GetHdlEntry() const { return pHdlEntry; }
- SvLBoxItem* GetHdlItem() const;
-
- // wird aufgerufen, wenn ein Eintrag mit gesetztem
- // ENTRYFLAG_CHILDREN_ON_DEMAND expandiert wird.
- virtual void RequestingChildren( SvLBoxEntry* pParent );
-
- // Drag & Drop
-
- //JP 28.3.2001: new Drag & Drop API
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
- SvLBoxEntry* );
- virtual void DragFinished( sal_Int8 nDropAction );
- virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* );
-
- void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; }
- sal_Int8 GetDragOptions() const { return nDragOptions; }
-
- SvLBox* GetSourceView() const;
-
- virtual void NotifyRemoving( SvLBoxEntry* );
- virtual void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow );
- virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
- virtual SvLBoxEntry* CreateEntry() const; // zum 'new'en von Entries
-
- // Rueckgabe: sal_True==Ok, sal_False==Abbrechen
- virtual sal_Bool NotifyMoving(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list