diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /framework/inc | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (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 'framework/inc')
-rw-r--r-- | framework/inc/classes/propertysethelper.hxx | 8 | ||||
-rw-r--r-- | framework/inc/helper/ocomponentenumeration.hxx | 2 | ||||
-rw-r--r-- | framework/inc/helper/oframes.hxx | 2 | ||||
-rw-r--r-- | framework/inc/helper/statusindicatorfactory.hxx | 10 | ||||
-rw-r--r-- | framework/inc/jobs/configaccess.hxx | 8 | ||||
-rw-r--r-- | framework/inc/xml/acceleratorconfigurationwriter.hxx | 2 | ||||
-rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 8 | ||||
-rw-r--r-- | framework/inc/xml/menudocumenthandler.hxx | 6 | ||||
-rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 2 | ||||
-rw-r--r-- | framework/inc/xml/toolboxdocumenthandler.hxx | 8 |
10 files changed, 28 insertions, 28 deletions
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 19bb4fbd5dbf..1e022a3c5f16 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -108,7 +108,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * The owner of this class has to be sure, that every new property does * not clash with any existing one. */ - virtual void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty) + void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty) throw(css::beans::PropertyExistException, css::uno::Exception ); @@ -120,7 +120,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * @throw [com::sun::star::beans::UnknownPropertyException] * if no property with the specified name exists. */ - virtual void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) + void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ); @@ -130,8 +130,8 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * There is no chance to reactive a "dead" object by calling impl_enablePropertySet() * again! */ - virtual void SAL_CALL impl_enablePropertySet(); - virtual void SAL_CALL impl_disablePropertySet(); + void SAL_CALL impl_enablePropertySet(); + void SAL_CALL impl_disablePropertySet(); /** */ diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 8dfff638566e..33d8951cdcc4 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -139,7 +139,7 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star @seealso destructor ~TaskEnumeration() *//*-*****************************************************************************************************/ - virtual void impl_resetObject(); + void impl_resetObject(); private: diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 5e1bc562e0c1..67b7e57c6284 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -178,7 +178,7 @@ class OFrames : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr @seealso method dispose() (if it exist!) @seealso destructor ~TaskEnumeration() *//*-*****************************************************************************************************/ - virtual void impl_resetObject(); + void impl_resetObject(); private: diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 142eb8256bd1..328e71320e7f 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -229,18 +229,18 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // similar (XStatusIndicator) - virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText , sal_Int32 nRange); - virtual void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - virtual void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - virtual void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ); - virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, sal_Int32 nValue); // specials diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index bcc01ca7bbfe..9318afe236d2 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -80,11 +80,11 @@ class FWI_DLLPUBLIC ConfigAccess const OUString& sRoot ); virtual ~ConfigAccess(); - virtual void open ( EOpenMode eMode ); - virtual void close ( ); - virtual EOpenMode getMode( ) const; + void open ( EOpenMode eMode ); + void close ( ); + EOpenMode getMode( ) const; - virtual const css::uno::Reference< css::uno::XInterface >& cfg(); + const css::uno::Reference< css::uno::XInterface >& cfg(); }; } // namespace framework diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index a5813c149cfa..c9f432456abb 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -74,7 +74,7 @@ class AcceleratorConfigurationWriter virtual ~AcceleratorConfigurationWriter(); /** @short TODO */ - virtual void flush(); + void flush(); // helper diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 921f3eb6d026..cbb83f07d297 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -150,19 +150,19 @@ class OWriteImagesDocumentHandler ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteImageList( const ImageListItemDescriptor* ) throw + void WriteImageList( const ImageListItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw + void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteImage( const ImageItemDescriptor* ) throw + void WriteImage( const ImageItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteExternalImage( const ExternalImageItemDescriptor* ) throw + void WriteExternalImage( const ExternalImageItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 2462bb2e9336..10de22c60af6 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -260,11 +260,11 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler void WriteMenuDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw + void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 ); - virtual void WriteMenuSeparator(); + void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 ); + void WriteMenuSeparator(); com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index dfe8ef9c9a6b..96c70fdb72b3 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -137,7 +137,7 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteStatusBarItem( + void WriteStatusBarItem( const OUString& rCommandURL, const OUString& rHelpURL, sal_Int16 nOffset, diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index e50df109378b..8fb52012d832 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -162,20 +162,20 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, + void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, sal_Int16 nWidth, bool bVisible ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteToolBoxSpace() throw + void WriteToolBoxSpace() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteToolBoxBreak() throw + void WriteToolBoxBreak() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteToolBoxSeparator() throw + void WriteToolBoxSeparator() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); |