|
 |
135360 |
From 08fa99f5d2eba0159b34d401b179f294ac483125 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Tue, 15 Sep 2015 10:59:58 +0200
|
|
|
135360 |
Subject: [PATCH 125/398] gtktiledviewer: these globals can be static
|
|
|
135360 |
|
|
|
135360 |
Change-Id: Ife0a4bb1102f6135e297dc69ba5b52b89a5dd9dd
|
|
|
135360 |
(cherry picked from commit 20df29e660139fc27d50fe006202f7ea78a3903a)
|
|
|
135360 |
---
|
|
|
135360 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 12 ++++++------
|
|
|
135360 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
index dd369f5e7fb1..2bafd24f8b08 100644
|
|
|
135360 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
@@ -38,17 +38,17 @@ static GtkToolItem* pItalic;
|
|
|
135360 |
static GtkToolItem* pUnderline;
|
|
|
135360 |
static GtkToolItem* pStrikethrough;
|
|
|
135360 |
static GtkWidget* pScrolledWindow;
|
|
|
135360 |
-std::map<GtkToolItem*, std::string> g_aToolItemCommandNames;
|
|
|
135360 |
-std::map<std::string, GtkToolItem*> g_aCommandNameToolItems;
|
|
|
135360 |
-bool g_bToolItemBroadcast = true;
|
|
|
135360 |
+static std::map<GtkToolItem*, std::string> g_aToolItemCommandNames;
|
|
|
135360 |
+static std::map<std::string, GtkToolItem*> g_aCommandNameToolItems;
|
|
|
135360 |
+static bool g_bToolItemBroadcast = true;
|
|
|
135360 |
static GtkWidget* pVBox;
|
|
|
135360 |
static GtkComboBoxText* pPartSelector;
|
|
|
135360 |
static GtkWidget* pPartModeComboBox;
|
|
|
135360 |
/// Should the part selector avoid calling lok::Document::setPart()?
|
|
|
135360 |
static bool g_bPartSelectorBroadcast = true;
|
|
|
135360 |
-GtkWidget* pFindbar;
|
|
|
135360 |
-GtkWidget* pFindbarEntry;
|
|
|
135360 |
-GtkWidget* pFindbarLabel;
|
|
|
135360 |
+static GtkWidget* pFindbar;
|
|
|
135360 |
+static GtkWidget* pFindbarEntry;
|
|
|
135360 |
+static GtkWidget* pFindbarLabel;
|
|
|
135360 |
|
|
|
135360 |
static void lcl_registerToolItem(GtkToolItem* pItem, const std::string& rName)
|
|
|
135360 |
{
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|