diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-22 16:44:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-23 17:34:53 +0200 |
commit | 461f2173d10934f54cebacfedd4c8840a827b5f7 (patch) | |
tree | 300d01568313f1aaf5eb2287099eba5cb7c13570 /include | |
parent | 3ca952ddb3ad78fca5d2ca14a3c7cb8417dec4c1 (diff) |
rename SvxGraphCtrl back to GraphCtrl
Change-Id: I340b1695588bea0f1ce15685731c522907fdb7ee
Reviewed-on: https://gerrit.libreoffice.org/72806
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/graphctl.hxx | 28 | ||||
-rw-r--r-- | include/svx/imapdlg.hxx | 8 |
2 files changed, 18 insertions, 18 deletions
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 41d02cc0482f..53047ce4145f 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -27,15 +27,15 @@ #include <svx/svdview.hxx> #include <svx/svdobj.hxx> -class SvxGraphCtrl; +class GraphCtrl; class GraphCtrlUserCall : public SdrObjUserCall { - SvxGraphCtrl& rWin; + GraphCtrl& rWin; public: - GraphCtrlUserCall(SvxGraphCtrl& rGraphWin) + GraphCtrlUserCall(GraphCtrl& rGraphWin) : rWin(rGraphWin) {} @@ -44,7 +44,7 @@ public: class SvxGraphCtrlAccessibleContext; -class SVX_DLLPUBLIC SvxGraphCtrl : public weld::CustomWidgetController +class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController { friend class GraphCtrlView; friend class GraphCtrlUserCall; @@ -52,9 +52,9 @@ class SVX_DLLPUBLIC SvxGraphCtrl : public weld::CustomWidgetController Graphic aGraphic; ScopedVclPtrInstance<VirtualDevice> xVD; Idle aUpdateIdle; - Link<SvxGraphCtrl*,void> aMousePosLink; - Link<SvxGraphCtrl*,void> aGraphSizeLink; - Link<SvxGraphCtrl*,void> aUpdateLink; + Link<GraphCtrl*,void> aMousePosLink; + Link<GraphCtrl*,void> aGraphSizeLink; + Link<GraphCtrl*,void> aUpdateLink; MapMode const aMap100; Size aGraphSize; Point aMousePos; @@ -94,9 +94,9 @@ protected: public: - SvxGraphCtrl(weld::Dialog* pDialog); + GraphCtrl(weld::Dialog* pDialog); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual ~SvxGraphCtrl() override; + virtual ~GraphCtrl() override; void SetGraphic( const Graphic& rGraphic, bool bNewModel = true ); const Graphic& GetGraphic() const { return aGraphic; } @@ -116,11 +116,11 @@ public: SdrObject* GetSelectedSdrObject() const; bool IsChanged() const { return mbSdrMode && pModel->IsChanged(); } - void SetMousePosLink( const Link<SvxGraphCtrl*,void>& rLink ) { aMousePosLink = rLink; } + void SetMousePosLink( const Link<GraphCtrl*,void>& rLink ) { aMousePosLink = rLink; } - void SetGraphSizeLink( const Link<SvxGraphCtrl*,void>& rLink ) { aGraphSizeLink = rLink; } + void SetGraphSizeLink( const Link<GraphCtrl*,void>& rLink ) { aGraphSizeLink = rLink; } - void SetUpdateLink( const Link<SvxGraphCtrl*,void>& rLink ) { aUpdateLink = rLink; } + void SetUpdateLink( const Link<GraphCtrl*,void>& rLink ) { aUpdateLink = rLink; } void QueueIdleUpdate(); void SetSdrMode(bool b); @@ -131,7 +131,7 @@ public: class GraphCtrlView : public SdrView { - SvxGraphCtrl& rGraphCtrl; + GraphCtrl& rGraphCtrl; protected: @@ -142,7 +142,7 @@ protected: } public: - GraphCtrlView(SdrModel& rSdrModel, SvxGraphCtrl* pWindow) + GraphCtrlView(SdrModel& rSdrModel, GraphCtrl* pWindow) : SdrView(rSdrModel, &pWindow->GetDrawingArea()->get_ref_device()) , rGraphCtrl(*pWindow) { diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 1630c019f0cc..a1f38ac87268 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -82,7 +82,7 @@ public: class IMapOwnData; class IMapWindow; -class SvxGraphCtrl; +class GraphCtrl; class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialogController { @@ -109,14 +109,14 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialogController DECL_LINK( TbxClickHdl, const OString&, void ); DECL_LINK( InfoHdl, IMapWindow&, void ); - DECL_LINK( MousePosHdl, SvxGraphCtrl*, void ); - DECL_LINK( GraphSizeHdl, SvxGraphCtrl*, void ); + DECL_LINK( MousePosHdl, GraphCtrl*, void ); + DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); DECL_LINK( URLModifyHdl, weld::ComboBox&, void ); DECL_LINK( EntryModifyHdl, weld::Entry&, void ); DECL_LINK( URLModifyComboBoxHdl, weld::ComboBox&, void ); DECL_LINK( URLLoseFocusHdl, weld::Widget&, void ); DECL_LINK( UpdateHdl, Timer *, void ); - DECL_LINK( StateHdl, SvxGraphCtrl*, void ); + DECL_LINK( StateHdl, GraphCtrl*, void ); DECL_LINK( CancelHdl, weld::Button&, void ); void URLModify(); |