diff options
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 40 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 16 |
2 files changed, 3 insertions, 53 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 067e91c7657b..ff95f66b2574 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -278,42 +278,6 @@ short AbstractSignSignatureLineDialog_Impl::Execute() IMPL_ABSTDLG_BASE(AbstractScreenshotAnnotationDlg_Impl); -// VclAbstractDialog2_Impl - - -// virtual -VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl() -{ - disposeOnce(); -} - -void VclAbstractDialog2_Impl::dispose() -{ - m_pDlg.disposeAndClear(); - VclAbstractDialog2::dispose(); -} - -// virtual -void VclAbstractDialog2_Impl::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) -{ - m_aEndDlgHdl = rEndDialogHdl; - m_pDlg->StartExecuteAsync([=](sal_Int32 nResult){ - EndDialogHdl(nResult); - }); -} - -// virtual -sal_Int32 VclAbstractDialog2_Impl::GetResult() -{ - return m_pDlg->GetResult(); -} - -void VclAbstractDialog2_Impl::EndDialogHdl(sal_Int32 /*nResult*/) -{ - m_aEndDlgHdl.Call( *m_pDlg ); - m_aEndDlgHdl = Link<Dialog&,void>(); -} - void CuiAbstractTabDialog_Impl::SetCurPageId( const OString& rName ) { pDlg->SetCurPageId( rName ); @@ -1154,12 +1118,12 @@ VclPtr<AbstractGalleryIdDialog> AbstractDialogFactory_Impl::CreateGalleryIdDialo return VclPtr<AbstractGalleryIdDialog_Impl>::Create(o3tl::make_unique<GalleryIdDialog>(pParent, pThm)); } -VclPtr<VclAbstractDialog2> AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(vcl::Window* pParent, +VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) { VclPtrInstance<GalleryThemeProperties> pDlg(pParent, pData, pItemSet); - return VclPtr<VclAbstractDialog2_Impl>::Create( pDlg ); + return VclPtr<CuiVclAbstractDialog_Impl>::Create( pDlg ); } VclPtr<AbstractURLDlg> AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index d780da073e28..a662aa09ee07 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -80,20 +80,6 @@ bool Class::StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) \ return pDlg->StartExecuteAsync(rCtx); \ } -class VclAbstractDialog2_Impl : public VclAbstractDialog2 -{ - ScopedVclPtr<Dialog> m_pDlg; - Link<Dialog&,void> m_aEndDlgHdl; -public: - explicit VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} - virtual ~VclAbstractDialog2_Impl() override; - virtual void dispose() override; - virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; - virtual sal_Int32 GetResult() override; -private: - void EndDialogHdl(sal_Int32 nResult); -}; - class CuiVclAbstractDialog_Impl : public VclAbstractDialog { DECL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl,Dialog) @@ -756,7 +742,7 @@ public: virtual VclPtr<AbstractTitleDialog> CreateTitleDialog(weld::Window* pParent, const OUString& rOldText) override; virtual VclPtr<AbstractGalleryIdDialog> CreateGalleryIdDialog(weld::Window* pParent, GalleryTheme* pThm) override; - virtual VclPtr<VclAbstractDialog2> CreateGalleryThemePropertiesDialog(vcl::Window* pParent, + virtual VclPtr<VclAbstractDialog> CreateGalleryThemePropertiesDialog(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) override; virtual VclPtr<AbstractURLDlg> CreateURLDialog( vcl::Window* pParent, |