summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svtools/source/control/ruler.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx12
-rw-r--r--svx/source/form/tbxform.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/services.cxx2
-rw-r--r--svx/source/unodraw/unoprov.cxx12
6 files changed, 16 insertions, 16 deletions
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index f931c4c7e83a..1ac385326d93 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -107,7 +107,7 @@ public:
ImplRulerData& operator=( const ImplRulerData& rData );
};
-static RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
+static const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
{
{ MAP_100TH_MM, 100, 25, 50, 100, 100, 3, " mm" }, // MM
{ MAP_100TH_MM, 1000, 250, 500, 1000, 1000, 3, " cm" }, // CM
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 30fe1c34cedb..1a36a866240d 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -245,7 +245,7 @@ DisposeListenerGridBridge::~DisposeListenerGridBridge()
//==============================================================================
-static sal_uInt16 ControlMap[] =
+static const sal_uInt16 ControlMap[] =
{
DbGridControl::NavigationBar::RECORD_TEXT,
DbGridControl::NavigationBar::RECORD_ABSOLUTE,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0ef26cdc7fef..ebf5260a53e3 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -103,7 +103,7 @@
#include <vector>
// wird fuer Invalidate verwendet -> mitpflegen
-static sal_uInt16 DatabaseSlotMap[] =
+static const sal_uInt16 DatabaseSlotMap[] =
{
SID_FM_RECORD_FIRST,
SID_FM_RECORD_NEXT,
@@ -131,7 +131,7 @@ static sal_uInt16 DatabaseSlotMap[] =
// wird fuer Invalidate verwendet -> mitpflegen
// aufsteigend sortieren !!!!!!
-static sal_Int16 DlgSlotMap[] = // slots des Controllers
+static const sal_Int16 DlgSlotMap[] = // slots des Controllers
{
SID_FM_CTL_PROPERTIES,
SID_FM_PROPERTIES,
@@ -147,7 +147,7 @@ static sal_Int16 DlgSlotMap[] = // slots des Controllers
0
};
-static sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige Slots
+static const sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige Slots
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -178,7 +178,7 @@ static 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
-static sal_Int16 nConvertSlots[] =
+static const sal_Int16 nConvertSlots[] =
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -202,7 +202,7 @@ static sal_Int16 nConvertSlots[] =
SID_FM_CONVERTTO_NAVIGATIONBAR
};
-static sal_Int16 nCreateSlots[] =
+static const sal_Int16 nCreateSlots[] =
{
SID_FM_EDIT,
SID_FM_PUSHBUTTON,
@@ -226,7 +226,7 @@ static sal_Int16 nCreateSlots[] =
SID_FM_NAVIGATIONBAR
};
-static sal_Int16 nObjectTypes[] =
+static const sal_Int16 nObjectTypes[] =
{
OBJ_FM_EDIT,
OBJ_FM_BUTTON,
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 8407e8ef3267..c3c1b0bdc133 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -121,7 +121,7 @@ struct MapSlotToCmd
const char* pCommand;
};
-static MapSlotToCmd SlotToCommands[] =
+static const MapSlotToCmd SlotToCommands[] =
{
{ SID_FM_PUSHBUTTON, ".uno:Pushbutton" },
{ SID_FM_RADIOBUTTON, ".uno:RadioButton" },
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 1bdd0723ff6e..9519ad9bcc21 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -20,7 +20,7 @@
#include "chinese_translation_unodialog.hxx"
#include <cppuhelper/implementationentry.hxx>
-static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslation[] =
+static const struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslation[] =
{
{
::textconversiondlgs::ChineseTranslation_UnoDialog::create
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index ac17d01d1597..47bb410c88ee 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -834,7 +834,7 @@ namespace {
static UHashMapImpl aImpl(63);
static bool bInited = false;
if (!bInited) {
- struct { const char *name; sal_Int32 length; sal_uInt32 id; } aInit[] = {
+ const struct { const char *name; sal_Int32 length; sal_uInt32 id; } aInit[] = {
{ RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.RectangleShape"), OBJ_RECT },
{ RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.EllipseShape"), OBJ_CIRC },
{ RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape"), OBJ_UNO },
@@ -1214,7 +1214,7 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
// the possibility to define it wrong
// - change the compare to also work when a shorter name is in front of a longer one
-static sal_uInt16 SvxUnoColorNameDefResId[] =
+static const sal_uInt16 SvxUnoColorNameDefResId[] =
{
RID_SVXSTR_COLOR_BLUEGREY_DEF,
RID_SVXSTR_COLOR_BLACK_DEF,
@@ -1258,7 +1258,7 @@ static sal_uInt16 SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
};
-static sal_uInt16 SvxUnoColorNameResId[] =
+static const sal_uInt16 SvxUnoColorNameResId[] =
{
RID_SVXSTR_COLOR_BLUEGREY,
RID_SVXSTR_COLOR_BLACK,
@@ -1304,7 +1304,7 @@ static sal_uInt16 SvxUnoColorNameResId[] =
//////////////////////////////////////////////////////////////////////////////
-bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()
+bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, String& rString ) throw()
{
//We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
//replace "Red Hat 1" with the translation of Red :-)
@@ -1343,7 +1343,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern
if( nWhich == XATTR_LINECOLOR )
{
- if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameResId, (sal_uInt16*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
+ if( SvxUnoConvertResourceString( SvxUnoColorNameResId, SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
{
return aNew;
}
@@ -1376,7 +1376,7 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA
if( nWhich == XATTR_LINECOLOR )
{
- if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameDefResId, (sal_uInt16*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
+ if( SvxUnoConvertResourceString( SvxUnoColorNameDefResId, SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
{
return aNew;
}
generated by cgit (git 2.34.1) at 2024-07-30 10:49:52 +0000