[Libreoffice-commits] core.git: cui/source dbaccess/source editeng/source extensions/source filter/source fpicker/source framework/source
Takeshi Abe
tabe at fixedpoint.jp
Sat Aug 3 08:56:04 PDT 2013
cui/source/customize/acccfg.cxx | 4 ++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 +-
editeng/source/uno/unotext.cxx | 6 +++---
extensions/source/bibliography/framectr.cxx | 2 +-
filter/source/msfilter/msdffimp.cxx | 4 ++--
fpicker/source/generic/fpicker.cxx | 2 +-
fpicker/source/office/fps_office.cxx | 2 +-
framework/source/services/substitutepathvars.cxx | 8 ++++----
framework/source/uielement/controlmenucontroller.cxx | 6 +++---
9 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit e2e15148fc133c0b6fb3d9dc3cade2ef2ef64f41
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Aug 4 00:25:32 2013 +0900
Mark as const/static
Change-Id: I54a7daee7345e7c0c5c3f866d5c365722b567eff
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ddb681f..2ec0328 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -88,7 +88,7 @@ static OUString MEDIATYPE_PROPNAME ("MediaType"
static OUString MEDIATYPE_UICONFIG ("application/vnd.sun.xml.ui.configuration");
//-----------------------------------------------
-static sal_uInt16 KEYCODE_ARRAY[] =
+static const sal_uInt16 KEYCODE_ARRAY[] =
{
KEY_F1 ,
KEY_F2 ,
@@ -600,7 +600,7 @@ static sal_uInt16 KEYCODE_ARRAY[] =
KEY_DELETE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2
};
-static sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY);
+static const sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY);
//-----------------------------------------------
// seems to be needed to layout the list box, which shows all
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 8045c43..ec85ed3 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2166,7 +2166,7 @@ long OSelectionBrowseBox::GetRealRow(long nRowId) const
OSL_ENSURE(nErg <= long(m_bVisibleRow.size()),"nErg kann nicht groesser als BROW_ROW_CNT sein!");
return i;
}
-static long nVisibleRowMask[] =
+static const long nVisibleRowMask[] =
{
0x0001,
0x0002,
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 3cbf4c80..9299b6d 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -949,7 +949,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::getPropertyState( const OUStr
return _getPropertyState( PropertyName, -1 );
}
-static sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_ITALIC,
+static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_ITALIC,
EE_CHAR_UNDERLINE, EE_CHAR_WEIGHT, EE_CHAR_STRIKEOUT,
EE_CHAR_WLM, 0 };
@@ -968,7 +968,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
{
case WID_FONTDESC:
{
- sal_uInt16* pWhichId = aSvxUnoFontDescriptorWhichMap;
+ const sal_uInt16* pWhichId = aSvxUnoFontDescriptorWhichMap;
SfxItemState eTempItemState;
while( *pWhichId )
{
@@ -1115,7 +1115,7 @@ sal_Bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, cons
{
case WID_FONTDESC:
{
- sal_uInt16* pWhichId = aSvxUnoFontDescriptorWhichMap;
+ const sal_uInt16* pWhichId = aSvxUnoFontDescriptorWhichMap;
SfxItemState eTempItemState;
while( *pWhichId )
{
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 5a6cd4f..d8a6473 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -76,7 +76,7 @@ struct CacheDispatchInfo
// Attention: commands must be sorted by command groups. Implementation is dependent
// on this!!
-static DispatchInfo SupportedCommandsArray[] =
+static const DispatchInfo SupportedCommandsArray[] =
{
{ ".uno:Undo" , frame::CommandGroup::EDIT , sal_False },
{ ".uno:Cut" , frame::CommandGroup::EDIT , sal_False },
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index c7b24da..56ade5f 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6487,7 +6487,7 @@ struct ClsIDs {
const sal_Char* pSvrName;
const sal_Char* pDspName;
};
-static ClsIDs aClsIDs[] = {
+static const ClsIDs aClsIDs[] = {
{ 0x000212F0, "MSWordArt", "Microsoft Word Art" },
{ 0x000212F0, "MSWordArt.2", "Microsoft Word Art 2.0" },
@@ -6651,7 +6651,7 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
xOle10Stm = SotStorageStreamRef();
// set the compobj stream
- ClsIDs* pIds;
+ const ClsIDs* pIds;
for( pIds = aClsIDs; pIds->nId; pIds++ )
{
if( aSvrName == OUString::createFromAscii(pIds->pSvrName) )
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 6b7743e..ea35226 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -189,7 +189,7 @@ static Sequence< OUString > FolderPicker_getSupportedServiceNames()
/*
* Implementation entries.
*/
-static cppu::ImplementationEntry g_entries[] =
+static const cppu::ImplementationEntry g_entries[] =
{
{
FilePicker_createInstance,
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index e38d25f..c98b21f 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -25,7 +25,7 @@
#include "OfficeFilePicker.hxx"
#include "OfficeFolderPicker.hxx"
-static cppu::ImplementationEntry g_entries[] =
+static const cppu::ImplementationEntry g_entries[] =
{
{
SvtFilePicker::impl_createInstance,
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index ceb8b48..1ec4d2d 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 a861194..b5e4302 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",
More information about the Libreoffice-commits
mailing list