De-duplicate AbstractSfxDialog_Impl

Change-Id: Iddf2222aa75b21dd60472fa8dc979ddbdc18dcba

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;
 }
 

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.

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

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;

sw/source/ui/dialog/swdlgfact.cxx

@@ -107,7 +107,7 @@ using namespace ::com::sun::star;
 
 IMPL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractSfxDialog_Impl);
+IMPL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl);
 IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl);
@@ -178,17 +178,17 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const
 }
 
 //add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg  SwFldEditDlg begin
-const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const
+const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
 
-void AbstractSfxDialog_Impl::SetText( const XubString& rStr )
+void SwAbstractSfxDialog_Impl::SetText( const XubString& rStr )
 {
     pDlg->SetText( rStr );
 }
 
-String AbstractSfxDialog_Impl::GetText() const
+String SwAbstractSfxDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -667,7 +667,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParen
     }
 
     if ( pDlg )
-        return new AbstractSfxDialog_Impl( pDlg );
+        return new SwAbstractSfxDialog_Impl( pDlg );
     return 0;
 }
 
@@ -980,7 +980,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa
     }
 
     if ( pDlg )
-        return new AbstractSfxDialog_Impl( pDlg );
+        return new SwAbstractSfxDialog_Impl( pDlg );
     return 0;
 }
 
@@ -997,7 +997,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pPare
     }
 
     if ( pDlg )
-        return new AbstractSfxDialog_Impl( pDlg );
+        return new SwAbstractSfxDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1057,7 +1057,7 @@ SfxAbstractDialog*   SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView&
     }
 
     if ( pDlg )
-        return new AbstractSfxDialog_Impl( pDlg );
+        return new SwAbstractSfxDialog_Impl( pDlg );
     return 0;
 }
 

sw/source/ui/dialog/swdlgfact.hxx

@@ -95,9 +95,9 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
 
 // add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg  SwWrapDlg SwBorderDlg, SwFldEditDlg  begin
 class SfxSingleTabDialog;
-class AbstractSfxDialog_Impl :public SfxAbstractDialog
+class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
 {
-    DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
+    DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog)
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual void        SetText( const XubString& rStr );
     virtual String      GetText() const;