loplugin:unnecessaryvirtual improve result output

and merge some of the template function results

Change-Id: I9a7855ce6720d022ea5b988d68f0d59ff81ee5b9
Reviewed-on: https://gerrit.libreoffice.org/51985
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 14 insertions, 11 deletions

diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 336f6770ab3e..24863cb0a2ce 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -70,7 +70,7 @@ namespace dbaccess
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue ) override;
 
-        virtual void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue);
+        void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue);
     protected:
         using ODataColumn::getFastPropertyValue;
     };
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 11312dbc5dda..59c6dfccd5cb 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -185,10 +185,11 @@ namespace dbaccess
         virtual bool rowUpdated(  ) override;
         virtual bool rowInserted(  ) override;
         virtual bool rowDeleted(  ) override;
+        bool isBeforeFirst(  );
+        bool isAfterLast(  );
+
         // css::sdbc::XResultSet
         virtual bool next() override;
-        virtual bool isBeforeFirst(  );
-        virtual bool isAfterLast(  );
         virtual void beforeFirst(  ) override;
         virtual void afterLast(  ) override;
         virtual bool first() override;
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index cddf6c95299a..a059f8f74420 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -235,7 +235,7 @@ namespace dbaccess
         virtual bool notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard) override;
         virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard) override;
         // notify all that rowset changed
-        virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard);
+        void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard);
 
         virtual void doCancelModification( ) override;
         virtual bool isModification( ) override;
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 0a2219c6a067..8c466d29e208 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -51,10 +51,11 @@ namespace dbaccess
         virtual bool hasOrderedBookmarks(  ) override;
         virtual sal_Int32 hashBookmark( const css::uno::Any& bookmark ) override;
 
+        bool isBeforeFirst(  );
+        bool isAfterLast(  );
+
         // css::sdbc::XResultSet
         virtual bool next() override;
-        virtual bool isBeforeFirst(  );
-        virtual bool isAfterLast(  );
         virtual void beforeFirst(  ) override;
         virtual void afterLast(  ) override;
         virtual bool first() override;
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index ec4bb0b46116..de094ecf2ae4 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -43,7 +43,7 @@ namespace dbaccess
         );
         virtual ~StorageXMLOutputStream() override;
 
-        virtual void close();
+        void    close();
 
         void    addAttribute( const OUString& i_rName, const OUString& i_rValue ) const;
 
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index 41cad914eb74..dfada694fdfb 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -46,7 +46,7 @@ namespace dbaui
         bool IsSourcePrimKey()  const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM);    }
         bool IsDestPrimKey()    const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO);       }
 
-        virtual OConnectionLineDataRef CreateLineDataObj();
+        OConnectionLineDataRef CreateLineDataObj();
 
         ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData );
     public:
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index ee438c21dfbe..49ee4e3b513e 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -203,9 +203,10 @@ namespace dbaui
         virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) override;
 
     private:
-        // SbaXDataBrowserController overridables
+        // SbaXDataBrowserController overridable
         virtual bool     InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override;
-        virtual void     InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
+
+        void             InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
 
         virtual bool     preReloadForm() override;
         virtual void     postReloadForm() override;
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 5a2a88472935..441276b05b66 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -33,7 +33,7 @@ namespace dbaui
         bool            m_bNatural;
 
         // for creation and duplication of lines of own type
-        virtual OConnectionLineDataRef CreateLineDataObj();
+        OConnectionLineDataRef CreateLineDataObj();
 
         OQueryTableConnectionData& operator=( const OQueryTableConnectionData& rConnData );
     public: