diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-21 10:33:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-21 15:48:12 +0100 |
| commit | 12efe34abb984ac37abae59ccac83a4f86a27e77 (patch) | |
| tree | d0b72087fe2911e9ce73a31b955582186f2ca7d8 /dbaccess/source/ext | |
| parent | 718c82d1de44d2d7c16e4299b61171b72186f50b (diff) | |
support both vcl and weld in genericunodialog for interim
Change-Id: Ife85dd7a4bd27260514b390ca3928152db0d688f
Reviewed-on: https://gerrit.libreoffice.org/51699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ext')
| -rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationwizard.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index fccd12968016..a445b2bff175 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -32,10 +32,10 @@ namespace dbmm { // we do this here cause the base class' call to destroyDialog won't reach us anymore: we're within an dtor, // so this virtual-method-call the base class does not work, we're already dead then... - if ( m_pDialog ) + if (m_aDialog) { ::osl::MutexGuard aGuard( m_aMutex ); - if ( m_pDialog ) + if (m_aDialog) destroyDialog(); } } @@ -45,9 +45,9 @@ namespace dbmm return *(new MacroMigrationDialogService( _rxContext ) ); } - VclPtr<Dialog> MacroMigrationDialogService::createDialog( vcl::Window* _pParent ) + svt::OGenericUnoDialog::Dialog MacroMigrationDialogService::createDialog(vcl::Window* _pParent) { - return VclPtr<MacroMigrationDialog>::Create( _pParent, m_aContext, m_xDocument ); + return svt::OGenericUnoDialog::Dialog(VclPtr<MacroMigrationDialog>::Create(_pParent, m_aContext, m_xDocument)); } Sequence< sal_Int8 > SAL_CALL MacroMigrationDialogService::getImplementationId() diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx index 886239cde4de..85adc818e048 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -87,7 +87,7 @@ namespace dbmm virtual ~MacroMigrationDialogService() override; protected: - virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override; private: Reference< XOfficeDatabaseDocument > m_xDocument; |