[Libreoffice-commits] .: 4 commits - accessibility/inc accessibility/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source formula/inc formula/source fpicker/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 xmlsecurity/inc xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 18 02:45:23 PDT 2012
accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx | 4
accessibility/source/extended/accessiblelistbox.cxx | 22
accessibility/source/extended/accessiblelistboxentry.cxx | 54 -
accessibility/source/extended/accessibletablistboxtable.cxx | 8
basctl/source/basicide/baside2.hxx | 10
basctl/source/basicide/baside2b.cxx | 34
basctl/source/basicide/bastype2.cxx | 70 -
basctl/source/basicide/bastype2.hxx | 38
basctl/source/basicide/bastype3.cxx | 24
basctl/source/basicide/macrodlg.cxx | 50
basctl/source/basicide/macrodlg.hxx | 2
basctl/source/basicide/moduldl2.cxx | 58 -
basctl/source/basicide/moduldlg.cxx | 48
basctl/source/basicide/moduldlg.hxx | 32
chart2/source/controller/dialogs/tp_DataSource.cxx | 20
chart2/source/controller/dialogs/tp_DataSourceControls.cxx | 2
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 4
cui/source/customize/acccfg.cxx | 38
cui/source/customize/cfg.cxx | 104 +-
cui/source/customize/cfgutil.cxx | 42
cui/source/customize/macropg.cxx | 22
cui/source/customize/selector.cxx | 36
cui/source/dialogs/hangulhanjadlg.cxx | 8
cui/source/dialogs/hlmarkwn.cxx | 14
cui/source/dialogs/linkdlg.cxx | 24
cui/source/dialogs/multipat.cxx | 14
cui/source/dialogs/scriptdlg.cxx | 50
cui/source/dialogs/srchxtra.cxx | 2
cui/source/dialogs/thesdlg.cxx | 16
cui/source/dialogs/thesdlg_impl.hxx | 6
cui/source/inc/acccfg.hxx | 4
cui/source/inc/autocdlg.hxx | 8
cui/source/inc/cfg.hxx | 38
cui/source/inc/cfgutil.hxx | 10
cui/source/inc/dbregister.hxx | 6
cui/source/inc/hlmarkwn.hxx | 4
cui/source/inc/optdict.hxx | 2
cui/source/inc/optlingu.hxx | 6
cui/source/inc/radiobtnbox.hxx | 2
cui/source/inc/scriptdlg.hxx | 28
cui/source/inc/selector.hxx | 18
cui/source/inc/thesdlg.hxx | 8
cui/source/inc/treeopt.hxx | 2
cui/source/options/certpath.cxx | 16
cui/source/options/certpath.hxx | 2
cui/source/options/dbregister.cxx | 16
cui/source/options/fontsubs.cxx | 26
cui/source/options/fontsubs.hxx | 10
cui/source/options/optHeaderTabListbox.cxx | 8
cui/source/options/optHeaderTabListbox.hxx | 2
cui/source/options/optdict.cxx | 20
cui/source/options/optfltr.cxx | 16
cui/source/options/optfltr.hxx | 6
cui/source/options/optjava.cxx | 16
cui/source/options/optjava.hxx | 2
cui/source/options/optlingu.cxx | 72 -
cui/source/options/optpath.cxx | 10
cui/source/options/radiobtnbox.cxx | 6
cui/source/options/treeopt.cxx | 42
cui/source/options/webconninfo.cxx | 12
cui/source/tabpages/autocdlg.cxx | 52 -
cui/source/tabpages/macroass.cxx | 12
dbaccess/source/ui/app/AppController.cxx | 6
dbaccess/source/ui/app/AppController.hxx | 4
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 52 -
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 10
dbaccess/source/ui/app/AppDetailView.cxx | 36
dbaccess/source/ui/app/AppDetailView.hxx | 22
dbaccess/source/ui/app/AppView.cxx | 8
dbaccess/source/ui/app/AppView.hxx | 10
dbaccess/source/ui/browser/dbtreeview.hxx | 2
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 22
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 18
dbaccess/source/ui/browser/unodatbr.cxx | 144 +-
dbaccess/source/ui/control/dbtreelistbox.cxx | 42
dbaccess/source/ui/control/listviewitems.cxx | 4
dbaccess/source/ui/control/marktree.cxx | 20
dbaccess/source/ui/control/tabletree.cxx | 54 -
dbaccess/source/ui/dlg/adtabdlg.cxx | 14
dbaccess/source/ui/dlg/indexdialog.cxx | 38
dbaccess/source/ui/dlg/sqlmessage.cxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 28
dbaccess/source/ui/dlg/tablespage.hxx | 2
dbaccess/source/ui/inc/TableCopyHelper.hxx | 4
dbaccess/source/ui/inc/TableWindow.hxx | 4
dbaccess/source/ui/inc/TableWindowListBox.hxx | 4
dbaccess/source/ui/inc/WNameMatch.hxx | 4
dbaccess/source/ui/inc/callbacks.hxx | 4
dbaccess/source/ui/inc/dbtreelistbox.hxx | 26
dbaccess/source/ui/inc/indexdialog.hxx | 18
dbaccess/source/ui/inc/listviewitems.hxx | 6
dbaccess/source/ui/inc/marktree.hxx | 4
dbaccess/source/ui/inc/tabletree.hxx | 26
dbaccess/source/ui/inc/unodatbr.hxx | 70 -
dbaccess/source/ui/misc/WNameMatch.cxx | 30
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 6
dbaccess/source/ui/querydesign/JoinTableView.cxx | 8
dbaccess/source/ui/querydesign/QTableWindow.cxx | 4
dbaccess/source/ui/querydesign/QTableWindow.hxx | 2
dbaccess/source/ui/querydesign/TableWindow.cxx | 12
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 14
dbaccess/source/ui/querydesign/querycontroller.cxx | 12
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2
extensions/source/bibliography/datman.cxx | 4
extensions/source/propctrlr/selectlabeldialog.cxx | 14
extensions/source/propctrlr/selectlabeldialog.hxx | 6
extensions/source/propctrlr/taborder.cxx | 18
extensions/source/propctrlr/taborder.hxx | 2
extensions/source/scanner/sanedlg.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 14
formula/inc/formula/IFunctionDescription.hxx | 8
formula/source/ui/dlg/formula.cxx | 6
formula/source/ui/dlg/structpg.cxx | 18
formula/source/ui/dlg/structpg.hxx | 12
fpicker/source/office/PlacesListBox.cxx | 2
fpicker/source/office/iodlg.cxx | 6
reportdesign/source/ui/dlg/AddField.cxx | 4
reportdesign/source/ui/dlg/Navigator.cxx | 84 -
reportdesign/source/ui/inc/AddField.hxx | 2
sc/source/ui/condformat/condformatmgr.cxx | 8
sc/source/ui/dbgui/tpsubt.cxx | 2
sc/source/ui/inc/acredlin.hxx | 24
sc/source/ui/inc/condformatmgr.hxx | 2
sc/source/ui/inc/conflictsdlg.hxx | 2
sc/source/ui/inc/content.hxx | 6
sc/source/ui/inc/namemgrtable.hxx | 4
sc/source/ui/miscdlgs/acredlin.cxx | 80 -
sc/source/ui/miscdlgs/conflictsdlg.cxx | 22
sc/source/ui/miscdlgs/solveroptions.cxx | 18
sc/source/ui/namedlg/namemgrtable.cxx | 18
sc/source/ui/navipi/content.cxx | 38
sc/source/ui/optdlg/calcoptionsdlg.cxx | 12
sd/source/ui/animations/CustomAnimationList.cxx | 32
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/dlg/custsdlg.cxx | 8
sd/source/ui/dlg/dlgassim.cxx | 18
sd/source/ui/dlg/dlgassim.hxx | 4
sd/source/ui/dlg/sdtreelb.cxx | 46
sd/source/ui/inc/sdtreelb.hxx | 16
sfx2/inc/docvor.hxx | 46
sfx2/source/appl/newhelp.cxx | 14
sfx2/source/appl/newhelp.hxx | 4
sfx2/source/dialog/templdlg.cxx | 42
sfx2/source/dialog/versdlg.cxx | 6
sfx2/source/doc/docvor.cxx | 202 ++--
sfx2/source/view/orgmgr.cxx | 10
svtools/Library_svt.mk | 1
svtools/Package_inc.mk | 1
svtools/inc/svtools/fileview.hxx | 8
svtools/inc/svtools/svlbitm.hxx | 30
svtools/inc/svtools/svtabbx.hxx | 50
svtools/inc/svtools/treelist.hxx | 330 ++----
svtools/inc/svtools/treelistbox.hxx | 320 ++----
svtools/inc/svtools/treelistentry.hxx | 104 ++
svtools/source/contnr/fileview.cxx | 32
svtools/source/contnr/svimpbox.cxx | 244 ++--
svtools/source/contnr/svlbitm.cxx | 30
svtools/source/contnr/svtabbx.cxx | 80 -
svtools/source/contnr/treelist.cxx | 318 ++----
svtools/source/contnr/treelistbox.cxx | 503 ++++------
svtools/source/contnr/treelistentry.cxx | 229 ++++
svtools/source/inc/svimpbox.hxx | 100 -
svtools/source/uno/treecontrolpeer.cxx | 40
svx/inc/svx/checklbx.hxx | 4
svx/inc/svx/ctredlin.hxx | 20
svx/inc/svx/fontlb.hxx | 8
svx/inc/svx/simptabl.hxx | 4
svx/source/dialog/checklbx.cxx | 14
svx/source/dialog/ctredlin.cxx | 20
svx/source/dialog/docrecovery.cxx | 14
svx/source/dialog/fontlb.cxx | 12
svx/source/dialog/simptabl.cxx | 8
svx/source/form/datanavi.cxx | 44
svx/source/form/filtnav.cxx | 82 -
svx/source/form/fmexch.cxx | 16
svx/source/form/navigatortree.cxx | 92 -
svx/source/form/tabwin.cxx | 4
svx/source/inc/datanavi.hxx | 10
svx/source/inc/docrecovery.hxx | 6
svx/source/inc/filtnav.hxx | 20
svx/source/inc/fmexch.hxx | 18
svx/source/inc/fmexpl.hxx | 30
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 18
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 4
svx/workben/msview/msview.cxx | 36
sw/source/ui/chrdlg/swuiccoll.cxx | 6
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 10
sw/source/ui/dbui/addresslistdialog.cxx | 26
sw/source/ui/dbui/addresslistdialog.hxx | 6
sw/source/ui/dbui/dbtree.cxx | 22
sw/source/ui/dbui/mmaddressblockpage.cxx | 16
sw/source/ui/dbui/selectdbtabledialog.cxx | 10
sw/source/ui/dialog/uiregionsw.cxx | 48
sw/source/ui/envelp/label1.cxx | 12
sw/source/ui/envelp/labelexp.cxx | 2
sw/source/ui/fldui/FldRefTreeListBox.cxx | 2
sw/source/ui/fldui/FldRefTreeListBox.hxx | 2
sw/source/ui/fldui/changedb.cxx | 18
sw/source/ui/fldui/flddb.cxx | 6
sw/source/ui/fldui/flddinf.cxx | 8
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/fldref.cxx | 10
sw/source/ui/inc/changedb.hxx | 2
sw/source/ui/inc/conttree.hxx | 58 -
sw/source/ui/inc/dbtree.hxx | 2
sw/source/ui/inc/glossary.hxx | 20
sw/source/ui/inc/optload.hxx | 4
sw/source/ui/inc/redlndlg.hxx | 8
sw/source/ui/inc/regionsw.hxx | 2
sw/source/ui/index/cnttab.cxx | 16
sw/source/ui/misc/glosbib.cxx | 18
sw/source/ui/misc/glossary.cxx | 76 -
sw/source/ui/misc/redlndlg.cxx | 26
sw/source/ui/utlui/content.cxx | 112 +-
sw/source/ui/utlui/glbltree.cxx | 66 -
sw/source/ui/utlui/navipi.cxx | 4
xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 2
xmlsecurity/source/dialogs/certificatechooser.cxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 20
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
222 files changed, 3332 insertions(+), 3250 deletions(-)
New commits:
commit 4b313fd5661ca5ac096e60d46691b1a9857877d9
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Oct 18 16:28:20 2012 +0200
Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.
Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
index 6941c5a..2027208 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star { namespace awt {
} } } }
class SvTreeListBox;
-class SvLBoxEntry;
+class SvTreeListEntry;
//........................................................................
namespace accessibility
@@ -119,7 +119,7 @@ namespace accessibility
@param _xParent
is our parent accessible object
*/
- AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry,
+ AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvTreeListEntry* _pEntry,
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >& _xParent );
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 4a43b6c..63dc7ad 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -81,7 +81,7 @@ namespace accessibility
{
if ( getListBox() && getListBox()->HasFocus() )
{
- SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+ SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( !pEntry )
pEntry = getListBox()->GetCurEntry();
@@ -105,7 +105,7 @@ namespace accessibility
NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
if ( getListBox() && getListBox()->HasFocus() )
{
- SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+ SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
@@ -120,7 +120,7 @@ namespace accessibility
case VCLEVENT_ITEM_EXPANDED :
case VCLEVENT_ITEM_COLLAPSED :
{
- SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+ SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
AccessibleListBoxEntry* pAccListBoxEntry =
@@ -237,7 +237,7 @@ namespace accessibility
::comphelper::OExternalLockGuard aGuard( this );
ensureAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntry(i);
+ SvTreeListEntry* pEntry = getListBox()->GetEntry(i);
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -281,7 +281,7 @@ namespace accessibility
ensureAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -294,7 +294,7 @@ namespace accessibility
ensureAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -310,7 +310,7 @@ namespace accessibility
sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) )
getListBox()->Select( pEntry, sal_False );
}
@@ -325,7 +325,7 @@ namespace accessibility
sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
if ( !getListBox()->IsSelected( pEntry ) )
getListBox()->Select( pEntry, sal_True );
}
@@ -341,7 +341,7 @@ namespace accessibility
sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) )
++nSelCount;
}
@@ -363,7 +363,7 @@ namespace accessibility
sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) )
++nSelCount;
@@ -383,7 +383,7 @@ namespace accessibility
ensureAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 16ef81d..e0b5bbb 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -65,7 +65,7 @@ namespace accessibility
// Ctor() and Dtor()
// -----------------------------------------------------------------------------
AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox,
- SvLBoxEntry* _pEntry,
+ SvTreeListEntry* _pEntry,
const Reference< XAccessible >& _xParent ) :
AccessibleListBoxEntry_BASE ( m_aMutex ),
@@ -92,11 +92,11 @@ namespace accessibility
Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const
{
Rectangle aRect;
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
aRect = getListBox()->GetBoundingRect( pEntry );
- SvLBoxEntry* pParent = getListBox()->GetParent( pEntry );
+ SvTreeListEntry* pParent = getListBox()->GetParent( pEntry );
if ( pParent )
{
// position relative to parent entry
@@ -112,7 +112,7 @@ namespace accessibility
Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const
{
Rectangle aRect;
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
aRect = getListBox()->GetBoundingRect( pEntry );
@@ -173,7 +173,7 @@ namespace accessibility
OUString AccessibleListBoxEntry::implGetText()
{
OUString sRet;
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
sRet = getListBox()->SearchEntryText( pEntry );
return sRet;
@@ -295,7 +295,7 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
EnsureIsAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
sal_Int32 nCount = 0;
if ( pEntry )
nCount = getListBox()->GetLevelChildCount( pEntry );
@@ -309,8 +309,8 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
EnsureIsAlive();
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
- SvLBoxEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL;
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL;
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -338,7 +338,7 @@ namespace accessibility
aParentPath.pop_back();
// get the entry for this shortened access path
- SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
OSL_ENSURE( pParentEntry, "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!" );
if ( pParentEntry )
@@ -454,7 +454,7 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
EnsureIsAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) );
if ( !pEntry )
throw RuntimeException();
@@ -539,7 +539,7 @@ namespace accessibility
throw IndexOutOfBoundsException();
awt::Rectangle aBounds( 0, 0, 0, 0 );
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
::vcl::ControlLayoutData aLayoutData;
@@ -560,7 +560,7 @@ namespace accessibility
EnsureIsAlive();
sal_Int32 nIndex = -1;
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
::vcl::ControlLayoutData aLayoutData;
@@ -644,7 +644,7 @@ namespace accessibility
checkActionIndex_Impl( nIndex );
EnsureIsAlive();
- SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
if ( getListBox()->IsExpanded( pEntry ) )
@@ -688,8 +688,8 @@ namespace accessibility
EnsureIsAlive();
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -703,8 +703,8 @@ namespace accessibility
EnsureIsAlive();
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -718,13 +718,13 @@ namespace accessibility
EnsureIsAlive();
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( !pParent )
throw RuntimeException();
sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( getListBox()->IsSelected( pEntry ) )
getListBox()->Select( pEntry, sal_False );
}
@@ -737,13 +737,13 @@ namespace accessibility
EnsureIsAlive();
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( !pParent )
throw RuntimeException();
sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( !getListBox()->IsSelected( pEntry ) )
getListBox()->Select( pEntry, sal_True );
}
@@ -758,13 +758,13 @@ namespace accessibility
sal_Int32 i, nSelCount = 0, nCount = 0;
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( !pParent )
throw RuntimeException();
nCount = getListBox()->GetLevelChildCount( pParent );
for ( i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( getListBox()->IsSelected( pEntry ) )
++nSelCount;
}
@@ -785,13 +785,13 @@ namespace accessibility
Reference< XAccessible > xChild;
sal_Int32 i, nSelCount = 0, nCount = 0;
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( !pParent )
throw RuntimeException();
nCount = getListBox()->GetLevelChildCount( pParent );
for ( i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( getListBox()->IsSelected( pEntry ) )
++nSelCount;
@@ -812,8 +812,8 @@ namespace accessibility
EnsureIsAlive();
- SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
- SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex );
+ SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+ SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 1ddaff3..a33c9f1 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -96,7 +96,7 @@ namespace accessibility
commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
if ( m_pTabListBox && m_pTabListBox->HasFocus() )
{
- SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+ SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
@@ -136,7 +136,7 @@ namespace accessibility
{
if ( m_pTabListBox && m_pTabListBox->HasFocus() )
{
- SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+ SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
@@ -161,7 +161,7 @@ namespace accessibility
{
commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
TabListBoxEventData* pData = static_cast< TabListBoxEventData* >( rVclWindowEvent.GetData() );
- SvLBoxEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL;
+ SvTreeListEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL;
if ( pEntry )
{
sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
@@ -244,7 +244,7 @@ namespace accessibility
if ( m_pTabListBox )
{
sal_Int32 nRow = 0;
- SvLBoxEntry* pEntry = m_pTabListBox->FirstSelected();
+ SvTreeListEntry* pEntry = m_pTabListBox->FirstSelected();
while ( pEntry )
{
++nRow;
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 8ca3812..1619261 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -191,17 +191,17 @@ class WatchTreeListBox : public SvHeaderTabListBox
String aEditingRes;
protected:
- virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
- virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText );
+ virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
+ virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
- bool ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult );
- SbxBase* ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement );
+ bool ImplBasicEntryEdited( SvTreeListEntry* pEntry, const String& rResult );
+ SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement );
public:
WatchTreeListBox( Window* pParent, WinBits nWinBits );
~WatchTreeListBox();
- void RequestingChildren( SvLBoxEntry * pParent );
+ void RequestingChildren( SvTreeListEntry * pParent );
void UpdateWatches( bool bBasicStopped = false );
using SvTabListBox::SetTabs;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 914a916..134533c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1363,7 +1363,7 @@ void WatchWindow::AddWatch( const String& rVName )
OUString aWatchStr_( aVar );
aWatchStr_ += OUString( "\t\t" );
- SvLBoxEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND );
+ SvTreeListEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND );
pNewEntry->SetUserData( pWatchItem );
aTreeListBox.Select(pNewEntry, true);
@@ -1375,7 +1375,7 @@ void WatchWindow::AddWatch( const String& rVName )
bool WatchWindow::RemoveSelectedWatch()
{
- SvLBoxEntry* pEntry = aTreeListBox.GetCurEntry();
+ SvTreeListEntry* pEntry = aTreeListBox.GetCurEntry();
if ( pEntry )
{
aTreeListBox.GetModel()->Remove( pEntry );
@@ -1406,7 +1406,7 @@ IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
{
- SvLBoxEntry* pCurEntry = aTreeListBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aTreeListBox.GetCurEntry();
if ( pCurEntry && pCurEntry->GetUserData() )
aXEdit.SetText( ((WatchItem*)pCurEntry->GetUserData())->maName );
@@ -1724,7 +1724,7 @@ WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits )
WatchTreeListBox::~WatchTreeListBox()
{
// Destroy user data
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
delete (WatchItem*)pEntry->GetUserData();
@@ -1746,7 +1746,7 @@ void WatchTreeListBox::SetTabs()
}
}
-void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
+void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent )
{
if( !StarBASIC::IsRunning() )
return;
@@ -1754,7 +1754,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
if( GetChildCount( pParent ) > 0 )
return;
- SvLBoxEntry* pEntry = pParent;
+ SvTreeListEntry* pEntry = pParent;
WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
SbxDimArray* pArray = pItem->mpArray;
@@ -1780,7 +1780,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
pItem->maMemberList.push_back(String(pVar->GetName()));
String const& rName = pItem->maMemberList.back();
- SvLBoxEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry );
+ SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry );
pChildEntry->SetUserData(new WatchItem(rName));
}
if( nPropCount > 0 )
@@ -1828,7 +1828,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
aDisplayName += aIndexStr;
pChildItem->maDisplayName = aDisplayName;
- SvLBoxEntry* pChildEntry = SvTreeListBox::InsertEntry( aDisplayName, pEntry );
+ SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( aDisplayName, pEntry );
nElementCount++;
pChildEntry->SetUserData( pChildItem );
}
@@ -1839,7 +1839,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
}
}
-SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement )
+SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement )
{
SbxBase* pSBX = NULL;
rbArrayElement = false;
@@ -1847,7 +1847,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
String aVName( pItem->maName );
- SvLBoxEntry* pParentEntry = GetParent( pEntry );
+ SvTreeListEntry* pParentEntry = GetParent( pEntry );
WatchItem* pParentItem = pParentEntry ? (WatchItem*)pParentEntry->GetUserData() : NULL;
if( pParentItem )
{
@@ -1879,7 +1879,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
return pSBX;
}
-sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
{
WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
@@ -1904,7 +1904,7 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
return bEdit;
}
-sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText )
+sal_Bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
String aVName( pItem->maName );
@@ -1920,7 +1920,7 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNe
return aResult != aEditingRes && ImplBasicEntryEdited(pEntry, aResult);
}
-bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult )
+bool WatchTreeListBox::ImplBasicEntryEdited( SvTreeListEntry* pEntry, const String& rResult )
{
bool bArrayElement;
SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
@@ -1953,12 +1953,12 @@ bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String&
namespace
{
-void implCollapseModifiedObjectEntry( SvLBoxEntry* pParent, WatchTreeListBox* pThis )
+void implCollapseModifiedObjectEntry( SvTreeListEntry* pParent, WatchTreeListBox* pThis )
{
pThis->Collapse( pParent );
SvLBoxTreeList* pModel = pThis->GetModel();
- SvLBoxEntry* pDeleteEntry;
+ SvTreeListEntry* pDeleteEntry;
while( (pDeleteEntry = pThis->SvTreeListBox::GetEntry( pParent, 0 )) != NULL )
{
implCollapseModifiedObjectEntry( pDeleteEntry, pThis );
@@ -1998,7 +1998,7 @@ String implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eType )
return aRetStr;
}
-void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable )
+void implEnableChildren( SvTreeListEntry* pEntry, bool bEnable )
{
if( bEnable )
{
@@ -2023,7 +2023,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
SbxError eOld = SbxBase::GetError();
setBasicWatchMode( true );
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 8ef1a92..feac68e 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -198,7 +198,7 @@ TreeListBox::~TreeListBox ()
m_aNotifier.dispose();
// destroy user data
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
delete static_cast<Entry*>(pEntry->GetUserData());
@@ -218,7 +218,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL
SetUpdateMode(false);
// level 1: BasicManager (application, document, ...)
- SvLBoxEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation );
+ SvTreeListEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation );
if ( pDocumentRootEntry && IsExpanded( pDocumentRootEntry ) )
ImpCreateLibEntries( pDocumentRootEntry, rDocument, eLocation );
if ( !pDocumentRootEntry )
@@ -239,7 +239,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL
SetUpdateMode(true);
}
-void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation )
+void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation )
{
// get a sorted list of library names
Sequence< OUString > aLibNames( rDocument.getLibraryNames() );
@@ -283,7 +283,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc
nId = bLoaded ? RID_IMG_DLGLIB : RID_IMG_DLGLIBNOTLOADED;
else
nId = bLoaded ? RID_IMG_MODLIB : RID_IMG_MODLIBNOTLOADED;
- SvLBoxEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+ SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
if ( pLibRootEntry )
{
SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ) );
@@ -303,7 +303,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc
}
}
-void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
{
// modules
if ( nMode & BROWSEMODE_MODULES )
@@ -326,7 +326,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
{
OUString aModName = pModNames[ i ];
- SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
+ SvTreeListEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
pModuleEntry = AddEntry(
aModName,
@@ -345,7 +345,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
for ( sal_Int32 j = 0 ; j < nCount ; j++ )
{
OUString aName = pNames[ j ];
- SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
+ SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
if ( !pEntry )
pEntry = AddEntry(
aName,
@@ -382,7 +382,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
for ( sal_Int32 i = 0 ; i < nDlgCount ; i++ )
{
OUString aDlgName = pDlgNames[ i ];
- SvLBoxEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG );
+ SvTreeListEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG );
if ( !pDialogEntry )
pDialogEntry = AddEntry(
aDlgName,
@@ -400,7 +400,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
}
}
-void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
{
std::vector<std::pair<EntryType, OUString> > aEntries;
@@ -414,7 +414,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c
{
EntryType eType = iter->first;
OUString aEntryName = iter->second;
- SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
+ SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
if( pLibSubRootEntry )
{
SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ) );
@@ -433,7 +433,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c
}
}
-void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
{
uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName );
if( !xLib.is() )
@@ -486,7 +486,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn
}
}
OUString aEntryName(aEntryNameBuf.makeStringAndClear());
- SvLBoxEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
+ SvTreeListEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
pModuleEntry = AddEntry(
aEntryName,
@@ -505,7 +505,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn
for ( sal_Int32 j = 0 ; j < nCount ; j++ )
{
OUString aName = pNames[ j ];
- SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
+ SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
if ( !pEntry )
pEntry = AddEntry(
aName,
@@ -523,10 +523,10 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn
}
}
-SvLBoxEntry* TreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText )
+SvTreeListEntry* TreeListBox::ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText )
{
sal_uLong nRootPos = 0;
- SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
+ SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
while ( pEntry )
{
if ( rText.equals(GetEntryText( pEntry )) )
@@ -590,8 +590,8 @@ void TreeListBox::UpdateEntries()
EntryDescriptor aCurDesc( GetEntryDescriptor( FirstSelected() ) );
// removing the invalid entries
- SvLBoxEntry* pLastValid = 0;
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pLastValid = 0;
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
if ( IsValidEntry( pEntry ) )
@@ -607,7 +607,7 @@ void TreeListBox::UpdateEntries()
}
// Removes the entry from the tree.
-void TreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
+void TreeListBox::RemoveEntry (SvTreeListEntry* pEntry)
{
// removing the associated user data
delete static_cast<Entry*>(pEntry->GetUserData());
@@ -619,7 +619,7 @@ void TreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
void TreeListBox::RemoveEntry (ScriptDocument const& rDocument)
{
// finding the entry of rDocument
- for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+ for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
if (rDocument == GetEntryDescriptor(pEntry).GetDocument())
{
RemoveEntry(pEntry);
@@ -627,9 +627,9 @@ void TreeListBox::RemoveEntry (ScriptDocument const& rDocument)
}
}
-SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource )
+SvTreeListEntry* TreeListBox::CloneEntry( SvTreeListEntry* pSource )
{
- SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource );
+ SvTreeListEntry* pNew = SvTreeListBox::CloneEntry( pSource );
Entry* pUser = static_cast<Entry*>(pSource->GetUserData());
DBG_ASSERT( pUser, "User-Daten?!" );
@@ -640,10 +640,10 @@ SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource )
return pNew;
}
-SvLBoxEntry* TreeListBox::FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType )
+SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType )
{
sal_uLong nRootPos = 0;
- SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
+ SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
while ( pEntry )
{
Entry* pBasicEntry = static_cast<Entry*>(pEntry->GetUserData());
@@ -662,7 +662,7 @@ long TreeListBox::ExpandingHdl()
bool bOK = true;
if ( GetModel()->GetDepth( GetHdlEntry() ) == 1 )
{
- SvLBoxEntry* pCurEntry = GetCurEntry();
+ SvTreeListEntry* pCurEntry = GetCurEntry();
EntryDescriptor aDesc( GetEntryDescriptor( pCurEntry ) );
ScriptDocument aDocument( aDesc.GetDocument() );
OSL_ENSURE( aDocument.isAlive(), "TreeListBox::ExpandingHdl: no document, or document is dead!" );
@@ -692,7 +692,7 @@ long TreeListBox::ExpandingHdl()
return bOK;
}
-bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
+bool TreeListBox::IsEntryProtected( SvTreeListEntry* pEntry )
{
bool bProtected = false;
if ( pEntry && ( GetModel()->GetDepth( pEntry ) == 1 ) )
@@ -718,15 +718,15 @@ bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
-SvLBoxEntry* TreeListBox::AddEntry(
+SvTreeListEntry* TreeListBox::AddEntry(
OUString const& rText,
const Image& rImage,
- SvLBoxEntry* pParent,
+ SvTreeListEntry* pParent,
bool bChildrenOnDemand,
std::auto_ptr<Entry> aUserData
)
{
- SvLBoxEntry* p = InsertEntry(
+ SvTreeListEntry* p = InsertEntry(
rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release() // XXX possible leak
);
@@ -734,7 +734,7 @@ SvLBoxEntry* TreeListBox::AddEntry(
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-void TreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage )
+void TreeListBox::SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage )
{
SetExpandedEntryBmp( pEntry, rImage );
SetCollapsedEntryBmp( pEntry, rImage );
@@ -809,7 +809,7 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r
void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
{
- SvLBoxEntry* pCurEntry = 0;
+ SvTreeListEntry* pCurEntry = 0;
EntryDescriptor aDesc = rDesc;
if ( aDesc.GetType() == OBJ_TYPE_UNKNOWN )
{
@@ -822,7 +822,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
ScriptDocument aDocument = aDesc.GetDocument();
OSL_ENSURE( aDocument.isValid(), "TreeListBox::SetCurrentEntry: invalid document!" );
LibraryLocation eLocation = aDesc.GetLocation();
- SvLBoxEntry* pRootEntry = FindRootEntry( aDocument, eLocation );
+ SvTreeListEntry* pRootEntry = FindRootEntry( aDocument, eLocation );
if ( pRootEntry )
{
pCurEntry = pRootEntry;
@@ -830,7 +830,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
if ( !aLibName.isEmpty() )
{
Expand( pRootEntry );
- SvLBoxEntry* pLibEntry = FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+ SvTreeListEntry* pLibEntry = FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
if ( pLibEntry )
{
pCurEntry = pLibEntry;
@@ -838,7 +838,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
if( !aLibSubName.isEmpty() )
{
Expand( pLibEntry );
- SvLBoxEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName );
+ SvTreeListEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName );
if( pLibSubEntry )
{
pCurEntry = pLibSubEntry;
@@ -851,7 +851,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
EntryType eType = OBJ_TYPE_MODULE;
if ( aDesc.GetType() == OBJ_TYPE_DIALOG )
eType = OBJ_TYPE_DIALOG;
- SvLBoxEntry* pEntry = FindEntry( pCurEntry, aName, eType );
+ SvTreeListEntry* pEntry = FindEntry( pCurEntry, aName, eType );
if ( pEntry )
{
pCurEntry = pEntry;
@@ -859,7 +859,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
if ( !aMethodName.isEmpty() )
{
Expand( pEntry );
- SvLBoxEntry* pSubEntry = FindEntry( pEntry, aMethodName, OBJ_TYPE_METHOD );
+ SvTreeListEntry* pSubEntry = FindEntry( pEntry, aMethodName, OBJ_TYPE_METHOD );
if ( pSubEntry )
{
pCurEntry = pSubEntry;
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 1c0de30..45ce1a3 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -31,7 +31,7 @@
#include "basobj.hxx"
class SbModule;
-class SvLBoxEntry;
+class SvTreeListEntry;
class SbxVariable;
namespace basctl
@@ -178,20 +178,20 @@ private:
sal_uInt16 nMode;
DocumentEventNotifier m_aNotifier;
- void SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage );
+ void SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
protected:
- virtual void RequestingChildren( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvTreeListEntry* pParent );
virtual void ExpandedHdl();
- virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
+ virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
virtual long ExpandingHdl();
- void ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
- void ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
- void ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
- void ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
- SvLBoxEntry* ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText );
+ void ImpCreateLibEntries( SvTreeListEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
+ void ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
+ void ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
+ void ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
+ SvTreeListEntry* ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText );
// DocumentEventListener
virtual void onDocumentCreated( const ScriptDocument& _rDocument );
@@ -212,27 +212,27 @@ public:
void ScanAllEntries();
void UpdateEntries();
- bool IsEntryProtected( SvLBoxEntry* pEntry );
+ bool IsEntryProtected( SvTreeListEntry* pEntry );
void SetMode( sal_uInt16 nM ) { nMode = nM; }
sal_uInt16 GetMode() const { return nMode; }
- SbModule* FindModule( SvLBoxEntry* pEntry );
- SbxVariable* FindVariable( SvLBoxEntry* pEntry );
- SvLBoxEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
- SvLBoxEntry* FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType );
+ SbModule* FindModule( SvTreeListEntry* pEntry );
+ SbxVariable* FindVariable( SvTreeListEntry* pEntry );
+ SvTreeListEntry* FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
+ SvTreeListEntry* FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType );
- EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry );
+ EntryDescriptor GetEntryDescriptor( SvTreeListEntry* pEntry );
ItemType ConvertType (EntryType eType);
- bool IsValidEntry( SvLBoxEntry* pEntry );
+ bool IsValidEntry( SvTreeListEntry* pEntry );
- SvLBoxEntry* AddEntry(
+ SvTreeListEntry* AddEntry(
const OUString& rText, const Image& rImage,
- SvLBoxEntry* pParent, bool bChildrenOnDemand,
+ SvTreeListEntry* pParent, bool bChildrenOnDemand,
std::auto_ptr<Entry> aUserData
);
- void RemoveEntry (SvLBoxEntry*);
+ void RemoveEntry (SvTreeListEntry*);
void RemoveEntry (ScriptDocument const&);
OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 17c66a7..d201081 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -38,10 +38,10 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-typedef std::deque< SvLBoxEntry* > EntryArray;
+typedef std::deque< SvTreeListEntry* > EntryArray;
-void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
+void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry )
{
EntryDescriptor aDesc = GetEntryDescriptor(pEntry);
ScriptDocument aDocument = aDesc.GetDocument();
@@ -133,12 +133,12 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
void TreeListBox::ExpandedHdl()
{
- SvLBoxEntry* pEntry = GetHdlEntry();
+ SvTreeListEntry* pEntry = GetHdlEntry();
DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
if ( !IsExpanded( pEntry ) && pEntry->HasChildrenOnDemand() )
{
- SvLBoxEntry* pChild = FirstChild( pEntry );
+ SvTreeListEntry* pChild = FirstChild( pEntry );
while ( pChild )
{
GetModel()->Remove( pChild ); // does also call the DTOR
@@ -163,7 +163,7 @@ void TreeListBox::ScanAllEntries()
}
}
-SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry )
+SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
{
if ( !pEntry )
return 0;
@@ -199,7 +199,7 @@ SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry )
{
for ( size_t n = 0; n < aEntries.size(); n++ )
{
- SvLBoxEntry* pLE = aEntries[n];
+ SvTreeListEntry* pLE = aEntries[n];
DBG_ASSERT( pLE, "Can not find entry in array" );
Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
DBG_ASSERT( pBE, "The data in the entry not found!" );
@@ -260,7 +260,7 @@ SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry )
return pVar;
}
-EntryDescriptor TreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
+EntryDescriptor TreeListBox::GetEntryDescriptor( SvTreeListEntry* pEntry )
{
ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
@@ -306,7 +306,7 @@ EntryDescriptor TreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
{
for ( size_t n = 0; n < aEntries.size(); n++ )
{
- SvLBoxEntry* pLE = aEntries[n];
+ SvTreeListEntry* pLE = aEntries[n];
DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
@@ -376,7 +376,7 @@ ItemType TreeListBox::ConvertType (EntryType eType)
}
}
-bool TreeListBox::IsValidEntry( SvLBoxEntry* pEntry )
+bool TreeListBox::IsValidEntry( SvTreeListEntry* pEntry )
{
bool bIsValid = false;
@@ -431,16 +431,16 @@ bool TreeListBox::IsValidEntry( SvLBoxEntry* pEntry )
return bIsValid;
}
-SbModule* TreeListBox::FindModule( SvLBoxEntry* pEntry )
+SbModule* TreeListBox::FindModule( SvTreeListEntry* pEntry )
{
return dynamic_cast<SbModule*>(FindVariable(pEntry));
}
-SvLBoxEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
+SvTreeListEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
{
OSL_ENSURE( rDocument.isValid(), "basctl::TreeListBox::FindRootEntry: invalid document!" );
sal_uLong nRootPos = 0;
- SvLBoxEntry* pRootEntry = GetEntry( nRootPos );
+ SvTreeListEntry* pRootEntry = GetEntry( nRootPos );
while ( pRootEntry )
{
DBG_ASSERT( static_cast<Entry*>(pRootEntry->GetUserData())->GetType() == OBJ_TYPE_DOCUMENT, "Kein Shelleintrag?" );
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 9bc56e9..3e07dfd 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -135,7 +135,7 @@ void MacroChooser::StoreMacroDescription()
{
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(aBasicBox.FirstSelected());
String aMethodName;
- SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+ SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
if ( pEntry )
aMethodName = aMacroBox.GetEntryText( pEntry );
else
@@ -170,9 +170,9 @@ void MacroChooser::RestoreMacroDescription()
if ( aLastMacro.Len() )
{
// find entry in macro box
- SvLBoxEntry* pEntry = 0;
+ SvTreeListEntry* pEntry = 0;
sal_uLong nPos = 0;
- SvLBoxEntry* pE = aMacroBox.GetEntry( nPos );
+ SvTreeListEntry* pE = aMacroBox.GetEntry( nPos );
while ( pE )
{
if ( aMacroBox.GetEntryText( pE ) == aLastMacro )
@@ -199,7 +199,7 @@ short MacroChooser::Execute()
aRunButton.GrabFocus();
// #104198 Check if "wrong" document is active
- SvLBoxEntry* pSelectedEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pSelectedEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pSelectedEntry ) );
const ScriptDocument& rSelectedDoc( aDesc.GetDocument() );
@@ -208,15 +208,15 @@ short MacroChooser::Execute()
{
// Search for the right entry
sal_uLong nRootPos = 0;
- SvLBoxEntry* pRootEntry = aBasicBox.GetEntry( nRootPos );
+ SvTreeListEntry* pRootEntry = aBasicBox.GetEntry( nRootPos );
while( pRootEntry )
{
EntryDescriptor aCmpDesc( aBasicBox.GetEntryDescriptor( pRootEntry ) );
const ScriptDocument& rCmpDoc( aCmpDesc.GetDocument() );
if ( rCmpDoc.isDocument() && rCmpDoc.isActive() )
{
- SvLBoxEntry* pEntry = pRootEntry;
- SvLBoxEntry* pLastValid = pEntry;
+ SvTreeListEntry* pEntry = pRootEntry;
+ SvTreeListEntry* pLastValid = pEntry;
while ( pEntry )
{
pLastValid = pEntry;
@@ -267,7 +267,7 @@ SbMethod* MacroChooser::GetMacro()
SbModule* pModule = aBasicBox.FindModule( aBasicBox.GetCurEntry() );
if ( pModule )
{
- SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+ SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
if ( pEntry )
{
String aMacroName( aMacroBox.GetEntryText( pEntry ) );
@@ -315,7 +315,7 @@ void MacroChooser::DeleteMacro()
String aModName = pModule->GetName();
OSL_VERIFY( aDocument.updateModule( aLibName, aModName, aSource ) );
- SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+ SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
DBG_ASSERT( pEntry, "DeleteMacro: Entry ?!" );
aMacroBox.GetModel()->Remove( pEntry );
bForceStoreBasic = true;
@@ -325,7 +325,7 @@ void MacroChooser::DeleteMacro()
SbMethod* MacroChooser::CreateMacro()
{
SbMethod* pMethod = 0;
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
OSL_ENSURE( aDocument.isAlive(), "MacroChooser::CreateMacro: no document!" );
@@ -380,7 +380,7 @@ SbMethod* MacroChooser::CreateMacro()
return pMethod;
}
-void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry )
+void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry )
{
// the edit would be killed by the highlight otherwise:
@@ -394,9 +394,9 @@ void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry )
void MacroChooser::CheckButtons()
{
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
- SvLBoxEntry* pMacroEntry = aMacroBox.FirstSelected();
+ SvTreeListEntry* pMacroEntry = aMacroBox.FirstSelected();
SbMethod* pMethod = GetMacro();
// check, if corresponding libraries are readonly
@@ -532,7 +532,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
if ( aMacroBox.GetEntryCount() )
{
- SvLBoxEntry* pEntry = aMacroBox.GetEntry( 0 );
+ SvTreeListEntry* pEntry = aMacroBox.GetEntry( 0 );
DBG_ASSERT( pEntry, "Entry ?!" );
aMacroBox.SetCurEntry( pEntry );
}
@@ -551,19 +551,19 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
// select the module in which the macro is put at Neu (new),
// if BasicManager or Lib is selecting
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
if ( pCurEntry )
{
sal_uInt16 nDepth = aBasicBox.GetModel()->GetDepth( pCurEntry );
if ( ( nDepth == 1 ) && ( aBasicBox.IsEntryProtected( pCurEntry ) ) )
{
// then put to the respective Std-Lib...
- SvLBoxEntry* pManagerEntry = aBasicBox.GetModel()->GetParent( pCurEntry );
+ SvTreeListEntry* pManagerEntry = aBasicBox.GetModel()->GetParent( pCurEntry );
pCurEntry = aBasicBox.GetModel()->FirstChild( pManagerEntry );
}
if ( nDepth < 2 )
{
- SvLBoxEntry* pNewEntry = pCurEntry;
+ SvTreeListEntry* pNewEntry = pCurEntry;
while ( pCurEntry && ( nDepth < 2 ) )
{
pCurEntry = aBasicBox.FirstChild( pCurEntry );
@@ -581,7 +581,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
bool bFound = false;
for ( sal_uInt16 n = 0; n < aMacroBox.GetEntryCount(); n++ )
{
- SvLBoxEntry* pEntry = aMacroBox.GetEntry( n );
+ SvTreeListEntry* pEntry = aMacroBox.GetEntry( n );
DBG_ASSERT( pEntry, "Entry ?!" );
if ( aMacroBox.GetEntryText( pEntry ).CompareIgnoreCaseToAscii( aEdtText ) == COMPARE_EQUAL )
{
@@ -592,7 +592,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
}
if ( !bFound )
{
- SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+ SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
// if the entry exists ->Select ->Desription...
if ( pEntry )
aMacroBox.Select( pEntry, false );
@@ -654,7 +654,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
}
else if ( ( pButton == &aEditButton ) || ( pButton == &aNewDelButton ) )
{
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" );
@@ -673,7 +673,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() );
if ( pButton == &aEditButton )
{
- SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+ SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
if ( pEntry )
aInfoItem.SetMethod( aMacroBox.GetEntryText( pEntry ) );
StoreMacroDescription();
@@ -728,7 +728,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
else if ( pButton == &aAssignButton )
{
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" );
@@ -750,14 +750,14 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
}
else if ( pButton == &aNewLibButton )
{
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
createLibImpl( static_cast<Window*>( this ), aDocument, NULL, &aBasicBox );
}
else if ( pButton == &aNewModButton )
{
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
String aLibName( aDesc.GetLibName() );
@@ -793,7 +793,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
void MacroChooser::UpdateFields()
{
- SvLBoxEntry* pMacroEntry = aMacroBox.GetCurEntry();
+ SvTreeListEntry* pMacroEntry = aMacroBox.GetCurEntry();
String aEmptyStr;
aMacroNameEdit.SetText( aEmptyStr );
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 083cb2e..4262882 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -80,7 +80,7 @@ private:
DECL_LINK( ButtonHdl, Button * );
void CheckButtons();
- void SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry );
+ void SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry );
void UpdateFields();
void EnableButton( Button& rButton, bool bEnable );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 4986ad2..a972bf5 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -119,15 +119,15 @@ public:
class LibLBoxString : public SvLBoxString
{
public:
- LibLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
+ LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
SvLBoxString( pEntry, nFlags, rTxt ) {}
- virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry );
};
//----------------------------------------------------------------------------
-void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry )
{
// Change text color if library is read only:
bool bReadOnly = false;
@@ -180,7 +180,7 @@ CheckBox::~CheckBox()
delete pCheckButton;
// delete user data
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
delete static_cast<LibUserData*>(pEntry->GetUserData());
@@ -216,19 +216,19 @@ void CheckBox::SetMode (ObjectMode::Mode e)
//----------------------------------------------------------------------------
-SvLBoxEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos )
+SvTreeListEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos )
{
return SvTabListBox::InsertEntryToColumn( rStr, nPos, 0 );
}
//----------------------------------------------------------------------------
-SvLBoxEntry* CheckBox::FindEntry( const String& rName )
+SvTreeListEntry* CheckBox::FindEntry( const String& rName )
{
sal_uLong nCount = GetEntryCount();
for ( sal_uLong i = 0; i < nCount; i++ )
{
- SvLBoxEntry* pEntry = GetEntry( i );
+ SvTreeListEntry* pEntry = GetEntry( i );
DBG_ASSERT( pEntry, "pEntry?!" );
if ( rName.CompareIgnoreCaseToAscii( GetEntryText( pEntry, 0 ) ) == COMPARE_EQUAL )
return pEntry;
@@ -242,7 +242,7 @@ void CheckBox::CheckEntryPos( sal_uLong nPos )
{
if ( nPos < GetEntryCount() )
{
- SvLBoxEntry* pEntry = GetEntry( nPos );
+ SvTreeListEntry* pEntry = GetEntry( nPos );
if ( GetCheckButtonState( pEntry ) != SV_BUTTON_CHECKED )
SetCheckButtonState( pEntry, SvButtonState(SV_BUTTON_CHECKED) );
@@ -260,7 +260,7 @@ bool CheckBox::IsChecked( sal_uLong nPos ) const
//----------------------------------------------------------------------------
-void CheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
+void CheckBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
{
SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2, eButtonKind );
@@ -279,7 +279,7 @@ void CheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Imag
//----------------------------------------------------------------------------
-sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
{
if (eMode != ObjectMode::Module)
return false;
@@ -327,7 +327,7 @@ sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
//----------------------------------------------------------------------------
-sal_Bool CheckBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewName )
+sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
{
bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName);
OUString aOldName( GetEntryText( pEntry, 0 ) );
@@ -558,7 +558,7 @@ LibPage::~LibPage()
void LibPage::CheckButtons()
{
- SvLBoxEntry* pCur = aLibBox.GetCurEntry();
+ SvTreeListEntry* pCur = aLibBox.GetCurEntry();
if ( pCur )
{
OUString aLibName = aLibBox.GetEntryText( pCur, 0 );
@@ -656,7 +656,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
SFX_APP()->ExecuteSlot( aRequest );
SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
- SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
DBG_ASSERT( pCurEntry, "Entry?!" );
String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
@@ -681,7 +681,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
}
else if ( pButton == &aPasswordButton )
{
- SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
// load module library (if not loaded)
@@ -748,7 +748,7 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
{
long nRet = 0;
- SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
Reference< script::XLibraryContainerPassword > xPasswd( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
@@ -899,7 +899,7 @@ void LibPage::InsertLib()
if ( !( ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) && xModLibContImport->isLibraryLink( aLibName ) ) ||
( xDlgLibContImport.is() && xDlgLibContImport->hasByName( aLibName ) && xDlgLibContImport->isLibraryLink( aLibName ) ) ) )
{
- SvLBoxEntry* pEntry = pLibDlg->GetLibBox().DoInsertEntry( aLibName );
+ SvTreeListEntry* pEntry = pLibDlg->GetLibBox().DoInsertEntry( aLibName );
sal_uInt16 nPos = (sal_uInt16) pLibDlg->GetLibBox().GetModel()->GetAbsPos( pEntry );
pLibDlg->GetLibBox().CheckEntryPos(nPos);
}
@@ -928,7 +928,7 @@ void LibPage::InsertLib()
{
if ( pLibDlg->GetLibBox().IsChecked( nLib ) )
{
- SvLBoxEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib );
+ SvTreeListEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib );
DBG_ASSERT( pEntry, "Entry?!" );
OUString aLibName( pLibDlg->GetLibBox().GetEntryText( pEntry, 0 ) );
Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
@@ -1001,7 +1001,7 @@ void LibPage::InsertLib()
if ( bRemove )
{
// remove listbox entry
- SvLBoxEntry* pEntry_ = aLibBox.FindEntry( aLibName );
+ SvTreeListEntry* pEntry_ = aLibBox.FindEntry( aLibName );
if ( pEntry_ )
aLibBox.SvTreeListBox::GetModel()->Remove( pEntry_ );
@@ -1141,7 +1141,7 @@ void LibPage::InsertLib()
}
}
- SvLBoxEntry* pFirstNew = aLibBox.GetEntry( nNewPos );
+ SvTreeListEntry* pFirstNew = aLibBox.GetEntry( nNewPos );
if ( pFirstNew )
aLibBox.SetCurEntry( pFirstNew );
}
@@ -1158,7 +1158,7 @@ void LibPage::InsertLib()
void LibPage::Export( void )
{
- SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
// Password verification
@@ -1417,7 +1417,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
void LibPage::DeleteCurrent()
{
- SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
// check, if library is link
@@ -1518,7 +1518,7 @@ void LibPage::SetCurLib()
ImpInsertLibEntry( aLibName, i );
}
- SvLBoxEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) );
+ SvTreeListEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) );
if ( !pEntry_ )
pEntry_ = aLibBox.GetEntry( 0 );
aLibBox.SetCurEntry( pEntry_ );
@@ -1528,7 +1528,7 @@ void LibPage::SetCurLib()
//----------------------------------------------------------------------------
-SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos )
+SvTreeListEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos )
{
// check, if library is password protected
bool bProtected = false;
@@ -1543,7 +1543,7 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos
}
}
- SvLBoxEntry* pNewEntry = aLibBox.DoInsertEntry( rLibName, nPos );
+ SvTreeListEntry* pNewEntry = aLibBox.DoInsertEntry( rLibName, nPos );
pNewEntry->SetUserData( new LibUserData(m_aCurDocument) );
if (bProtected)
@@ -1620,7 +1620,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
if( pLibBox )
{
- SvLBoxEntry* pEntry = pLibBox->DoInsertEntry( aLibName );
+ SvTreeListEntry* pEntry = pLibBox->DoInsertEntry( aLibName );
pEntry->SetUserData( new LibUserData( rDocument ) );
pLibBox->SetCurEntry( pEntry );
}
@@ -1638,8 +1638,8 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
if( pBasicBox )
{
- SvLBoxEntry* pEntry = pBasicBox->GetCurEntry();
- SvLBoxEntry* pRootEntry = NULL;
+ SvTreeListEntry* pEntry = pBasicBox->GetCurEntry();
+ SvTreeListEntry* pRootEntry = NULL;
while( pEntry )
{
pRootEntry = pEntry;
@@ -1649,7 +1649,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
sal_uInt16 nMode = pBasicBox->GetMode();
bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
sal_uInt16 nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB;
- SvLBoxEntry* pNewLibEntry = pBasicBox->AddEntry(
+ SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry(
aLibName,
Image( IDEResId( nId ) ),
pRootEntry, false,
@@ -1659,7 +1659,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
if( pNewLibEntry )
{
- SvLBoxEntry* pEntry_ = pBasicBox->AddEntry(
+ SvTreeListEntry* pEntry_ = pBasicBox->AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
pNewLibEntry, false,
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 337063d..cfbea3e 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -59,7 +59,7 @@ ExtTreeListBox::ExtTreeListBox (Window* pParent, ResId const& rRes) :
ExtTreeListBox::~ExtTreeListBox ()
{ }
-sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
{
bool bRet = false;
@@ -85,7 +85,7 @@ sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
return bRet;
}
-sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText )
+sal_Bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
if ( !IsValidSbxName(rNewText) )
{
@@ -133,7 +133,7 @@ sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewT
}
-DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
+DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* pEntry )
{
DragDropMode nMode_ = SV_DRAGDROP_NONE;
@@ -173,14 +173,14 @@ DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntr
}
-sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
+sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry )
{
// don't drop on a BasicManager (nDepth == 0)
sal_uInt16 nDepth = pEntry ? GetModel()->GetDepth( pEntry ) : 0;
bool bValid = nDepth != 0;
// don't drop in the same library
- SvLBoxEntry* pSelected = FirstSelected();
+ SvTreeListEntry* pSelected = FirstSelected();
if ( ( nDepth == 1 ) && ( pEntry == GetParent( pSelected ) ) )
bValid = false;
else if ( ( nDepth == 2 ) && ( GetParent( pEntry ) == GetParent( pSelected ) ) )
@@ -237,15 +237,15 @@ sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
return bValid;
}
-sal_Bool ExtTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos )
+sal_Bool ExtTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos )
{
return NotifyCopyingMoving( pTarget, pEntry,
rpNewParent, rNewChildPos, true );
}
-sal_Bool ExtTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos )
+sal_Bool ExtTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos )
{
// return false; // how do I copy an SBX?!
return NotifyCopyingMoving( pTarget, pEntry,
@@ -311,8 +311,8 @@ void Shell::CopyDialogResources(
}
-sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove )
+sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove )
{
(void)pEntry;
DBG_ASSERT( pEntry, "Kein Eintrag?" ); // ASS is ok here, should not be reached
@@ -606,7 +606,7 @@ void ObjectPage::DeactivatePage()
void ObjectPage::CheckButtons()
{
// enable/disable edit button
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
OUString aLibName( aDesc.GetLibName() );
@@ -679,7 +679,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
SFX_APP()->ExecuteSlot( aRequest );
SfxDispatcher* pDispatcher = GetDispatcher();
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
DBG_ASSERT( pCurEntry, "Entry?!" );
if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) >= 2 )
{
@@ -702,7 +702,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
{
DBG_ASSERT( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 1, "Kein LibEntry?!" );
ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
- SvLBoxEntry* pParentEntry = aBasicBox.GetParent( pCurEntry );
+ SvTreeListEntry* pParentEntry = aBasicBox.GetParent( pCurEntry );
if ( pParentEntry )
{
DocumentEntry* pDocumentEntry = (DocumentEntry*)pParentEntry->GetUserData();
@@ -735,7 +735,7 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, OUString& rLibName )
{
bool bRet = false;
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
rDocument = aDesc.GetDocument();
rLibName = aDesc.GetLibName();
@@ -827,18 +827,18 @@ void ObjectPage::NewDialog()
pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
- SvLBoxEntry* pRootEntry = aBasicBox.FindRootEntry( aDocument, eLocation );
+ SvTreeListEntry* pRootEntry = aBasicBox.FindRootEntry( aDocument, eLocation );
if ( pRootEntry )
{
if ( !aBasicBox.IsExpanded( pRootEntry ) )
aBasicBox.Expand( pRootEntry );
- SvLBoxEntry* pLibEntry = aBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+ SvTreeListEntry* pLibEntry = aBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
DBG_ASSERT( pLibEntry, "Libeintrag nicht gefunden!" );
if ( pLibEntry )
{
if ( !aBasicBox.IsExpanded( pLibEntry ) )
aBasicBox.Expand( pLibEntry );
- SvLBoxEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG );
+ SvTreeListEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG );
if ( !pEntry )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -862,7 +862,7 @@ void ObjectPage::NewDialog()
void ObjectPage::DeleteCurrent()
{
- SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+ SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
DBG_ASSERT( pCurEntry, "Kein aktueller Eintrag!" );
EntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
ScriptDocument aDocument( aDesc.GetDocument() );
@@ -981,22 +981,22 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName );
- SvLBoxEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );
+ SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );
if ( pRootEntry )
{
if ( !rBasicBox.IsExpanded( pRootEntry ) )
rBasicBox.Expand( pRootEntry );
- SvLBoxEntry* pLibEntry = rBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+ SvTreeListEntry* pLibEntry = rBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
DBG_ASSERT( pLibEntry, "Libeintrag nicht gefunden!" );
if ( pLibEntry )
{
if ( !rBasicBox.IsExpanded( pLibEntry ) )
rBasicBox.Expand( pLibEntry );
- SvLBoxEntry* pSubRootEntry = pLibEntry;
+ SvTreeListEntry* pSubRootEntry = pLibEntry;
if( pBasic && rDocument.isInVBAMode() )
{
// add the new module in the "Modules" entry
- SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES );
+ SvTreeListEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES );
if( pLibSubEntry )
{
if( !rBasicBox.IsExpanded( pLibSubEntry ) )
@@ -1005,7 +1005,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
}
}
- SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
+ SvTreeListEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pEntry )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 1179a9c..156f0ad 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -104,18 +104,18 @@ public:
class ExtTreeListBox : public TreeListBox
{
protected:
- virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
- virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText );
+ virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
+ virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
- virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry );
- virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* pEntry );
+ virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry );
+ virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* pEntry );
- virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos );
- virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos );
- sal_Bool NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
+ virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos );
+ virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos );
+ sal_Bool NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
public:
ExtTreeListBox( Window* pParent, const ResId& rRes );
@@ -134,15 +134,15 @@ public:
CheckBox( Window* pParent, const ResId& rResId );
~CheckBox();
- SvLBoxEntry* DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND );
- SvLBoxEntry* FindEntry( const String& rName );
+ SvTreeListEntry* DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND );
+ SvTreeListEntry* FindEntry( const String& rName );
void CheckEntryPos( sal_uLong nPos );
bool IsChecked( sal_uLong nPos ) const;
- virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
- virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
- virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText );
+ virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+ virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
+ virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
@@ -259,7 +259,7 @@ protected:
void FillListBox();
void InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
void SetCurLib();
- SvLBoxEntry* ImpInsertLibEntry( const String& rLibName, sal_uLong nPos );
+ SvTreeListEntry* ImpInsertLibEntry( const String& rLibName, sal_uLong nPos );
virtual void ActivatePage();
virtual void DeactivatePage();
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 080ad76..bb5ef2a 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -77,7 +77,7 @@ void lcl_UpdateCurrentRange(
SvTabListBox & rOutListBox,
const OUString & rRole, const OUString & rRange )
{
- SvLBoxEntry * pEntry = rOutListBox.FirstSelected();
+ SvTreeListEntry * pEntry = rOutListBox.FirstSelected();
if( pEntry )
rOutListBox.SetEntryText( lcl_GetRoleLBEntry( rRole, rRange ), pEntry );
}
@@ -106,7 +106,7 @@ bool lcl_UpdateCurrentSeriesName(
OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITranslated = false )
{
OUString aResult;
- SvLBoxEntry * pEntry = rRoleListBox.FirstSelected();
+ SvTreeListEntry * pEntry = rRoleListBox.FirstSelected();
if( pEntry )
aResult = OUString( rRoleListBox.GetEntryText( pEntry,
bUITranslated ? 1 : 0 ));
@@ -116,7 +116,7 @@ OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITransla
OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox )
{
OUString aResult;
- SvLBoxEntry * pEntry = rRoleListBox.FirstSelected();
+ SvTreeListEntry * pEntry = rRoleListBox.FirstSelected();
if( pEntry )
aResult = OUString( rRoleListBox.GetEntryText( pEntry, 2 ));
return aResult;
@@ -459,7 +459,7 @@ void DataSourceTabPage::fillSeriesListBox()
xSelected.set( pEntry->m_xDataSeries );
bool bHasSelectedEntry = (pEntry != 0);
- SvLBoxEntry * pSelectedEntry = 0;
+ SvTreeListEntry * pSelectedEntry = 0;
m_apLB_SERIES->Clear();
::std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries(
@@ -511,7 +511,7 @@ void DataSourceTabPage::fillRoleListBox()
SeriesEntry * pSeriesEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
bool bHasSelectedEntry = (pSeriesEntry != 0);
- SvLBoxEntry * pRoleEntry = m_aLB_ROLE.FirstSelected();
+ SvTreeListEntry * pRoleEntry = m_aLB_ROLE.FirstSelected();
sal_uLong nRoleIndex = SAL_MAX_UINT32;
if( pRoleEntry )
nRoleIndex = m_aLB_ROLE.GetModel()->GetAbsPos( pRoleEntry );
@@ -549,14 +549,14 @@ void DataSourceTabPage::fillRoleListBox()
void DataSourceTabPage::updateControlState()
{
- SvLBoxEntry * pSeriesEntry = m_apLB_SERIES->FirstSelected();
+ SvTreeListEntry * pSeriesEntry = m_apLB_SERIES->FirstSelected();
bool bHasSelectedSeries = (pSeriesEntry != 0);
bool bHasValidRole = false;
bool bHasRangeChooser = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection();
if( bHasSelectedSeries )
{
- SvLBoxEntry * pRoleEntry = m_aLB_ROLE.FirstSelected();
+ SvTreeListEntry * pRoleEntry = m_aLB_ROLE.FirstSelected();
bHasValidRole = (pRoleEntry != 0);
}
@@ -601,7 +601,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl)
IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
{
m_rDialogModel.startControllerLockTimer();
- SvLBoxEntry * pEntry = m_aLB_ROLE.FirstSelected();
+ SvTreeListEntry * pEntry = m_aLB_ROLE.FirstSelected();
if( pEntry )
{
OUString aRange( m_aEDT_RANGE.GetText());
@@ -712,10 +712,10 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl)
fillSeriesListBox();
// note the box was cleared and refilled, so pEntry is invalid now
- SvLBoxEntry * pSelEntry = m_apLB_SERIES->FirstSelected();
+ SvTreeListEntry * pSelEntry = m_apLB_SERIES->FirstSelected();
if( pSelEntry )
{
- SvLBoxEntry * pNextEntry = m_apLB_SERIES->Next( pSelEntry );
+ SvTreeListEntry * pNextEntry = m_apLB_SERIES->Next( pSelEntry );
if( pNextEntry )
m_apLB_SERIES->Select( pNextEntry );
}
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index fe1f1fd..602831e 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -39,7 +39,7 @@ SeriesListBox::SeriesListBox( Window* pParent, const ResId & rResId ) :
SeriesListBox::~SeriesListBox()
{}
-SvLBoxEntry* SeriesListBox::CreateEntry() const
+SvTreeListEntry* SeriesListBox::CreateEntry() const
{
return new SeriesEntry();
}
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index c2f0b79..4714281 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -31,7 +31,7 @@
namespace chart
{
-class SeriesEntry : public ::SvLBoxEntry
+class SeriesEntry : public ::SvTreeListEntry
{
public:
virtual ~SeriesEntry();
@@ -53,7 +53,7 @@ public:
explicit SeriesListBox( Window* pParent, const ResId & rResId );
~SeriesListBox( );
- virtual SvLBoxEntry* CreateEntry() const;
+ virtual SvTreeListEntry* CreateEntry() const;
};
} // namespace chart
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1bfbfd4..0d6eb9e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -622,18 +622,18 @@ static long AccCfgTabs[] =
class SfxAccCfgLBoxString_Impl : public SvLBoxString
{
public:
- SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry,
+ SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry,
sal_uInt16 nFlags,
const String& sText );
virtual ~SfxAccCfgLBoxString_Impl();
virtual void Paint(
- const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+ const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry);
};
//-----------------------------------------------
-SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry,
+SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvTreeListEntry* pEntry,
sal_uInt16 nFlags,
const String& sText )
: SvLBoxString(pEntry, nFlags, sText)
@@ -646,7 +646,7 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
}
void SfxAccCfgLBoxString_Impl::Paint(
- const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry)
+ const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvTreeListEntry* pEntry)
{
if (!pEntry)
return;
@@ -663,7 +663,7 @@ void SfxAccCfgLBoxString_Impl::Paint(
}
//-----------------------------------------------
-void SfxAccCfgTabListBox_Impl::InitEntry( SvLBoxEntry* pEntry ,
+void SfxAccCfgTabListBox_Impl::InitEntry( SvTreeListEntry* pEntry ,
const XubString& sText ,
const Image& aImage1,
const Image& aImage2,
@@ -692,7 +692,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
(nCode1 != KEY_PAGEDOWN)
)
{
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while (pEntry)
{
TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
@@ -798,7 +798,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
{
// free memory - remove all dynamic user data
- SvLBoxEntry* pEntry = aEntriesBox.First();
+ SvTreeListEntry* pEntry = aEntriesBox.First();
while (pEntry)
{
TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
@@ -876,7 +876,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
This is needed as we have to paint disabled entries by ourself. No support for that in the
original SvTabListBox!
*/
-void SfxAcceleratorConfigPage::CreateCustomItems( SvLBoxEntry* pEntry,
+void SfxAcceleratorConfigPage::CreateCustomItems( SvTreeListEntry* pEntry,
const String& sCol1 ,
const String& sCol2 )
{
@@ -921,7 +921,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
if (!sKey.Len())
continue;
TAccInfo* pEntry = new TAccInfo(i1, nListPos, aKey);
- SvLBoxEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF);
+ SvTreeListEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF);
pLBEntry->SetUserData(pEntry);
}
@@ -944,7 +944,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
aEntriesBox.SetEntryText(sLabel, nPos, nCol);
- SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
+ SvTreeListEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData();
pEntry->m_bIsConfigurable = sal_True;
@@ -964,7 +964,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
continue;
// Hardcoded function mapped so no ID possible and mark entry as not changeable
- SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
+ SvTreeListEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData();
pEntry->m_bIsConfigurable = sal_False;
@@ -981,7 +981,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele
// Go through the list from the bottom to the top ...
// because logical accelerator must be preferred instead of
// physical ones!
- SvLBoxEntry* pEntry = aEntriesBox.First();
+ SvTreeListEntry* pEntry = aEntriesBox.First();
while (pEntry)
{
TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
@@ -1115,7 +1115,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
aChangeButton.Enable( sal_False );
// #i36994 First selected can return zero!
- SvLBoxEntry* pLBEntry = aEntriesBox.FirstSelected();
+ SvTreeListEntry* pLBEntry = aEntriesBox.FirstSelected();
if ( pLBEntry != 0 )
{
sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
@@ -1131,14 +1131,14 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
// update key box
aKeyBox.Clear();
- SvLBoxEntry* pIt = aEntriesBox.First();
+ SvTreeListEntry* pIt = aEntriesBox.First();
while ( pIt )
{
TAccInfo* pUserData = (TAccInfo*)pIt->GetUserData();
if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand )
{
TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey);
- SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND );
+ SvTreeListEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND );
pE1->SetUserData(pU1);
pE1->EnableChildrenOnDemand( sal_False );
}
@@ -1149,10 +1149,10 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
else
{
// goto selected "key" entry of the key box
- SvLBoxEntry* pE2 = 0;
+ SvTreeListEntry* pE2 = 0;
TAccInfo* pU2 = 0;
sal_uInt16 nP2 = LISTBOX_ENTRY_NOTFOUND;
- SvLBoxEntry* pE3 = 0;
+ SvTreeListEntry* pE3 = 0;
pE2 = aKeyBox.FirstSelected();
if (pE2)
@@ -1194,7 +1194,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
pGroupLBox->Init(m_xSMGR, m_xFrame, m_sModuleLongName);
// pb: #133213# do not select NULL entries
- SvLBoxEntry* pEntry = aEntriesBox.GetEntry( 0, 0 );
+ SvTreeListEntry* pEntry = aEntriesBox.GetEntry( 0, 0 );
if ( pEntry )
aEntriesBox.Select( pEntry );
pEntry = pGroupLBox->GetEntry( 0, 0 );
@@ -1472,7 +1472,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
{
sal_uInt16 nCode1 = aKey.GetCode()+aKey.GetModifier();
- SvLBoxEntry* pEntry = aEntriesBox.First();
+ SvTreeListEntry* pEntry = aEntriesBox.First();
sal_uInt16 i = 0;
while (pEntry)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 50e21ff..03ca2fe 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1256,7 +1256,7 @@ void MenuSaveInData::Apply(
SvxConfigEntry* pRootEntry_,
uno::Reference< container::XIndexContainer >& rMenuBar,
uno::Reference< lang::XSingleComponentFactory >& rFactory,
- SvLBoxEntry *pParentEntry )
+ SvTreeListEntry *pParentEntry )
{
(void)pRootEntry_;
(void)pParentEntry;
@@ -1353,14 +1353,14 @@ MenuSaveInData::Reset()
class PopupPainter : public SvLBoxString
{
public:
- PopupPainter( SvLBoxEntry* pEntry, const String& rStr )
+ PopupPainter( SvTreeListEntry* pEntry, const String& rStr )
: SvLBoxString( pEntry, 0, rStr )
{ }
~PopupPainter() { }
void Paint( const Point& rPos, SvTreeListBox& rOutDev,
- sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry )
+ sal_uInt16 nViewDataEntryFlags, SvTreeListEntry* pEntry )
{
SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry );
@@ -1438,7 +1438,7 @@ SvxMenuEntriesListBox::~SvxMenuEntriesListBox()
// drag and drop support
DragDropMode SvxMenuEntriesListBox::NotifyStartDrag(
- TransferDataContainer& aTransferDataContainer, SvLBoxEntry* pEntry )
+ TransferDataContainer& aTransferDataContainer, SvTreeListEntry* pEntry )
{
(void)aTransferDataContainer;
(void)pEntry;
@@ -1470,14 +1470,14 @@ sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt )
return SvTreeListBox::AcceptDrop( aNewAcceptDropEvent );
}
-sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvLBoxEntry* )
+sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvTreeListEntry* )
{
return sal_True;
}
sal_Bool SvxMenuEntriesListBox::NotifyMoving(
- SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
+ SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
// only try to do a move if we are dragging within the list box
if ( m_bIsInternalDrag )
@@ -1500,8 +1500,8 @@ sal_Bool SvxMenuEntriesListBox::NotifyMoving(
}
sal_Bool SvxMenuEntriesListBox::NotifyCopying(
- SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
- SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
+ SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
(void)pSource;
(void)rpNewParent;
@@ -2063,8 +2063,8 @@ SvxEntries* SvxConfigPage::FindParentForChild(
return NULL;
}
-SvLBoxEntry* SvxConfigPage::AddFunction(
- SvLBoxEntry* pTarget, bool bFront, bool bAllowDuplicates )
+SvTreeListEntry* SvxConfigPage::AddFunction(
+ SvTreeListEntry* pTarget, bool bFront, bool bAllowDuplicates )
{
String aDisplayName = pSelectorDlg->GetSelectedDisplayName();
String aHelpText = pSelectorDlg->GetSelectedHelpText();
@@ -2106,16 +2106,16 @@ SvLBoxEntry* SvxConfigPage::AddFunction(
return InsertEntry( pNewEntryData, pTarget, bFront );
}
-SvLBoxEntry* SvxConfigPage::InsertEntry(
+SvTreeListEntry* SvxConfigPage::InsertEntry(
SvxConfigEntry* pNewEntryData,
- SvLBoxEntry* pTarget,
+ SvTreeListEntry* pTarget,
bool bFront )
{
// Grab the entries list for the currently selected menu
SvxEntries* pEntries = GetTopLevelSelection()->GetEntries();
- SvLBoxEntry* pNewEntry = NULL;
- SvLBoxEntry* pCurEntry =
+ SvTreeListEntry* pNewEntry = NULL;
+ SvTreeListEntry* pCurEntry =
pTarget != NULL ? pTarget : aContentsListBox->GetCurEntry();
if ( bFront )
@@ -2166,10 +2166,10 @@ SvLBoxEntry* SvxConfigPage::InsertEntry(
return pNewEntry;
}
-SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI(
+SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
SvxConfigEntry* pNewEntryData, sal_uLong nPos )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list