Kaydet (Commit) 3ca952dd authored tarafından Caolán McNamara's avatar Caolán McNamara

rename SvxGraphCtrlView back to GraphCtrlView

Change-Id: I658773f4fc0409a73de56301f5457fa1fb9e4a28
Reviewed-on: https://gerrit.libreoffice.org/72805
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 220b7bd8
...@@ -46,7 +46,7 @@ class SvxGraphCtrlAccessibleContext; ...@@ -46,7 +46,7 @@ class SvxGraphCtrlAccessibleContext;
class SVX_DLLPUBLIC SvxGraphCtrl : public weld::CustomWidgetController class SVX_DLLPUBLIC SvxGraphCtrl : public weld::CustomWidgetController
{ {
friend class SvxGraphCtrlView; friend class GraphCtrlView;
friend class GraphCtrlUserCall; friend class GraphCtrlUserCall;
Graphic aGraphic; Graphic aGraphic;
...@@ -129,7 +129,7 @@ public: ...@@ -129,7 +129,7 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
}; };
class SvxGraphCtrlView : public SdrView class GraphCtrlView : public SdrView
{ {
SvxGraphCtrl& rGraphCtrl; SvxGraphCtrl& rGraphCtrl;
...@@ -142,13 +142,13 @@ protected: ...@@ -142,13 +142,13 @@ protected:
} }
public: public:
SvxGraphCtrlView(SdrModel& rSdrModel, SvxGraphCtrl* pWindow) GraphCtrlView(SdrModel& rSdrModel, SvxGraphCtrl* pWindow)
: SdrView(rSdrModel, &pWindow->GetDrawingArea()->get_ref_device()) : SdrView(rSdrModel, &pWindow->GetDrawingArea()->get_ref_device())
, rGraphCtrl(*pWindow) , 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 // 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 // if it had one, and route to WidgetController::Invalidate instead
......
...@@ -136,7 +136,7 @@ void SvxGraphCtrl::InitSdrModel() ...@@ -136,7 +136,7 @@ void SvxGraphCtrl::InitSdrModel()
pModel->SetChanged( false ); pModel->SetChanged( false );
// Creating a View // Creating a View
pView.reset(new SvxGraphCtrlView(*pModel, this)); pView.reset(new GraphCtrlView(*pModel, this));
pView->SetWorkArea( tools::Rectangle( Point(), aGraphSize ) ); pView->SetWorkArea( tools::Rectangle( Point(), aGraphSize ) );
pView->EnableExtendedMouseEventDispatcher( true ); pView->EnableExtendedMouseEventDispatcher( true );
pView->ShowSdrPage(pView->GetModel()->GetPage(0)); pView->ShowSdrPage(pView->GetModel()->GetPage(0));
...@@ -780,7 +780,7 @@ namespace ...@@ -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()); assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV) if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
...@@ -792,7 +792,7 @@ rtl::Reference<sdr::overlay::OverlayManager> SvxGraphCtrlView::CreateOverlayMana ...@@ -792,7 +792,7 @@ rtl::Reference<sdr::overlay::OverlayManager> SvxGraphCtrlView::CreateOverlayMana
return SdrView::CreateOverlayManager(rDevice); return SdrView::CreateOverlayManager(rDevice);
} }
void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice) void GraphCtrlView::InvalidateOneWin(OutputDevice& rDevice)
{ {
assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device()); assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV) if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
...@@ -803,7 +803,7 @@ void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice) ...@@ -803,7 +803,7 @@ void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice)
SdrView::InvalidateOneWin(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()); assert(&rDevice == &rGraphCtrl.GetDrawingArea()->get_ref_device());
if (rDevice.GetOutDevType() == OUTDEV_VIRDEV) if (rDevice.GetOutDevType() == OUTDEV_VIRDEV)
...@@ -814,7 +814,7 @@ void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rect ...@@ -814,7 +814,7 @@ void SvxGraphCtrlView::InvalidateOneWin(OutputDevice& rDevice, const tools::Rect
SdrView::InvalidateOneWin(rDevice, rArea); SdrView::InvalidateOneWin(rDevice, rArea);
} }
SvxGraphCtrlView::~SvxGraphCtrlView() GraphCtrlView::~GraphCtrlView()
{ {
// turn SetOutputToWindow back off again before // turn SetOutputToWindow back off again before
// turning back into our baseclass during dtoring // turning back into our baseclass during dtoring
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment