summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svddrgm1.hxx108
-rw-r--r--svx/source/svdraw/svdibrow.cxx2
-rw-r--r--svx/source/svdraw/svdograf.cxx8
-rw-r--r--svx/source/svdraw/svdoole2.cxx44
-rw-r--r--svx/source/svdraw/svdotxln.cxx4
-rw-r--r--svx/source/svdraw/svdouno.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx2
7 files changed, 85 insertions, 85 deletions
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index d77268ecd25f..621589c1f046 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -37,18 +37,18 @@ class SdrDragMovHdl : public SdrDragMethod
{
protected:
// define nothing, overload to do so
- virtual void createSdrDragEntries();
+ virtual void createSdrDragEntries() SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
SdrDragMovHdl(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual void CancelSdrDrag();
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual void CancelSdrDrag() SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
};
@@ -67,14 +67,14 @@ public:
TYPEINFO_OVERRIDE();
SdrDragRotate(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
- virtual basegfx::B2DHomMatrix getCurrentTransformation();
- virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget);
+ virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE;
+ virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE;
};
@@ -96,14 +96,14 @@ public:
TYPEINFO_OVERRIDE();
SdrDragShear(SdrDragView& rNewView,bool bSlant1);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
- virtual basegfx::B2DHomMatrix getCurrentTransformation();
- virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget);
+ virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE;
+ virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE;
};
@@ -123,14 +123,14 @@ public:
TYPEINFO_OVERRIDE();
SdrDragMirror(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
- virtual basegfx::B2DHomMatrix getCurrentTransformation();
- virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget);
+ virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE;
+ virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE;
};
@@ -151,12 +151,12 @@ public:
bool IsGradient() const { return bIsGradient; }
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
- virtual void CancelSdrDrag();
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
+ virtual void CancelSdrDrag() SAL_OVERRIDE;
};
@@ -195,20 +195,20 @@ private:
protected:
// needs to add drag geometry to the default
- virtual void createSdrDragEntries();
+ virtual void createSdrDragEntries() SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
SdrDragCrook(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
- virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget);
- virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget);
+ virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE;
+ virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) SAL_OVERRIDE;
};
@@ -229,20 +229,20 @@ private:
protected:
// needs to add drag geometry to the default
- virtual void createSdrDragEntries();
+ virtual void createSdrDragEntries() SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
SdrDragDistort(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual void MoveSdrDrag(const Point& rPnt);
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
- virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget);
- virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget);
+ virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE;
+ virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget) SAL_OVERRIDE;
};
@@ -256,10 +256,10 @@ public:
TYPEINFO_OVERRIDE();
SdrDragCrop(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(OUString& rStr) const;
- virtual bool BeginSdrDrag();
- virtual bool EndSdrDrag(bool bCopy);
- virtual Pointer GetSdrDragPointer() const;
+ virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
+ virtual bool BeginSdrDrag() SAL_OVERRIDE;
+ virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
+ virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
};
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index c1ab90a3eb4d..c912c55c48bb 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -169,7 +169,7 @@ public:
{}
virtual ~ImpItemEdit();
- virtual void KeyInput(const KeyEvent& rEvt);
+ virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE;
};
ImpItemEdit::~ImpItemEdit()
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index a158dcd25e74..7da704e5b219 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -113,10 +113,10 @@ public:
SdrGraphicLink(SdrGrafObj& rObj);
virtual ~SdrGraphicLink();
- virtual void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
void DataChanged( const Graphic& rGraphic );
bool Connect() { return 0 != GetRealObject(); }
@@ -141,12 +141,12 @@ protected:
/** is called from the inherited create method and acts as the
main function of this thread.
*/
- virtual void SAL_CALL run(void);
+ virtual void SAL_CALL run(void) SAL_OVERRIDE;
/** Called after the thread is terminated via the terminate
method. Used to kill the thread by calling delete on this.
*/
- virtual void SAL_CALL onTerminated(void);
+ virtual void SAL_CALL onTerminated(void) SAL_OVERRIDE;
private:
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index e918196e77e5..8a62a66d138a 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -139,36 +139,36 @@ public:
private:
Rectangle impl_getScaledRect_nothrow() const;
// XStateChangeListener
- virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// document::XEventListener
- virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception );
+ virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEmbeddedClient
- virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception );
- virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
+ virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponentSupplier
- virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception );
+ virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XInplaceClient
- virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception );
- virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception );
- virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XWindowSupplier
- virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception );
+ virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -601,9 +601,9 @@ public:
SdrEmbedObjectLink(SdrOle2Obj* pObj);
virtual ~SdrEmbedObjectLink();
- virtual void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
bool Connect() { return GetRealObject() != NULL; }
};
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index fd2c30298a2b..1b81975f4626 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -46,9 +46,9 @@ public:
{}
virtual ~ImpSdrObjTextLink();
- virtual void Closed();
+ virtual void Closed() SAL_OVERRIDE;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
};
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index dc1466d05419..1234c9dd61d5 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -77,7 +77,7 @@ public:
{}
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void StopListening(const uno::Reference< lang::XComponent >& xComp);
void StartListening(const uno::Reference< lang::XComponent >& xComp);
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 8e010d143e87..3090690e5015 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -685,7 +685,7 @@ public:
~ObjListListener();
private:
- virtual void Notify(SfxBroadcaster& rBroadcaster, const SfxHint& rHint);
+ virtual void Notify(SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE;
private:
SdrUndoObjList& m_rThat;