compilerplugins/clang/unnecessaryoverride.cxx | 3 +--
dbaccess/source/core/api/CacheSet.hxx | 2 +-
dbaccess/source/core/api/StaticSet.cxx | 5 -----
dbaccess/source/core/api/StaticSet.hxx | 1 -
4 files changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 7441141bcffe43c7cad3795f2979270328028917
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Oct 31 11:38:49 2016 +0100
No good reason for dbaccess::OCacheSet::updateRow to be pure?
Most of its virtual member functions are (though insertRow is already a
curious
exception), even though they are defined, so smells like a copy/paste error
rather than deliberate design. And appears to have been the only reason why
loplugin:unnecessaryoverride filtered out such overriding of pure base
functions.
Change-Id: Ib2a40af9cd3cd3dbb26c4147f7d01de4e11f5f6e
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx
b/compilerplugins/clang/unnecessaryoverride.cxx
index fedea34..96da48c 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -80,8 +80,7 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const
CXXMethodDecl* methodDecl)
// if we are overriding more than one method, then this is a
disambiguating override
if (methodDecl->isVirtual()) {
- if (methodDecl->size_overridden_methods() != 1
- || (*methodDecl->begin_overridden_methods())->isPure())
+ if (methodDecl->size_overridden_methods() != 1)
{
return true;
}
diff --git a/dbaccess/source/core/api/CacheSet.hxx
b/dbaccess/source/core/api/CacheSet.hxx
index 117454d..88e0058 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -122,7 +122,7 @@ namespace dbaccess
virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark
) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
// css::sdbc::XResultSetUpdate
virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const
connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException,
css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) = 0;
+ virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const
connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException,
css::uno::RuntimeException) = 0;
virtual bool isResultSetChanged() const;
diff --git a/dbaccess/source/core/api/StaticSet.cxx
b/dbaccess/source/core/api/StaticSet.cxx
index aa1ec1c..e73c2bb 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -258,11 +258,6 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow&
_rInsertRow,const connect
}
}
-void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(SQLException, RuntimeException, std::exception)
-{
- OCacheSet::updateRow( _rInsertRow,_rOriginalRow,_xTable);
-}
-
void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const
connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
{
OCacheSet::deleteRow(_rDeleteRow,_xTable);
diff --git a/dbaccess/source/core/api/StaticSet.hxx
b/dbaccess/source/core/api/StaticSet.hxx
index 0b6f516..2074441 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -68,7 +68,6 @@ namespace dbaccess
virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException,
css::uno::RuntimeException) override;
// css::sdbc::XResultSetUpdate
virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const
connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException,
css::uno::RuntimeException) override;
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const
ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable )
throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
override;
virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const
connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException,
css::uno::RuntimeException) override;
};
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
