cui/source/factory/dlgfact.cxx | 12 +----------- cui/source/factory/dlgfact.hxx | 7 +------ 2 files changed, 2 insertions(+), 17 deletions(-)
New commits: commit 80b3c85269a593b0b10355e770dc91ab3d419696 Author: Noel Grandin <n...@peralex.com> Date: Wed May 6 11:44:15 2015 +0200 simplify code using ScopedVclPtr Change-Id: I71db7422ab8ad83455cc61df5314cf214a4d388c diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index c6079c3..4ec04be 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -104,17 +104,7 @@ IMPL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl) IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl) - -AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() -{ - pDlg.disposeAndClear(); -} - -short AbstractSvxZoomDialog_Impl::Execute() -{ - return pDlg->Execute(); -} - +IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl) IMPL_ABSTDLG_BASE(AbstractSearchProgress_Impl); IMPL_ABSTDLG_BASE(AbstractTakeProgress_Impl); IMPL_ABSTDLG_BASE(AbstractTitleDialog_Impl); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 4a4dbcd..b194d19 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -62,19 +62,14 @@ class HangulHanjaConversionDialog; using namespace svx; #define DECL_ABSTDLG_BASE(Class,DialogClass) \ - VclPtr<DialogClass> pDlg; \ + ScopedVclPtr<DialogClass> pDlg; \ public: \ Class( DialogClass* p) \ : pDlg(p) \ {} \ - virtual ~Class(); \ virtual short Execute() SAL_OVERRIDE ; #define IMPL_ABSTDLG_BASE(Class) \ -Class::~Class() \ -{ \ - pDlg.disposeAndClear(); \ -} \ short Class::Execute() \ { \ return pDlg->Execute(); \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits