[Libreoffice-commits] core.git: extensions/source sal/osl sw/source
Stephan Bergmann
sbergman at redhat.com
Wed Mar 30 12:08:40 UTC 2016
extensions/source/update/check/updatecheck.cxx | 6 +++---
sal/osl/unx/signal.cxx | 2 +-
sw/source/core/doc/DocumentRedlineManager.cxx | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 9b39649fa1ce4d81658a6c9448cfdf76581813f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 30 14:06:04 2016 +0200
loplugin:staticanonymous
cf. <https://gerrit.libreoffice.org/#/c/23630/> "tdf#97966 Compiler plugin"; in
code not covered by Tamás's pending "tdf#97966 Drop 'static' keywords" changes.
Change-Id: Ifbaef83fdb1fde7e25fafd5746cdbf99c334c5be
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 74221ea..9899472 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -98,7 +98,7 @@ OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloa
namespace
{
-static inline OUString getBuildId()
+inline OUString getBuildId()
{
OUString aPathVal("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
rtl::Bootstrap::expandMacros(aPathVal);
@@ -107,7 +107,7 @@ static inline OUString getBuildId()
#if defined LINUX || defined SOLARIS
-static inline OUString getBaseInstallation()
+inline OUString getBaseInstallation()
{
OUString aPathVal("$BRAND_BASE_DIR");
rtl::Bootstrap::expandMacros(aPathVal);
@@ -196,7 +196,7 @@ OUString getImageFromFileName(const OUString& aFile)
}
-static uno::Reference< beans::XPropertySet > createMenuBarUI(
+uno::Reference< beans::XPropertySet > createMenuBarUI(
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< task::XJob >& xJob)
{
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 9f44d31..7f86456 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -352,7 +352,7 @@ void callSystemHandler(int signal)
}
#if defined HAVE_VALGRIND_HEADERS
-static void DUMPCURRENTALLOCS()
+void DUMPCURRENTALLOCS()
{
VALGRIND_PRINTF( "=== start memcheck dump of active allocations ===\n" );
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 4974408..58551bd 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
// helper function for lcl_CheckRedline
// 1. make sure that pPos->nContent points into pPos->nNode
// 2. check that position is valid and doesn't point after text
- static void lcl_CheckPosition( const SwPosition* pPos )
+ void lcl_CheckPosition( const SwPosition* pPos )
{
assert(dynamic_cast<SwIndexReg*>(&pPos->nNode.GetNode())
== pPos->nContent.GetIdxReg());
@@ -58,7 +58,7 @@ using namespace com::sun::star;
}
}
- static void lcl_CheckPam( const SwPaM* pPam )
+ void lcl_CheckPam( const SwPaM* pPam )
{
assert(pPam);
lcl_CheckPosition( pPam->GetPoint() );
@@ -67,7 +67,7 @@ using namespace com::sun::star;
// check validity of the redline table. Checks redline bounds, and make
// sure the redlines are sorted and non-overlapping.
- static void lcl_CheckRedline( IDocumentRedlineAccess& redlineAccess )
+ void lcl_CheckRedline( IDocumentRedlineAccess& redlineAccess )
{
const SwRedlineTable& rTable = redlineAccess.GetRedlineTable();
More information about the Libreoffice-commits
mailing list