[Libreoffice-commits] core.git: sw/source
Takeshi Abe
tabe at fixedpoint.jp
Mon Jul 15 18:36:38 PDT 2013
sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
sw/source/filter/ww8/wrtw8num.cxx | 6 +++---
sw/source/filter/ww8/wrtww8.cxx | 2 +-
sw/source/filter/ww8/ww8graf.cxx | 6 +++---
sw/source/filter/ww8/ww8par2.cxx | 4 ++--
sw/source/filter/ww8/ww8par5.cxx | 2 +-
sw/source/ui/dbui/dbinsdlg.cxx | 2 +-
sw/source/ui/fldui/fldmgr.cxx | 2 +-
sw/source/ui/shells/tabsh.cxx | 2 +-
sw/source/ui/shells/textsh.cxx | 2 +-
sw/source/ui/uiview/pview.cxx | 2 +-
sw/source/ui/uiview/viewsrch.cxx | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 56ee768bfd912c3c4278056a4712c1108ec38af4
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jul 16 10:26:45 2013 +0900
Mark as const
Change-Id: I06e85719590be114ab1d19010886a035e36f34b0
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index e92b2ae..001b220 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2688,7 +2688,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
if ( pRedline->Next() )
Redline( pRedline->Next() );
- static sal_uInt16 aSprmIds[ 2 * 2 * 3 ] =
+ static const sal_uInt16 aSprmIds[ 2 * 2 * 3 ] =
{
// Ids for insert
NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark, // for WW8
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 61ffdee..d0d1827 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -562,12 +562,12 @@ void WW8Export::OutputOlst( const SwNumRule& rRule )
if ( bWrtWW8 )
return;
- static sal_uInt8 aAnlvBase[] = { // Defaults
+ static const sal_uInt8 aAnlvBase[] = { // Defaults
1,0,0, // Upper Roman
0x0C, // Hanging Indent, fPrev
0,0,1,0x80,0,0,1,0,0x1b,1,0,0 };
- static sal_uInt8 aSprmOlstHdr[] = { 133, 212 };
+ static const sal_uInt8 aSprmOlstHdr[] = { 133, 212 };
pO->insert( pO->end(), aSprmOlstHdr, aSprmOlstHdr+sizeof( aSprmOlstHdr ) );
WW8_OLST aOlst;
@@ -797,7 +797,7 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
sal_uInt8 nSwLevel )
{
- static sal_uInt8 aSprmAnldDefault[54] = {
+ static const sal_uInt8 aSprmAnldDefault[54] = {
12, 52,
1,0,0,0x0c,0,0,1,0x80,0,0,1,0,0x1b,1,0,0,0x2e,
0,0,0,
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 08bf24b..67dbaab 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2393,7 +2393,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
//Set Default, just taken from the first cell of the first
//row
- static sal_uInt16 aBorders[] =
+ static const sal_uInt16 aBorders[] =
{
BOX_LINE_TOP, BOX_LINE_LEFT,
BOX_LINE_BOTTOM, BOX_LINE_RIGHT
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index ba92b6d..ce1b721 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -105,7 +105,7 @@ Color WW8TransCol(SVBT32 nWC)
// ( Damit bei der Writer-UI die Farbnamen stimmen )
// Die Tabelle int im *3er-System* aufgeteilt. Die Grauwerte fehlen,
// da sie nicht ins 3er-System passen ( 4 Werte: sw, ws, 2 * grau )
- static ColorData eColA[] = { // B G R B G R B G R
+ static const ColorData eColA[] = { // B G R B G R B G R
COL_BLACK, COL_RED, COL_LIGHTRED, // 0 0 0, 0 0 1, 0 0 2
COL_GREEN, COL_BROWN, COL_BLACK, // 0 1 0, 0 1 1, 0 1 2
COL_LIGHTGREEN, COL_BLACK, COL_YELLOW, // 0 2 0, 0 2 1, 0 2 2
@@ -244,7 +244,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill )
{
- static sal_uInt8 nPatA[] =
+ static const sal_uInt8 nPatA[] =
{
0, 0, 5, 10, 20, 25, 30, 40, 50, 60, 70, 75, 80,
90, 50, 50, 50, 50, 50, 50, 33, 33, 33, 33, 33, 33
@@ -1234,7 +1234,7 @@ SdrObject* SwWW8ImplReader::ReadTxtBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
SdrObject* SwWW8ImplReader::ReadCaptionBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet)
{
- static SdrCaptionType aCaptA[] = { SDRCAPT_TYPE1, SDRCAPT_TYPE2,
+ static const SdrCaptionType aCaptA[] = { SDRCAPT_TYPE1, SDRCAPT_TYPE2,
SDRCAPT_TYPE3, SDRCAPT_TYPE4 };
WW8_DP_CALLOUT_TXTBOX aCallB;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3ff4585..8626adc 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -561,11 +561,11 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, sal_uInt8 nSwLevel )
{
- static SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
+ static const SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N, SVX_NUM_ARABIC,
SVX_NUM_ARABIC, SVX_NUM_ARABIC };
- static SvxAdjust eAdjA[4] = { SVX_ADJUST_LEFT,
+ static const SvxAdjust eAdjA[4] = { SVX_ADJUST_LEFT,
SVX_ADJUST_RIGHT, SVX_ADJUST_LEFT, SVX_ADJUST_LEFT };
// in fact the following 2, but writer UI does not provide
// SVX_ADJUST_CENTER, SVX_ADJUST_BLOCKLINE };
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 09e957c..041cac9 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -880,7 +880,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
{
typedef eF_ResT (SwWW8ImplReader:: *FNReadField)( WW8FieldDesc*, String& );
enum Limits {eMax = 96};
- static FNReadField aWW8FieldTab[eMax+1] =
+ static const FNReadField aWW8FieldTab[eMax+1] =
{
0,
&SwWW8ImplReader::Read_F_Input,
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 3ba2fbd..8fc1c6c 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1443,7 +1443,7 @@ void SwInsertDBColAutoPilot::SetTabSet()
{
// remove the defaults again, it makes no sense to set them
SvxBrushItem aBrush( RES_BACKGROUND );
- static sal_uInt16 aIds[3] =
+ static const sal_uInt16 aIds[3] =
{ RES_BACKGROUND, SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE };
for( int i = 0; i < 3; ++i )
if( SFX_ITEM_SET == pTblSet->GetItemState( aIds[ i ],
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 439c36d..d9e0d56 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -1613,7 +1613,7 @@ sal_uInt16 SwFldMgr::GetCurrLanguage() const
void SwFieldType::_GetFldName()
{
- static sal_uInt16 coFldNms[] = {
+ static const sal_uInt16 coFldNms[] = {
FLD_DATE_STD,
FLD_TIME_STD,
STR_FILENAMEFLD,
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index b5d24e8..6b91fc7 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -400,7 +400,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
rSh.SetTableName( *pFmt, ((const SfxStringItem*)pItem)->GetValue() );
// Copy the chosen attributes in the ItemSet.
- static sal_uInt16 aIds[] =
+ static const sal_uInt16 aIds[] =
{
RES_PAGEDESC,
RES_BREAK,
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 096209b..7b74e5b 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -542,7 +542,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
}
else
{
- static sal_uInt16 aFrmAttrRange[] =
+ static const sal_uInt16 aFrmAttrRange[] =
{
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index e7f1ab0..838462d 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -104,7 +104,7 @@ TYPEINIT1(SwPagePreView,SfxViewShell)
static sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, sal_Bool bZoomIn)
{
- static sal_uInt16 aZoomArr[] =
+ static const sal_uInt16 aZoomArr[] =
{
25, 50, 75, 100, 150, 200, 400, 600
};
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 3df85c96..4b67059 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -704,7 +704,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
m_pWrtShell->SttSelect();
- static sal_uInt16 aSearchAttrRange[] = {
+ static const sal_uInt16 aSearchAttrRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
More information about the Libreoffice-commits
mailing list