diff options
-rw-r--r-- | tools/source/datetime/tdate.cxx | 2 | ||||
-rw-r--r-- | tools/source/zcodec/zcodec.cxx | 2 | ||||
-rw-r--r-- | ucb/source/core/ucbprops.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 4 | ||||
-rw-r--r-- | unotools/source/misc/fontcvt.cxx | 10 | ||||
-rw-r--r-- | vcl/source/edit/texteng.cxx | 6 | ||||
-rw-r--r-- | vcl/source/filter/ixpm/rgbtable.hxx | 2 | ||||
-rw-r--r-- | vcl/source/fontsubset/sft.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impvect.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/outmap.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde/fpicker/kdefpmain.cxx | 2 |
12 files changed, 22 insertions, 22 deletions
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index 11f1917c9e8a..719219a58afe 100644 --- a/tools/source/datetime/tdate.cxx +++ b/tools/source/datetime/tdate.cxx @@ -32,7 +32,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *buffer); } #endif -static sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30, +static const sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; #define MAX_DAYS 3636532 diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 497662cf1315..8d23861c796e 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -35,7 +35,7 @@ #define GZ_COMMENT 0x10 /* bit 4 set: file comment present */ #define GZ_RESERVED 0xE0 /* bits 5..7: reserved */ -static int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */ +static const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */ ZCodec::ZCodec( sal_uIntPtr nInBufSize, sal_uIntPtr nOutBufSize, sal_uIntPtr nMemUsage ) : mnCRC(0) diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 2207a05df587..ee61cb6e0840 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -164,7 +164,7 @@ static const com::sun::star::uno::Type& Sequence_SendMediaTypes_getCppuType() #define ATTR_DEFAULT ( PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID | PropertyAttribute::MAYBEDEFAULT ) -static PropertyTableEntry __aPropertyTable[] = +static const PropertyTableEntry __aPropertyTable[] = { { "Account", -1, ATTR_DEFAULT, &OUString_getCppuType }, { "AutoUpdateInterval", -1, ATTR_DEFAULT, &sal_uInt32_getCppuType }, diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 2acbea03de3f..9435505ce1fe 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -196,7 +196,7 @@ struct VarNameAttribute VarNameProperty eVarProperty; // Which return value is needed by this path variable }; -static PropertyStruct aPropNames[] = +static const PropertyStruct aPropNames[] = { { "Addin", SvtPathOptions::PATH_ADDIN }, { "AutoCorrect", SvtPathOptions::PATH_AUTOCORRECT }, @@ -224,7 +224,7 @@ static PropertyStruct aPropNames[] = { "Fingerprint", SvtPathOptions::PATH_FINGERPRINT } }; -static VarNameAttribute aVarNameAttribute[] = +static const VarNameAttribute aVarNameAttribute[] = { { SUBSTITUTE_INSTPATH, VAR_NEEDS_SYSTEM_PATH }, // $(instpath) { SUBSTITUTE_PROGPATH, VAR_NEEDS_SYSTEM_PATH }, // $(progpath) diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 516a05a48baa..277afed3960f 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1404,7 +1404,7 @@ void ConvertChar::RecodeString( OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen struct RecodeTable { const char* pOrgName; ConvertChar aCvt;}; -static RecodeTable aStarSymbolRecodeTable[] = +static const RecodeTable aStarSymbolRecodeTable[] = { // the first two entries must be StarMath and StarBats; do not reorder! // reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS @@ -1428,7 +1428,7 @@ static RecodeTable aStarSymbolRecodeTable[] = {"mtextra", {aMTExtraTab, "StarSymbol", NULL}} }; -static RecodeTable aAppleSymbolRecodeTable[] = { +static const RecodeTable aAppleSymbolRecodeTable[] = { {"symbol", {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", NULL}} }; @@ -1451,7 +1451,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con int nEntries = SAL_N_ELEMENTS(aStarSymbolRecodeTable); for( int i = 0; i < nEntries; ++i) { - RecodeTable& r = aStarSymbolRecodeTable[i]; + const RecodeTable& r = aStarSymbolRecodeTable[i]; if( aOrgName.equalsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } @@ -1464,7 +1464,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con int nEntries = SAL_N_ELEMENTS(aAppleSymbolRecodeTable); for( int i = 0; i < nEntries; ++i) { - RecodeTable& r = aAppleSymbolRecodeTable[i]; + const RecodeTable& r = aAppleSymbolRecodeTable[i]; if( aOrgName.equalsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } @@ -1496,7 +1496,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, nEntries = 2; for( int i = 0; i < nEntries; ++i ) { - RecodeTable& r = aStarSymbolRecodeTable[i]; + const RecodeTable& r = aStarSymbolRecodeTable[i]; if( aName.equalsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index cd84e6f06d85..3710fbf5ef52 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -234,9 +234,9 @@ void TextEngine::SetMaxTextWidth( sal_uLong nMaxWidth ) } } -static sal_Unicode static_aLFText[] = { '\n', 0 }; -static sal_Unicode static_aCRText[] = { '\r', 0 }; -static sal_Unicode static_aCRLFText[] = { '\r', '\n', 0 }; +static const sal_Unicode static_aLFText[] = { '\n', 0 }; +static const sal_Unicode static_aCRText[] = { '\r', 0 }; +static const sal_Unicode static_aCRLFText[] = { '\r', '\n', 0 }; static inline const sal_Unicode* static_getLineEndText( LineEnd aLineEnd ) { diff --git a/vcl/source/filter/ixpm/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx index 8f86fe8c371c..375dbdecdb2f 100644 --- a/vcl/source/filter/ixpm/rgbtable.hxx +++ b/vcl/source/filter/ixpm/rgbtable.hxx @@ -25,7 +25,7 @@ struct XPMRGBTab sal_uInt8 blue; }; -static XPMRGBTab pRGBTable[] = { +static const XPMRGBTab pRGBTable[] = { { "white", 255, 255, 255 }, { "black", 0, 0, 0 }, { "snow", 255, 250, 250 }, diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 548b2d36213b..e1dcb76d6c30 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -414,7 +414,7 @@ _inline sal_uInt32 getTableSize(TrueTypeFont *ttf, sal_uInt32 ord) #ifndef NO_TYPE42 /* Hex Formatter functions */ -static char HexChars[] = "0123456789ABCDEF"; +static const char HexChars[] = "0123456789ABCDEF"; static HexFmt *HexFmtNew(FILE *outf) { diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index d427ba4dab9b..027a41632d51 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -45,7 +45,7 @@ struct ChainMove { long nDX; long nDY; }; -static ChainMove aImplMove[ 8 ] = { +static const ChainMove aImplMove[ 8 ] = { { 1L, 0L }, { 0L, -1L }, { -1L, 0L }, @@ -56,7 +56,7 @@ static ChainMove aImplMove[ 8 ] = { { 1L, 1L } }; -static ChainMove aImplMoveInner[ 8 ] = { +static const ChainMove aImplMoveInner[ 8 ] = { { 0L, 1L }, { 1L, 0L }, { 0L, -1L }, @@ -67,7 +67,7 @@ static ChainMove aImplMoveInner[ 8 ] = { { -1L, 0L } }; -static ChainMove aImplMoveOuter[ 8 ] = { +static const ChainMove aImplMoveOuter[ 8 ] = { { 0L, -1L }, { -1L, 0L }, { 0L, 1L }, diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 0f252fa84dc3..63277491c8a9 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -52,9 +52,9 @@ DBG_NAMEEX( Region ) // ======================================================================= static int const s_ImplArySize = MAP_PIXEL+1; -static long aImplNumeratorAry[s_ImplArySize] = +static const long aImplNumeratorAry[s_ImplArySize] = { 1, 1, 5, 50, 1, 1, 1, 1, 1, 1, 1 }; -static long aImplDenominatorAry[s_ImplArySize] = +static const long aImplDenominatorAry[s_ImplArySize] = { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 }; // ----------------------------------------------------------------------- diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index fd6aa07a0cfd..7c4ddfb3016c 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -598,7 +598,7 @@ static void activate_uno(GSimpleAction *action, GVariant*, gpointer) xDisp->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >()); } -static GActionEntry app_entries[] = { +static const GActionEntry app_entries[] = { { "OptionsTreeDialog", activate_uno, NULL, NULL, NULL, {0} }, { "About", activate_uno, NULL, NULL, NULL, {0} }, { "HelpIndex", activate_uno, NULL, NULL, NULL, {0} }, diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx index 8178586b14e9..ed01febd3057 100644 --- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++ b/vcl/unx/kde/fpicker/kdefpmain.cxx @@ -60,7 +60,7 @@ // Main ////////////////////////////////////////////////////////////////////////// -static KCmdLineOptions sOptions[] = +static const KCmdLineOptions sOptions[] = { { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, KCmdLineLastOption |