Kaydet (Commit) 461f2173 authored tarafından Caolán McNamara's avatar Caolán McNamara

rename SvxGraphCtrl back to GraphCtrl

Change-Id: I340b1695588bea0f1ce15685731c522907fdb7ee
Reviewed-on: https://gerrit.libreoffice.org/72806
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 3ca952dd
......@@ -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)
{
......
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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: */
......@@ -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();
......
......@@ -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 );
......
......@@ -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);
......
......@@ -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;
......
......@@ -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 )
{
......
......@@ -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();
......
......@@ -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 );
}
......
......@@ -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;
......
......@@ -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;
......
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