summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorWastack <btomi96@gmail.com>2016-03-31 08:46:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-01 06:46:17 +0000
commitcb495d71063d60da46215a2510736eccd910fa7a (patch)
tree3179b5a73b9ca9e0e45618bfaa09c9718c0290f6 /stoc
parenteea3f508c35f8f391825761ab6e1f3fbfb2fd0c1 (diff)
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks Change-Id: I364aa7d67c2bf867588798e07df95c3f3f2bd7f3 Reviewed-on: https://gerrit.libreoffice.org/23676 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/implementationregistration/implreg.cxx34
-rw-r--r--stoc/source/javavm/javavm.cxx2
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx6
-rw-r--r--stoc/source/security/access_controller.cxx2
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx2
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx2
6 files changed, 24 insertions, 24 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index c95159bb7a7f..45d699f59131 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -112,7 +112,7 @@ const StringPool &spool()
// static deleteAllLinkReferences()
-static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
+void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
const Reference < XRegistryKey >& xSource)
// throw ( InvalidRegistryException, RuntimeException )
{
@@ -195,7 +195,7 @@ static void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
// static prepareLink
-static void prepareLink( const Reference < XSimpleRegistry > & xDest,
+void prepareLink( const Reference < XSimpleRegistry > & xDest,
const Reference < XRegistryKey > & xSource,
const OUString& link)
// throw ( InvalidRegistryException, RuntimeException )
@@ -239,7 +239,7 @@ static void prepareLink( const Reference < XSimpleRegistry > & xDest,
// static searchImplForLink
-static OUString searchImplForLink(
+OUString searchImplForLink(
const Reference < XRegistryKey > & xRootKey,
const OUString& linkName,
const OUString& implName )
@@ -279,7 +279,7 @@ static OUString searchImplForLink(
// static searchLinkTargetForImpl
-static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey,
+OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey,
const OUString& linkName,
const OUString& implName)
// throw ( InvalidRegistryException, RuntimeException )
@@ -323,7 +323,7 @@ static OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootK
// static createUniqueSubEntry
-static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
+void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
const OUString& value)
// throw ( InvalidRegistryException, RuntimeException )
{
@@ -382,7 +382,7 @@ static void createUniqueSubEntry(const Reference < XRegistryKey > & xSuperKey,
// static deleteSubEntry
-static bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const OUString& value)
+bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const OUString& value)
// throw ( InvalidRegistryException, RuntimeException )
{
if (xSuperKey->getValueType() == RegistryValueType_ASCIILIST)
@@ -427,7 +427,7 @@ static bool deleteSubEntry(const Reference < XRegistryKey >& xSuperKey, const OU
// static prepareUserLink
-static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
+void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
const OUString& linkName,
const OUString& linkTarget,
const OUString& implName)
@@ -454,7 +454,7 @@ static void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
// static deleteUserLink
-static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
+void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
const OUString& path)
{
try
@@ -481,7 +481,7 @@ static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey,
// static deleteUserLink
-static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
+void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
const OUString& linkName,
const OUString& linkTarget,
const OUString& implName)
@@ -584,7 +584,7 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
// static prepareUserKeys
-static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
+void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
const Reference < XRegistryKey >& xUnoKey,
const Reference < XRegistryKey >& xKey,
const OUString& implName,
@@ -661,7 +661,7 @@ static void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
// static deleteAllImplementations
-static void deleteAllImplementations( const Reference < XSimpleRegistry >& xReg,
+void deleteAllImplementations( const Reference < XSimpleRegistry >& xReg,
const Reference < XRegistryKey >& xSource,
const OUString& locationUrl,
std::list<OUString> & implNames)
@@ -748,7 +748,7 @@ static void deleteAllImplementations( const Reference < XSimpleRegistry >& xRe
}
-static void delete_all_singleton_entries(
+void delete_all_singleton_entries(
Reference < registry::XRegistryKey > const & xSingletons_section,
::std::list< OUString > const & impl_names )
// throw (InvalidRegistryException, RuntimeException)
@@ -813,7 +813,7 @@ static void delete_all_singleton_entries(
// static deleteAllServiceEntries
-static void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xReg,
+void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xReg,
const Reference < XRegistryKey >& xSource,
const OUString& implName)
// throw ( InvalidRegistryException, RuntimeException )
@@ -890,7 +890,7 @@ static void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xRe
}
-static bool is_supported_service(
+bool is_supported_service(
OUString const & service_name,
Reference< reflection::XServiceTypeDescription > const & xService_td )
{
@@ -908,7 +908,7 @@ static bool is_supported_service(
}
-static void insert_singletons(
+void insert_singletons(
Reference< registry::XSimpleRegistry > const & xDest,
Reference< registry::XRegistryKey > const & xImplKey,
Reference< XComponentContext > const & xContext )
@@ -1029,7 +1029,7 @@ static void insert_singletons(
// static prepareRegistry
-static void prepareRegistry(
+void prepareRegistry(
const Reference < XSimpleRegistry >& xDest,
const Reference < XRegistryKey >& xSource,
const OUString& implementationLoaderUrl,
@@ -1142,7 +1142,7 @@ static void prepareRegistry(
}
-static void findImplementations( const Reference < XRegistryKey > & xSource,
+void findImplementations( const Reference < XRegistryKey > & xSource,
std::list <OUString>& implNames)
{
bool isImplKey = false;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 0e6577364fe2..290198c6451c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -465,7 +465,7 @@ void getJavaPropsFromSafetySettings(
xConfRegistry_simple->close();
}
-static void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
+void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
/* A Bug in the Java function
** struct Hjava_util_Properties * java_lang_System_initProperties(
** struct Hjava_lang_System *this,
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 2ce250ba17e2..6153062a0336 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -50,12 +50,12 @@ using namespace css::uno;
namespace
{
-static OUString proxyfac_getImplementationName()
+OUString proxyfac_getImplementationName()
{
return OUString(IMPL_NAME);
}
-static Sequence< OUString > proxyfac_getSupportedServiceNames()
+Sequence< OUString > proxyfac_getSupportedServiceNames()
{
OUString str_name = SERVICE_NAME;
return Sequence< OUString >( &str_name, 1 );
@@ -450,7 +450,7 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames()
}
-static Reference< XInterface > SAL_CALL proxyfac_create(
+Reference< XInterface > SAL_CALL proxyfac_create(
SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
throw (Exception)
{
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index b5966bb23f32..13b5f3b92759 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -258,7 +258,7 @@ Any acc_CurrentContext::getValueByName( OUString const & name )
}
-static inline Reference< security::XAccessControlContext > getDynamicRestriction(
+inline Reference< security::XAccessControlContext > getDynamicRestriction(
Reference< XCurrentContext > const & xContext )
{
if (xContext.is())
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 75533986ff63..861e73f102de 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -68,7 +68,7 @@ using namespace std;
namespace {
-static Sequence< OUString > retrieveAsciiValueList(
+Sequence< OUString > retrieveAsciiValueList(
const Reference< XSimpleRegistry > &xReg, const OUString &keyName )
{
Reference< XEnumerationAccess > xAccess( xReg, UNO_QUERY );
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index eaf874143a5e..3092c8d3284a 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -138,7 +138,7 @@ OUString parsePart(
namespace
{
- static OUString encodeNameOrParamFragment( OUString const & fragment )
+ OUString encodeNameOrParamFragment( OUString const & fragment )
{
static sal_Bool const aCharClass[] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* NameOrParamFragment */