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/CollectionView.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx11
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx11
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.cxx4
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx6
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx4
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx40
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx2
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx8
13 files changed, 40 insertions, 56 deletions
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 6c75204f17d4..81fda93c625e 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -201,7 +201,7 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click, Button*, void)
}
catch( const SQLException& )
{
- showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), this, m_xContext );
+ showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), VCLUnoHelper::GetInterface(this), m_xContext );
}
catch( const Exception& )
{
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index c8d99ff45878..20f814313551 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -133,9 +133,9 @@ namespace
}
// ODbDataSourceAdministrationHelper
-ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB, vcl::Window* _pParent,IItemSetHelper* _pItemSetHelper)
+ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB, weld::Window* pParent, weld::Window* pTopParent, IItemSetHelper* _pItemSetHelper)
: m_xContext(_xORB)
- , m_pParent(_pParent)
+ , m_pParent(pParent)
, m_pItemSetHelper(_pItemSetHelper)
{
/// initialize the property translation map
@@ -200,8 +200,7 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
}
catch(const Exception&)
{
- vcl::Window* pTopParent = _pParent->GetParent();
- ShowServiceNotAvailableError(pTopParent ? pTopParent->GetFrameWeld() : nullptr, "com.sun.star.sdb.DatabaseContext", true);
+ ShowServiceNotAvailableError(pTopParent, "com.sun.star.sdb.DatabaseContext", true);
}
}
@@ -352,7 +351,7 @@ std::pair< Reference<XConnection>,bool> ODbDataSourceAdministrationHelper::creat
SQLExceptionInfo aErrorInfo;
try
{
- WaitObject aWaitCursor(m_pParent);
+ weld::WaitObject aWaitCursor(m_pParent);
aRet.first = getDriver()->connect(getConnectionURL(), aConnectionParams);
aRet.second = true;
}
@@ -360,7 +359,7 @@ std::pair< Reference<XConnection>,bool> ODbDataSourceAdministrationHelper::creat
catch (const SQLWarning& e) { aErrorInfo = SQLExceptionInfo(e); }
catch (const SQLException& e) { aErrorInfo = SQLExceptionInfo(e); }
- showError(aErrorInfo,m_pParent,getORB());
+ showError(aErrorInfo,m_pParent->GetXWindow(),getORB());
}
if ( aRet.first.is() )
successfullyConnected();// notify the admindlg to save the password
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 2912619bdd5d..559db0e6f10e 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -35,9 +35,8 @@
#include <svl/itemset.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <svl/poolitem.hxx>
-#include <vcl/vclptr.hxx>
+#include <vcl/weld.hxx>
-namespace vcl { class Window; }
namespace dbaui
{
namespace DataSourceInfoConverter
@@ -67,13 +66,13 @@ namespace dbaui
MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source)
MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source)
- VclPtr<vcl::Window> m_pParent;
+ weld::Window* m_pParent;
IItemSetHelper* m_pItemSetHelper;
public:
- ODbDataSourceAdministrationHelper(const css::uno::Reference< css::uno::XComponentContext >& _xORB
- ,vcl::Window* _pParent
- ,IItemSetHelper* _pItemSetHelper);
+ ODbDataSourceAdministrationHelper(const css::uno::Reference< css::uno::XComponentContext >& _xORB,
+ weld::Window* pParent, weld::Window* pTopParent,
+ IItemSetHelper* _pItemSetHelper);
/** translate the current dialog SfxItems into driver relevant PropertyValues
@see successfullyConnected
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index a724f3e16482..873028b4ec81 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -199,8 +199,8 @@ IMPL_LINK_NOARG( ORelationDialog, OKClickHdl, Button*, void )
}
catch( const SQLException& )
{
- ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ),
- this,
+ ::dbtools::showError( SQLExceptionInfo( ::cppu::getCaughtException() ),
+ VCLUnoHelper::GetInterface(this),
static_cast<OJoinTableView*>(GetParent())->getDesignView()->getController().getORB());
}
catch( const Exception& )
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 8c74ed4a2669..b332f0018de6 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -38,7 +38,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent
,const css::uno::Any& _aDataSourceName)
: SfxSingleTabDialog(pParent, _pItems, "TablesFilterDialog",
"dbaccess/ui/tablesfilterdialog.ui")
- , m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
+ , m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, GetFrameWeld(), pParent ? pParent->GetFrameWeld() : nullptr, this ) )
, m_bStopExecution(false)
{
m_pImpl->setDataSourceOrName(_aDataSourceName);
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 74a1db8723f1..c35e2033c52d 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -203,7 +203,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
{
SfxPasswordDialog aPwdDlg(GetFrameWeld());
aPwdDlg.ShowExtras(SfxShowExtras::ALL);
- if (aPwdDlg.execute())
+ if (aPwdDlg.run())
{
Reference<XDataDescriptorFactory> xUserFactory(m_xUsers,UNO_QUERY);
Reference<XPropertySet> xNewUser = xUserFactory->createDataDescriptor();
@@ -259,7 +259,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
}
catch(const SQLException& e)
{
- ::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB);
+ ::dbtools::showError(::dbtools::SQLExceptionInfo(e), VCLUnoHelper::GetInterface(this), m_xORB);
}
catch(Exception& )
{
@@ -316,7 +316,7 @@ void OUserAdmin::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
}
catch(const SQLException& e)
{
- ::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB);
+ ::dbtools::showError(::dbtools::SQLExceptionInfo(e), VCLUnoHelper::GetInterface(this), m_xORB);
}
OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index a818462196e4..48bc536df9dd 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -56,7 +56,7 @@ namespace dbaui
, m_xConnection(_xConnection)
, m_bOwnConnection(!_xConnection.is())
{
- m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,GetFrameWeld(),_pParent ? _pParent->GetFrameWeld() : nullptr, this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pImpl->translateProperties(xDatasource, *_pItems);
@@ -107,7 +107,7 @@ namespace dbaui
}
catch(const SQLException&)
{
- ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), GetParent(), getORB() );
+ ::dbtools::showError(::dbtools::SQLExceptionInfo(::cppu::getCaughtException()), VCLUnoHelper::GetInterface(GetParent()), getORB());
return RET_CANCEL;
}
catch(const Exception&)
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 10393c427b88..696c0fe78c52 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -343,19 +343,17 @@ namespace dbaui
}
// AdvancedSettingsDialog
- AdvancedSettingsDialog::AdvancedSettingsDialog( vcl::Window* _pParent, SfxItemSet* _pItems,
+ AdvancedSettingsDialog::AdvancedSettingsDialog(weld::Window* pParent, SfxItemSet* _pItems,
const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName )
- : SfxTabDialog(_pParent, "AdvancedSettingsDialog",
- "dbaccess/ui/advancedsettingsdialog.ui", _pItems)
+ : SfxTabDialogController(pParent, "dbaccess/ui/advancedsettingsdialog.ui", "AdvancedSettingsDialog", _pItems)
{
- m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext, m_xDialog.get(), pParent, this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pImpl->translateProperties(xDatasource, *_pItems);
SetInputSet(_pItems);
// propagate this set as our new input set and reset the example set
- delete m_pExampleSet;
- m_pExampleSet = new SfxItemSet(*GetInputSetImpl());
+ m_xExampleSet.reset(new SfxItemSet(*GetInputSetImpl()));
const OUString eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*_pItems);
@@ -380,14 +378,7 @@ namespace dbaui
AdvancedSettingsDialog::~AdvancedSettingsDialog()
{
- disposeOnce();
- }
-
- void AdvancedSettingsDialog::dispose()
- {
SetInputSet(nullptr);
- DELETEZ(m_pExampleSet);
- SfxTabDialog::dispose();
}
bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const OUString& _sURL )
@@ -397,38 +388,33 @@ namespace dbaui
return rFeatures.supportsGeneratedValues() || rFeatures.supportsAnySpecialSetting();
}
- short AdvancedSettingsDialog::Execute()
+ short AdvancedSettingsDialog::Ok()
{
- short nRet = SfxTabDialog::Execute();
+ short nRet = SfxTabDialogController::Ok();
if ( nRet == RET_OK )
{
- m_pExampleSet->Put(*GetOutputItemSet());
- m_pImpl->saveChanges(*m_pExampleSet);
+ m_xExampleSet->Put(*GetOutputItemSet());
+ m_pImpl->saveChanges(*m_xExampleSet);
}
return nRet;
}
- void AdvancedSettingsDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
+ void AdvancedSettingsDialog::PageCreated(const OString& rId, SfxTabPage& _rPage)
{
// register ourself as modified listener
static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() );
static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this);
-
- vcl::Window *pWin = GetViewWindow();
- if(pWin)
- pWin->Invalidate();
-
- SfxTabDialog::PageCreated(_nId, _rPage);
+ SfxTabDialogController::PageCreated(rId, _rPage);
}
const SfxItemSet* AdvancedSettingsDialog::getOutputSet() const
{
- return m_pExampleSet;
+ return m_xExampleSet.get();
}
SfxItemSet* AdvancedSettingsDialog::getWriteOutputSet()
{
- return m_pExampleSet;
+ return m_xExampleSet.get();
}
std::pair< Reference< XConnection >, bool > AdvancedSettingsDialog::createConnection()
@@ -458,7 +444,7 @@ namespace dbaui
void AdvancedSettingsDialog::setTitle(const OUString& _sTitle)
{
- SetText(_sTitle);
+ m_xDialog->set_title(_sTitle);
}
void AdvancedSettingsDialog::enableConfirmSettings( bool ) {}
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 431dcc9d8e08..d267f7efa08c 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -53,7 +53,7 @@ ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent
"dbaccess/ui/admindialog.ui", _pItems)
, m_bUIEnabled(true)
{
- m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,GetFrameWeld(), _pParent ? _pParent->GetFrameWeld() : nullptr, this));
// add the initial tab page
m_nMainPageID = AddTabPage("advanced", OConnectionTabPage::Create, nullptr);
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 603adbec9142..2eb084e4dddc 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -69,7 +69,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
)
:OWizardMachine(_pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP )
{
- m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,GetFrameWeld(), _pParent ? _pParent->GetFrameWeld() : nullptr, this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pOutSet.reset(new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ));
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 8d2581487e42..17565955523b 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -135,7 +135,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
OSL_ENSURE(m_pCollection, "ODbTypeWizDialogSetup::ODbTypeWizDialogSetup : really need a DSN type collection !");
- m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
+ m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,GetFrameWeld(),_pParent ? _pParent->GetFrameWeld() : nullptr, this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
m_pOutSet.reset( new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ) );
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 95b25438be29..e5c549214005 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -298,7 +298,7 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void)
if ( m_pImpl->m_rObjectNameCheck.isNameValid( sNameToCheck, aNameError ) )
EndDialog( RET_OK );
- showError( aNameError, this, m_xContext );
+ showError( aNameError, VCLUnoHelper::GetInterface(this), m_xContext );
m_pImpl->m_pTitle->GrabFocus();
}
}
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 30f94d19f973..5494f2600a36 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -221,7 +221,7 @@ namespace dbaui
}
catch(SQLException& e)
{
- ::dbaui::showError(SQLExceptionInfo(e),_pParent,_rxContext);
+ ::dbtools::showError(SQLExceptionInfo(e),VCLUnoHelper::GetInterface(_pParent),_rxContext);
}
catch(Exception&)
{
@@ -345,7 +345,7 @@ namespace dbaui
updateToolbox();
if (aExceptionInfo.isValid())
- showError(aExceptionInfo, this, m_xContext);
+ showError(aExceptionInfo, VCLUnoHelper::GetInterface(this), m_xContext);
else
{
m_pUnique->SaveValue();
@@ -445,7 +445,7 @@ namespace dbaui
catch(SQLException& e) { aExceptionInfo = SQLExceptionInfo(e); }
if (aExceptionInfo.isValid())
- showError(aExceptionInfo, this, m_xContext);
+ showError(aExceptionInfo, VCLUnoHelper::GetInterface(this), m_xContext);
else if (bSuccess && _bRemoveFromCollection)
{
SvTreeList* pModel = m_pIndexList->GetModel();
@@ -526,7 +526,7 @@ namespace dbaui
catch(SQLException& e) { aExceptionInfo = SQLExceptionInfo(e); }
if (aExceptionInfo.isValid())
- showError(aExceptionInfo, this, m_xContext);
+ showError(aExceptionInfo, VCLUnoHelper::GetInterface(this), m_xContext);
else
m_pIndexList->SetEntryText(pSelected, aResetPos->sName);
generated by cgit (git 2.34.1) at 2024-07-17 21:55:18 +0000