summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/font/font.cxx10
-rw-r--r--vcl/source/fontsubset/sft.cxx42
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx2
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx2
5 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index ebf89250d650..3db74fce047a 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -563,12 +563,12 @@ namespace
bool bResult = false;
// might be a type1, find eexec
const char* pStream = i_pBuffer;
- const char* pExec = "eexec";
+ const char* const pExec = "eexec";
const char* pExecPos = std::search( pStream, pStream+i_nSize, pExec, pExec+5 );
if( pExecPos != pStream+i_nSize)
{
// find /FamilyName entry
- static const char* pFam = "/FamilyName";
+ static const char* const pFam = "/FamilyName";
const char* pFamPos = std::search( pStream, pExecPos, pFam, pFam+11 );
if( pFamPos != pExecPos )
{
@@ -586,7 +586,7 @@ namespace
}
// parse /ItalicAngle
- static const char* pItalic = "/ItalicAngle";
+ static const char* const pItalic = "/ItalicAngle";
const char* pItalicPos = std::search( pStream, pExecPos, pItalic, pItalic+12 );
if( pItalicPos != pExecPos )
{
@@ -595,7 +595,7 @@ namespace
}
// parse /Weight
- static const char* pWeight = "/Weight";
+ static const char* const pWeight = "/Weight";
const char* pWeightPos = std::search( pStream, pExecPos, pWeight, pWeight+7 );
if( pWeightPos != pExecPos )
{
@@ -620,7 +620,7 @@ namespace
}
// parse isFixedPitch
- static const char* pFixed = "/isFixedPitch";
+ static const char* const pFixed = "/isFixedPitch";
const char* pFixedPos = std::search( pStream, pExecPos, pFixed, pFixed+13 );
if( pFixedPos != pExecPos )
{
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 6ee64ec63463..682dc8764ba1 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -47,9 +47,9 @@ namespace vcl
/*- module identification */
-static const char *modname = "SunTypeTools-TT";
-static const char *modver = "1.0";
-static const char *modextra = "gelf";
+static const char * const modname = "SunTypeTools-TT";
+static const char * const modver = "1.0";
+static const char * const modextra = "gelf";
/*- private functions, constants and data types */
@@ -1797,39 +1797,39 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname,
TTGlyphMetrics metrics;
int UPEm = ttf->unitsPerEm;
- const char *h01 = "%%!PS-AdobeFont-%d.%d-%d.%d\n";
- const char *h02 = "%% Creator: %s %s %s\n";
- const char *h09 = "%% Original font name: %s\n";
+ const char * const h01 = "%%!PS-AdobeFont-%d.%d-%d.%d\n";
+ const char * const h02 = "%% Creator: %s %s %s\n";
+ const char * const h09 = "%% Original font name: %s\n";
- const char *h10 =
+ const char * const h10 =
"30 dict begin\n"
"/PaintType 0 def\n"
"/FontType 3 def\n"
"/StrokeWidth 0 def\n";
- const char *h11 = "/FontName (%s) cvn def\n";
+ const char * const h11 = "/FontName (%s) cvn def\n";
/*
const char *h12 = "%/UniqueID %d def\n";
*/
- const char *h13 = "/FontMatrix [.001 0 0 .001 0 0] def\n";
- const char *h14 = "/FontBBox [%d %d %d %d] def\n";
+ const char * const h13 = "/FontMatrix [.001 0 0 .001 0 0] def\n";
+ const char * const h14 = "/FontBBox [%d %d %d %d] def\n";
- const char *h15=
+ const char * const h15=
"/Encoding 256 array def\n"
" 0 1 255 {Encoding exch /.notdef put} for\n";
- const char *h16 = " Encoding %d /glyph%d put\n";
- const char *h17 = "/XUID [103 0 0 16#%08X %d 16#%08X 16#%08X] def\n";
+ const char * const h16 = " Encoding %d /glyph%d put\n";
+ const char * const h17 = "/XUID [103 0 0 16#%08X %d 16#%08X 16#%08X] def\n";
- const char *h30 = "/CharProcs %d dict def\n";
- const char *h31 = " CharProcs begin\n";
- const char *h32 = " /.notdef {} def\n";
- const char *h33 = " /glyph%d {\n";
- const char *h34 = " } bind def\n";
- const char *h35 = " end\n";
+ const char * const h30 = "/CharProcs %d dict def\n";
+ const char * const h31 = " CharProcs begin\n";
+ const char * const h32 = " /.notdef {} def\n";
+ const char * const h33 = " /glyph%d {\n";
+ const char * const h34 = " } bind def\n";
+ const char * const h35 = " end\n";
- const char *h40 =
+ const char * const h40 =
"/BuildGlyph {\n"
" exch /CharProcs get exch\n"
" 2 copy known not\n"
@@ -1842,7 +1842,7 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname,
"} bind def\n"
"currentdict end\n";
- const char *h41 = "(%s) cvn exch definefont pop\n";
+ const char * const h41 = "(%s) cvn exch definefont pop\n";
if (!((nGlyphs > 0) && (nGlyphs <= 256))) return SF_GLYPHNUM;
if (!glyphArray) return SF_BADARG;
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 9b91415d2392..76039a35e09a 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -170,7 +170,7 @@ namespace
OString getHexString(const sal_uInt8* pData, sal_uInt32 nLength)
{
- static const char* pHexData = "0123456789ABCDEF";
+ static const char* const pHexData = "0123456789ABCDEF";
bool bIsZero = true;
OStringBuffer aHexStr;
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 4e7a22c88557..56eaf8e3a9d7 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1071,7 +1071,7 @@ bool PrintFontManager::createFontSubset(
return false;
}
// create font subset
- const char* pGlyphSetName = nullptr; // TODO: better name?
+ const char* const pGlyphSetName = nullptr; // TODO: better name?
const bool bOK = rInfo.CreateFontSubset(
FontSubsetInfo::TYPE1_PFB,
pOutFile, pGlyphSetName,
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 25b3da511224..5e6e9961d676 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -739,7 +739,7 @@ String2Locale( uno::Any& rAny, const gchar * value )
// @see http://www.w3.org/TR/2002/WD-css3-fonts-20020802/#font-effect-prop
static const gchar * relief[] = { "none", "emboss", "engrave" };
-static const gchar * outline = "outline";
+static const gchar * const outline = "outline";
static gchar *
get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList,