rename to original names

Change-Id: I1f4f57b77982a71f9be7cb5cd61116c9aa77189e
Reviewed-on: https://gerrit.libreoffice.org/60713
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/source/dialogs/cuigrfflt.cxx

@@ -125,29 +125,29 @@ void CuiGraphicPreviewWindow::Resize()
     ScaleImageToFit();
 }
 
-GraphicFilterDialogController::GraphicFilterDialogController(weld::Window* pParent,
+GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent,
     const OUString& rUIXMLDescription, const OString& rID,
     const Graphic& rGraphic)
     : GenericDialogController(pParent, rUIXMLDescription, rID)
-    , maModifyHdl(LINK(this, GraphicFilterDialogController, ImplModifyHdl))
+    , maModifyHdl(LINK(this, GraphicFilterDialog, ImplModifyHdl))
     , mxPreview(new weld::CustomWeld(*m_xBuilder, "preview", maPreview))
 {
     bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap;
 
-    maTimer.SetInvokeHandler(LINK(this, GraphicFilterDialogController, ImplPreviewTimeoutHdl));
+    maTimer.SetInvokeHandler(LINK(this, GraphicFilterDialog, ImplPreviewTimeoutHdl));
     maTimer.SetTimeout(5);
 
     maPreview.init(&rGraphic, maModifyHdl);
 }
 
-IMPL_LINK_NOARG(GraphicFilterDialogController, ImplPreviewTimeoutHdl, Timer *, void)
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
 {
     maTimer.Stop();
     maPreview.SetPreview(GetFilteredGraphic(maPreview.GetScaledOriginal(),
         maPreview.GetScaleX(), maPreview.GetScaleY()));
 }
 
-IMPL_LINK_NOARG(GraphicFilterDialogController, ImplModifyHdl, LinkParamNone*, void)
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
 {
     if (bIsBitmap)
     {
@@ -158,7 +158,7 @@ IMPL_LINK_NOARG(GraphicFilterDialogController, ImplModifyHdl, LinkParamNone*, vo
 
 GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& rGraphic,
                                          sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges)
-    : GraphicFilterDialogController(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", rGraphic)
+    : GraphicFilterDialog(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", rGraphic)
     , mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PIXEL))
     , mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PIXEL))
     , mxCbxEdges(m_xBuilder->weld_check_button("edges"))
@@ -225,7 +225,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
 }
 
 GraphicFilterSmooth::GraphicFilterSmooth(weld::Window* pParent, const Graphic& rGraphic, double nRadius)
-    : GraphicFilterDialogController(pParent, "cui/ui/smoothdialog.ui", "SmoothDialog", rGraphic)
+    : GraphicFilterDialog(pParent, "cui/ui/smoothdialog.ui", "SmoothDialog", rGraphic)
     , mxMtrRadius(m_xBuilder->weld_spin_button("radius"))
 {
     mxMtrRadius->set_value(nRadius * 10);
@@ -267,7 +267,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
 
 GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const Graphic& rGraphic,
                                              sal_uInt8 cGreyThreshold, bool bInvert)
