From 3f00118cc911ca1175031fed2b6b8931a421c04c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 9 Oct 2012 09:25:16 +0300 Subject: De-duplicate AbstractSfxDialog_Impl Change-Id: Iddf2222aa75b21dd60472fa8dc979ddbdc18dcba --- sd/source/ui/dlg/sddlgfact.cxx | 10 +++++----- sd/source/ui/dlg/sddlgfact.hxx | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index dbff1fca28d9..44c0c8165dc3 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -75,7 +75,7 @@ IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl); +IMPL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl); IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl); @@ -332,15 +332,15 @@ void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) // AbstractSdPresLayoutDlg_Impl end //SfxAbstractDialog_Impl begin -const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const +const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -void AbstractSfxDialog_Impl::SetText( const XubString& rStr ) +void SdAbstractSfxDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractSfxDialog_Impl::GetText() const +String SdAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -520,7 +520,7 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( :: SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { - return new AbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); + return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); } // add for SdVectorizeDlg begin diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 6970d7143808..e29d2d20c227 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -218,9 +218,9 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg }; // add for SdActionDlg -class AbstractSfxDialog_Impl : public SfxAbstractDialog +class SdAbstractSfxDialog_Impl : public SfxAbstractDialog { - DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog) + DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog) virtual const SfxItemSet* GetOutputItemSet() const; virtual void SetText( const XubString& rStr ); virtual String GetText() const; -- cgit