summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWastack <btomi96@gmail.com>2016-03-31 08:38:10 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-01 06:44:18 +0000
commit62d1632498d92b6e73b952c9d379edebe3052341 (patch)
tree05bc34137b4617d51d62412fde5a8941fb6a602f
parent0b8e5ca5a25dfe9f20b098fdbd94f7e9f223f5c7 (diff)
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--connectivity/source/commontools/FValue.cxx4
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx10
-rw-r--r--connectivity/source/commontools/dbtools.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_databasemetadata.cxx2
-rw-r--r--connectivity/source/parse/sqliterator.cxx4
-rw-r--r--cppu/source/uno/lbenv.cxx6
-rw-r--r--cui/source/customize/cfgutil.cxx4
-rw-r--r--cui/source/customize/selector.cxx4
-rw-r--r--cui/source/options/optgdlg.cxx4
9 files changed, 20 insertions, 20 deletions
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<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 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 )
{
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 2281bc143862..9f8948db2764 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 a1fd315d845e..7120d233291c 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 28fbd8716661..21d58e05fcf3 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 b4da71fec511..52ef10e0e058 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;