summaryrefslogtreecommitdiff
path: root/svx/source/sdr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /svx/source/sdr
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'svx/source/sdr')
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.hxx18
-rw-r--r--svx/source/sdr/contact/viewobjectcontact.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgraphic.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx26
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx46
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx10
6 files changed, 52 insertions, 52 deletions
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index 3bf306413884..ceacf966f963 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -37,19 +37,19 @@ public:
SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact );
virtual ~SdrMediaWindow();
- virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
- virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
- virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKEvt ) override;
+ virtual void KeyUp( const KeyEvent& rKEvt ) override;
- virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+ virtual void Command( const CommandEvent& rCEvt ) override;
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override;
private:
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index af4369108d7f..7ce2905c4809 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -67,7 +67,7 @@ protected:
// as tooling, the process() implementation takes over API handling and calls this
// virtual render method when the primitive implementation is BasePrimitive2D-based.
- virtual void processBasePrimitive2D(const drawinglayer::primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE;
+ virtual void processBasePrimitive2D(const drawinglayer::primitive2d::BasePrimitive2D& rCandidate) override;
public:
AnimatedExtractingProcessor2D(
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 7b26f0031a34..a2a578e029b4 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -43,7 +43,7 @@ namespace sdr
virtual ~AsynchGraphicLoadingEvent();
// the called method if the event is triggered
- virtual void ExecuteEvent() SAL_OVERRIDE;
+ virtual void ExecuteEvent() override;
};
AsynchGraphicLoadingEvent::AsynchGraphicLoadingEvent(
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 761a9c85d7b1..7cc66dcfc4ab 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -51,28 +51,28 @@ public:
// LazyInvalidate request. Supported here to not automatically
// invalidate the second interaction state all the time at the
// original OC
- virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE;
+ virtual void setLazyInvalidate(ViewObjectContact& rVOC) override;
// From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism
- virtual void Invoke() SAL_OVERRIDE;
+ virtual void Invoke() override;
// get primitive visualization
drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo);
// Own reaction on changes which will be forwarded to the OC of the owner-VOC
- virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const SAL_OVERRIDE;
+ virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override;
// forward access to SdrPageView of ViewObjectContactOfPageObj
- virtual bool isOutputToPrinter() const SAL_OVERRIDE;
- virtual bool isOutputToWindow() const SAL_OVERRIDE;
- virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE;
- virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE;
- virtual bool isOutputToPDFFile() const SAL_OVERRIDE;
- virtual bool isDrawModeGray() const SAL_OVERRIDE;
- virtual bool isDrawModeBlackWhite() const SAL_OVERRIDE;
- virtual bool isDrawModeHighContrast() const SAL_OVERRIDE;
- virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE;
- virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
+ virtual bool isOutputToPrinter() const override;
+ virtual bool isOutputToWindow() const override;
+ virtual bool isOutputToVirtualDevice() const override;
+ virtual bool isOutputToRecordingMetaFile() const override;
+ virtual bool isOutputToPDFFile() const override;
+ virtual bool isDrawModeGray() const override;
+ virtual bool isDrawModeBlackWhite() const override;
+ virtual bool isDrawModeHighContrast() const override;
+ virtual SdrPageView* TryToGetSdrPageView() const override;
+ virtual OutputDevice* TryToGetOutputDevice() const override;
};
PagePrimitiveExtractor::PagePrimitiveExtractor(
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 114770441e29..6542edb71328 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -375,10 +375,10 @@ namespace sdr { namespace contact {
virtual ~SdrPageViewAccess() {}
- virtual bool isDesignMode() const SAL_OVERRIDE;
+ virtual bool isDesignMode() const override;
virtual Reference< XControlContainer >
- getControlContainer( const OutputDevice& _rDevice ) const SAL_OVERRIDE;
- virtual bool isLayerVisible( SdrLayerID _nLayerID ) const SAL_OVERRIDE;
+ getControlContainer( const OutputDevice& _rDevice ) const override;
+ virtual bool isLayerVisible( SdrLayerID _nLayerID ) const override;
};
@@ -417,10 +417,10 @@ namespace sdr { namespace contact {
virtual ~InvisibleControlViewAccess() {}
- virtual bool isDesignMode() const SAL_OVERRIDE;
+ virtual bool isDesignMode() const override;
virtual Reference< XControlContainer >
- getControlContainer( const OutputDevice& _rDevice ) const SAL_OVERRIDE;
- virtual bool isLayerVisible( SdrLayerID _nLayerID ) const SAL_OVERRIDE;
+ getControlContainer( const OutputDevice& _rDevice ) const override;
+ virtual bool isLayerVisible( SdrLayerID _nLayerID ) const override;
};
@@ -467,10 +467,10 @@ namespace sdr { namespace contact {
virtual ~DummyPageViewAccess() {}
- virtual bool isDesignMode() const SAL_OVERRIDE;
+ virtual bool isDesignMode() const override;
virtual Reference< XControlContainer >
- getControlContainer( const OutputDevice& _rDevice ) const SAL_OVERRIDE;
- virtual bool isLayerVisible( SdrLayerID _nLayerID ) const SAL_OVERRIDE;
+ getControlContainer( const OutputDevice& _rDevice ) const override;
+ virtual bool isLayerVisible( SdrLayerID _nLayerID ) const override;
};
@@ -627,24 +627,24 @@ namespace sdr { namespace contact {
virtual ~ViewObjectContactOfUnoControl_Impl();
// XEventListener
- virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) override;
// XWindowListener
- virtual void SAL_CALL windowResized( const WindowEvent& e ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL windowMoved( const WindowEvent& e ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL windowShown( const EventObject& e ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL windowHidden( const EventObject& e ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL windowResized( const WindowEvent& e ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowMoved( const WindowEvent& e ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowShown( const EventObject& e ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowHidden( const EventObject& e ) throw(RuntimeException, std::exception) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) override;
// XModeChangeListener
- virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) override;
// XContainerListener
- virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
private:
/** retrieves the SdrPageView which our associated SdrPageViewWindow belongs to
@@ -802,17 +802,17 @@ namespace sdr { namespace contact {
virtual ::drawinglayer::primitive2d::Primitive2DSequence
get2DDecomposition(
const ::drawinglayer::geometry::ViewInformation2D& rViewInformation
- ) const SAL_OVERRIDE;
+ ) const override;
virtual ::drawinglayer::primitive2d::Primitive2DSequence
create2DDecomposition(
const ::drawinglayer::geometry::ViewInformation2D& rViewInformation
- ) const SAL_OVERRIDE;
+ ) const override;
virtual ::basegfx::B2DRange
getB2DRange(
const ::drawinglayer::geometry::ViewInformation2D& rViewInformation
- ) const SAL_OVERRIDE;
+ ) const override;
public:
explicit LazyControlCreationPrimitive2D( const ::rtl::Reference< ViewObjectContactOfUnoControl_Impl >& _pVOCImpl )
@@ -822,7 +822,7 @@ namespace sdr { namespace contact {
getTransformation( m_pVOCImpl->getViewContact(), m_aTransformation );
}
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// declare unique ID for this primitive class
DeclPrimitive2DIDBlock()
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 8544b3fc9d6f..f42c1c80efc3 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -44,19 +44,19 @@ public:
PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {}
// Methods from XPrimitiveFactory2D
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (css::uno::RuntimeException, std::exception) override
{ return OUString("com.sun.star.comp.graphic.PrimitiveFactory2D"); }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (css::uno::RuntimeException, std::exception) override
{ return cppu::supportsService(this, ServiceName); }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (css::uno::RuntimeException, std::exception) override
{
return css::uno::Sequence<OUString>{
"com.sun.star.graphic.PrimitiveFactory2D"};