connectivity/source/drivers/jdbc/JStatement.cxx | 4 ++--
connectivity/source/drivers/jdbc/Object.cxx | 4 ++--
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 2 +-
connectivity/source/inc/java/lang/Object.hxx | 2 +-
connectivity/source/inc/java/sql/JStatement.hxx | 2 +-
include/comphelper/basicio.hxx | 3 +++
include/comphelper/logging.hxx | 1 +
7 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 6759faa1e65c311b07b65e64276cd9f3a9480004
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Feb 18 10:53:46 2014 +0100
sal_Bool -> bool fixup
Change-Id: Id1d838fe4316bbc0e1137d395bb15db3585aed84
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx
b/connectivity/source/drivers/jdbc/JStatement.cxx
index 7bfb0cb..c4b0f29 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -501,11 +501,11 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32
_par0) throw(SQLExceptio
}
//------------------------------------------------------------------------------
-void java_sql_Statement_Base::setEscapeProcessing(sal_Bool _par0)
throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setEscapeProcessing(bool _par0)
throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
- m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, (bool)_par0
);
+ m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, _par0 );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
m_bEscapeProcessing = _par0;
diff --git a/connectivity/source/drivers/jdbc/Object.cxx
b/connectivity/source/drivers/jdbc/Object.cxx
index 4089cb8..461c1ba 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -315,13 +315,13 @@ void java_lang_Object::callVoidMethodWithIntArg( const
char* _pMethodName, jmeth
ThrowSQLException( t.pEnv, NULL );
}
// -------------------------------------------------------------------------
-void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException ) const
+void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, bool _nArgument,bool _bIgnoreException ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment
anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID);
// call method
- t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument );
+ t.pEnv->CallVoidMethod( object, _inout_MethodID,int(_nArgument) );
if ( _bIgnoreException )
isExceptionOccurred(t.pEnv,sal_True);
else
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 9843884..c66b703 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -161,7 +161,7 @@ void SAL_CALL java_sql_PreparedStatement::setString(
sal_Int32 parameterIndex, c
void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32
parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException)
{
- m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex,
(bool)x );
+ m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex,
bool(x) );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/inc/java/lang/Object.hxx
b/connectivity/source/inc/java/lang/Object.hxx
index 7d13c62..c7298c8 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -121,7 +121,7 @@ namespace connectivity
OUString callStringMethodWithIntArg( const char* _pMethodName,
jmethodID& _inout_MethodID , sal_Int32 _nArgument) const;
void callVoidMethod( const char* _pMethodName, jmethodID&
_inout_MethodID) const;
void callVoidMethodWithIntArg( const char* _pMethodName,
jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException = false
) const;
- void callVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException = false
) const;
+ void callVoidMethodWithBoolArg( const char* _pMethodName,
jmethodID& _inout_MethodID, bool _nArgument,bool _bIgnoreException = false )
const;
void callVoidMethodWithStringArg( const char* _pMethodName,
jmethodID& _inout_MethodID, const OUString& _nArgument ) const;
jobject callObjectMethod( JNIEnv * pEnv, const char*
_pMethodName, const char* _pSignature, jmethodID& _inout_MethodID ) const;
jobject callObjectMethodWithIntArg( JNIEnv * pEnv, const char*
_pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32
_nArgument) const;
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx
b/connectivity/source/inc/java/sql/JStatement.hxx
index ebe18c4..d0e5c06 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -77,7 +77,7 @@ namespace connectivity
void setFetchDirection(sal_Int32 _par0)
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
void setFetchSize(sal_Int32 _par0)
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
void setCursorName(const OUString &_par0)
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- void setEscapeProcessing(sal_Bool _par0)
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
+ void setEscapeProcessing(bool _par0)
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement>
m_xGeneratedStatement;
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 7b0c354..35b9bae 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -36,6 +36,9 @@ namespace starawt = ::com::sun::star::awt;
// bool
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>&
operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream,
bool& _rVal);
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>&
operator << (const staruno::Reference<stario::XObjectOutputStream>&
_rxOutStream, bool _bVal);
+void operator <<(
+ css::uno::Reference<css::io::XObjectOutputStream> const &, sal_Bool)
+ SAL_DELETED_FUNCTION;
// OUString
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>&
operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream,
OUString& _rStr);
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index ce7b829..c243c2b 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -58,6 +58,7 @@ namespace comphelper
inline OUString convertLogArgToString( sal_Int16 _nValue ) { return
OUString::number( _nValue ); }
inline OUString convertLogArgToString( sal_Unicode _nValue ) { return
OUString( _nValue ); }
inline OUString convertLogArgToString( bool _bValue ) { return
OUString::boolean( _bValue ); }
+ void convertLogArgToString(sal_Bool) SAL_DELETED_FUNCTION;
} } // namespace log::convert
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
