include/svx/graphctl.hxx | 34 ++++----- include/svx/imapdlg.hxx | 8 +- sd/source/ui/dlg/PhotoAlbumDialog.hxx | 2 sd/source/ui/inc/vectdlg.hxx | 4 - svx/source/accessibility/GraphCtlAccessibleContext.cxx | 3 svx/source/dialog/_contdlg.cxx | 8 +- svx/source/dialog/contimp.hxx | 6 - svx/source/dialog/contwnd.cxx | 14 +-- svx/source/dialog/contwnd.hxx | 2 svx/source/dialog/graphctl.cxx | 60 ++++++++--------- svx/source/dialog/imapdlg.cxx | 8 +- svx/source/dialog/imapwnd.cxx | 8 +- svx/source/dialog/imapwnd.hxx | 4 - svx/source/inc/GraphCtlAccessibleContext.hxx | 8 +- vcl/unx/gtk3/gtk3gtkinst.cxx | 9 ++ 15 files changed, 92 insertions(+), 86 deletions(-)
New commits: commit 110f149a5ded5144f0c4320b5787ff98a1a26b7d Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu May 23 12:16:34 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu May 23 17:35:09 2019 +0200 add comment to document upstream bug Change-Id: I2814c6b0ccb1198bc83f79e63a8a1713d8df32cd Reviewed-on: https://gerrit.libreoffice.org/72834 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 6ade98fcd25e..39581793b406 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -8938,7 +8938,9 @@ private: return pThis->separator_function(nIndex); } - // in the absence of a built-in solution for https://gitlab.gnome.org/GNOME/gtk/issues/310 + // https://gitlab.gnome.org/GNOME/gtk/issues/310 + // + // in the absence of a built-in solution // a) support typeahead for the case where there is no entry widget, typing ahead // into the button itself will select via the vcl selection engine, a matching // entry @@ -9050,6 +9052,9 @@ private: set_selected_entry(nSelect); } + // https://gitlab.gnome.org/GNOME/gtk/issues/310 + // + // in the absence of a built-in solution // b) support typeahead for the menu itself, typing into the menu will // select via the vcl selection engine, a matching entry. Clearly // this is cheating, brittle and not a long term solution. @@ -9263,6 +9268,8 @@ public: #endif } + // https://gitlab.gnome.org/GNOME/gtk/issues/1910 + // has_entry long menus take forever to appear (tdf#125388) void bodge_area_apply_attributes_cb() { gtk_container_foreach(GTK_CONTAINER(m_pMenu), disable_area_apply_attributes_cb, m_pMenu); commit 461f2173d10934f54cebacfedd4c8840a827b5f7 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Wed May 22 16:44:15 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu May 23 17:34:53 2019 +0200 rename SvxGraphCtrl back to GraphCtrl Change-Id: I340b1695588bea0f1ce15685731c522907fdb7ee Reviewed-on: https://gerrit.libreoffice.org/72806 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> 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(); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index f8f1b4e503ce..75c20fd5ccc6 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -39,7 +39,7 @@ private: SdDrawDocument* m_pDoc; GraphicFilter* m_pGraphicFilter; - SvxGraphCtrl m_aImg; + GraphCtrl m_aImg; std::unique_ptr<weld::Button> m_xCancelBtn; std::unique_ptr<weld::Button> m_xCreateBtn; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 60ccc3dcd5bc..f5977e52d863 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -40,8 +40,8 @@ class SdVectorizeDlg : public weld::GenericDialogController Bitmap aPreviewBmp; GDIMetaFile aMtf; - SvxGraphCtrl m_aBmpWin; - SvxGraphCtrl m_aMtfWin; + GraphCtrl m_aBmpWin; + GraphCtrl m_aMtfWin; std::unique_ptr<weld::SpinButton> m_xNmLayers; std::unique_ptr<weld::MetricSpinButton> m_xMtReduce; diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 4d048070897c..db79abc3f03b 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::accessibility; // internal /** initialize this component and set default values */ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( - SvxGraphCtrl& rRepr ) : + GraphCtrl& rRepr ) : SvxGraphCtrlAccessibleContext_Base( m_aMutex ), mpControl( &rRepr ), @@ -776,5 +776,4 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const return rSize; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 67001af2f779..2832eece6ec2 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -239,7 +239,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(weld::Builder& rBuilder, SvxSuperContourDlg::~SvxSuperContourDlg() { - m_xContourWnd->SetUpdateLink( Link<SvxGraphCtrl*,void>() ); + m_xContourWnd->SetUpdateLink( Link<GraphCtrl*,void>() ); m_xContourWnd.reset(); } @@ -476,7 +476,7 @@ void SvxSuperContourDlg::SetActivePoly(const OString& rId) m_xTbx1->set_item_active("TBI_POLYINSERT", rId == "TBI_POLYINSERT"); } -IMPL_LINK( SvxSuperContourDlg, MousePosHdl, SvxGraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) { OUString aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); @@ -491,7 +491,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, SvxGraphCtrl*, pWnd, void ) m_xStbStatus2->set_label( aStr ); } -IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, SvxGraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) { OUString aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); @@ -545,7 +545,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl, Timer *, void) SetPolyPolygon( SvxContourDlg::CreateAutoContour( rGraphic, bValid ? &aWorkRect : nullptr ) ); } -IMPL_LINK( SvxSuperContourDlg, StateHdl, SvxGraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrView* pView = pWnd->GetSdrView(); diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 4032085c20fb..ecf0bdc08dac 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -90,11 +90,11 @@ class SvxSuperContourDlg std::unique_ptr<weld::CustomWeld> m_xContourWndWeld; DECL_LINK( Tbx1ClickHdl, const OString&, void ); - DECL_LINK( MousePosHdl, SvxGraphCtrl*, void ); - DECL_LINK( GraphSizeHdl, SvxGraphCtrl*, void ); + DECL_LINK( MousePosHdl, GraphCtrl*, void ); + DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); DECL_LINK( UpdateHdl, Timer *, void ); DECL_LINK( CreateHdl, Timer *, void ); - DECL_LINK( StateHdl, SvxGraphCtrl*, void ); + DECL_LINK( StateHdl, GraphCtrl*, void ); DECL_LINK( PipetteHdl, ContourWindow&, void ); DECL_LINK( PipetteClickHdl, ContourWindow&, void ); DECL_LINK( WorkplaceClickHdl, ContourWindow&, void ); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index a2379035e255..f8137f7dcd67 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -34,7 +34,7 @@ using namespace css; #define TRANSCOL COL_WHITE ContourWindow::ContourWindow(weld::Dialog* pDialog) - : SvxGraphCtrl(pDialog) + : GraphCtrl(pDialog) , aWorkRect(0, 0, 0, 0) , bPipetteMode(false) , bWorkplaceMode(false) @@ -111,7 +111,7 @@ const tools::PolyPolygon& ContourWindow::GetPolyPolygon() void ContourWindow::InitSdrModel() { - SvxGraphCtrl::InitSdrModel(); + GraphCtrl::InitSdrModel(); SfxItemSet aSet( pModel->GetItemPool() ); @@ -151,7 +151,7 @@ bool ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) } if (!bPipetteMode) - return SvxGraphCtrl::MouseButtonDown( rMEvt ); + return GraphCtrl::MouseButtonDown( rMEvt ); return true; } @@ -176,7 +176,7 @@ bool ContourWindow::MouseMove( const MouseEvent& rMEvt ) return true; } - return SvxGraphCtrl::MouseMove( rMEvt ); + return GraphCtrl::MouseMove( rMEvt ); } bool ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) @@ -197,7 +197,7 @@ bool ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) } else if ( bWorkplaceMode ) { - SvxGraphCtrl::MouseButtonUp( rMEvt ); + GraphCtrl::MouseButtonUp( rMEvt ); aWorkRect.SetRight( aLogPt.X() ); aWorkRect.SetBottom( aLogPt.Y() ); @@ -222,7 +222,7 @@ bool ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) return false; } - return SvxGraphCtrl::MouseButtonUp( rMEvt ); + return GraphCtrl::MouseButtonUp( rMEvt ); } void ContourWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) @@ -263,7 +263,7 @@ void ContourWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta void ContourWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - SvxGraphCtrl::SetDrawingArea(pDrawingArea); + GraphCtrl::SetDrawingArea(pDrawingArea); Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(270, 170), MapMode(MapUnit::MapAppFont))); pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); SetOutputSizePixel(aSize); diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index 991c76ffa55d..1bad623c05d6 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -23,7 +23,7 @@ #include <tools/poly.hxx> #include <svx/graphctl.hxx> -class ContourWindow final : public SvxGraphCtrl +class ContourWindow final : public GraphCtrl { tools::PolyPolygon aPolyPoly; Color aPipetteColor; diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 606ad5fa478c..3191beb47d28 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -55,7 +55,7 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c rWin.QueueIdleUpdate(); } -SvxGraphCtrl::SvxGraphCtrl(weld::Dialog* pDialog) +GraphCtrl::GraphCtrl(weld::Dialog* pDialog) : aUpdateIdle("svx GraphCtrl Update") , aMap100(MapUnit::Map100thMM) , eObjKind(OBJ_NONE) @@ -67,17 +67,17 @@ SvxGraphCtrl::SvxGraphCtrl(weld::Dialog* pDialog) { pUserCall.reset(new GraphCtrlUserCall( *this )); aUpdateIdle.SetPriority( TaskPriority::LOWEST ); - aUpdateIdle.SetInvokeHandler( LINK( this, SvxGraphCtrl, UpdateHdl ) ); + aUpdateIdle.SetInvokeHandler( LINK( this, GraphCtrl, UpdateHdl ) ); aUpdateIdle.Start(); } -void SvxGraphCtrl::SetDrawingArea(weld::DrawingArea* pDrawingArea) +void GraphCtrl::SetDrawingArea(weld::DrawingArea* pDrawingArea) { weld::CustomWidgetController::SetDrawingArea(pDrawingArea); EnableRTL(false); } -SvxGraphCtrl::~SvxGraphCtrl() +GraphCtrl::~GraphCtrl() { aUpdateIdle.Stop(); @@ -91,7 +91,7 @@ SvxGraphCtrl::~SvxGraphCtrl() pUserCall.reset(); } -void SvxGraphCtrl::SetSdrMode(bool bSdrMode) +void GraphCtrl::SetSdrMode(bool bSdrMode) { mbSdrMode = bSdrMode; @@ -111,7 +111,7 @@ void SvxGraphCtrl::SetSdrMode(bool bSdrMode) QueueIdleUpdate(); } -void SvxGraphCtrl::InitSdrModel() +void GraphCtrl::InitSdrModel() { SolarMutexGuard aGuard; @@ -154,7 +154,7 @@ void SvxGraphCtrl::InitSdrModel() mpAccContext->setModelAndView (pModel.get(), pView.get()); } -void SvxGraphCtrl::SetGraphic( const Graphic& rGraphic, bool bNewModel ) +void GraphCtrl::SetGraphic( const Graphic& rGraphic, bool bNewModel ) { aGraphic = rGraphic; xVD->SetOutputSizePixel(Size(0, 0)); //force redraw @@ -175,7 +175,7 @@ void SvxGraphCtrl::SetGraphic( const Graphic& rGraphic, bool bNewModel ) QueueIdleUpdate(); } -void SvxGraphCtrl::GraphicToVD() +void GraphCtrl::GraphicToVD() { OutputDevice& rDevice = GetDrawingArea()->get_ref_device(); xVD->SetOutputSizePixel(GetOutputSizePixel()); @@ -186,7 +186,7 @@ void SvxGraphCtrl::GraphicToVD() aGraphic.Draw(xVD.get(), Point(), aGraphSize); } -void SvxGraphCtrl::Resize() +void GraphCtrl::Resize() { weld::CustomWidgetController::Resize(); @@ -229,7 +229,7 @@ void SvxGraphCtrl::Resize() Invalidate(); } -void SvxGraphCtrl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) +void GraphCtrl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { // #i72889# used split repaint to be able to paint an own background // even to the buffered view @@ -267,22 +267,22 @@ void SvxGraphCtrl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan } } -void SvxGraphCtrl::SdrObjChanged( const SdrObject& ) +void GraphCtrl::SdrObjChanged( const SdrObject& ) { QueueIdleUpdate(); } -void SvxGraphCtrl::SdrObjCreated( const SdrObject& ) +void GraphCtrl::SdrObjCreated( const SdrObject& ) { QueueIdleUpdate(); } -void SvxGraphCtrl::MarkListHasChanged() +void GraphCtrl::MarkListHasChanged() { QueueIdleUpdate(); } -bool SvxGraphCtrl::KeyInput( const KeyEvent& rKEvt ) +bool GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { vcl::KeyCode aCode( rKEvt.GetKeyCode() ); bool bProc = false; @@ -584,7 +584,7 @@ bool SvxGraphCtrl::KeyInput( const KeyEvent& rKEvt ) return bProc; } -bool SvxGraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) +bool GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) { if ( mbSdrMode && ( rMEvt.GetClicks() < 2 ) ) { @@ -629,7 +629,7 @@ bool SvxGraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) return false; } -bool SvxGraphCtrl::MouseMove(const MouseEvent& rMEvt) +bool GraphCtrl::MouseMove(const MouseEvent& rMEvt) { OutputDevice& rDevice = GetDrawingArea()->get_ref_device(); const Point aLogPos( rDevice.PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -665,7 +665,7 @@ bool SvxGraphCtrl::MouseMove(const MouseEvent& rMEvt) return false; } -bool SvxGraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) +bool GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) { if ( mbSdrMode ) { @@ -687,7 +687,7 @@ bool SvxGraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) return false; } -SdrObject* SvxGraphCtrl::GetSelectedSdrObject() const +SdrObject* GraphCtrl::GetSelectedSdrObject() const { SdrObject* pSdrObj = nullptr; @@ -702,7 +702,7 @@ SdrObject* SvxGraphCtrl::GetSelectedSdrObject() const return pSdrObj; } -void SvxGraphCtrl::SetEditMode( const bool _bEditMode ) +void GraphCtrl::SetEditMode( const bool _bEditMode ) { if ( mbSdrMode ) { @@ -717,7 +717,7 @@ void SvxGraphCtrl::SetEditMode( const bool _bEditMode ) QueueIdleUpdate(); } -void SvxGraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) +void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) { if ( mbSdrMode && ( _nPolyEdit != nPolyEdit ) ) { @@ -730,7 +730,7 @@ void SvxGraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) QueueIdleUpdate(); } -void SvxGraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) +void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) { if ( mbSdrMode ) { @@ -745,14 +745,14 @@ void SvxGraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) QueueIdleUpdate(); } -IMPL_LINK_NOARG(SvxGraphCtrl, UpdateHdl, Timer *, void) +IMPL_LINK_NOARG(GraphCtrl, UpdateHdl, Timer *, void) { mbInIdleUpdate = true; aUpdateLink.Call( this ); mbInIdleUpdate = false; } -void SvxGraphCtrl::QueueIdleUpdate() +void GraphCtrl::QueueIdleUpdate() { if (!mbInIdleUpdate) aUpdateIdle.Start(); @@ -826,7 +826,7 @@ GraphCtrlView::~GraphCtrlView() } } -Point SvxGraphCtrl::GetPositionInDialog() const +Point GraphCtrl::GetPositionInDialog() const { int x, y, width, height; if (GetDrawingArea()->get_extents_relative_to(*mpDialog, x, y, width, height)) @@ -834,7 +834,7 @@ Point SvxGraphCtrl::GetPositionInDialog() const return Point(); } -css::uno::Reference< css::accessibility::XAccessible > SvxGraphCtrl::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessible() { if(mpAccContext == nullptr ) { diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 5eedd281a623..a51875ddde6e 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -184,7 +184,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, weld::Windo SvxIMapDlg::~SvxIMapDlg() { - m_xIMapWnd->SetUpdateLink( Link<SvxGraphCtrl*,void>() ); + m_xIMapWnd->SetUpdateLink( Link<GraphCtrl*,void>() ); m_xIMapWnd.reset(); } @@ -571,7 +571,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) } } -IMPL_LINK( SvxIMapDlg, MousePosHdl, SvxGraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) { const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Point& rMousePos = pWnd->GetMousePos(); @@ -584,7 +584,7 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, SvxGraphCtrl*, pWnd, void ) m_xStbStatus2->set_label(aStr); } -IMPL_LINK( SvxIMapDlg, GraphSizeHdl, SvxGraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) { const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Size& rSize = pWnd->GetGraphicSize(); @@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Timer *, void) m_xIMapWnd->QueueIdleUpdate(); } -IMPL_LINK( SvxIMapDlg, StateHdl, SvxGraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 2d0ab179301f..38d089bf4cc3 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -56,7 +56,7 @@ using ::com::sun::star::uno::Reference; #define TRANSCOL COL_WHITE IMapWindow::IMapWindow(const Reference< XFrame >& rxDocumentFrame, weld::Dialog* pDialog) - : SvxGraphCtrl(pDialog) + : GraphCtrl(pDialog) , mxDocumentFrame(rxDocumentFrame) { memset( maItemInfos, 0, sizeof( SfxItemInfo ) ); @@ -296,7 +296,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) void IMapWindow::InitSdrModel() { - SvxGraphCtrl::InitSdrModel(); + GraphCtrl::InitSdrModel(); SfxItemSet aSet( pModel->GetItemPool() ); @@ -431,14 +431,14 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) bool IMapWindow::MouseButtonUp(const MouseEvent& rMEvt) { - bool bRet = SvxGraphCtrl::MouseButtonUp( rMEvt ); + bool bRet = GraphCtrl::MouseButtonUp( rMEvt ); UpdateInfo( true ); return bRet; } void IMapWindow::MarkListHasChanged() { - SvxGraphCtrl::MarkListHasChanged(); + GraphCtrl::MarkListHasChanged(); UpdateInfo( false ); } diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 8c18140dd8c7..0184c2282a69 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -81,7 +81,7 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; }; -class IMapWindow final : public SvxGraphCtrl +class IMapWindow final : public GraphCtrl { NotifyInfo aInfo; ImageMap aIMap; @@ -96,7 +96,7 @@ class IMapWindow final : public SvxGraphCtrl void MenuSelectHdl(const OString& rId); - // SvxGraphCtrl + // GraphCtrl virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; virtual bool ContextMenu(const CommandEvent& rCEvt) override; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index ade908906b99..9d348c6f3ce7 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -54,7 +54,7 @@ namespace com { namespace sun { namespace star { namespace awt { } } } } namespace tools { class Rectangle; } -class SvxGraphCtrl; +class GraphCtrl; class SdrObject; class SdrModel; class SdrPage; @@ -80,10 +80,10 @@ class SvxGraphCtrlAccessibleContext final : public SfxListener, public ::accessibility::IAccessibleViewForwarder { public: - friend class SvxGraphCtrl; + friend class GraphCtrl; // internal - SvxGraphCtrlAccessibleContext(SvxGraphCtrl& rRepresentation); + SvxGraphCtrlAccessibleContext(GraphCtrl& rRepresentation); void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ) override; @@ -181,7 +181,7 @@ private: typedef ::std::map< const SdrObject*, rtl::Reference<::accessibility::AccessibleShape> > ShapesMapType; ShapesMapType mxShapes; - SvxGraphCtrl* mpControl; + GraphCtrl* mpControl; SdrModel* mpModel; SdrPage* mpPage; commit 3ca952ddb3ad78fca5d2ca14a3c7cb8417dec4c1 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Wed May 22 16:37:22 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu May 23 17:34:33 2019 +0200 rename SvxGraphCtrlView back to GraphCtrlView Change-Id: I658773f4fc0409a73de56301f5457fa1fb9e4a28 Reviewed-on: https://gerrit.libreoffice.org/72805 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits