[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source desktop/source
Wastack
btomi96 at gmail.com
Fri Apr 1 06:44:58 UTC 2016
dbaccess/qa/unit/data/hsqldb_empty.odb.lck |binary
dbaccess/source/core/api/resultset.cxx | 2 +-
dbaccess/source/core/dataaccess/ModelImpl.cxx | 2 +-
dbaccess/source/core/dataaccess/databasedocument.cxx | 8 ++++----
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 2 +-
dbaccess/source/core/recovery/dbdocrecovery.cxx | 14 +++++++-------
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 8 ++++----
dbaccess/source/ext/macromigration/migrationengine.cxx | 12 ++++++------
dbaccess/source/ext/macromigration/migrationlog.cxx | 2 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 +-
dbaccess/source/ui/dlg/sqlmessage.cxx | 2 +-
dbaccess/source/ui/misc/UITools.cxx | 2 +-
dbaccess/source/ui/misc/imageprovider.cxx | 4 ++--
desktop/source/app/dispatchwatcher.cxx | 2 +-
desktop/source/deployment/misc/dp_misc.cxx | 2 +-
15 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 9e596250a6e968c5d1e2fb0de582ae242e02acf9
Author: Wastack <btomi96 at gmail.com>
Date: Thu Mar 31 08:40:23 2016 +0200
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: Icff7c0308843d6a7608be24d7fcf11fa079c7b72
Reviewed-on: https://gerrit.libreoffice.org/23672
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/dbaccess/qa/unit/data/hsqldb_empty.odb.lck b/dbaccess/qa/unit/data/hsqldb_empty.odb.lck
new file mode 100644
index 0000000..d64ce94
Binary files /dev/null and b/dbaccess/qa/unit/data/hsqldb_empty.odb.lck differ
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index e69cf2b..f268810 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -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
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 318ed94..9df76e5 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -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() )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index dc1f629..2922e8e 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -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() )
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 7cffb62..2438dc2 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -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 );
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index c706375..940ab62 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -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() )
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index bb852c5..970ad31 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -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 );
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c4f02cd..c9ecb2b 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -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.
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 475ca47..e28ce2b 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -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;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 7a5457b..29dffc9 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -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
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index db8ba6a..6ef0fc7 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -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()
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 475da80..22c2abf 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -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
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index f0562cc..bbdc586 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -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;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 9f1c7bd..7279a8f 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -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
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 24f23a5..28cf3d1 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -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);
More information about the Libreoffice-commits
mailing list