summaryrefslogtreecommitdiff
path: root/sd/source/core
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /sd/source/core
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sd/source/core')
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx4
-rw-r--r--sd/source/core/PageListWatcher.hxx8
-rw-r--r--sd/source/core/annotations/Annotation.cxx50
-rw-r--r--sd/source/core/annotations/AnnotationEnumeration.cxx4
-rw-r--r--sd/source/core/stlpool.cxx4
-rw-r--r--sd/source/core/stlsheet.cxx2
-rw-r--r--sd/source/core/text/textapi.cxx10
7 files changed, 41 insertions, 41 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index d66285ec517c..b1639a99b22e 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2982,8 +2982,8 @@ class AnimationChangeListener : public cppu::WeakImplHelper1< XChangesListener >
public:
AnimationChangeListener( MainSequence* pMainSequence ) : mpMainSequence( pMainSequence ) {}
- virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (RuntimeException, std::exception);
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception);
+ virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
private:
MainSequence* mpMainSequence;
};
diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx
index d16d67f737bf..773a50aec729 100644
--- a/sd/source/core/PageListWatcher.hxx
+++ b/sd/source/core/PageListWatcher.hxx
@@ -67,8 +67,8 @@ public:
class ImpDrawPageListWatcher : public ImpPageListWatcher
{
protected:
- virtual sal_uInt32 ImpGetPageCount() const;
- virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const;
+ virtual sal_uInt32 ImpGetPageCount() const SAL_OVERRIDE;
+ virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const SAL_OVERRIDE;
public:
ImpDrawPageListWatcher(const SdrModel& rModel);
@@ -78,8 +78,8 @@ public:
class ImpMasterPageListWatcher : public ImpPageListWatcher
{
protected:
- virtual sal_uInt32 ImpGetPageCount() const;
- virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const;
+ virtual sal_uInt32 ImpGetPageCount() const SAL_OVERRIDE;
+ virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const SAL_OVERRIDE;
public:
ImpMasterPageListWatcher(const SdrModel& rModel);
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 212853931701..736661f9b8f6 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -59,30 +59,30 @@ public:
SdrModel* GetModel() { return (mpPage != 0) ? mpPage->GetModel() : 0; }
// XInterface:
- virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException, std::exception);
- virtual void SAL_CALL acquire() throw () { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); }
- virtual void SAL_CALL release() throw () { ::cppu::WeakComponentImplHelper1< XAnnotation >::release(); }
+ virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); }
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper1< XAnnotation >::release(); }
// ::com::sun::star::beans::XPropertySet:
- virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception);
- virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception);
- virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception);
- virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception);
- virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception);
- virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception);
- virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception);
+ virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception) SAL_OVERRIDE;
+ virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::office::XAnnotation:
- virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException, std::exception);
- virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception);
- virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL setSize( const ::com::sun::star::geometry::RealSize2D& _size ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual OUString SAL_CALL getAuthor() throw (RuntimeException, std::exception);
- virtual void SAL_CALL setAuthor(const OUString & the_value) throw (RuntimeException, std::exception);
- virtual util::DateTime SAL_CALL getDateTime() throw (RuntimeException, std::exception);
- virtual void SAL_CALL setDateTime(const util::DateTime & the_value) throw (RuntimeException, std::exception);
- virtual Reference< XText > SAL_CALL getTextRange() throw (RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setSize( const ::com::sun::star::geometry::RealSize2D& _size ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getAuthor() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setAuthor(const OUString & the_value) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual util::DateTime SAL_CALL getDateTime() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setDateTime(const util::DateTime & the_value) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual Reference< XText > SAL_CALL getTextRange() throw (RuntimeException, std::exception) SAL_OVERRIDE;
private:
Annotation(const Annotation &); // not defined
@@ -96,7 +96,7 @@ private:
// This function is called upon disposing the component,
// if your component needs special work when it becomes
// disposed, do it here.
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
SdPage* mpPage;
Reference< XComponentContext > m_xContext;
@@ -113,8 +113,8 @@ class UndoInsertOrRemoveAnnotation : public SdrUndoAction
public:
UndoInsertOrRemoveAnnotation( Annotation& rAnnotation, bool bInsert );
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
protected:
rtl::Reference< Annotation > mxAnnotation;
@@ -151,8 +151,8 @@ class UndoAnnotation : public SdrUndoAction
public:
UndoAnnotation( Annotation& rAnnotation );
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
protected:
rtl::Reference< Annotation > mxAnnotation;
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 8ad59904604c..43f872f4e142 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -40,8 +40,8 @@ public:
AnnotationEnumeration( const AnnotationVector& rAnnotations );
// ::com::sun::star::office::XAnnotationEnumeration:
- virtual ::sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception);
- virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception);
+ virtual ::sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
private:
AnnotationEnumeration(const AnnotationEnumeration &); // not defined
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 3dfd66f4a6fc..8a7cc23d11cc 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -631,7 +631,7 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate
HasFamilyPredicate(SfxStyleFamily eFamily)
: meFamily(eFamily) {;}
- bool Check(const SfxStyleSheetBase& sheet)
+ bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE
{
return sheet.GetFamily() == meFamily;
}
@@ -935,7 +935,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate
StyleSheetIsUserDefinedPredicate()
{;}
- bool Check(const SfxStyleSheetBase& sheet)
+ bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE
{
return sheet.IsUserDefined();
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index ce7fbf1cdb5c..d29ad99f72f3 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -108,7 +108,7 @@ class ModifyListenerForewarder : public SfxListener
public:
ModifyListenerForewarder( SdStyleSheet* pStyleSheet );
- virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
private:
SdStyleSheet* mpStyleSheet;
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 3a35ee6cc1ed..9ed4f6731511 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -44,8 +44,8 @@ public:
UndoTextAPIChanged( SdrModel& rModel, TextApiObject* pTextObj );
~UndoTextAPIChanged();
- virtual void Undo();
- virtual void Redo();
+ virtual void Undo() SAL_OVERRIDE;
+ virtual void Redo() SAL_OVERRIDE;
protected:
OutlinerParaObject* mpOldText;
@@ -96,9 +96,9 @@ class TextAPIEditSource : public SvxEditSource
{
TextAPIEditSource_Impl* pImpl;
- virtual SvxEditSource* Clone() const;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual void UpdateData();
+ virtual SvxEditSource* Clone() const SAL_OVERRIDE;
+ virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE;
+ virtual void UpdateData() SAL_OVERRIDE;
explicit TextAPIEditSource( const TextAPIEditSource& rSource );
public: