summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/inc/unosqlmessage.hxx4
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx7
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.hxx4
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx6
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx4
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.hxx4
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.hxx4
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/admindlg.hxx4
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx18
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.hxx8
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx8
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx6
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx11
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.hxx2
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx4
-rw-r--r--dbaccess/source/ui/uno/unosqlmessage.cxx6
20 files changed, 61 insertions, 55 deletions
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 6a38537ab82f..ae3b2a8f116b 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -69,8 +69,8 @@ private:
// (overwriting these three, because we have some special handling for our property)
virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue) override;
-// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ // OGenericUnoDialog overridables
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 8a2bd3e88a84..8f1d34334555 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -65,7 +65,7 @@ namespace dbaui
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
protected:
// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB)
@@ -120,9 +120,10 @@ namespace dbaui
describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps);
}
- VclPtr<Dialog> OAdvancedSettingsDialog::createDialog(vcl::Window* _pParent)
+
+ svt::OGenericUnoDialog::Dialog OAdvancedSettingsDialog::createDialog(vcl::Window* _pParent)
{
- return VclPtr<AdvancedSettingsDialog>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
+ return svt::OGenericUnoDialog::Dialog(VclPtr<AdvancedSettingsDialog>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection));
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index fa119a03fd2c..e9f007905ff9 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -91,9 +91,9 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo()
return new ::cppu::OPropertyArrayHelper(aProps);
}
-VclPtr<Dialog> ODBTypeWizDialog::createDialog(vcl::Window* _pParent)
+svt::OGenericUnoDialog::Dialog ODBTypeWizDialog::createDialog(vcl::Window* _pParent)
{
- return VclPtr<ODbTypeWizDialog>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
+ return svt::OGenericUnoDialog::Dialog(VclPtr<ODbTypeWizDialog>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection));
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index a13e569b1f87..6be18eba68df 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -54,8 +54,8 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
private:
-// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ // OGenericUnoDialog overridables
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 9005e8acb918..645736285d8e 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -104,16 +104,16 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo(
return new ::cppu::OPropertyArrayHelper(aProps);
}
-VclPtr<Dialog> ODBTypeWizDialogSetup::createDialog(vcl::Window* _pParent)
+svt::OGenericUnoDialog::Dialog ODBTypeWizDialogSetup::createDialog(vcl::Window* _pParent)
{
- return VclPtr<ODbTypeWizDialogSetup>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
+ return svt::OGenericUnoDialog::Dialog(VclPtr<ODbTypeWizDialogSetup>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection));
}
void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult)
{
if ( _nExecutionResult == RET_OK )
{
- const ODbTypeWizDialogSetup* pDialog = static_cast< ODbTypeWizDialogSetup* >( m_pDialog.get() );
+ const ODbTypeWizDialogSetup* pDialog = static_cast<ODbTypeWizDialogSetup*>(m_aDialog.m_xVclDialog.get());
m_bOpenDatabase = pDialog->IsDatabaseDocumentToBeOpened();
m_bStartTableWizard = pDialog->IsTableWizardToBeStarted();
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 9c8be2e76b8c..d70aac205b57 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -56,8 +56,8 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
private:
-// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ // OGenericUnoDialog overridables
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
virtual void executedDialog(sal_Int16 _nExecutionResult) override;
};
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index dc3462871a0d..4a6ef4cf6c3c 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -91,9 +91,9 @@ Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo()
return new ::cppu::OPropertyArrayHelper(aProps);
}
-VclPtr<Dialog> OTableFilterDialog::createDialog(vcl::Window* _pParent)
+svt::OGenericUnoDialog::Dialog OTableFilterDialog::createDialog(vcl::Window* _pParent)
{
- return VclPtr<OTableSubscriptionDialog>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
+ return svt::OGenericUnoDialog::Dialog(VclPtr<OTableSubscriptionDialog>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection));
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 3faf9dde83a1..3a8d9b7f3f6e 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -55,8 +55,8 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
private:
-// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ // OGenericUnoDialog overridables
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index ce7be4598215..f2aa0681e68b 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -91,9 +91,9 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo()
return new ::cppu::OPropertyArrayHelper(aProps);
}
-VclPtr<Dialog> OUserSettingsDialog::createDialog(vcl::Window* _pParent)
+svt::OGenericUnoDialog::Dialog OUserSettingsDialog::createDialog(vcl::Window* _pParent)
{
- return VclPtr<OUserAdminDlg>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection);
+ return svt::OGenericUnoDialog::Dialog(VclPtr<OUserAdminDlg>::Create(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection));
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 931d1c77a701..b7b7cc66e469 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -55,8 +55,8 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
private:
-// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ // OGenericUnoDialog overridables
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index e5ac2b416a4b..c58afd44919e 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -91,7 +91,7 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI
return new ::cppu::OPropertyArrayHelper(aProps);
}
-VclPtr<Dialog> ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent)
+svt::OGenericUnoDialog::Dialog ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent)
{
VclPtrInstance<ODbAdminDialog> pDialog(_pParent, m_pDatasourceItems, m_aContext);
@@ -99,7 +99,7 @@ VclPtr<Dialog> ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent)
if ( m_aInitialSelection.hasValue() )
pDialog->selectDataSource(m_aInitialSelection);
- return pDialog;
+ return svt::OGenericUnoDialog::Dialog(pDialog);
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 38b2bf632c3e..e0e80e8586ae 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -54,8 +54,8 @@ public:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
private:
-// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ // OGenericUnoDialog overridables
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 0af4b19d97ee..b0613c60580c 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -76,7 +76,7 @@ namespace dbaui
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog )
- VclPtr<Dialog> ComposerDialog::createDialog(vcl::Window* _pParent)
+ svt::OGenericUnoDialog::Dialog ComposerDialog::createDialog(vcl::Window* _pParent)
{
// obtain all the objects needed for the dialog
Reference< XConnection > xConnection;
@@ -117,10 +117,12 @@ namespace dbaui
}
if ( !xConnection.is() || !xColumns.is() || !m_xComposer.is() )
+ {
// can't create the dialog if I have improper settings
- return nullptr;
+ return svt::OGenericUnoDialog::Dialog(nullptr);
+ }
- return createComposerDialog( _pParent, xConnection, xColumns );
+ return svt::OGenericUnoDialog::Dialog(createComposerDialog(_pParent, xConnection, xColumns));
}
// RowsetFilterDialog
@@ -167,8 +169,8 @@ namespace dbaui
{
ComposerDialog::executedDialog( _nExecutionResult );
- if ( _nExecutionResult && m_pDialog )
- static_cast< DlgFilterCrit* >( m_pDialog.get() )->BuildWherePart();
+ if ( _nExecutionResult && m_aDialog )
+ static_cast< DlgFilterCrit* >( m_aDialog.m_xVclDialog.get() )->BuildWherePart();
}
// RowsetOrderDialog
@@ -211,13 +213,13 @@ namespace dbaui
{
ComposerDialog::executedDialog( _nExecutionResult );
- if ( !m_pDialog )
+ if ( !m_aDialog )
return;
if ( _nExecutionResult )
- static_cast< DlgOrderCrit* >( m_pDialog.get() )->BuildOrderPart();
+ static_cast< DlgOrderCrit* >( m_aDialog.m_xVclDialog.get() )->BuildOrderPart();
else if ( m_xComposer.is() )
- m_xComposer->setOrder( static_cast< DlgOrderCrit* >( m_pDialog.get() )->GetOrignalOrder() );
+ m_xComposer->setOrder( static_cast< DlgOrderCrit* >( m_aDialog.m_xVclDialog.get() )->GetOrignalOrder() );
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 7647a1f4d5b6..f850b021a797 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -60,7 +60,7 @@ namespace dbaui
protected:
// own overridables
- virtual VclPtr<Dialog> createComposerDialog(
+ virtual VclPtr<::Dialog> createComposerDialog(
vcl::Window* _pParent,
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const css::uno::Reference< css::container::XNameAccess >& _rxColumns
@@ -68,7 +68,7 @@ namespace dbaui
private:
// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
};
// RowsetFilterDialog
@@ -89,7 +89,7 @@ namespace dbaui
protected:
// own overridables
- virtual VclPtr<Dialog> createComposerDialog(
+ virtual VclPtr<::Dialog> createComposerDialog(
vcl::Window* _pParent,
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const css::uno::Reference< css::container::XNameAccess >& _rxColumns
@@ -119,7 +119,7 @@ namespace dbaui
protected:
// own overridables
- virtual VclPtr<Dialog> createComposerDialog(
+ virtual VclPtr<::Dialog> createComposerDialog(
vcl::Window* _pParent,
const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const css::uno::Reference< css::container::XNameAccess >& _rxColumns
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index b714f93ae3c8..076ceb4c0726 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -192,7 +192,7 @@ namespace dbaui
virtual ~CopyTableWizard() override;
// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override;
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
virtual void executedDialog( sal_Int16 _nExecutionResult ) override;
private:
@@ -546,7 +546,7 @@ void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle )
OCopyTableWizard& CopyTableWizard::impl_getDialog_throw()
{
- OCopyTableWizard* pWizard = dynamic_cast< OCopyTableWizard* >( m_pDialog.get() );
+ OCopyTableWizard* pWizard = dynamic_cast< OCopyTableWizard* >(m_aDialog.m_xVclDialog.get());
if ( !pWizard )
throw DisposedException( OUString(), *this );
return *pWizard;
@@ -1508,7 +1508,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
return new ::cppu::OPropertyArrayHelper( aProps );
}
-VclPtr<Dialog> CopyTableWizard::createDialog( vcl::Window* _pParent )
+svt::OGenericUnoDialog::Dialog CopyTableWizard::createDialog( vcl::Window* _pParent )
{
OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" );
// this should have been prevented in ::execute already
@@ -1526,7 +1526,7 @@ VclPtr<Dialog> CopyTableWizard::createDialog( vcl::Window* _pParent )
impl_attributesToDialog_nothrow( *pWizard );
- return pWizard;
+ return svt::OGenericUnoDialog::Dialog(pWizard);
}
void CopyTableWizard::executedDialog( sal_Int16 _nExecutionResult )
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 609ad0362747..62ca64e0cb7b 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -105,7 +105,7 @@ namespace dbaui
protected:
// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override;
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
using OTextConnectionSettingsDialog_BASE::getFastPropertyValue;
};
@@ -202,9 +202,9 @@ namespace dbaui
return new ::cppu::OPropertyArrayHelper( aProps );
}
- VclPtr<Dialog> OTextConnectionSettingsDialog::createDialog(vcl::Window* _pParent)
+ svt::OGenericUnoDialog::Dialog OTextConnectionSettingsDialog::createDialog(vcl::Window* _pParent)
{
- return VclPtr<TextConnectionSettingsDialog>::Create( _pParent, *m_pDatasourceItems );
+ return svt::OGenericUnoDialog::Dialog(VclPtr<TextConnectionSettingsDialog>::Create(_pParent, *m_pDatasourceItems));
}
void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 56723e7a1f95..39ed8a9a5aa5 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -77,7 +77,7 @@ namespace dbaui
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog )
- VclPtr<Dialog> ODirectSQLDialog::createDialog(vcl::Window* _pParent)
+ svt::OGenericUnoDialog::Dialog ODirectSQLDialog::createDialog(vcl::Window* _pParent)
{
// obtain all the objects needed for the dialog
Reference< XConnection > xConnection = m_xActiveConnection;
@@ -94,12 +94,15 @@ namespace dbaui
DBG_UNHANDLED_EXCEPTION();
}
}
- if ( !xConnection.is() )
+ if (!xConnection.is())
+ {
// can't create the dialog if I have improper settings
- return nullptr;
+ return svt::OGenericUnoDialog::Dialog(nullptr);
+ }
- return VclPtr<DirectSQLDialog>::Create( _pParent, xConnection );
+ return svt::OGenericUnoDialog::Dialog(VclPtr<DirectSQLDialog>::Create(_pParent, xConnection));
}
+
void ODirectSQLDialog::implInitialize(const Any& _rValue)
{
PropertyValue aProperty;
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index c0e2a63b914a..d616888e92ff 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -61,7 +61,7 @@ namespace dbaui
protected:
// OGenericUnoDialog overridables
- virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
+ virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override;
virtual void implInitialize(const css::uno::Any& _rValue) override;
};
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index a1aaca3ef8c5..51abc7e5a208 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -51,10 +51,10 @@ ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XC
ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog()
{
- if (m_pDialog)
+ if (m_aDialog)
{
::osl::MutexGuard aGuard(m_aMutex);
- if (m_pDialog)
+ if (m_aDialog)
{
destroyDialog();
ODbAdminDialog::destroyItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults);
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index a9f9791cc316..7b8158855535 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -143,13 +143,13 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo()
return new ::cppu::OPropertyArrayHelper(aProps);
}
-VclPtr<Dialog> OSQLMessageDialog::createDialog(vcl::Window* _pParent)
+svt::OGenericUnoDialog::Dialog OSQLMessageDialog::createDialog(vcl::Window* _pParent)
{
if ( m_aException.hasValue() )
- return VclPtr<OSQLMessageBox>::Create( _pParent, SQLExceptionInfo( m_aException ), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, m_sHelpURL );
+ return svt::OGenericUnoDialog::Dialog(VclPtr<OSQLMessageBox>::Create(_pParent, SQLExceptionInfo(m_aException), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, m_sHelpURL));
OSL_FAIL("OSQLMessageDialog::createDialog : You should use the SQLException property to specify the error to display!");
- return VclPtr<OSQLMessageBox>::Create(_pParent, SQLException());
+ return svt::OGenericUnoDialog::Dialog(VclPtr<OSQLMessageBox>::Create(_pParent, SQLException()));
}
} // namespace dbaui
generated by cgit (git 2.34.1) at 2024-07-07 20:33:34 +0000