diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-10 21:37:22 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-10 12:15:42 +0000 |
| commit | 536d0e27f05d9db7469bd8a3571c87b2ea885367 (patch) | |
| tree | 304d45792300b026f22a26db6c748def48d979ec /vcl/generic | |
| parent | 36ccb37eee589c444445ab2d05a5c0dff6585a2f (diff) | |
Cleanup FontCharMapPtr variable prefixes
Change-Id: Ib106b91ab71ee45d5ad469d0beaf4ebaef8b57e1
Reviewed-on: https://gerrit.libreoffice.org/21306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 8 | ||||
| -rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 86dfab3b0a9d..4fe08f13ed46 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -2109,11 +2109,11 @@ void PrintFontManager::getGlyphWidths( fontID nFont, CmapResult aCmapResult; if( ParseCMAP( pCmapData, nCmapSize, aCmapResult ) ) { - FontCharMapPtr pCharMap( new FontCharMap(aCmapResult) ); + FontCharMapPtr xFontCharMap( new FontCharMap(aCmapResult) ); for( sal_uInt32 cOld = 0;;) { // get next unicode covered by font - const sal_uInt32 c = pCharMap->GetNextChar( cOld ); + const sal_uInt32 c = xFontCharMap->GetNextChar( cOld ); if( c == cOld ) break; cOld = c; @@ -2122,12 +2122,12 @@ void PrintFontManager::getGlyphWidths( fontID nFont, break; #endif // get the matching glyph index - const sal_GlyphId aGlyphId = pCharMap->GetGlyphIndex( c ); + const sal_GlyphId aGlyphId = xFontCharMap->GetGlyphIndex( c ); // update the requested map rUnicodeEnc[ (sal_Unicode)c ] = aGlyphId; } - pCharMap = nullptr; + xFontCharMap = nullptr; } } } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 6ce0811ca28f..145bf7dc18e6 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -770,8 +770,8 @@ const FontCharMapPtr GenPspGraphics::GetFontCharMap() const if( !m_pServerFont[0] ) return nullptr; - const FontCharMapPtr pFCMap = m_pServerFont[0]->GetFontCharMap(); - return pFCMap; + const FontCharMapPtr xFCMap = m_pServerFont[0]->GetFontCharMap(); + return xFCMap; } bool GenPspGraphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const |