New loplugin:externvar: sal

Change-Id: Iefc33784f21e7a0b88c8d6308618926e38ab8554

4 files changed, 10 insertions, 10 deletions

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 1f8841c129f0..ae4243b4b25d 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5090,6 +5090,6 @@ class GlobalObject
     }
 };
 
-GlobalObject theGlobalObject;
+static GlobalObject theGlobalObject;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx
index 0326df1aaccd..b2adc17272d6 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -9,7 +9,6 @@
 
 // activate support for detecting errors instead of getting compile errors
 #define RTL_STRING_UNITTEST_CONCAT
-bool rtl_string_unittest_invalid_concat = false;
 
 #include <sal/types.h>
 #include <cppunit/TestFixture.h>
@@ -22,6 +21,8 @@ bool rtl_string_unittest_invalid_concat = false;
 
 #include <typeinfo>
 
+bool rtl_string_unittest_invalid_concat = false;
+
 using namespace rtl;
 
 namespace std
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 2b08581d0712..9d81a90ac6a9 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -9,10 +9,6 @@
 
 // activate the extra needed ctor
 #define RTL_STRING_UNITTEST
-bool rtl_string_unittest_const_literal;
-bool rtl_string_unittest_invalid_conversion;
-bool rtl_string_unittest_const_literal_function;
-bool rtl_string_unittest_non_const_literal_function;
 
 #include <sal/types.h>
 #include <cppunit/TestFixture.h>
@@ -21,6 +17,10 @@ bool rtl_string_unittest_non_const_literal_function;
 #include "rtl/string.hxx"
 #include "rtl/strbuf.hxx"
 
+bool rtl_string_unittest_const_literal;
+bool rtl_string_unittest_const_literal_function;
+static bool rtl_string_unittest_non_const_literal_function;
+
 namespace test { namespace ostring {
 
 class StringLiterals: public CppUnit::TestFixture
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 3c0b996627dc..094a779fc2f1 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -9,10 +9,6 @@
 
 // activate the extra needed ctor
 #define RTL_STRING_UNITTEST
-extern bool rtl_string_unittest_const_literal;
-extern bool rtl_string_unittest_invalid_conversion;
-extern bool rtl_string_unittest_const_literal_function;
-extern bool rtl_string_unittest_non_const_literal_function;
 
 #include <sal/config.h>
 
@@ -26,6 +22,9 @@ extern bool rtl_string_unittest_non_const_literal_function;
 #include "rtl/ustring.hxx"
 #include "rtl/ustrbuf.hxx"
 
+extern bool rtl_string_unittest_const_literal;
+bool rtl_string_unittest_invalid_conversion;
+
 namespace test { namespace oustring {
 
 class StringLiterals: public CppUnit::TestFixture