accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 4 ++-- accessibility/source/extended/AccessibleGridControlTableCell.cxx | 2 +- basctl/source/basicide/scriptdocument.cxx | 2 +- basic/source/basmgr/vbahelper.cxx | 2 +- chart2/source/model/template/PieChartTypeTemplate.cxx | 2 +- chart2/source/view/main/AbstractShapeFactory.cxx | 2 +- codemaker/source/cppumaker/cpputype.cxx | 2 +- comphelper/source/misc/accessibleeventnotifier.cxx | 6 +++--- 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 ++-- cppu/source/uno/lbenv.cxx | 6 +++--- cui/source/customize/cfgutil.cxx | 4 ++-- cui/source/customize/selector.cxx | 4 ++-- cui/source/options/optgdlg.cxx | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-)
New commits: commit 62d1632498d92b6e73b952c9d379edebe3052341 Author: Wastack <[email protected]> Date: Thu Mar 31 08:38:10 2016 +0200 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 <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 944ebe0..b9d6fc9 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 f1a66cf..eb7cee3 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 0f1ee60..b9eb99f 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<XPropertySet>& _xTable, + void lcl_getTableNameComponents( const Reference<XPropertySet>& _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 4d4ce9e..22d3df1 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 1888547..6c5f2cc 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 ) { diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 2281bc1..9f8948d 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -634,7 +634,7 @@ uno_DefaultEnvironment::~uno_DefaultEnvironment() } -static void writeLine( +void writeLine( void * stream, const sal_Char * pLine, const sal_Char * pFilter ) { if (pFilter && *pFilter) @@ -678,7 +678,7 @@ static void writeLine( } -static void writeLine( +void writeLine( void * stream, const OUString & rLine, const sal_Char * pFilter ) { ::rtl::OString aLine( ::rtl::OUStringToOString( @@ -1022,7 +1022,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( } } -static bool loadEnv(OUString const & cLibStem, +bool loadEnv(OUString const & cLibStem, uno_Environment * pEnv) { #ifdef DISABLE_DYNLOADING diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index a1fd315..7120d23 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -492,7 +492,7 @@ namespace the model which supports the embedded scripts, or <NULL/> if it cannot find such a model */ - static Reference< XModel > lcl_getDocumentWithScripts_throw( const Reference< XInterface >& _rxComponent ) + Reference< XModel > lcl_getDocumentWithScripts_throw( const Reference< XInterface >& _rxComponent ) { Reference< XEmbeddedScripts > xScripts( _rxComponent, UNO_QUERY ); if ( !xScripts.is() ) @@ -506,7 +506,7 @@ namespace } - static Reference< XModel > lcl_getScriptableDocument_nothrow( const Reference< XFrame >& _rxFrame ) + Reference< XModel > lcl_getScriptableDocument_nothrow( const Reference< XFrame >& _rxFrame ) { Reference< XModel > xDocument; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 28fbd87..21d58e0 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -264,7 +264,7 @@ namespace the model which supports the embedded scripts, or <NULL/> if it cannot find such a model */ - static Reference< XModel > lcl_getDocumentWithScripts_throw( const Reference< XInterface >& _rxComponent ) + Reference< XModel > lcl_getDocumentWithScripts_throw( const Reference< XInterface >& _rxComponent ) { Reference< XEmbeddedScripts > xScripts( _rxComponent, UNO_QUERY ); if ( !xScripts.is() ) @@ -278,7 +278,7 @@ namespace } - static Reference< XModel > lcl_getScriptableDocument_nothrow( const Reference< XFrame >& _rxFrame ) + Reference< XModel > lcl_getScriptableDocument_nothrow( const Reference< XFrame >& _rxFrame ) { Reference< XModel > xDocument; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index b4da71f..52ef10e 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -196,7 +196,7 @@ SvxGeneralTabPage::sfxpg OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) namespace { - static OUString impl_SystemFileOpenServiceName() + OUString impl_SystemFileOpenServiceName() { const OUString &rDesktopEnvironment = Application::GetDesktopEnvironment(); @@ -225,7 +225,7 @@ namespace #endif } - static bool lcl_HasSystemFilePicker() + bool lcl_HasSystemFilePicker() { if( Application::hasNativeFileSelection() ) return true; commit 0b8e5ca5a25dfe9f20b098fdbd94f7e9f223f5c7 Author: Wastack <[email protected]> Date: Thu Mar 31 08:34:53 2016 +0200 tdf#97966 Drop 'static' keywords Including no keywords from extern "C" blocks Change-Id: Id0304994a692f1004993dda2ffd7fb819ab8e8d0 Reviewed-on: https://gerrit.libreoffice.org/23670 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Stephan Bergmann <[email protected]> diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index e51ff1f..74d344b6 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -28,13 +28,13 @@ namespace accessibility { namespace { - static void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) + void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) { if ( _nIndex >= _sText.getLength() ) throw css::lang::IndexOutOfBoundsException(); } - static sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount ) + sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount ) { return _nRow * _nColumnCount + _nColumn; } diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 30b941e..771b806 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -31,7 +31,7 @@ namespace accessibility { // FIXME this is a copy'n'paste from // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that... - static void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) + void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) { if ( _nIndex >= _sText.getLength() ) throw css::lang::IndexOutOfBoundsException(); diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 6d3a328..3581c1b 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -115,7 +115,7 @@ namespace basctl namespace { - static bool StringCompareLessThan( const OUString& lhs, const OUString& rhs ) + bool StringCompareLessThan( const OUString& lhs, const OUString& rhs ) { return lhs.compareToIgnoreAsciiCase( rhs ) < 0; } diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index 366df75..475a02f 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -48,7 +48,7 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager() typedef ::std::vector<uno::Reference<frame::XModel>> ModelVector; -static ModelVector CreateDocumentsEnumeration( +ModelVector CreateDocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel) { ModelVector models; diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 3e5b679..bd154e3 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -57,7 +57,7 @@ enum PROP_PIE_TEMPLATE_USE_RINGS }; -static void lcl_AddPropertiesToVector( +void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 3955e31..d975ed0 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -55,7 +55,7 @@ typedef opengl::OpenglShapeFactory* (*__getOpenglShapeFactory)(void); #ifndef DISABLE_DYNLOADING -static void SAL_CALL thisModule() {} +void SAL_CALL thisModule() {} osl::Module* getOpenGLModule() { diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 92a1c64..7189405 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -3426,7 +3426,7 @@ private: rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > entity_; }; -static void failsToSupply( +void failsToSupply( FileStream & o, OUString const & service, OString const & type) { o << "::rtl::OUString(\"component context fails to supply service \") + \"" diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index b005d31..a84d0aa 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -58,7 +58,7 @@ namespace } }; - static void releaseId(AccessibleEventNotifier::TClientId const nId) + void releaseId(AccessibleEventNotifier::TClientId const nId) { IntervalMap & rFreeIntervals(FreeIntervals::get()); IntervalMap::iterator const upper(rFreeIntervals.upper_bound(nId)); @@ -87,7 +87,7 @@ namespace } /// generates a new client id - static AccessibleEventNotifier::TClientId generateId() + AccessibleEventNotifier::TClientId generateId() { IntervalMap & rFreeIntervals(FreeIntervals::get()); assert(!rFreeIntervals.empty()); @@ -124,7 +124,7 @@ namespace <TRUE/> if and only if the client could be found and <arg>rPos</arg> has been filled with its position */ - static bool implLookupClient( + bool implLookupClient( const AccessibleEventNotifier::TClientId nClient, ClientMap::iterator& rPos ) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
