diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-22 16:37:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-23 17:34:33 +0200 |
| commit | 3ca952ddb3ad78fca5d2ca14a3c7cb8417dec4c1 (patch) | |
| tree | cddd59c9acc95d53555a5d4bdeb5dddfa7b8dd70 | |
| parent | 220b7bd84934389f4f71c3f59daa94ff138fe33d (diff) | |
rename SvxGraphCtrlView back to GraphCtrlView
Change-Id: I658773f4fc0409a73de56301f5457fa1fb9e4a28
Reviewed-on: https://gerrit.libreoffice.org/72805
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/svx/graphctl.hxx | 8 | ||||
| -rw-r--r-- | svx/source/dialog/graphctl.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 4b9a30671ac1..41d02cc0482f 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -46,7 +46,7 @@ class SvxGraphCtrlAccessibleContext; class SVX_DLLPUBLIC SvxGraphCtrl : public weld::CustomWidgetController { - friend class SvxGraphCtrlView; + friend class GraphCtrlView; friend class GraphCtrlUserCall; Graphic aGraphic; @@ -129,7 +129,7 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; -class SvxGraphCtrlView : public SdrView +class GraphCtrlView : public SdrView { SvxGraphCtrl& rGraphCtrl; @@ -142,13 +142,13 @@ protected: } public: - SvxGraphCtrlView(SdrModel& rSdrModel, SvxGraphCtrl* pWindow) + GraphCtrlView(SdrModel& rSdrModel, SvxGraphCtrl* pWindow) : SdrView(rSdrModel, &pWindow->GetDrawingArea()->get_ref_device()) , rGraphCtrl(*pWindow) { } - virtual ~SvxGraphCtrlView() override; + virtual ~GraphCtrlView() override; // override these so we can get the occasions SdrPaintView would call Window::Invalidate on its vcl::Window // if it had one, and route to WidgetController::Invalidate instead diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 60a2a306128a..606ad5fa478c 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -136,7 +136,7 @@ void SvxGraphCtrl::InitSdrModel() pModel->SetChanged( false ); // Creating a View - pView.reset(new SvxGraphCtrlView(*pModel, this)); + pView.reset(new GraphCtrlView(*pModel, this)); pView->SetWorkArea( tools::Rectangle( Point(), aGraphSize ) ); pView->EnableExtendedMouseEventDispatcher( true ); pView->ShowSdrPage(pView->GetModel()->GetPage(0)); @@ -780,7 +780,7 @@ namespace }; } -rtl::Reference<sdr::overlay::OverlayManager> SvxGraphCtrlView::CreateOverlayManager(OutputDevice& rDevice) const +rtl::Reference<sdr::overlay::OverlayManager> GraphCtrlView::CreateOverlayManager(OutputDevice& rDevice) const { assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device()); if (rDevice.GetOutDevType() == OUTDEV_VIRDEV) @@ -792,7 +792,7 @@ rtl::Reference<sdr::overlay::OverlayManager> SvxGraphCtrlView::CreateOverlayMana return SdrView::CreateOverlayManager(rDevice); } -void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice) +void GraphCtrlView::InvalidateOneWin(OutputDevice& rDevice) { assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device()); if (rDevice.GetOutDevType() == OUTDEV_VIRDEV) @@ -803,7 +803,7 @@ void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice) SdrView::InvalidateOneWin(rDevice); } -void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rectangle& rArea) +void GraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rectangle& rArea) { assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device()); if (rDevice.GetOutDevType() == OUTDEV_VIRDEV) @@ -814,7 +814,7 @@ void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rect SdrView::InvalidateOneWin(rDevice, rArea); } -SvxGraphCtrlView::~SvxGraphCtrlView() +GraphCtrlView::~GraphCtrlView() { // turn SetOutputToWindow back off again before // turning back into our baseclass during dtoring |