From 39d45c1f55fe71e15aa93a24323972225eaafd86 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Oct 2012 11:35:37 +0300 Subject: Deduplication of AbstractTabDialog_Impl and VclAbstractDialog_Impl Change-Id: Ifda222d842312d084496bc17d3ae6eaf83c13d25 --- cui/source/factory/dlgfact.cxx | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'cui/source/factory/dlgfact.cxx') diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 2c9bd96fff46..a97e658ce21d 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -101,9 +101,9 @@ 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(VclAbstractDialog_Impl) +IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl) IMPL_ABSTDLG_BASE(VclAbstractRefreshableDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); +IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxDistributeDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); @@ -191,31 +191,31 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg ) ////////////////////////////////////////////////////////////////////////// -void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) +void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); } -const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const +const SfxItemSet* CuiAbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } -const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) +const sal_uInt16* CuiAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } -void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) +void CuiAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } //From class Window. -void AbstractTabDialog_Impl::SetText( const XubString& rStr ) +void CuiAbstractTabDialog_Impl::SetText( const XubString& rStr ) { pDlg->SetText( rStr ); } -String AbstractTabDialog_Impl::GetText() const +String CuiAbstractTabDialog_Impl::GetText() const { return pDlg->GetText(); } @@ -1017,7 +1017,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1045,7 +1045,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); else return NULL; } @@ -1072,7 +1072,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1101,7 +1101,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1112,7 +1112,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p SdrModel* ) { SfxTabDialog* pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView ); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } // TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog @@ -1241,7 +1241,7 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window pDlg = new SvxScriptOrgDialog( pParent, rLanguage); if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1317,7 +1317,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1326,7 +1326,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial const sal_uInt16* pWhRanges ) { Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges); - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); } AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent, @@ -1346,7 +1346,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( sal_Bool bEnableSelector) { SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent, @@ -1386,7 +1386,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W } if ( pDlg ) - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); return 0; } @@ -1439,7 +1439,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo } if ( pDlg ) - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); return 0; } @@ -1602,7 +1602,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window sal_Bool bHasObj) { SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj ); - return new AbstractTabDialog_Impl( pDlg ); + return new CuiAbstractTabDialog_Impl( pDlg ); } SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, @@ -1889,7 +1889,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p { pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); - return new VclAbstractDialog_Impl( pDlg ); + return new CuiVclAbstractDialog_Impl( pDlg ); } return 0; } @@ -1911,7 +1911,7 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* p SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) { - return new AbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); + return new CuiAbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); } SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) @@ -1927,7 +1927,7 @@ SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& /*rApplicationContext*/ ) { - return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); + return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) -- cgit v1.2.3