summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-15 19:13:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-17 09:05:38 +0200
commit206b5b2661be37efdff3c6aedb6f248c4636be79 (patch)
treeaf385e5b4725dcfea23988d9113cced8e9ccaf3c /desktop/source
parenta85d3ba1c0de313b60324b9ecfa488bb99d69d06 (diff)
New loplugin:external
...warning about (for now only) functions and variables with external linkage that likely don't need it. The problems with moving entities into unnamed namespacs and breaking ADL (as alluded to in comments in compilerplugins/clang/external.cxx) are illustrated by the fact that while struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { struct S2: S1 { int f() { return 1; } }; int f(S2 s) { return s.f(); } } int main() { return f(N::S2()); } returns 1, both moving just the struct S2 into an nunnamed namespace, struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { namespace { struct S2: S1 { int f() { return 1; } }; } int f(S2 s) { return s.f(); } } int main() { return f(N::S2()); } as well as moving just the function f overload into an unnamed namespace, struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { struct S2: S1 { int f() { return 1; } }; namespace { int f(S2 s) { return s.f(); } } } int main() { return f(N::S2()); } would each change the program to return 0 instead. Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c Reviewed-on: https://gerrit.libreoffice.org/60539 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/officeipcthread.cxx6
-rw-r--r--desktop/source/app/opencl.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx2
-rw-r--r--desktop/source/migration/migration.cxx4
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx2
-rw-r--r--desktop/source/minidump/minidump.cxx8
-rw-r--r--desktop/source/offacc/acceptor.cxx6
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx4
9 files changed, 20 insertions, 16 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 2e5596c259ff..a606c589bcc8 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -237,7 +237,7 @@ rtl::Reference< RequestHandler > RequestHandler::pGlobal;
// Turns a string in aMsg such as file:///home/foo/.libreoffice/3
// Into a hex string of well known length ff132a86...
-OUString CreateMD5FromString( const OUString& aMsg )
+static OUString CreateMD5FromString( const OUString& aMsg )
{
SAL_INFO("desktop.app", "create md5 from '" << aMsg << "'");
@@ -287,12 +287,12 @@ IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent,
delete pDocsRequest;
}
-void ImplPostForeignAppEvent( ApplicationEvent* pEvent )
+static void ImplPostForeignAppEvent( ApplicationEvent* pEvent )
{
Application::PostUserEvent( LINK( nullptr, ProcessEventsClass_Impl, CallEvent ), pEvent );
}
-void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent )
+static void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent )
{
Application::PostUserEvent( LINK( nullptr, ProcessEventsClass_Impl, ProcessDocumentsEvent ), pEvent );
}
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index ed58733e8ab6..5c991842b94f 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -45,7 +45,7 @@ namespace desktop {
#if HAVE_FEATURE_OPENCL
-bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &rURL)
+static bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &rURL)
{
bool bSuccess = false;
css::uno::Reference< css::lang::XComponent > xComponent;
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 4393029537e8..17bbd81131df 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -97,7 +97,7 @@ namespace
: public rtl::Static< OUString, Extension > {};
}
-OUString ReplaceProductNameHookProc( const OUString& rStr )
+static OUString ReplaceProductNameHookProc( const OUString& rStr )
{
if (rStr.indexOf( "%PRODUCT" ) == -1)
return rStr;
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index b231dac760ec..9ccb179747c9 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -472,7 +472,7 @@ void writeConsoleWithStream(OUString const & sText, HANDLE stream)
sText.getLength() * 2, &nWrittenChars, nullptr);
}
#else
-void writeConsoleWithStream(OUString const & sText, FILE * stream)
+static void writeConsoleWithStream(OUString const & sText, FILE * stream)
{
OString s = OUStringToOString(sText, osl_getThreadTextEncoding());
fprintf(stream, "%s", s.getStr());
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 622515d3e179..ce32432e2dcf 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -78,7 +78,7 @@ static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
-OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sModuleIdentifier)
+static OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sModuleIdentifier)
{
OUString sLabel;
@@ -116,7 +116,7 @@ OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sMod
return sLabel;
}
-OUString mapModuleShortNameToIdentifier(const OUString& sShortName)
+static OUString mapModuleShortNameToIdentifier(const OUString& sShortName)
{
OUString sIdentifier;
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 114e36e55325..202b883d11ee 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -105,7 +105,7 @@ namespace migration
}
#define MAX_HEADER_LENGTH 16
-bool IsUserWordbook( const OUString& rFile )
+static bool IsUserWordbook( const OUString& rFile )
{
bool bRet = false;
std::unique_ptr<SvStream> pStream = ::utl::UcbStreamHelper::CreateStream( rFile, StreamMode::STD_READ );
diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx
index f3eefd023b75..85b2374e4ad7 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -19,7 +19,7 @@
static const char kUserAgent[] = "Breakpad/1.0 (Linux)";
-std::map<std::string, std::string> readStrings(std::istream& file)
+static std::map<std::string, std::string> readStrings(std::istream& file)
{
std::map<std::string, std::string> parameters;
@@ -52,7 +52,7 @@ static size_t WriteCallback(void const *ptr, size_t size,
return real_size;
}
-void getProperty(const std::string& key, std::string& value,
+static void getProperty(const std::string& key, std::string& value,
std::map<std::string, std::string>& parameters)
{
auto itr = parameters.find(key);
@@ -63,7 +63,7 @@ void getProperty(const std::string& key, std::string& value,
}
}
-std::string generate_json(const std::map<std::string, std::string>& parameters)
+static std::string generate_json(const std::map<std::string, std::string>& parameters)
{
std::ostringstream stream;
stream << "{\n";
@@ -82,7 +82,7 @@ std::string generate_json(const std::map<std::string, std::string>& parameters)
return stream.str();
}
-bool uploadContent(std::map<std::string, std::string>& parameters, std::string& response)
+static bool uploadContent(std::map<std::string, std::string>& parameters, std::string& response)
{
CURL* curl = curl_easy_init();
if (!curl)
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 11cbe497290b..13d92c6bd216 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -37,13 +37,17 @@ using namespace css::uno;
namespace desktop
{
-extern "C" void offacc_workerfunc (void * acc)
+extern "C" {
+
+static void offacc_workerfunc (void * acc)
{
osl_setThreadName("URP Acceptor");
static_cast<Acceptor*>(acc)->run();
}
+}
+
Acceptor::Acceptor( const Reference< XComponentContext >& rxContext )
: m_thread(nullptr)
, m_rContext(rxContext)
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 9fb377f2aef0..4adc21b683d8 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -291,7 +291,7 @@ void printf_package(
} // anon namespace
-void printf_unaccepted_licenses(
+static void printf_unaccepted_licenses(
Reference<deployment::XPackage> const & ext)
{
OUString id(
@@ -396,7 +396,7 @@ Reference<XComponentContext> connectToOffice(
/** returns the path to the lock file used by unopkg.
@return the path. An empty string signifies an error.
*/
-OUString getLockFilePath()
+static OUString getLockFilePath()
{
OUString ret;
OUString sBootstrap("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}");