From 62d1632498d92b6e73b952c9d379edebe3052341 Mon Sep 17 00:00:00 2001 From: Wastack Date: Thu, 31 Mar 2016 08:38:10 +0200 Subject: tdf#97966 Drop 'static' keywords Including no keywords from extern "C" blocks Change-Id: I18ddafbf3d41f6779fb43e36ba1f1c48b37757a0 Reviewed-on: https://gerrit.libreoffice.org/23671 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- connectivity/source/commontools/FValue.cxx | 4 ++-- connectivity/source/commontools/dbmetadata.cxx | 10 +++++----- connectivity/source/commontools/dbtools.cxx | 2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2 +- connectivity/source/parse/sqliterator.cxx | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 944ebe00d7b1..b9d6fc9f3e9b 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -38,7 +38,7 @@ namespace connectivity { namespace { - static bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2) + bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2) { bool bIsCompatible = true; @@ -104,7 +104,7 @@ namespace { return bIsCompatible; } - static bool isStorageComparable(sal_Int32 _eType1, sal_Int32 _eType2) + bool isStorageComparable(sal_Int32 _eType1, sal_Int32 _eType2) { bool bIsComparable = true; diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index f1a66cf791d1..eb7cee3e578f 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -95,7 +95,7 @@ namespace dbtools namespace { - static void lcl_construct( DatabaseMetaData_Impl& _metaDataImpl, const Reference< XConnection >& _connection ) + void lcl_construct( DatabaseMetaData_Impl& _metaDataImpl, const Reference< XConnection >& _connection ) { _metaDataImpl.xConnection = _connection; if ( !_metaDataImpl.xConnection.is() ) @@ -107,7 +107,7 @@ namespace dbtools } - static void lcl_checkConnected( const DatabaseMetaData_Impl& _metaDataImpl ) + void lcl_checkConnected( const DatabaseMetaData_Impl& _metaDataImpl ) { if ( !_metaDataImpl.xConnection.is() || !_metaDataImpl.xConnectionMetaData.is() ) { @@ -118,7 +118,7 @@ namespace dbtools } - static bool lcl_getDriverSetting( const sal_Char* _asciiName, const DatabaseMetaData_Impl& _metaData, Any& _out_setting ) + bool lcl_getDriverSetting( const sal_Char* _asciiName, const DatabaseMetaData_Impl& _metaData, Any& _out_setting ) { lcl_checkConnected( _metaData ); const ::comphelper::NamedValueCollection& rDriverMetaData = _metaData.aDriverConfig.getMetaData( _metaData.xConnectionMetaData->getURL() ); @@ -129,7 +129,7 @@ namespace dbtools } - static bool lcl_getConnectionSetting( const sal_Char* _asciiName, const DatabaseMetaData_Impl& _metaData, Any& _out_setting ) + bool lcl_getConnectionSetting( const sal_Char* _asciiName, const DatabaseMetaData_Impl& _metaData, Any& _out_setting ) { try { @@ -160,7 +160,7 @@ namespace dbtools } - static const OUString& lcl_getConnectionStringSetting( + const OUString& lcl_getConnectionStringSetting( const DatabaseMetaData_Impl& _metaData, ::boost::optional< OUString >& _cachedSetting, OUString (SAL_CALL XDatabaseMetaData::*_getter)() ) { diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 0f1ee600a4fb..b9eb99f55166 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1309,7 +1309,7 @@ OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnectio namespace { - static void lcl_getTableNameComponents( const Reference& _xTable, + void lcl_getTableNameComponents( const Reference& _xTable, OUString& _out_rCatalog, OUString& _out_rSchema, OUString& _out_rName ) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 4d4ce9e78011..22d3df1e8b9e 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1368,7 +1368,7 @@ namespace { // Oh, quelle horreur // LEM TODO: Need to severely rewrite that! // should probably just "do the same" as ODBC or JDBC drivers... - static void extractPrecisionAndScale( + void extractPrecisionAndScale( sal_Int32 dataType, sal_Int32 atttypmod, sal_Int32 *precision, sal_Int32 *scale ) { if( atttypmod < PQ_VARHDRSZ ) diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 188854702a33..6c5f2ccd43c2 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -247,7 +247,7 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree) namespace { - static void impl_getRowString( const Reference< XRow >& _rxRow, const sal_Int32 _nColumnIndex, OUString& _out_rString ) + void impl_getRowString( const Reference< XRow >& _rxRow, const sal_Int32 _nColumnIndex, OUString& _out_rString ) { _out_rString = _rxRow->getString( _nColumnIndex ); if ( _rxRow->wasNull() ) @@ -255,7 +255,7 @@ namespace } - static OUString lcl_findTableInMetaData( + OUString lcl_findTableInMetaData( const Reference< XDatabaseMetaData >& _rxDBMeta, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rTableName ) { -- cgit