mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: Unreachable code

Browse Source 
Noticed by the MS linker when doing link-time code generation (!). In
all cases, a "return" after a call to a function that always throws an
exception. To avoid other compilers perhaps warning about missing
return of a value, put the "returns" inside ifdefs.

Change-Id: I83aa04cb5c3ff8413d3ed4dc85fb57f2a41fd589
This commit is contained in:
Tor Lillqvist
2013-09-04 01:37:58 +03:00
parent 340c546eca
commit aa4868de78
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/source/commontools/BlobHelper.cxx
View File

@@ -49,13 +49,17 @@ BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val)
::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{ {
::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this ); ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this );
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return 0; return 0;
#endif
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{ {
::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this );
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return 0; return 0;
#endif
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

20
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
View File

@@ -326,13 +326,17 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException) void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException)
@@ -360,32 +364,42 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException) Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException)
@@ -397,19 +411,25 @@ Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) th
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException)
{ {
::dbtools::throwFunctionSequenceException(*this); ::dbtools::throwFunctionSequenceException(*this);
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return sal_False; return sal_False;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------

4
connectivity/source/sdbcx/VUser.cxx
View File

@@ -128,7 +128,9 @@ sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OUser_BASE::rBHelper.bDisposed); checkDisposed(OUser_BASE::rBHelper.bDisposed);
::dbtools::throwFeatureNotImplementedException( "XAuthorizable::changePassword", *this ); ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::changePassword", *this );
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return 0; return 0;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -136,7 +138,9 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, s
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OUser_BASE::rBHelper.bDisposed); checkDisposed(OUser_BASE::rBHelper.bDisposed);
::dbtools::throwFeatureNotImplementedException( "XAuthorizable::getGrantablePrivileges", *this ); ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::getGrantablePrivileges", *this );
#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
return 0; return 0;
#endif
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)