[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann (via logerrit)]

 connectivity/source/sdbcx/VUser.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 870452546a56ce635f36247c44aee6068d70c053
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jul 1 21:06:11 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jul 2 07:24:44 2022 +0200

    Use some more O3TL_UNREACHABLE
    
    Change-Id: I42401a5ba68e6e0d5b99fae4adbea01cd5fa1600
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136778
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/connectivity/source/sdbcx/VUser.cxx 
b/connectivity/source/sdbcx/VUser.cxx
index a09d82183682..51d05b9387be 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -22,6 +22,7 @@
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
+#include <o3tl/unreachable.hxx>
 
 
 using namespace connectivity;
@@ -113,15 +114,12 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups(  )
     return m_pGroups.get();
 }
 
-
-SAL_WNOUNREACHABLE_CODE_PUSH
-
 sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, 
sal_Int32 /*objType*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedSQLException( 
"XAuthorizable::changePassword", *this );
-    return 0;
+    O3TL_UNREACHABLE;
 }
 
 sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, 
sal_Int32 /*objType*/ )
@@ -129,12 +127,9 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const 
OUString& /*objName*/, s
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedSQLException( 
"XAuthorizable::getGrantablePrivileges", *this );
-    return 0;
+    O3TL_UNREACHABLE;
 }
 
-SAL_WNOUNREACHABLE_CODE_POP
-
-
 void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 
/*objType*/, sal_Int32 /*objPrivileges*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);