diff options
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/abpilot/unodialogabp.cxx | 6 | ||||
-rw-r--r-- | extensions/source/abpilot/unodialogabp.hxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/unoautopilot.hxx | 6 | ||||
-rw-r--r-- | extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 7 | ||||
-rw-r--r-- | extensions/source/propctrlr/MasterDetailLinkDialog.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/controlfontdialog.cxx | 15 | ||||
-rw-r--r-- | extensions/source/propctrlr/controlfontdialog.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrunodialogs.cxx | 11 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrunodialogs.hxx | 4 |
9 files changed, 26 insertions, 31 deletions
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index dee2c9d0a231..28f7924db0f4 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -111,9 +111,9 @@ namespace abp } } - VclPtr<Dialog> OABSPilotUno::createDialog(vcl::Window* _pParent) + svt::OGenericUnoDialog::Dialog OABSPilotUno::createDialog(vcl::Window* _pParent) { - return VclPtr<OAddressBookSourcePilot>::Create(_pParent, m_aContext ); + return svt::OGenericUnoDialog::Dialog(VclPtr<OAddressBookSourcePilot>::Create(_pParent, m_aContext)); } @@ -136,7 +136,7 @@ namespace abp { if ( _nExecutionResult == RET_OK ) { - const AddressSettings& aSettings = static_cast<OAddressBookSourcePilot*>(m_pDialog.get())->getSettings(); + const AddressSettings& aSettings = static_cast<OAddressBookSourcePilot*>(m_aDialog.m_xVclDialog.get())->getSettings(); m_sDataSourceName = aSettings.bRegisterDataSource ? aSettings.sRegisteredDataSourceName : aSettings.sDataSourceName; } } diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index 5bf30a9e0c13..01f3bad92e55 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -71,7 +71,7 @@ namespace abp using svt::OGenericUnoDialog::execute; // 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; }; diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 49bbf19ec1a4..fe8b7058f70b 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -103,10 +103,10 @@ namespace dbp } private: - // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override + // OGenericUnoDialog overridables + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override { - return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext); + return svt::OGenericUnoDialog::Dialog(VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext)); } virtual void implInitialize(const css::uno::Any& _rValue) override diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 31f49eb29df7..e6af23a138a6 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -97,11 +97,10 @@ namespace pcr return new ::cppu::OPropertyArrayHelper(aProps); } - - VclPtr<Dialog> MasterDetailLinkDialog::createDialog(vcl::Window* _pParent) + svt::OGenericUnoDialog::Dialog MasterDetailLinkDialog::createDialog(vcl::Window* _pParent) { - return VclPtr<FormLinkDialog>::Create(_pParent,m_xDetail,m_xMaster, m_aContext - ,m_sExplanation,m_sDetailLabel,m_sMasterLabel); + return svt::OGenericUnoDialog::Dialog(VclPtr<FormLinkDialog>::Create(_pParent,m_xDetail,m_xMaster, m_aContext + ,m_sExplanation,m_sDetailLabel,m_sMasterLabel)); } void MasterDetailLinkDialog::implInitialize(const Any& _rValue) diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index e23fac7b4958..939f6287f64d 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -58,7 +58,7 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // 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; css::uno::Reference< css::beans::XPropertySet> m_xDetail; diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 53d3f7fcf432..a9cf32d93ab4 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -53,10 +53,10 @@ namespace pcr OControlFontDialog::~OControlFontDialog() { - if (m_pDialog) + if (m_aDialog) { ::osl::MutexGuard aGuard(m_aMutex); - if (m_pDialog) + if (m_aDialog) { destroyDialog(); ControlCharacterDialog::destroyItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults); @@ -138,8 +138,7 @@ namespace pcr return new ::cppu::OPropertyArrayHelper(aProps); } - - VclPtr<Dialog> OControlFontDialog::createDialog(vcl::Window* _pParent) + svt::OGenericUnoDialog::Dialog OControlFontDialog::createDialog(vcl::Window* _pParent) { ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults); @@ -150,15 +149,15 @@ namespace pcr // sets a new introspectee and re-executes us. In this case, the dialog returned here (upon the first // execute) will be re-used upon the second execute, and thus it won't be initialized correctly. - return VclPtr<ControlCharacterDialog>::Create(_pParent, *m_pFontItems); + return svt::OGenericUnoDialog::Dialog(VclPtr<ControlCharacterDialog>::Create(_pParent, *m_pFontItems)); } void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult) { - OSL_ENSURE(m_pDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!"); - if (m_pDialog && (RET_OK == _nExecutionResult) && m_xControlModel.is()) + OSL_ENSURE(m_aDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!"); + if (m_aDialog && (RET_OK == _nExecutionResult) && m_xControlModel.is()) { - const SfxItemSet* pOutput = static_cast<ControlCharacterDialog*>(m_pDialog.get())->GetOutputItemSet(); + const SfxItemSet* pOutput = static_cast<ControlCharacterDialog*>(m_aDialog.m_xVclDialog.get())->GetOutputItemSet(); if (pOutput) ControlCharacterDialog::translateItemsToProperties( *pOutput, m_xControlModel ); } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index 576614baa1cb..980441320064 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -79,8 +79,8 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: - // 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/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index c2b1d6f08396..2d6cd48e0bb2 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -58,18 +58,16 @@ namespace pcr &m_xTabbingModel, cppu::UnoType<decltype(m_xTabbingModel)>::get() ); } - OTabOrderDialog::~OTabOrderDialog() { - if ( m_pDialog ) + if (m_aDialog) { ::osl::MutexGuard aGuard( m_aMutex ); - if ( m_pDialog ) + if (m_aDialog) destroyDialog(); } } - Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); @@ -129,10 +127,9 @@ namespace pcr return new ::cppu::OPropertyArrayHelper( aProps ); } - - VclPtr<Dialog> OTabOrderDialog::createDialog( vcl::Window* _pParent ) + svt::OGenericUnoDialog::Dialog OTabOrderDialog::createDialog( vcl::Window* _pParent ) { - return VclPtr<TabOrderDialog>::Create( _pParent, m_xTabbingModel, m_xControlContext, m_aContext ); + return svt::OGenericUnoDialog::Dialog(VclPtr<TabOrderDialog>::Create( _pParent, m_xTabbingModel, m_xControlContext, m_aContext)); } void OTabOrderDialog::initialize( const Sequence< Any >& aArguments ) diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 1eb7375abba5..48d85f9be880 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -77,8 +77,8 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: - // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; + // OGenericUnoDialog overridables + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override; }; |