summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-09 15:39:55 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-09 15:39:55 +0100
commit736300b358bc9207b360d6d7e4aa0b70499f4837 (patch)
treeb86830604449508b4e89dd00aa3a0931a7182bbf
parentb57368b894851e1ae204c03753005a4a1d121908 (diff)
New loplugin:externvar: vcl
Change-Id: I8b01a7bd7459db242364b6a766549374264f26f2
-rw-r--r--vcl/inc/svdata.hxx2
-rw-r--r--vcl/opengl/x11/gdiimpl.cxx2
-rw-r--r--vcl/source/app/svapp.cxx2
-rw-r--r--vcl/source/filter/sgvmain.hxx2
-rw-r--r--vcl/source/filter/sgvtext.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_keysym.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx10
-rw-r--r--vcl/unx/gtk/gtkdata.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3gtkdata.cxx2
-rw-r--r--vcl/workben/fftester.cxx2
10 files changed, 14 insertions, 14 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 78eefcbabb7a..824daa8f35a0 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -390,6 +390,8 @@ struct ControlCacheHashFunction
}
};
+extern int nImplSysDialog;
+
#endif // INCLUDED_VCL_INC_SVDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index c6807de25066..3fe62601e200 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -639,7 +639,7 @@ bool X11OpenGLSalGraphicsImpl::FillPixmapFromScreen( X11Pixmap* pPixmap, int nX,
typedef typename std::pair<ControlCacheKey, std::unique_ptr<TextureCombo>> ControlCachePair;
typedef o3tl::lru_map<ControlCacheKey, std::unique_ptr<TextureCombo>, ControlCacheHashFunction> ControlCacheType;
-vcl::DeleteOnDeinit<ControlCacheType> gTextureCache(new ControlCacheType(200));
+static vcl::DeleteOnDeinit<ControlCacheType> gTextureCache(new ControlCacheType(200));
namespace
{
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e839815415f3..f723527acd25 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -635,8 +635,6 @@ sal_uInt64 Application::GetLastInputInterval()
return (tools::Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime);
}
-extern int nImplSysDialog;
-
bool Application::IsUICaptured()
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 08450f1be117..9dea0795ae01 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -358,6 +358,8 @@ public:
SgfFontOne* GetFontDesc(sal_uInt32 ID);
};
+extern SgfFontLst* pSgfFonts;
+
#endif // INCLUDED_VCL_SOURCE_FILTER_SGVMAIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 404dd4206c9b..a60dd0bacad1 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -31,8 +31,6 @@
#include <memory>
#include <cstdlib>
-extern SgfFontLst* pSgfFonts;
-
// Limitations: only grey shadows, 2D and with fixed distance.
// Start of AbsBase.Pas
diff --git a/vcl/unx/generic/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx
index 880f46ef8d4b..fa263f20577b 100644
--- a/vcl/unx/generic/app/i18n_keysym.cxx
+++ b/vcl/unx/generic/app/i18n_keysym.cxx
@@ -303,7 +303,7 @@ const unicode_t keymap255_map[] = {
const keymap_t keymap255 = { 128, 189, keymap255_map };
#define INITIAL_KEYMAPS 33
-const keymap_t* p_keymap[INITIAL_KEYMAPS] = {
+const keymap_t* const p_keymap[INITIAL_KEYMAPS] = {
&keymap00, &keymap01, &keymap02, &keymap03, /* 00 -- 03 */
&keymap04, &keymap05, &keymap06, &keymap07, /* 04 -- 07 */
&keymap08, &keymap09, &keymap10, &keymap11, /* 08 -- 11 */
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index c31fccdbeebf..25b3da511224 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -434,7 +434,7 @@ Justification2Adjust( uno::Any& rAny, const gchar * value )
/*****************************************************************************/
-const gchar * font_strikethrough[] = {
+const gchar * const font_strikethrough[] = {
"none", // FontStrikeout::NONE
"single", // FontStrikeout::SINGLE
"double", // FontStrikeout::DOUBLE
@@ -667,7 +667,7 @@ String2CaseMap( uno::Any& rAny, const gchar * value )
/*****************************************************************************/
-const gchar * font_stretch[] = {
+const gchar * const font_stretch[] = {
"ultra_condensed",
"extra_condensed",
"condensed",
@@ -839,7 +839,7 @@ Short2Degree( const uno::Any& rAny )
/*****************************************************************************/
-const gchar * directions[] = { "ltr", "rtl", "rtl", "ltr", "none" };
+const gchar * const directions[] = { "ltr", "rtl", "rtl", "ltr", "none" };
static gchar *
WritingMode2Direction( const uno::Any& rAny )
@@ -854,7 +854,7 @@ WritingMode2Direction( const uno::Any& rAny )
// @see http://www.w3.org/TR/2001/WD-css3-text-20010517/#PrimaryTextAdvanceDirection
-const gchar * writing_modes[] = { "lr-tb", "rl-tb", "tb-rl", "tb-lr", "none" };
+const gchar * const writing_modes[] = { "lr-tb", "rl-tb", "tb-rl", "tb-lr", "none" };
static gchar *
WritingMode2String( const uno::Any& rAny )
{
@@ -868,7 +868,7 @@ WritingMode2String( const uno::Any& rAny )
/*****************************************************************************/
-const char * baseline_values[] = { "baseline", "sub", "super" };
+const char * const baseline_values[] = { "baseline", "sub", "super" };
// @see http://www.w3.org/TR/REC-CSS2/visudet.html#propdef-vertical-align
static gchar *
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index e621f474dc23..9558e863e31f 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -428,7 +428,7 @@ GtkData::GtkData( SalInstance *pInstance )
m_aDispatchCondition = osl_createCondition();
}
-XIOErrorHandler aOrigXIOErrorHandler = nullptr;
+static XIOErrorHandler aOrigXIOErrorHandler = nullptr;
extern "C" {
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index f911d384253e..764067f34175 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -392,7 +392,7 @@ GtkData::GtkData( SalInstance *pInstance )
}
#if defined(GDK_WINDOWING_X11)
-XIOErrorHandler aOrigXIOErrorHandler = nullptr;
+static XIOErrorHandler aOrigXIOErrorHandler = nullptr;
extern "C" {
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index af9f7251c17f..a89f0144332c 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -74,7 +74,7 @@ typedef bool (*HFilterCall)(const OUString &rUrl);
* hiccups. */
#define PERSIST_MAX 1000
-unsigned int persist_cnt;
+static unsigned int persist_cnt;
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{