From c9d7d201749ebabe4c8a0d7e5051337b83b50ee7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 3 Oct 2017 16:01:41 +0200 Subject: drop WB_SDRMODE in favour of explicit method was the only style being used on the class anyhow, and there was already a field for it Change-Id: Icdbc9f312851e0476a8b1d21fd4dc9c8166d4e08 Reviewed-on: https://gerrit.libreoffice.org/43085 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/svx/graphctl.hxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'include/svx/graphctl.hxx') diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 385d63d7e6d1..85ecc62e904f 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -29,8 +29,6 @@ class GraphCtrlUserCall; class SvxGraphCtrlAccessibleContext; -#define WB_SDRMODE ((WinBits)0x0080) - class SVX_DLLPUBLIC GraphCtrl : public Control { friend class GraphCtrlView; @@ -45,11 +43,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control Size aGraphSize; Point aMousePos; GraphCtrlUserCall* pUserCall; - WinBits nWinStyle; SdrObjKind eObjKind; sal_uInt16 nPolyEdit; bool bEditMode; - bool bSdrMode; + bool mbSdrMode; bool mbInIdleUpdate; DECL_LINK( UpdateHdl, Timer*, void ); @@ -82,8 +79,6 @@ public: virtual ~GraphCtrl() override; virtual void dispose() override; - void SetWinStyle( WinBits nWinBits ); - void SetGraphic( const Graphic& rGraphic, bool bNewModel = true ); const Graphic& GetGraphic() const { return aGraphic; } const Size& GetGraphicSize() const { return aGraphSize; } @@ -100,7 +95,7 @@ public: SdrModel* GetSdrModel() const { return pModel; } SdrView* GetSdrView() const { return pView; } SdrObject* GetSelectedSdrObject() const; - bool IsChanged() const { return bSdrMode && pModel->IsChanged(); } + bool IsChanged() const { return mbSdrMode && pModel->IsChanged(); } void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; } @@ -109,6 +104,8 @@ public: void SetUpdateLink( const Link& rLink ) { aUpdateLink = rLink; } void QueueIdleUpdate(); + void SetSdrMode(bool b); + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; -- cgit