GraphicFilterDialog->oldGraphicFilterDialog

Change-Id: I13eb7c462538520c119391ad54fac2c0e0d052e9

4 files changed, 32 insertions, 33 deletions

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4009454b3e8d..d7ac4bafb91f 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -30,17 +30,17 @@
 #include <svx/dialogs.hrc>
 
 // --------------------------------------
-// - GraphicFilterDialog::PreviewWindow -
+// - oldGraphicFilterDialog::PreviewWindow -
 // --------------------------------------
 
-GraphicFilterDialog::PreviewWindow::PreviewWindow( Window* pParent, const ResId& rResId ) :
+oldGraphicFilterDialog::PreviewWindow::PreviewWindow( Window* pParent, const ResId& rResId ) :
     Control( pParent, rResId )
 {
 }
 
 // -----------------------------------------------------------------------------
 
-void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect )
+void oldGraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect )
 {
     Control::Paint( rRect );
 
@@ -64,7 +64,7 @@ void GraphicFilterDialog::PreviewWindow::Paint( const Rectangle& rRect )
 
 // -----------------------------------------------------------------------------
 
-void GraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic )
+void oldGraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic )
 {
     maGraphic = rGraphic;
 
@@ -75,12 +75,12 @@ void GraphicFilterDialog::PreviewWindow::SetGraphic( const Graphic& rGraphic )
 }
 
 // -----------------------
-// - GraphicFilterDialog -
+// - oldGraphicFilterDialog -
 // -----------------------
 
-GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ) :
+oldGraphicFilterDialog::oldGraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic ) :
     ModalDialog     ( pParent, rResId ),
-    maModifyHdl     ( LINK( this, GraphicFilterDialog, ImplModifyHdl ) ),
+    maModifyHdl     ( LINK( this, oldGraphicFilterDialog, ImplModifyHdl ) ),
     mfScaleX        ( 0.0 ),
     mfScaleY        ( 0.0 ),
     maSizePixel     ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
@@ -123,14 +123,14 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId,
         }
     }
 
-    maTimer.SetTimeoutHdl( LINK( this, GraphicFilterDialog, ImplPreviewTimeoutHdl ) );
+    maTimer.SetTimeoutHdl( LINK( this, oldGraphicFilterDialog, ImplPreviewTimeoutHdl ) );
     maTimer.SetTimeout( 100 );
     ImplModifyHdl( NULL );
 }
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
+IMPL_LINK_NOARG(oldGraphicFilterDialog, ImplPreviewTimeoutHdl)
 {
     maTimer.Stop();
     maPreview.SetGraphic( GetFilteredGraphic( maGraphic, mfScaleX, mfScaleY ) );
@@ -140,7 +140,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
 
 // -----------------------------------------------------------------------------
 
-IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
+IMPL_LINK_NOARG(oldGraphicFilterDialog, ImplModifyHdl)
 {
     if( maGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -157,7 +157,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
 
 GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) :
-    GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
+    oldGraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
     maFtWidth   ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
     maMtrWidth  ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
     maFtHeight  ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
@@ -235,7 +235,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
 // ------------------
 
 GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SMOOTH ), rGraphic ),
+    oldGraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SMOOTH ), rGraphic ),
     maFtRadius   ( this, CUI_RES( DLG_FILTERSMOOTH_FT_RADIUS ) ),
     maMtrRadius  ( this, CUI_RES( DLG_FILTERSMOOTH_MTR_RADIUS ) )
 {
@@ -287,7 +287,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
 
 GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
                                               sal_uInt8 cGreyThreshold, sal_Bool bInvert ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
+    oldGraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
     maFtThreshold   ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
     maMtrThreshold  ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
     maCbxInvert     ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
@@ -349,7 +349,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
                                         sal_uInt16 nSepiaPercent ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
+    oldGraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
     maFtSepia       ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
     maMtrSepia      ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
 {
@@ -397,7 +397,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
 
 GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nPosterCount ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
+    oldGraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
     maFtPoster      ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
     maNumPoster     ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
 {
@@ -459,7 +459,7 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt
 
 GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
                                           RECT_POINT eLightSource ) :
-    GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
+    oldGraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
     maFtLight       ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
     maCtlLight      ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
 {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ea8c22d2ab0f..730d819bfff7 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1502,7 +1502,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb
                                             RECT_POINT eLightSource,
                                             sal_uInt32)
 {
-    GraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
+    oldGraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
     return new AbstractGraphicFilterDialog_Impl( pDlg );
 }
 
@@ -1511,7 +1511,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
                                             sal_uInt16 nCount,
                                             sal_uInt32 nResId)
 {
-    GraphicFilterDialog* pDlg=NULL;
+    oldGraphicFilterDialog* pDlg=NULL;
     switch ( nResId )
     {
         case RID_SVX_GRFFILTER_DLG_POSTER :
@@ -1533,14 +1533,14 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth ( Window* pParent,
                                             const Graphic& rGraphic, double nRadius, sal_uInt32)
 {
-    GraphicFilterDialog* pDlg = new GraphicFilterSmooth( pParent, rGraphic, nRadius );
+    oldGraphicFilterDialog* pDlg = new GraphicFilterSmooth( pParent, rGraphic, nRadius );
     return new AbstractGraphicFilterDialog_Impl( pDlg );
 }
 
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent,
                                             const Graphic& rGraphic, sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 )
 {
-    GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
+    oldGraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
     return new AbstractGraphicFilterDialog_Impl( pDlg );
 }
 
@@ -1548,7 +1548,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos
                                             const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
                                             sal_Bool bEnhanceEdges, sal_uInt32 nResId)
 {
-    GraphicFilterDialog* pDlg=NULL;
+    oldGraphicFilterDialog* pDlg=NULL;
     switch ( nResId )
     {
         case RID_SVX_GRFFILTER_DLG_MOSAIC :
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 0d171618bb93..909c8fd7ac32 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -46,7 +46,7 @@ class SvxMultiFileDialog;
 class SvxHpLinkDlg;
 class FmSearchDialog;
 class Graphic;
-class GraphicFilterDialog;
+class oldGraphicFilterDialog;
 class SvxAreaTabDialog;
 class InsertObjectDialog_Impl;
 class SvPasteObjectDialog;
@@ -436,10 +436,9 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
     virtual void SetActiveField(const OUString& strField);
 };
 
-class GraphicFilterDialog;
 class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog
 {
-    DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog)
+    DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,oldGraphicFilterDialog)
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
 };
 
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 29f35463e17c..b4fcfac12fa1 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -33,10 +33,10 @@
 #include <svx/rectenum.hxx>
 
 // -----------------------
-// - GraphicFilterDialog -
+// - oldGraphicFilterDialog -
 // -----------------------
 
-class GraphicFilterDialog : public ModalDialog
+class oldGraphicFilterDialog : public ModalDialog
 {
 private:
 
@@ -79,7 +79,7 @@ protected:
 
 public:
 
-    GraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic );
+    oldGraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic );
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
 };
@@ -88,7 +88,7 @@ public:
 // - GraphicFilterSmooth -
 // -------------------------
 
-class GraphicFilterSmooth : public GraphicFilterDialog
+class GraphicFilterSmooth : public oldGraphicFilterDialog
 {
 private:
 
@@ -108,7 +108,7 @@ public:
 // - GraphicFilterMosaic -
 // -----------------------
 
-class GraphicFilterMosaic : public GraphicFilterDialog
+class GraphicFilterMosaic : public oldGraphicFilterDialog
 {
 private:
 
@@ -134,7 +134,7 @@ public:
 // - GraphicFilterSolarize -
 // -------------------------
 
-class GraphicFilterSolarize : public GraphicFilterDialog
+class GraphicFilterSolarize : public oldGraphicFilterDialog
 {
 private:
 
@@ -157,7 +157,7 @@ public:
 // - GraphicFilterSepia -
 // ----------------------
 
-class GraphicFilterSepia : public GraphicFilterDialog
+class GraphicFilterSepia : public oldGraphicFilterDialog
 {
 private:
 
@@ -179,7 +179,7 @@ public:
 // - GraphicFilterPoster -
 // -----------------------
 
-class GraphicFilterPoster : public GraphicFilterDialog
+class GraphicFilterPoster : public oldGraphicFilterDialog
 {
 private:
 
@@ -200,7 +200,7 @@ public:
 // - GraphicFilterEmboss -
 // -----------------------
 
-class GraphicFilterEmboss : public GraphicFilterDialog
+class GraphicFilterEmboss : public oldGraphicFilterDialog
 {
 private: