[Libreoffice-commits] .: framework/source svx/source

[Matus Kukan]

 framework/source/uielement/controlmenucontroller.cxx |    4 ++--
 svx/source/form/fmshimp.cxx                          |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5f2355014375adb66dd8e986068abc8429e0ad0d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Jan 4 21:58:46 2012 +0100

    make these variables static

diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index a946858..1f5e64e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -115,7 +115,7 @@
 #define SID_FM_IMAGEBUTTON                  (SID_FMSLOTS_START + 12)
 #define SID_FM_FILECONTROL                  (SID_FMSLOTS_START + 13)
 
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
 {
     SID_FM_CONVERTTO_EDIT,
     SID_FM_CONVERTTO_BUTTON,
@@ -139,7 +139,7 @@ sal_Int16 nConvertSlots[] =
     SID_FM_CONVERTTO_SPINBUTTON
 };
 
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
 {
     SID_FM_EDIT,
     SID_FM_PUSHBUTTON,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e261c21..04751bb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -117,7 +117,7 @@
 #include <vector>
 
 // wird fuer Invalidate verwendet -> mitpflegen
-sal_uInt16 DatabaseSlotMap[] =
+static sal_uInt16 DatabaseSlotMap[] =
 {
     SID_FM_RECORD_FIRST,
     SID_FM_RECORD_NEXT,
@@ -145,7 +145,7 @@ sal_uInt16 DatabaseSlotMap[] =
 
 // wird fuer Invalidate verwendet -> mitpflegen
 // aufsteigend sortieren !!!!!!
-sal_Int16 DlgSlotMap[] =    // slots des Controllers
+static sal_Int16 DlgSlotMap[] =    // slots des Controllers
 {
     SID_FM_CTL_PROPERTIES,
     SID_FM_PROPERTIES,
@@ -161,7 +161,7 @@ sal_Int16 DlgSlotMap[] =    // slots des Controllers
     0
 };
 
-sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
+static sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
 {
     SID_FM_CONVERTTO_EDIT,
     SID_FM_CONVERTTO_BUTTON,
@@ -192,7 +192,7 @@ sal_Int16 SelObjectSlotMap[] =  // vom SelObject abhaengige Slots
 
 // die folgenden Arrays muessen kosistent sein, also einander entsprechende Eintraege an der selben relativen Position
 // innerhalb ihres jeweiligen Arrays stehen
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
 {
     SID_FM_CONVERTTO_EDIT,
     SID_FM_CONVERTTO_BUTTON,
@@ -216,7 +216,7 @@ sal_Int16 nConvertSlots[] =
     SID_FM_CONVERTTO_NAVIGATIONBAR
 };
 
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
 {
     SID_FM_EDIT,
     SID_FM_PUSHBUTTON,
@@ -240,7 +240,7 @@ sal_Int16 nCreateSlots[] =
     SID_FM_NAVIGATIONBAR
 };
 
-sal_Int16 nObjectTypes[] =
+static sal_Int16 nObjectTypes[] =
 {
     OBJ_FM_EDIT,
     OBJ_FM_BUTTON,