summaryrefslogtreecommitdiff
path: root/cui/source/factory
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-10-09 09:25:16 +0300
committerTor Lillqvist <tml@iki.fi>2012-10-09 11:41:31 +0300
commit3f00118cc911ca1175031fed2b6b8931a421c04c (patch)
tree5b4d0350dfe78e2de2ec404523fd9ecda73dd71f /cui/source/factory
parent3c4c11700899a1ee70d16444d960bd220d8e0b48 (diff)
De-duplicate AbstractSfxDialog_Impl
Change-Id: Iddf2222aa75b21dd60472fa8dc979ddbdc18dcba
Diffstat (limited to 'cui/source/factory')
-rw-r--r--cui/source/factory/dlgfact.cxx14
-rw-r--r--cui/source/factory/dlgfact.hxx4
2 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index a97e658ce21d..3c019294e1bf 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -100,7 +100,7 @@ using ::com::sun::star::uno::Reference;
using namespace svx;
// AbstractTabDialog implementations just forwards everything to the dialog
-IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl)
+IMPL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl)
IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl)
IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl);
IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl);
@@ -221,17 +221,17 @@ String CuiAbstractTabDialog_Impl::GetText() const
}
-const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const
+const SfxItemSet* CuiAbstractSfxDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-void AbstractSfxDialog_Impl::SetText( const XubString& rStr )
+void CuiAbstractSfxDialog_Impl::SetText( const XubString& rStr )
{
pDlg->SetText( rStr );
}
-String AbstractSfxDialog_Impl::GetText() const
+String CuiAbstractSfxDialog_Impl::GetText() const
{
return pDlg->GetText();
}
@@ -1299,7 +1299,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32,
const SfxItemSet* pAttrSet )
{
SfxModalDialog* pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet );
- return new AbstractSfxDialog_Impl( pDlg );
+ return new CuiAbstractSfxDialog_Impl( pDlg );
}
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* pParent,
@@ -1628,7 +1628,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
}
if ( pDlg )
- return new AbstractSfxDialog_Impl( pDlg );
+ return new CuiAbstractSfxDialog_Impl( pDlg );
return 0;
}
@@ -1655,7 +1655,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
}
if ( pDlg )
- return new AbstractSfxDialog_Impl( pDlg );
+ return new CuiAbstractSfxDialog_Impl( pDlg );
return 0;
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index d90e809161f5..d85f92339fbc 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -109,9 +109,9 @@ class VclAbstractRefreshableDialog_Impl : public VclAbstractRefreshableDialog
};
//for ActualizeProgress end
-class AbstractSfxDialog_Impl : public SfxAbstractDialog
+class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
{
- DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
+ DECL_ABSTDLG_BASE(CuiAbstractSfxDialog_Impl,SfxModalDialog)
virtual const SfxItemSet* GetOutputItemSet() const;
//From class Window.