summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx10
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx14
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx40
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx32
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx4
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx4
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx32
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx2
8 files changed, 65 insertions, 73 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index ac7e55f21a55..c33685de305a 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -45,7 +45,7 @@
#include "dsselect.hxx"
#include <svl/filenotation.hxx>
#include "dbustrings.hrc"
-#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/awt/XWindow.hpp>
@@ -172,13 +172,7 @@ DBG_NAME(OConnectionHelper)
{
try
{
- ::rtl::OUString sFolderPickerService(SERVICE_UI_FOLDERPICKER);
- Reference< XFolderPicker > xFolderPicker(m_xORB->createInstance(sFolderPickerService), UNO_QUERY);
- if (!xFolderPicker.is())
- {
- ShowServiceNotAvailableError(GetParent(), sFolderPickerService, sal_True);
- break;
- }
+ Reference< XFolderPicker2 > xFolderPicker = FolderPicker::create(comphelper::getComponentContext(m_xORB));
sal_Bool bDoBrowse = sal_False;
String sOldPath = getURLNoPrefix();
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 580791a345a0..55fbf4b1dfff 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -96,15 +96,15 @@ TableListFacade::~TableListFacade()
String TableListFacade::getSelectedName( String& _out_rAliasName ) const
{
- SvLBoxEntry* pEntry = m_rTableList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rTableList.FirstSelected();
if ( !pEntry )
return String();
::rtl::OUString aCatalog, aSchema, aTableName;
- SvLBoxEntry* pSchema = m_rTableList.GetParent(pEntry);
+ SvTreeListEntry* pSchema = m_rTableList.GetParent(pEntry);
if(pSchema && pSchema != m_rTableList.getAllObjectsEntry())
{
- SvLBoxEntry* pCatalog = m_rTableList.GetParent(pSchema);
+ SvTreeListEntry* pCatalog = m_rTableList.GetParent(pSchema);
if(pCatalog && pCatalog != m_rTableList.getAllObjectsEntry())
aCatalog = m_rTableList.GetEntryText(pCatalog);
aSchema = m_rTableList.GetEntryText(pSchema);
@@ -200,7 +200,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
}
m_rTableList.UpdateTableList( m_xConnection, sTables, sViews );
- SvLBoxEntry* pEntry = m_rTableList.First();
+ SvTreeListEntry* pEntry = m_rTableList.First();
while( pEntry && m_rTableList.GetModel()->HasChildren( pEntry ) )
{
m_rTableList.Expand( pEntry );
@@ -217,7 +217,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
bool TableListFacade::isLeafSelected() const
{
- SvLBoxEntry* pEntry = m_rTableList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rTableList.FirstSelected();
return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry );
}
@@ -306,7 +306,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
String QueryListFacade::getSelectedName( String& _out_rAliasName ) const
{
String sSelected;
- SvLBoxEntry* pEntry = m_rQueryList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rQueryList.FirstSelected();
if ( pEntry )
sSelected = _out_rAliasName = m_rQueryList.GetEntryText( pEntry );
return sSelected;
@@ -314,7 +314,7 @@ String QueryListFacade::getSelectedName( String& _out_rAliasName ) const
bool QueryListFacade::isLeafSelected() const
{
- SvLBoxEntry* pEntry = m_rQueryList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rQueryList.FirstSelected();
return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry );
}
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 7b64a5dfcafb..73e8624875e3 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -95,7 +95,7 @@ namespace dbaui
extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars);
//------------------------------------------------------------------
- sal_Bool DbaIndexList::EditedEntry( SvLBoxEntry* _pEntry, const rtl::OUString& _rNewText )
+ sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const rtl::OUString& _rNewText )
{
// first check if this is valid SQL92 name
if ( isSQL92CheckEnabled(m_xConnection) )
@@ -146,7 +146,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- void DbaIndexList::SelectNoHandlerCall( SvLBoxEntry* _pEntry )
+ void DbaIndexList::SelectNoHandlerCall( SvTreeListEntry* _pEntry )
{
disableSelectHandler();
Select(_pEntry, sal_True);
@@ -154,7 +154,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- sal_Bool DbaIndexList::Select( SvLBoxEntry* pEntry, sal_Bool _bSelect )
+ sal_Bool DbaIndexList::Select( SvTreeListEntry* pEntry, sal_Bool _bSelect )
{
sal_Bool bReturn = SvTreeListBox::Select(pEntry, _bSelect);
@@ -273,7 +273,7 @@ DBG_NAME(DbaIndexDialog)
{
m_aActions.EnableItem(ID_INDEX_NEW, !m_aIndexes.IsEditingActive());
- SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
+ SvTreeListEntry* pSelected = m_aIndexes.FirstSelected();
sal_Bool bSelectedAnything = NULL != pSelected;
@@ -304,7 +304,7 @@ DBG_NAME(DbaIndexDialog)
Indexes::iterator aEnd = m_pIndexes->end();
for (; aIndexLoop != aEnd; ++aIndexLoop)
{
- SvLBoxEntry* pNewEntry = NULL;
+ SvTreeListEntry* pNewEntry = NULL;
if (aIndexLoop->bPrimaryKey)
pNewEntry = m_aIndexes.InsertEntry(aIndexLoop->sName, aPKeyIcon, aPKeyIcon);
else
@@ -327,7 +327,7 @@ DBG_NAME(DbaIndexDialog)
}
//------------------------------------------------------------------
- sal_Bool DbaIndexDialog::implCommit(SvLBoxEntry* _pEntry)
+ sal_Bool DbaIndexDialog::implCommit(SvTreeListEntry* _pEntry)
{
OSL_ENSURE(_pEntry, "DbaIndexDialog::implCommit: invalid entry!");
@@ -389,12 +389,12 @@ DBG_NAME(DbaIndexDialog)
return;
}
- SvLBoxEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName);
+ SvTreeListEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName);
m_pIndexes->insert(sNewIndexName);
// update the user data on the entries in the list box:
// they're iterators of the index collection, and thus they have changed when removing the index
- for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
+ for (SvTreeListEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
{
Indexes::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
OSL_ENSURE(aAfterInsertPos != m_pIndexes->end(), "DbaIndexDialog::OnNewIndex: problems with on of the entries!");
@@ -412,7 +412,7 @@ DBG_NAME(DbaIndexDialog)
void DbaIndexDialog::OnDropIndex(sal_Bool _bConfirm)
{
// the selected index
- SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
+ SvTreeListEntry* pSelected = m_aIndexes.FirstSelected();
OSL_ENSURE(pSelected, "DbaIndexDialog::OnDropIndex: invalid call!");
if (pSelected)
{
@@ -435,7 +435,7 @@ DBG_NAME(DbaIndexDialog)
}
//------------------------------------------------------------------
- sal_Bool DbaIndexDialog::implDropIndex(SvLBoxEntry* _pEntry, sal_Bool _bRemoveFromCollection)
+ sal_Bool DbaIndexDialog::implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection)
{
// do the drop
Indexes::iterator aDropPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData());
@@ -458,7 +458,7 @@ DBG_NAME(DbaIndexDialog)
showError(aExceptionInfo, this, m_xORB);
else if (bSuccess && _bRemoveFromCollection)
{
- SvLBoxTreeList* pModel = m_aIndexes.GetModel();
+ SvTreeList* pModel = m_aIndexes.GetModel();
m_aIndexes.disableSelectHandler();
pModel->Remove(_pEntry);
@@ -466,7 +466,7 @@ DBG_NAME(DbaIndexDialog)
// update the user data on the entries in the list box:
// they're iterators of the index collection, and thus they have changed when removing the index
- for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
+ for (SvTreeListEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
{
Indexes::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
OSL_ENSURE(aAfterDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: problems with on of the remaining entries!");
@@ -489,7 +489,7 @@ DBG_NAME(DbaIndexDialog)
void DbaIndexDialog::OnRenameIndex()
{
// the selected index
- SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
+ SvTreeListEntry* pSelected = m_aIndexes.FirstSelected();
OSL_ENSURE(pSelected, "DbaIndexDialog::OnRenameIndex: invalid call!");
// save the changes made 'til here
@@ -506,7 +506,7 @@ DBG_NAME(DbaIndexDialog)
{
// the selected index
#if OSL_DEBUG_LEVEL > 0
- SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
+ SvTreeListEntry* pSelected = m_aIndexes.FirstSelected();
OSL_ENSURE( pSelected, "DbaIndexDialog::OnSaveIndex: invalid call!" );
#endif
@@ -518,7 +518,7 @@ DBG_NAME(DbaIndexDialog)
void DbaIndexDialog::OnResetIndex()
{
// the selected index
- SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
+ SvTreeListEntry* pSelected = m_aIndexes.FirstSelected();
OSL_ENSURE(pSelected, "DbaIndexDialog::OnResetIndex: invalid call!");
Indexes::iterator aResetPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData());
@@ -587,7 +587,7 @@ DBG_NAME(DbaIndexDialog)
}
// the currently selected entry
- const SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
+ const SvTreeListEntry* pSelected = m_aIndexes.FirstSelected();
OSL_ENSURE(pSelected == m_pPreviousSelection, "DbaIndexDialog::OnCloseDialog: inconsistence!");
sal_Int32 nResponse = RET_NO;
@@ -621,7 +621,7 @@ DBG_NAME(DbaIndexDialog)
}
//------------------------------------------------------------------
- IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvLBoxEntry*, _pEntry )
+ IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry )
{
m_bEditAgain = sal_False;
m_aIndexes.EditEntry(_pEntry);
@@ -629,7 +629,7 @@ DBG_NAME(DbaIndexDialog)
}
//------------------------------------------------------------------
- IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry )
+ IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry )
{
Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData());
@@ -767,7 +767,7 @@ DBG_NAME(DbaIndexDialog)
}
//------------------------------------------------------------------
- void DbaIndexDialog::updateControls(const SvLBoxEntry* _pEntry)
+ void DbaIndexDialog::updateControls(const SvTreeListEntry* _pEntry)
{
if (_pEntry)
{
@@ -823,7 +823,7 @@ DBG_NAME(DbaIndexDialog)
m_aFieldsLabel.Enable(bHaveSelection);
m_pFields->Enable(bHaveSelection);
- SvLBoxEntry* pNewSelection = m_aIndexes.FirstSelected();
+ SvTreeListEntry* pNewSelection = m_aIndexes.FirstSelected();
updateControls(pNewSelection);
if (bHaveSelection)
m_aIndexes.GrabFocus();
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 94895690ea92..1453c8434291 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -56,19 +56,6 @@ namespace dbaui
//==================================================================
//------------------------------------------------------------------------------
- #define INIT_MEMBERS() \
- :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \
- ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \
- ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \
- ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \
- ,m_aParam (this, ModuleRes(ET_PARAM)) \
- ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \
- ,m_aOKBtn (this, ModuleRes(BT_OK)) \
- ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \
- ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \
- ,m_xConnection(_rxConnection) \
- ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \
- ,m_bNeedErrorOnCurrent(sal_True) \
//------------------------------------------------------------------------------
@@ -76,13 +63,24 @@ DBG_NAME(OParameterDialog)
OParameterDialog::OParameterDialog(
Window* pParent, const Reference< XIndexAccess > & rParamContainer,
- const Reference< XConnection > & _rxConnection, const Reference< XMultiServiceFactory >& _rxORB)
- INIT_MEMBERS()
+ const Reference< XConnection > & _rxConnection, const Reference< XComponentContext >& rxContext)
+ :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS))
+ ,m_aNamesFrame (this, ModuleRes(FL_PARAMS))
+ ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS))
+ ,m_aValueFrame (this, ModuleRes(FT_VALUE))
+ ,m_aParam (this, ModuleRes(ET_PARAM))
+ ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT))
+ ,m_aOKBtn (this, ModuleRes(BT_OK))
+ ,m_aCancelBtn (this, ModuleRes(BT_CANCEL))
+ ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND)
+ ,m_xConnection(_rxConnection)
+ ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
+ ,m_bNeedErrorOnCurrent(sal_True)
{
DBG_CTOR(OParameterDialog,NULL);
- if (_rxORB.is())
- m_xFormatter = Reference< XNumberFormatter>( NumberFormatter::create(comphelper::getComponentContext(_rxORB)), UNO_QUERY_THROW);
+ if (rxContext.is())
+ m_xFormatter = Reference< XNumberFormatter>( NumberFormatter::create( rxContext ), UNO_QUERY_THROW);
else {
OSL_FAIL("OParameterDialog::OParameterDialog: need a service factory!");
}
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index a8696374338d..c6a38f75ba16 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -66,7 +66,7 @@ void Replace_SQL_PlaceHolder(String& aString)
DBG_NAME(DlgFilterCrit);
DlgFilterCrit::DlgFilterCrit(Window * pParent,
- const Reference< XMultiServiceFactory >& _rxORB,
+ const Reference< XComponentContext >& rxContext,
const Reference< XConnection>& _rxConnection,
const Reference< XSingleSelectQueryComposer >& _rxComposer,
const Reference< XNameAccess>& _rxCols
@@ -97,7 +97,7 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent,
,m_xColumns( _rxCols )
,m_xConnection( _rxConnection )
,m_xMetaData( _rxConnection->getMetaData() )
- ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() )
+ ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
{
DBG_CTOR(DlgFilterCrit,NULL);
// Write the String for noEntry into the ListBoxes of the field names
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 323d819ef61d..f0b5d32c643a 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -296,7 +296,7 @@ namespace
void lcl_insertExceptionEntry( SvTreeListBox& _rList, size_t _nElementPos, const ExceptionDisplayInfo& _rEntry )
{
Image aEntryImage( _rEntry.pImageProvider->getImage() );
- SvLBoxEntry* pListEntry =
+ SvTreeListEntry* pListEntry =
_rList.InsertEntry( _rEntry.pLabelProvider->getLabel(), aEntryImage, aEntryImage );
pListEntry->SetUserData( reinterpret_cast< void* >( _nElementPos ) );
}
@@ -390,7 +390,7 @@ OExceptionChainDialog::~OExceptionChainDialog()
//------------------------------------------------------------------------------
IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected)
{
- SvLBoxEntry* pSelected = m_aExceptionList.FirstSelected();
+ SvTreeListEntry* pSelected = m_aExceptionList.FirstSelected();
OSL_ENSURE(!pSelected || !m_aExceptionList.NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?");
String sText;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 3259a87d3f28..c58e5c4c6640 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -173,7 +173,7 @@ DBG_NAME(OTableSubscriptionPage)
String aListBoxTable;
::rtl::OUString sCatalog, sSchema, sName;
- SvLBoxEntry* pRootEntry = m_aTablesList.getAllObjectsEntry();
+ SvTreeListEntry* pRootEntry = m_aTablesList.getAllObjectsEntry();
sal_Bool bAllTables = sal_False;
sal_Bool bAllSchemas = sal_False;
@@ -189,7 +189,7 @@ DBG_NAME(OTableSubscriptionPage)
bAllSchemas = (1 == sSchema.getLength()) && ('%' == sSchema[0]);
// the catalog entry
- SvLBoxEntry* pCatalog = m_aTablesList.GetEntryPosByName(sCatalog, pRootEntry);
+ SvTreeListEntry* pCatalog = m_aTablesList.GetEntryPosByName(sCatalog, pRootEntry);
if (!(pCatalog || sCatalog.isEmpty()))
// the table (resp. its catalog) refered in this filter entry does not exist anymore
continue;
@@ -201,7 +201,7 @@ DBG_NAME(OTableSubscriptionPage)
}
// the schema entry
- SvLBoxEntry* pSchema = m_aTablesList.GetEntryPosByName(sSchema, (pCatalog ? pCatalog : pRootEntry));
+ SvTreeListEntry* pSchema = m_aTablesList.GetEntryPosByName(sSchema, (pCatalog ? pCatalog : pRootEntry));
if (!(pSchema || sSchema.isEmpty()))
// the table (resp. its schema) refered in this filter entry does not exist anymore
continue;
@@ -212,7 +212,7 @@ DBG_NAME(OTableSubscriptionPage)
continue;
}
- SvLBoxEntry* pEntry = m_aTablesList.GetEntryPosByName(sName, pSchema ? pSchema : (pCatalog ? pCatalog : pRootEntry) );
+ SvTreeListEntry* pEntry = m_aTablesList.GetEntryPosByName(sName, pSchema ? pSchema : (pCatalog ? pCatalog : pRootEntry) );
if (pEntry)
m_aTablesList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED);
}
@@ -384,7 +384,7 @@ DBG_NAME(OTableSubscriptionPage)
implCompleteTablesCheck( aTableFilter );
// expand the first entry by default
- SvLBoxEntry* pExpand = m_aTablesList.getAllObjectsEntry();
+ SvTreeListEntry* pExpand = m_aTablesList.getAllObjectsEntry();
while (pExpand)
{
m_aTablesList.Expand(pExpand);
@@ -401,7 +401,7 @@ DBG_NAME(OTableSubscriptionPage)
void OTableSubscriptionPage::CheckAll( sal_Bool _bCheck )
{
SvButtonState eState = _bCheck ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED;
- SvLBoxEntry* pEntry = m_aTablesList.First();
+ SvTreeListEntry* pEntry = m_aTablesList.First();
while (pEntry)
{
m_aTablesList.SetCheckButtonState( pEntry, eState);
@@ -434,12 +434,12 @@ DBG_NAME(OTableSubscriptionPage)
//------------------------------------------------------------------------
IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData )
{
- SvLBoxEntry* pLHS = static_cast<SvLBoxEntry*>(_pSortData->pLeft);
- SvLBoxEntry* pRHS = static_cast<SvLBoxEntry*>(_pSortData->pRight);
+ const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_pSortData->pLeft);
+ const SvTreeListEntry* pRHS = static_cast<const SvTreeListEntry*>(_pSortData->pRight);
OSL_ENSURE(pLHS && pRHS, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid tree entries!");
- SvLBoxString* pLeftTextItem = static_cast<SvLBoxString*>(pLHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
- SvLBoxString* pRightTextItem = static_cast<SvLBoxString*>(pRHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
+ const SvLBoxString* pLeftTextItem = static_cast<const SvLBoxString*>(pLHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
+ const SvLBoxString* pRightTextItem = static_cast<const SvLBoxString*>(pRHS->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
OSL_ENSURE(pLeftTextItem && pRightTextItem, "SbaTableQueryBrowser::OnTreeEntryCompare: invalid text items!");
String sLeftText = pLeftTextItem->GetText();
@@ -472,16 +472,16 @@ DBG_NAME(OTableSubscriptionPage)
static const ::rtl::OUString sWildcard(RTL_CONSTASCII_USTRINGPARAM("%"));
::rtl::OUString sComposedName;
- const SvLBoxEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry();
+ const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry();
if (!pAllObjectsEntry)
return aTableFilter;
- SvLBoxEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvLBoxEntry*>(pAllObjectsEntry));
+ SvTreeListEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvTreeListEntry*>(pAllObjectsEntry));
while(pEntry)
{
sal_Bool bCatalogWildcard = sal_False;
sal_Bool bSchemaWildcard = sal_False;
- SvLBoxEntry* pSchema = NULL;
- SvLBoxEntry* pCatalog = NULL;
+ SvTreeListEntry* pSchema = NULL;
+ SvTreeListEntry* pCatalog = NULL;
if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry))
{ // checked and a leaf, which means it's no catalog, no schema, but a real table
@@ -559,9 +559,9 @@ DBG_NAME(OTableSubscriptionPage)
}
//------------------------------------------------------------------------
- SvLBoxEntry* OTableSubscriptionPage::implNextSibling(SvLBoxEntry* _pEntry) const
+ SvTreeListEntry* OTableSubscriptionPage::implNextSibling(SvTreeListEntry* _pEntry) const
{
- SvLBoxEntry* pReturn = NULL;
+ SvTreeListEntry* pReturn = NULL;
if (_pEntry)
{
pReturn = m_aTablesList.NextSibling(_pEntry);
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 02c9aa4c45f4..6a64c2e2c31c 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -88,7 +88,7 @@ namespace dbaui
void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables);
/// returns the next sibling, if not available, the next sibling of the parent, a.s.o.
- SvLBoxEntry* implNextSibling(SvLBoxEntry* _pEntry) const;
+ SvTreeListEntry* implNextSibling(SvTreeListEntry* _pEntry) const;
/** return the current selection in <member>m_aTablesList</member>
*/
generated by cgit (git 2.34.1) at 2025-03-04 11:57:19 +0000