summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-06 11:44:15 +0200
committerNoel Grandin <noel@peralex.com>2015-05-06 11:44:15 +0200
commit80b3c85269a593b0b10355e770dc91ab3d419696 (patch)
tree776e594a39324e2ae7e940b9a2f195f699bf7ec1 /cui
parent0a825b9aae390dc426261e873ffbacc867814e53 (diff)
simplify code using ScopedVclPtr
Change-Id: I71db7422ab8ad83455cc61df5314cf214a4d388c
Diffstat (limited to 'cui')
-rw-r--r--cui/source/factory/dlgfact.cxx12
-rw-r--r--cui/source/factory/dlgfact.hxx7
2 files changed, 2 insertions, 17 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index c6079c396994..4ec04bef1cbd 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 4a4dbcd1cc10..b194d199b431 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(); \