summaryrefslogtreecommitdiff
path: root/xmlscript
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-09 15:39:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-09 15:39:11 +0100
commit9dbb143c25782b112dc0e4de29e09d740ad6bcf7 (patch)
treee504620355e8994a2367962b2a5a605279c9d49e /xmlscript
parenta32c0f4a1e32273bd9e443f76260381246dbe808 (diff)
New loplugin:externvar: xmlscript
Change-Id: Ie35e22e464ab71c864e3fba130d1e7946a83086a
Diffstat (limited to 'xmlscript')
-rw-r--r--xmlscript/source/xmldlg_imexp/common.hxx9
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_export.cxx8
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx8
3 files changed, 10 insertions, 15 deletions
diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx
index aa14e90f947d..ecfa439d4c00 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
@@ -29,6 +29,15 @@ const sal_Int16 BORDER_3D = 1;
const sal_Int16 BORDER_SIMPLE = 2;
const sal_Int16 BORDER_SIMPLE_COLOR = 3;
+struct StringTriple
+{
+ char const * first;
+ char const * second;
+ char const * third;
+};
+
+extern StringTriple const * const g_pEventTranslations;
+
}
#define XMLSCRIPT_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index b352053c8ee6..5ed18a517253 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -1133,14 +1133,6 @@ void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible
readStringAttr( "HelpURL", XMLNS_DIALOGS_PREFIX ":help-url" );
}
-struct StringTriple
-{
- char const * first;
- char const * second;
- char const * third;
-};
-extern StringTriple const * const g_pEventTranslations;
-
void ElementDescriptor::readEvents()
{
Reference< script::XScriptEventsSupplier > xSupplier( _xProps, UNO_QUERY );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 8bec171b0478..88664d91ea36 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -1383,12 +1383,6 @@ bool ImportContext::importImageScaleModeProperty(
return false;
}
-struct StringTriple
-{
- char const * first;
- char const * second;
- char const * third;
-};
static StringTriple const s_aEventTranslations[] =
{
// from xmloff/source/forms/formevents.cxx
@@ -1428,7 +1422,7 @@ static StringTriple const s_aEventTranslations[] =
{ "com.sun.star.awt.XAdjustmentListener", "adjustmentValueChanged", "on-adjustmentvaluechange" },
{ nullptr, nullptr, nullptr }
};
-extern StringTriple const * const g_pEventTranslations;
+
StringTriple const * const g_pEventTranslations = s_aEventTranslations;
void ImportContext::importEvents(