diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-08-04 00:25:32 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-08-04 00:54:12 +0900 |
| commit | e2e15148fc133c0b6fb3d9dc3cade2ef2ef64f41 (patch) | |
| tree | c9a3b8971b78b7c5dcf065687ce8319d63955414 /framework | |
| parent | fdo#46037: remove 1 comphelper/configurationhelper in sfx2 (diff) | |
| download | core-e2e15148fc133c0b6fb3d9dc3cade2ef2ef64f41.tar.gz core-e2e15148fc133c0b6fb3d9dc3cade2ef2ef64f41.zip | |
Mark as const/static
Change-Id: I54a7daee7345e7c0c5c3f866d5c365722b567eff
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 8 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index ceb8b48e10c5..1ec4d2d36733 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -130,7 +130,7 @@ struct TableEntry // Table with valid operating system strings // Name of the os as char* and the length // of the string -static TableEntry aOSTable[OS_COUNT] = +static const TableEntry aOSTable[OS_COUNT] = { { "WINDOWS" , 7 }, { "UNIX" , 4 }, @@ -142,7 +142,7 @@ static TableEntry aOSTable[OS_COUNT] = // Table with valid environment variables // Name of the environment type as a char* and // the length of the string. -static TableEntry aEnvTable[ET_COUNT] = +static const TableEntry aEnvTable[ET_COUNT] = { { "HOST" , 4 }, { "YPDOMAIN" , 8 }, @@ -155,7 +155,7 @@ static TableEntry aEnvTable[ET_COUNT] = // Priority table for the environment types. Lower numbers define // a higher priority. Equal numbers has the same priority that means // that the first match wins!! -static sal_Int16 aEnvPrioTable[ET_COUNT] = +static const sal_Int16 aEnvPrioTable[ET_COUNT] = { 1, // ET_HOST 2, // ET_IPDOMAIN @@ -166,7 +166,7 @@ static sal_Int16 aEnvPrioTable[ET_COUNT] = }; // Table with all fixed/predefined variables supported. -static FixedVariable aFixedVarTable[] = +static const FixedVariable aFixedVarTable[] = { { VARIABLE_INST, PREDEFVAR_INST, REPLACELENGTH_INST, true }, { VARIABLE_PROG, PREDEFVAR_PROG, REPLACELENGTH_PROG, true }, diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index a861194babd4..b5e4302ba93a 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -91,7 +91,7 @@ #define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) #define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) -static sal_Int16 nConvertSlots[] = +static const sal_Int16 nConvertSlots[] = { SID_FM_CONVERTTO_EDIT, SID_FM_CONVERTTO_BUTTON, @@ -115,7 +115,7 @@ static sal_Int16 nConvertSlots[] = SID_FM_CONVERTTO_SPINBUTTON }; -static sal_Int16 nCreateSlots[] = +static const sal_Int16 nCreateSlots[] = { SID_FM_EDIT, SID_FM_PUSHBUTTON, @@ -139,7 +139,7 @@ static sal_Int16 nCreateSlots[] = SID_FM_SPINBUTTON }; -const char* aCommands[] = +static const char* aCommands[] = { ".uno:ConvertToEdit", ".uno:ConvertToButton", |