De-duplicate harder

Change-Id: Ie319c98cc6c7551f6e1e5ba41d8bc2090d23e671

sc/source/ui/attrdlg/scdlgfact.cxx

@@ -86,7 +86,7 @@
 // ause
 #include "editutil.hxx"
 
-IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
+IMPL_ABSTDLG_BASE(ScVclAbstractDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl);
@@ -123,34 +123,34 @@ IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
+IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl);
 
-// AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
+// ScAbstractTabDialog_Impl begin
+void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
 
-const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
+const SfxItemSet* ScAbstractTabDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
 
-const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* ScAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
 
-void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
+void ScAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
 {
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void AbstractTabDialog_Impl::SetText( const XubString& rStr )
+void ScAbstractTabDialog_Impl::SetText( const XubString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String AbstractTabDialog_Impl::GetText() const
+String ScAbstractTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -757,7 +757,7 @@ VclAbstractDialog *  ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
     }
 
     if ( pDlg )
-        return new VclAbstractDialog_Impl( pDlg );
+        return new ScVclAbstractDialog_Impl( pDlg );
     return 0;
 }
 
@@ -776,7 +776,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window
         break;
     }
     if( pDlg )
-        return new VclAbstractDialog_Impl( pDlg );
+        return new ScVclAbstractDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1456,13 +1456,13 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFra
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 
 }
 
 #undef SfxTabDialog
-#undef AbstractTabDialog_Impl
+#undef ScAbstractTabDialog_Impl
 
 
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame*       pFrame,
@@ -1483,7 +1483,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1506,7 +1506,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window*
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1527,7 +1527,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1547,7 +1547,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pP
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1567,7 +1567,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1587,7 +1587,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 
@@ -1606,11 +1606,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
     }
 
     if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
+        return new ScAbstractTabDialog_Impl( pDlg );
     return 0;
 }
 #undef SfxTabDialog
-#undef AbstractTabDialog_Impl
+#undef ScAbstractTabDialog_Impl
 
 
 //------------------ Factories for TabPages--------------------

sc/source/ui/attrdlg/scdlgfact.hxx

@@ -110,9 +110,9 @@ long Class::GetResult()                             \
     return pDlg->GetResult();                       \
 }
 
-class VclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg
+class ScVclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg
 {
-    DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog)
+    DECL_ABSTDLG_BASE(ScVclAbstractDialog_Impl,Dialog)
 };
 
 class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg  //add for ScImportAsciiDlg
@@ -392,9 +392,9 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
 };
 
 //add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
-class AbstractTabDialog_Impl : public SfxAbstractTabDialog
+class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
-    DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
+    DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog )
     virtual void                SetCurPageId( sal_uInt16 nId );
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );

sd/source/ui/dlg/sddlgfact.cxx

@@ -61,10 +61,10 @@
 #include "masterlayoutdlg.hxx"
 #include "headerfooterdlg.hxx"
 
-IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
+IMPL_ABSTDLG_BASE(SdVclAbstractDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractCopyDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
+IMPL_ABSTDLG_BASE(SdAbstractTabDialog_Impl);
 IMPL_ABSTDLG_BASE(SdPresLayoutTemplateDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractAssistentDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractSdModifyFieldDlg_Impl);
@@ -99,33 +99,33 @@ sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const
 }
 // AbstractSdCustomShowDlg_Impl end
 
-// AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
+// SdAbstractTabDialog_Impl begin
+void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
-const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
+const SfxItemSet* SdAbstractTabDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
-const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* SdAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
-void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
+void SdAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
 {
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void AbstractTabDialog_Impl::SetText( const XubString& rStr )
+void SdAbstractTabDialog_Impl::SetText( const XubString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String AbstractTabDialog_Impl::GetText() const
+String SdAbstractTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
-//add for AbstractTabDialog_Impl end
+//add for SdAbstractTabDialog_Impl end
 
 // --------------------------------------------------------------------
 
@@ -388,7 +388,7 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg(
                                             sal_uLong nSumActionCount,
                                             sal_uLong nObjCount ) //add for BreakDlg
 {
-    return new VclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) );
+    return new SdVclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) );
 }
 //add for BreakDlg end
 
@@ -412,13 +412,13 @@ AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( :
 // add for SdCharDlg begin
 SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell )
 {
-    return new AbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) );
+    return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) );
 }
 
 
 SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage )
 {
-    return new AbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) );
+    return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) );
 }
 // add for SdCharDlg end
 
@@ -479,7 +479,7 @@ SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDl
 
 SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( ::Window* pParent, const SfxItemSet* pAttr )
 {
-    return new AbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) );
+    return new SdAbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) );
 }
 // add for OutlineBulletDlg end
 
@@ -494,7 +494,7 @@ AbstractSdStartPresDlg *  SdAbstractDialogFactory_Impl::CreateSdStartPresentatio
 // add for SdRemoteDlg begin
 VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow )
 {
-     return new VclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) );
+     return new SdVclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) );
 }
 // add for SdRemoteDlg end
 
@@ -514,7 +514,7 @@ AbstractSdPresLayoutDlg *  SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(
 // add for SdTabTemplateDlg begin
 SfxAbstractTabDialog *  SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView )
 {
-    return new AbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) );
+    return new SdAbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) );
 }
 // add for SdTabTemplateDlg end
 
@@ -561,7 +561,7 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc()
 VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent,
     SdDrawDocument* pDoc, SdPage* pCurrentPage )
 {
-  return new VclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage ));
+  return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage ));
 }
 
 AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell,

sd/source/ui/dlg/sddlgfact.hxx

@@ -59,9 +59,9 @@ namespace sd {
 }
 // add for BreakDlg
 class Dialog;
-class VclAbstractDialog_Impl : public VclAbstractDialog
+class SdVclAbstractDialog_Impl : public VclAbstractDialog
 {
-    DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog)
+    DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog)
 };
 
 // add for CopyDlg
@@ -83,9 +83,9 @@ class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg
 
 //add for SdCharDlg begin
 class SfxTabDialog;
-class AbstractTabDialog_Impl : public SfxAbstractTabDialog
+class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
-    DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
+    DECL_ABSTDLG_BASE( SdAbstractTabDialog_Impl,SfxTabDialog )
     virtual void                SetCurPageId( sal_uInt16 nId );
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );