diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-15 09:22:09 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-15 09:22:09 +0200 |
commit | 7275a051677b5646e56623b3addc783880ce8e9b (patch) | |
tree | ff4a200d324649789b4791ceacc8dabf822f7860 | |
parent | 2b2a27ed4452e5b6dbdd0036fa521663111c671d (diff) |
loplugin warnings
Change-Id: I23ce5efe4ba20e1da5ffd169a2f3140a73dd035f
-rw-r--r-- | connectivity/source/drivers/evoab2/NConnection.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/evoab2/NServices.cxx | 14 | ||||
-rw-r--r-- | connectivity/source/drivers/evoab2/NStatement.cxx | 10 | ||||
-rw-r--r-- | include/sal/log-areas.dox | 1 |
5 files changed, 17 insertions, 12 deletions
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 680a8ea2d121..b4424a6c3669 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -96,7 +96,7 @@ IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connec void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) { osl_atomic_increment( &m_refCount ); - SAL_INFO("evoab2", "OEvoabConnection::construct()::url = " << url ); + SAL_INFO("connectivity.evoab2", "OEvoabConnection::construct()::url = " << url ); OUString sPassword; const char* pPwd = "password"; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 8f3198234c26..cd71d722dd63 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -217,9 +217,11 @@ namespace connectivity initFields(); if( pSpec ) + { aName = OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), RTL_TEXTENCODING_UTF8 ); aName = aName.replace( '-', '_' ); + } return aName; } diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index e543cb808514..c5e7082dbcc2 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -61,13 +61,15 @@ struct ProviderRequest ) { if (!xRet.is() && (Implname == sImplementationName)) - try { - xRet = creator( xServiceManager, sImplementationName,Factory, Services,0); - } - catch(const ::com::sun::star::uno::Exception&) - { - OSL_FAIL("Service Creation Exception"); + try + { + xRet = creator( xServiceManager, sImplementationName,Factory, Services,0); + } + catch(const ::com::sun::star::uno::Exception&) + { + OSL_FAIL("Service Creation Exception"); + } } return xRet.is(); } diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 8a0be6123131..e490ebbce02f 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -375,7 +375,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) } else if( aMatchString.indexOf( WILDCARD ) == -1 ) { // Simple string , eg. "to match" "contains in evo" - SAL_INFO( "evoab2", "Plain contains '" << aMatchString << "'" ); + SAL_INFO( "connectivity.evoab2", "Plain contains '" << aMatchString << "'" ); pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, aMatchString ); if( pResult && bNotLike ) pResult = e_book_query_not( pResult, TRUE ); @@ -445,7 +445,7 @@ OUString OCommonStatement::getTableName() void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData ) { - SAL_INFO( "evoab2", "parsing " << sql ); + SAL_INFO( "connectivity.evoab2", "parsing " << sql ); _out_rQueryData.eFilterType = eFilterOther; @@ -463,7 +463,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData #if OSL_DEBUG_LEVEL > 1 OUString sTreeDebug; pOrderByClause->showParseTree( sTreeDebug ); - SAL_INFO( "evoab2", "found order-by tree:\n" << sTreeDebug ); + SAL_INFO( "connectivity.evoab2", "found order-by tree:\n" << sTreeDebug ); #endif orderByAnalysis( pOrderByClause, _out_rQueryData.aSortOrder ); } @@ -474,7 +474,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData #if OSL_DEBUG_LEVEL > 1 OUString sTreeDebug; pWhereClause->showParseTree( sTreeDebug ); - SAL_INFO( "evoab2", "found where tree:\n" << sTreeDebug ); + SAL_INFO( "connectivity.evoab2", "found where tree:\n" << sTreeDebug ); #endif EBookQuery* pQuery = whereAnalysis( pWhereClause->getChild( 1 ) ); if ( !pQuery ) @@ -582,7 +582,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa // ------------------------------------------------------------------------- Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql ) { - SAL_INFO( "evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" ); + SAL_INFO( "connectivity.evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" ); #if OSL_DEBUG_LEVEL > 1 g_message( "Parse SQL '%s'\n", diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 22f618c24ce0..caf4d1e145a0 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -51,6 +51,7 @@ certain functionality. @section connectivity +@li @c connectivity.evoab2 @li @c connectivity.cpool @li @c connectivity.commontools @li @c connectivity.mork |