summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-20 12:38:10 +0200
committerNoel Grandin <noel@peralex.com>2015-01-26 08:42:28 +0200
commitb44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch)
tree9b4d5d99e5dad0971079b997a02a6d96536709ca /svx/source/inc
parent26ad60aec69310fecd918f1c2e09056aa4782320 (diff)
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx18
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx10
-rw-r--r--svx/source/inc/charmapacc.hxx6
-rw-r--r--svx/source/inc/docrecovery.hxx26
-rw-r--r--svx/source/inc/eventhandler.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/inc/svdobjplusdata.hxx2
-rw-r--r--svx/source/inc/svxpixelctlaccessiblecontext.hxx6
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx32
-rw-r--r--svx/source/inc/tbxform.hxx2
10 files changed, 53 insertions, 53 deletions
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index c829f3a7aa93..fc998adf7a0c 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -75,8 +75,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
//XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -85,13 +85,13 @@ public:
virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
- virtual bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
+ bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
+ bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -111,7 +111,7 @@ public:
protected:
DECL_LINK( WindowEventListener, VclSimpleEvent* );
- virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+ void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
private:
void IsValid() throw (::com::sun::star::uno::RuntimeException);
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index b2c665048fee..ca861db77a21 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -108,10 +108,10 @@ public:
virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getForeground (void)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -186,10 +186,10 @@ protected:
When the object is already disposed then a
<type>DisposedException</type> is thrown.
*/
- virtual Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException);
+ Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException);
/// Return the object's current bounding box relative to the parent object.
- virtual Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException);
+ Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL disposing() SAL_OVERRIDE;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index c2f5cfaebef7..a85d343b3d32 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -58,7 +58,7 @@ namespace svx
// XAccessibleComponent
virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//OAccessibleContextHelper
// XAccessibleContext - still waiting to be overwritten
@@ -138,7 +138,7 @@ namespace svx
// XAccessibleComponent
virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//OAccessibleContextHelper
@@ -236,7 +236,7 @@ namespace svx
// XAccessibleComponent
virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//OAccessibleContextHelper
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 5d41f28ac598..4241576df3ad 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -233,34 +233,34 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
/** @short TODO */
- virtual css::uno::Reference< css::uno::XComponentContext > getComponentContext();
+ css::uno::Reference< css::uno::XComponentContext > getComponentContext();
/** @short TODO */
- virtual TURLList* getURLListAccess();
+ TURLList& getURLListAccess();
/** @short TODO */
static bool isBrokenTempEntry(const TURLInfo& rInfo);
- virtual void saveBrokenTempEntries(const OUString& sSaveDir);
- virtual void saveAllTempEntries(const OUString& sSaveDir);
- virtual void forgetBrokenTempEntries();
- virtual void forgetAllRecoveryEntries();
+ void saveBrokenTempEntries(const OUString& sSaveDir);
+ void saveAllTempEntries(const OUString& sSaveDir);
+ void forgetBrokenTempEntries();
+ void forgetAllRecoveryEntries();
void forgetBrokenRecoveryEntries();
/** @short TODO */
- virtual void setProgressHandler(const css::uno::Reference< css::task::XStatusIndicator >& xProgress);
+ void setProgressHandler(const css::uno::Reference< css::task::XStatusIndicator >& xProgress);
/** @short TODO */
- virtual void setUpdateListener(IRecoveryUpdateListener* pListener);
+ void setUpdateListener(IRecoveryUpdateListener* pListener);
/** @short TODO */
- virtual void doEmergencySavePrepare();
- virtual void doEmergencySave();
- virtual void doRecovery();
+ void doEmergencySavePrepare();
+ void doEmergencySave();
+ void doRecovery();
/** @short TODO */
@@ -583,11 +583,11 @@ class BrokenRecoveryDialog : public ModalDialog
/** @short TODO */
- virtual bool isExecutionNeeded();
+ bool isExecutionNeeded();
/** @short TODO */
- virtual OUString getSaveDirURL();
+ OUString getSaveDirURL();
// helper
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index f3a31de5ec50..ea9da53634d0 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -81,7 +81,7 @@ namespace sdr
virtual ~EventHandler();
// Trigger and consume the events
- virtual void ExecuteEvents();
+ void ExecuteEvents();
bool IsEmpty() const;
};
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 295067326353..2f68067994da 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -108,7 +108,7 @@ public:
virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException);
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/svx/source/inc/svdobjplusdata.hxx b/svx/source/inc/svdobjplusdata.hxx
index 289f64b2560f..7920df322a52 100644
--- a/svx/source/inc/svdobjplusdata.hxx
+++ b/svx/source/inc/svdobjplusdata.hxx
@@ -37,7 +37,7 @@ public:
TYPEINFO();
SdrObjPlusData();
virtual ~SdrObjPlusData();
- virtual SdrObjPlusData* Clone(SdrObject* pObj1) const;
+ SdrObjPlusData* Clone(SdrObject* pObj1) const;
void SetGluePoints(const SdrGluePointList& rPts);
};
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index b4fa3c008e2e..089904adbe95 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -138,9 +138,9 @@ public:
void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew);
virtual void SAL_CALL disposing() SAL_OVERRIDE;
- virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
- virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
/// @returns true if it's disposed or in disposing
inline bool IsAlive( void ) const;
@@ -238,7 +238,7 @@ public:
/// select child
void SelectChild( Point pos );
void SelectChild( long nIndex);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
CreateChild (long nIndex, Point mPoint);
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 84f1aad9dc01..04dec2226891 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -104,21 +104,21 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL
getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual bool SAL_CALL
+ bool SAL_CALL
isShowing() throw( ::com::sun::star::uno::RuntimeException );
- virtual bool SAL_CALL
+ bool SAL_CALL
isVisible() throw( ::com::sun::star::uno::RuntimeException );
- virtual bool SAL_CALL
+ bool SAL_CALL
isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL
+ void SAL_CALL
addFocusListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL
+ void SAL_CALL
removeFocusListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException );
@@ -126,7 +126,7 @@ public:
virtual void SAL_CALL
grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL
+ ::com::sun::star::uno::Any SAL_CALL
getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int32 SAL_CALL
getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -250,10 +250,10 @@ public:
protected:
/// @Return the object's current bounding box relative to the desktop.
- virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
/// @Return the object's current bounding box relative to the parent object.
- virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
/// Calls all Listener to tell they the change.
void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent );
@@ -354,27 +354,27 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL
getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual bool SAL_CALL
+ bool SAL_CALL
isShowing() throw( ::com::sun::star::uno::RuntimeException );
- virtual bool SAL_CALL
+ bool SAL_CALL
isVisible() throw( ::com::sun::star::uno::RuntimeException );
- virtual bool SAL_CALL
+ bool SAL_CALL
isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL
+ void SAL_CALL
addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener )
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL
+ void SAL_CALL
removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL
+ ::com::sun::star::uno::Any SAL_CALL
getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int32 SAL_CALL
getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -463,9 +463,9 @@ public:
void FireFocusEvent();
protected:
- virtual Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException );
- virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
+ Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent );
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index e1d79e5a7559..e9290a08ac49 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -38,7 +38,7 @@ public:
virtual void LoseFocus() SAL_OVERRIDE;
protected:
- virtual void FirePosition( bool _bForce );
+ void FirePosition( bool _bForce );
};