Kaydet (Commit) 9e596250 authored tarafından Wastack's avatar Wastack Kaydeden (comit) Stephan Bergmann

tdf#97966 Drop 'static' keywords

Including no keywords from extern "C" blocks

Change-Id: Icff7c0308843d6a7608be24d7fcf11fa079c7b72
Reviewed-on: https://gerrit.libreoffice.org/23672Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 62d16324
......@@ -295,7 +295,7 @@ sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException
namespace
{
static Reference< XDatabaseMetaData > lcl_getDBMetaDataFromStatement_nothrow( const Reference< XInterface >& _rxStatement )
Reference< XDatabaseMetaData > lcl_getDBMetaDataFromStatement_nothrow( const Reference< XInterface >& _rxStatement )
{
Reference< XDatabaseMetaData > xDBMetaData;
try
......
......@@ -1193,7 +1193,7 @@ namespace
namespace
{
static void lcl_rebaseScriptStorage_throw( const Reference< XStorageBasedLibraryContainer >& _rxContainer,
void lcl_rebaseScriptStorage_throw( const Reference< XStorageBasedLibraryContainer >& _rxContainer,
const Reference< XStorage >& _rxNewRootStorage )
{
if ( _rxContainer.is() )
......
......@@ -285,7 +285,7 @@ namespace
return _rArguments.getOrDefault( "StatusIndicator", xStatusIndicator );
}
static void lcl_triggerStatusIndicator_throw( const ::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const bool _bStart )
void lcl_triggerStatusIndicator_throw( const ::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const bool _bStart )
{
Reference< XStatusIndicator > xStatusIndicator( lcl_extractStatusIndicator( _rArguments ) );
if ( !xStatusIndicator.is() )
......@@ -307,7 +307,7 @@ namespace
// note that |reset| can throw a DisposedException
}
static void lcl_extractStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments, Sequence< Any >& _rCallArgs )
void lcl_extractStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments, Sequence< Any >& _rCallArgs )
{
Reference< XStatusIndicator > xStatusIndicator( lcl_extractStatusIndicator( _rArguments ) );
if ( !xStatusIndicator.is() )
......@@ -318,7 +318,7 @@ namespace
_rCallArgs[ nLength ] <<= xStatusIndicator;
}
static void lcl_extractAndStartStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >& _rxStatusIndicator,
void lcl_extractAndStartStatusIndicator( const ::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >& _rxStatusIndicator,
Sequence< Any >& _rCallArgs )
{
_rxStatusIndicator = lcl_extractStatusIndicator( _rArguments );
......@@ -339,7 +339,7 @@ namespace
}
}
static Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const OUString& _rURL )
Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const OUString& _rURL )
{
::comphelper::NamedValueCollection aMutableDescriptor( _rDescriptor );
if ( !_rURL.isEmpty() )
......
......@@ -76,7 +76,7 @@ namespace dbaccess
namespace
{
static void lcl_dispatchScriptURL_throw( DocumentEventExecutor_Data& _rDocExecData,
void lcl_dispatchScriptURL_throw( DocumentEventExecutor_Data& _rDocExecData,
const OUString& _rScriptURL, const DocumentEvent& _rTrigger )
{
Reference< XModel > xDocument( _rDocExecData.xDocument.get(), UNO_QUERY_THROW );
......
......@@ -76,7 +76,7 @@ namespace dbaccess
// helpers
namespace
{
static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer )
void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer )
{
o_rBuffer.append( i_rComponentDesc.first );
o_rBuffer.append( '=' );
......@@ -85,7 +85,7 @@ namespace dbaccess
o_rBuffer.append( sal_Unicode( i_rComponentDesc.second.bForEditing ? '1' : '0' ) );
}
static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc )
bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc )
{
const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( '=' );
if ( nEqualSignPos < 1 )
......@@ -110,7 +110,7 @@ namespace dbaccess
static const char sObjectMapStreamName[] = "storage-component-map.ini";
static void lcl_writeObjectMap_throw( const Reference<XComponentContext> & i_rContext, const Reference< XStorage >& i_rStorage,
void lcl_writeObjectMap_throw( const Reference<XComponentContext> & i_rContext, const Reference< XStorage >& i_rStorage,
const MapStringToCompDesc& i_mapStorageToCompDesc )
{
if ( i_mapStorageToCompDesc.empty() )
......@@ -135,7 +135,7 @@ namespace dbaccess
aTextOutput.writeLine();
}
static bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName )
bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName )
{
const sal_Int32 nLen = i_rIniLine.getLength();
if ( i_rIniLine.startsWith("[") && i_rIniLine.endsWith("]") )
......@@ -146,14 +146,14 @@ namespace dbaccess
return false;
}
static void lcl_stripTrailingLineFeed( OUString& io_rLine )
void lcl_stripTrailingLineFeed( OUString& io_rLine )
{
const sal_Int32 nLen = io_rLine.getLength();
if ( io_rLine.endsWith("\n") )
io_rLine = io_rLine.copy( 0, nLen - 1 );
}
static void lcl_readObjectMap_throw( const Reference<XComponentContext> & i_rxContext, const Reference< XStorage >& i_rStorage,
void lcl_readObjectMap_throw( const Reference<XComponentContext> & i_rxContext, const Reference< XStorage >& i_rStorage,
MapStringToCompDesc& o_mapStorageToObjectName )
{
ENSURE_OR_THROW( i_rStorage.is(), "invalid storage" );
......@@ -204,7 +204,7 @@ namespace dbaccess
}
}
static void lcl_markModified( const Reference< XComponent >& i_rSubComponent )
void lcl_markModified( const Reference< XComponent >& i_rSubComponent )
{
const Reference< XModifiable > xModify( i_rSubComponent, UNO_QUERY );
if ( !xModify.is() )
......
......@@ -84,7 +84,7 @@ namespace dbaccess
// helper
namespace
{
static OUString lcl_getComponentStorageBaseName( const SubComponentType i_eType )
OUString lcl_getComponentStorageBaseName( const SubComponentType i_eType )
{
switch ( i_eType )
{
......@@ -104,7 +104,7 @@ namespace dbaccess
return OUString();
}
static SubComponentType lcl_databaseObjectToSubComponentType( const sal_Int32 i_nObjectType )
SubComponentType lcl_databaseObjectToSubComponentType( const sal_Int32 i_nObjectType )
{
switch ( i_nObjectType )
{
......@@ -118,7 +118,7 @@ namespace dbaccess
return UNKNOWN;
}
static bool lcl_determineReadOnly( const Reference< XComponent >& i_rComponent )
bool lcl_determineReadOnly( const Reference< XComponent >& i_rComponent )
{
Reference< XModel > xDocument( i_rComponent, UNO_QUERY );
if ( !xDocument.is() )
......@@ -134,7 +134,7 @@ namespace dbaccess
return aDocArgs.getOrDefault( "ReadOnly", false );
}
static Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI,
Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI,
const SubComponentType i_eType, const OUString& i_rName )
{
Reference< XController > xController( i_rAppUI, UNO_QUERY_THROW );
......
......@@ -170,7 +170,7 @@ namespace dbmm
{
static const char sScriptsStorageName[] = "Scripts";
static OUString lcl_getScriptsSubStorageName( const ScriptType _eType )
OUString lcl_getScriptsSubStorageName( const ScriptType _eType )
{
switch ( _eType )
{
......@@ -186,7 +186,7 @@ namespace dbmm
return OUString();
}
static bool lcl_getScriptTypeFromLanguage( const OUString& _rLanguage, ScriptType& _out_rScriptType )
bool lcl_getScriptTypeFromLanguage( const OUString& _rLanguage, ScriptType& _out_rScriptType )
{
struct LanguageMapping
{
......@@ -228,7 +228,7 @@ namespace dbmm
return sObjectName;
}
static Any lcl_executeCommand_throw( const Reference< XCommandProcessor >& _rxCommandProc,
Any lcl_executeCommand_throw( const Reference< XCommandProcessor >& _rxCommandProc,
const sal_Char* _pAsciiCommand )
{
OSL_PRECOND( _rxCommandProc.is(), "lcl_executeCommand_throw: illegal object!" );
......@@ -263,7 +263,7 @@ namespace dbmm
eFailure
};
static OpenDocResult lcl_loadSubDocument_nothrow( SubDocument& _rDocument,
OpenDocResult lcl_loadSubDocument_nothrow( SubDocument& _rDocument,
const Reference< XStatusIndicator >& _rxProgress, MigrationLog& _rLogger )
{
OSL_PRECOND( !_rDocument.xDocument.is(), "lcl_loadSubDocument_nothrow: already loaded!" );
......@@ -317,7 +317,7 @@ namespace dbmm
return _rDocument.xDocument.is() ? eOpenedDoc : eFailure;
}
static bool lcl_unloadSubDocument_nothrow( SubDocument& _rDocument, MigrationLog& _rLogger )
bool lcl_unloadSubDocument_nothrow( SubDocument& _rDocument, MigrationLog& _rLogger )
{
bool bSuccess = false;
Any aException;
......@@ -1132,7 +1132,7 @@ namespace dbmm
namespace
{
static OUString lcl_createTargetLibName( const SubDocument& _rDocument,
OUString lcl_createTargetLibName( const SubDocument& _rDocument,
const OUString& _rSourceLibName, const Reference< XNameAccess >& _rxTargetContainer )
{
// The new library name is composed from the prefix, the base name, and the old library name.
......
......@@ -186,7 +186,7 @@ namespace dbmm
namespace
{
static void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError )
void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError )
{
const sal_Char* pAsciiErrorDescription( nullptr );
::std::vector< OUString > aParameterNames;
......
......@@ -678,7 +678,7 @@ namespace
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
static sal_Int32 lcl_getFolderIndicatorForType( const ElementType _eType )
sal_Int32 lcl_getFolderIndicatorForType( const ElementType _eType )
{
const sal_Int32 nFolderIndicator =
( _eType == E_FORM ) ? DatabaseObjectContainer::FORMS_FOLDER
......
......@@ -178,7 +178,7 @@ namespace
explicit ExceptionDisplayInfo( SQLExceptionInfo::TYPE _eType ) : eType( _eType ), bSubEntry( false ) { }
};
static bool lcl_hasDetails( const ExceptionDisplayInfo& _displayInfo )
bool lcl_hasDetails( const ExceptionDisplayInfo& _displayInfo )
{
return ( !_displayInfo.sErrorCode.isEmpty() )
|| ( !_displayInfo.sSQLState.isEmpty()
......
......@@ -1298,7 +1298,7 @@ sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _
namespace
{
static OUString lcl_createSDBCLevelStatement( const OUString& _rStatement, const Reference< XConnection >& _rxConnection )
OUString lcl_createSDBCLevelStatement( const OUString& _rStatement, const Reference< XConnection >& _rxConnection )
{
OUString sSDBCLevelStatement( _rStatement );
try
......
......@@ -61,7 +61,7 @@ namespace dbaui
namespace
{
static void lcl_getConnectionProvidedTableIcon_nothrow( const ImageProvider_Data& _rData,
void lcl_getConnectionProvidedTableIcon_nothrow( const ImageProvider_Data& _rData,
const OUString& _rName, Reference< XGraphic >& _out_rxGraphic )
{
try
......@@ -75,7 +75,7 @@ namespace dbaui
}
}
static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const OUString& _rName,
void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const OUString& _rName,
sal_uInt16& _out_rResourceID)
{
_out_rResourceID = 0;
......
......@@ -126,7 +126,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr
return pBestMatch;
}
static std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl(
std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl(
const rtl::OUString& rUrl, const rtl::OUString& rFactory)
{
try
......
......@@ -138,7 +138,7 @@ bool existsOfficePipe()
}
//get modification time
static bool getModifyTimeTargetFile(const OUString &rFileURL, TimeValue &rTime)
bool getModifyTimeTargetFile(const OUString &rFileURL, TimeValue &rTime)
{
salhelper::LinkResolver aResolver(osl_FileStatus_Mask_ModifyTime);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment