diff options
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/filter/ixpm/xpmread.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/font/fontcache.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/debugevent.cxx | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 7608c8252e48..6c4838af8e68 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -564,7 +564,7 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb ) bool XPMReader::ImplGetString() { - sal_uInt8 sID[] = "/* XPM */"; + sal_uInt8 const sID[] = "/* XPM */"; sal_uInt8* pString = mpStringBuf; mnStringSize = 0; diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx index 8b26edacb5fa..6b576999507b 100644 --- a/vcl/source/font/fontcache.cxx +++ b/vcl/source/font/fontcache.cxx @@ -116,8 +116,7 @@ LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection cons // the most recently used font usually has a hit rate of >50% LogicalFontInstance *pFontInstance = nullptr; PhysicalFontFamily* pFontFamily = nullptr; - IFSD_Equal aIFSD_Equal; - if( mpFirstEntry && aIFSD_Equal( aFontSelData, mpFirstEntry->maFontSelData ) ) + if( mpFirstEntry && IFSD_Equal()( aFontSelData, mpFirstEntry->maFontSelData ) ) pFontInstance = mpFirstEntry; else { diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 3cffc299c073..027e0c4238bd 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2105,7 +2105,7 @@ static void DumpSfnts(FILE *outf, sal_uInt8 *sfntP, sal_uInt32 sfntLen) HexFmt *h = HexFmtNew(outf); sal_uInt16 i, numTables = GetUInt16(sfntP, 4); GlyphOffsets *go = GlyphOffsetsNew(sfntP, sfntLen); - sal_uInt8 pad[] = {0,0,0,0}; /* zeroes */ + sal_uInt8 const pad[] = {0,0,0,0}; /* zeroes */ if (numTables > nMaxPossibleTables) { diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index e826d38be1fe..c169030f8f2a 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -407,7 +407,7 @@ bool CommonSalLayout::HasVerticalAlternate(sal_UCS4 aChar, sal_UCS4 aVariationSe // Find all GSUB lookups for “vert” feature. hb_set_t* pLookups = hb_set_create(); - hb_tag_t pFeatures[] = { HB_TAG('v','e','r','t'), HB_TAG_NONE }; + hb_tag_t const pFeatures[] = { HB_TAG('v','e','r','t'), HB_TAG_NONE }; hb_ot_layout_collect_lookups(pHbFace, HB_OT_TAG_GSUB, nullptr, nullptr, pFeatures, pLookups); if (!hb_set_is_empty(pLookups)) { @@ -592,7 +592,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs) // preference. The coretext_aat shaper is available only on macOS, // but there is no harm in always including it, HarfBuzz will // ignore unavailable shapers. - const char* pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr }; + const char*const pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr }; hb_segment_properties_t aHbProps; hb_buffer_get_segment_properties(pHbBuffer, &aHbProps); hb_shape_plan_t* pHbPlan = hb_shape_plan_create_cached(pHbFace, &aHbProps, maFeatures.data(), maFeatures.size(), pHbShapers); diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index 2b83f4f92f03..b47532891c24 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -192,7 +192,7 @@ void DebugEventInjector::InjectKeyNavEdit() struct { double mnProb; sal_uInt16 mnKey; - } nWeights[] = { + } const nWeights[] = { // edit / escape etc. - 50% { 0.20, KEY_SPACE }, { 0.10, KEY_TAB }, |