-    : GraphicFilterDialogController(pParent, "cui/ui/solarizedialog.ui", "SolarizeDialog", rGraphic)
+    : GraphicFilterDialog(pParent, "cui/ui/solarizedialog.ui", "SolarizeDialog", rGraphic)
     , mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT))
     , mxCbxInvert(m_xBuilder->weld_check_button("invert"))
 {
@@ -323,7 +323,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, doub
 
 GraphicFilterSepia::GraphicFilterSepia(weld::Window* pParent, const Graphic& rGraphic,
                                        sal_uInt16 nSepiaPercent)
-    : GraphicFilterDialogController(pParent, "cui/ui/agingdialog.ui", "AgingDialog", rGraphic)
+    : GraphicFilterDialog(pParent, "cui/ui/agingdialog.ui", "AgingDialog", rGraphic)
     , mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT))
 {
     mxMtrSepia->set_value(nSepiaPercent, FUNIT_PERCENT);
@@ -360,7 +360,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double,
 
 GraphicFilterPoster::GraphicFilterPoster(weld::Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nPosterCount)
-    : GraphicFilterDialogController(pParent, "cui/ui/posterdialog.ui", "PosterDialog", rGraphic)
+    : GraphicFilterDialog(pParent, "cui/ui/posterdialog.ui", "PosterDialog", rGraphic)
     , mxNumPoster(m_xBuilder->weld_spin_button("value"))
 {
     mxNumPoster->set_range(2, rGraphic.GetBitmapEx().GetBitCount());
@@ -416,7 +416,7 @@ void EmbossControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 
 GraphicFilterEmboss::GraphicFilterEmboss(weld::Window* pParent,
     const Graphic& rGraphic, RectPoint eLightSource)
-    : GraphicFilterDialogController(pParent, "cui/ui/embossdialog.ui", "EmbossDialog", rGraphic)
+    : GraphicFilterDialog(pParent, "cui/ui/embossdialog.ui", "EmbossDialog", rGraphic)
     , mxCtlLight(new weld::CustomWeld(*m_xBuilder, "lightsource", maCtlLight))
 {
     maCtlLight.SetActualRP(eLightSource);

cui/source/factory/dlgfact.cxx

@@ -189,7 +189,7 @@ short AbstractSvxPathSelectDialog_Impl::Execute()
 IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl);
 
-short AbstractGraphicFilterDialogController_Impl::Execute()
+short AbstractGraphicFilterDialog_Impl::Execute()
 {
     return m_xDlg->run();
 }
@@ -813,7 +813,7 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const OUString& strField)
     pDlg->SetActiveField(strField);
 }
 
-Graphic AbstractGraphicFilterDialogController_Impl::GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY)
+Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY)
 {
     return m_xDlg->GetFilteredGraphic(rGraphic, fScaleX, fScaleY);
 }
@@ -1276,37 +1276,37 @@ VclPtr<AbstractFmSearchDialog> AbstractDialogFactory_Impl::CreateFmSearchDialog(
 VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterEmboss(weld::Window* pParent,
                                             const Graphic& rGraphic)
 {
-    return VclPtr<AbstractGraphicFilterDialogController_Impl>::Create(o3tl::make_unique<GraphicFilterEmboss>(pParent, rGraphic, RectPoint::MM));
+    return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterEmboss>(pParent, rGraphic, RectPoint::MM));
 }
 
 VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterPoster(weld::Window* pParent,
                                             const Graphic& rGraphic)
 {
-    return VclPtr<AbstractGraphicFilterDialogController_Impl>::Create(o3tl::make_unique<GraphicFilterPoster>(pParent, rGraphic, 16));
+    return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterPoster>(pParent, rGraphic, 16));
 }
 
 VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterSepia(weld::Window* pParent,
                                             const Graphic& rGraphic)
 {
-    return VclPtr<AbstractGraphicFilterDialogController_Impl>::Create(o3tl::make_unique<GraphicFilterSepia>(pParent, rGraphic, 10));
+    return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterSepia>(pParent, rGraphic, 10));
 }
 
 VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(weld::Window* pParent,
                                             const Graphic& rGraphic, double nRadius)
 {
-    return VclPtr<AbstractGraphicFilterDialogController_Impl>::Create(o3tl::make_unique<GraphicFilterSmooth>(pParent, rGraphic, nRadius));
+    return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterSmooth>(pParent, rGraphic, nRadius));
 }
 
 VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterSolarize(weld::Window* pParent,
                                             const Graphic& rGraphic)
 {
-    return VclPtr<AbstractGraphicFilterDialogController_Impl>::Create(o3tl::make_unique<GraphicFilterSolarize>(pParent, rGraphic, 128, false /*bInvert*/));
+    return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterSolarize>(pParent, rGraphic, 128, false /*bInvert*/));
 }
 
 VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterMosaic(weld::Window* pParent,
                                             const Graphic& rGraphic)
 {
-    return VclPtr<AbstractGraphicFilterDialogController_Impl>::Create(o3tl::make_unique<GraphicFilterMosaic>(pParent, rGraphic, 4, 4, false /*bEnhanceEdges*/));
+    return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterMosaic>(pParent, rGraphic, 4, 4, false /*bEnhanceEdges*/));
 }
 
 VclPtr<AbstractSvxAreaTabDialog> AbstractDialogFactory_Impl::CreateSvxAreaTabDialog(weld::Window* pParent,

cui/source/factory/dlgfact.hxx

@@ -46,7 +46,6 @@ class SvxHpLinkDlg;
 class FmSearchDialog;
 class Graphic;
 class GraphicFilterDialog;
-class GraphicFilterDialogController;
 class SvxAreaTabDialog;
 class InsertObjectDialog_Impl;
 class SvPasteObjectDialog;
@@ -470,12 +469,12 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
     virtual void SetActiveField(const OUString& strField) override;
 };
 
-class AbstractGraphicFilterDialogController_Impl : public AbstractGraphicFilterDialog
+class AbstractGraphicFilterDialog_Impl : public AbstractGraphicFilterDialog
 {
 protected:
-    std::unique_ptr<GraphicFilterDialogController> m_xDlg;
+    std::unique_ptr<GraphicFilterDialog> m_xDlg;
 public:
-    explicit AbstractGraphicFilterDialogController_Impl(std::unique_ptr<GraphicFilterDialogController> p)
+    explicit AbstractGraphicFilterDialog_Impl(std::unique_ptr<GraphicFilterDialog> p)
         : m_xDlg(std::move(p))
     {
     }

cui/source/inc/cuigrfflt.hxx

@@ -68,7 +68,7 @@ public:
     const Size&     GetGraphicSizePixel() const { return maOrigGraphicSizePixel; }
 };
 
-class GraphicFilterDialogController : public weld::GenericDialogController
+class GraphicFilterDialog : public weld::GenericDialogController
 {
 private:
 
@@ -88,11 +88,11 @@ protected:
 
 public:
 
-    GraphicFilterDialogController(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic);
+    GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic);
     virtual Graphic GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY) = 0;
 };
 
-class GraphicFilterSmooth : public GraphicFilterDialogController
+class GraphicFilterSmooth : public GraphicFilterDialog
 {
 private:
     std::unique_ptr<weld::SpinButton> mxMtrRadius;
@@ -104,7 +104,7 @@ public:
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override;
 };
 
-class GraphicFilterMosaic : public GraphicFilterDialogController
+class GraphicFilterMosaic : public GraphicFilterDialog
 {
 private:
     std::unique_ptr<weld::MetricSpinButton> mxMtrWidth;
@@ -121,7 +121,7 @@ public:
     bool            IsEnhanceEdges() const { return mxCbxEdges->get_active(); }
 };
 
-class GraphicFilterSolarize : public GraphicFilterDialogController
+class GraphicFilterSolarize : public GraphicFilterDialog
 {
 private:
     std::unique_ptr<weld::MetricSpinButton> mxMtrThreshold;
@@ -136,7 +136,7 @@ public:
     bool            IsInvert() const { return mxCbxInvert->get_active(); }
 };
 
-class GraphicFilterSepia : public GraphicFilterDialogController
+class GraphicFilterSepia : public GraphicFilterDialog
 {
 private:
     std::unique_ptr<weld::MetricSpinButton> mxMtrSepia;
@@ -147,7 +147,7 @@ public:
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override;
 };
 
-class GraphicFilterPoster : public GraphicFilterDialogController
+class GraphicFilterPoster : public GraphicFilterDialog
 {
 private:
     std::unique_ptr<weld::SpinButton> mxNumPoster;
@@ -173,7 +173,7 @@ public:
     void            SetModifyHdl( const Link<LinkParamNone*,void>& rHdl ) { maModifyHdl = rHdl; }
 };
 
-class GraphicFilterEmboss : public GraphicFilterDialogController
+class GraphicFilterEmboss : public GraphicFilterDialog
 {
 private:
     EmbossControl  maCtlLight;