diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-12 12:39:13 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-12 12:43:12 +0200 |
commit | 20c43a23d1d02523da2a72c37b839350798c775f (patch) | |
tree | ca091afc2e1eaf39051aa6242c60764b5079bdb2 | |
parent | d4c09a4e3737c1355c666299d8a3f3f30dc659dd (diff) |
"Unicode" is a proper noun and should not be used in plural
The 16-bit things that make up the UTF-16 encoding are called "code
units".
Change-Id: Iab2b83323783e518198c1a0553f7b053fc415985
-rw-r--r-- | chart2/inc/SpecialCharacters.hxx (renamed from chart2/inc/SpecialUnicodes.hxx) | 4 | ||||
-rw-r--r-- | chart2/qa/extras/chart2_trendcalculators.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 8 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 1 | ||||
-rw-r--r-- | tools/source/stream/stream.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/i18nhelp.cxx | 6 | ||||
-rw-r--r-- | vcl/source/font/fontcharmap.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 64 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 14 |
14 files changed, 59 insertions, 60 deletions
diff --git a/chart2/inc/SpecialUnicodes.hxx b/chart2/inc/SpecialCharacters.hxx index 446ea4914d4e..5bf13e25cde3 100644 --- a/chart2/inc/SpecialUnicodes.hxx +++ b/chart2/inc/SpecialCharacters.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CHART2_INC_SPECIALUNICODES_HXX -#define INCLUDED_CHART2_INC_SPECIALUNICODES_HXX +#ifndef INCLUDED_CHART2_INC_SPECIALCHARACTERS_HXX +#define INCLUDED_CHART2_INC_SPECIALCHARACTERS_HXX const sal_Unicode aMinusSign = 0x2212; const sal_Unicode aSuperscriptFigures[10]={ 0x2070, 0x00B9, 0x00B2, 0x00B3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079 }; diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx index f3500fe9a3be..a45091057e80 100644 --- a/chart2/qa/extras/chart2_trendcalculators.cxx +++ b/chart2/qa/extras/chart2_trendcalculators.cxx @@ -10,7 +10,7 @@ #include "charttest.hxx" #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> -#include <SpecialUnicodes.hxx> +#include <SpecialCharacters.hxx> // Define the index of sheets in the test document diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index b1439867a449..d3c0cf84fbd9 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -20,7 +20,7 @@ #include "ExponentialRegressionCurveCalculator.hxx" #include "macros.hxx" #include "RegressionCalculationHelper.hxx" -#include <SpecialUnicodes.hxx> +#include <SpecialCharacters.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index a69d68ea4137..302350972f5d 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -20,7 +20,7 @@ #include "LogarithmicRegressionCurveCalculator.hxx" #include "macros.hxx" #include "RegressionCalculationHelper.hxx" -#include <SpecialUnicodes.hxx> +#include <SpecialCharacters.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx index 2846dbecba09..b122cd514001 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -25,7 +25,7 @@ #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> -#include <SpecialUnicodes.hxx> +#include <SpecialCharacters.hxx> using namespace com::sun::star; diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 90a542af26d9..92ae9ed8ef29 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -20,7 +20,7 @@ #include "PotentialRegressionCurveCalculator.hxx" #include "macros.hxx" #include "RegressionCalculationHelper.hxx" -#include <SpecialUnicodes.hxx> +#include <SpecialCharacters.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index afbe531b9601..ebdb4f82755c 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -52,7 +52,7 @@ #include "BubbleChart.hxx" #include "NetChart.hxx" #include <unonames.hxx> -#include <SpecialUnicodes.hxx> +#include <SpecialCharacters.hxx> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/TimeUnit.hpp> diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index a19f71642fce..7463089277a1 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -609,12 +609,12 @@ void PDFIProcessor::startIndicator( const OUString& rText ) sal_Int32 nElements = m_nPages; if( m_xStatusIndicator.is() ) { - sal_Int32 nUnicodes = rText.getLength(); - OUStringBuffer aStr( nUnicodes*2 ); + sal_Int32 nLength = rText.getLength(); + OUStringBuffer aStr( nLength*2 ); const sal_Unicode* pText = rText.getStr(); - for( int i = 0; i < nUnicodes; i++ ) + for( int i = 0; i < nLength; i++ ) { - if( nUnicodes-i > 1&& + if( nLength-i > 1&& pText[i] == '%' && pText[i+1] == 'd' ) diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index d308f3457a1f..5204a37e2876 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -309,7 +309,6 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat) { case FilteringContent: { - // Read Unicodes from buffer. if( m_ChunkPosition == m_pContentReader ->getChunkBuffer().size() ) { m_ulUnicodeBufferLen=0; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 9035a9cecff1..f54924fc7087 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -2002,7 +2002,7 @@ OString read_uInt8s_ToOString(SvStream& rStrm, std::size_t nLen) return pStr ? OString(pStr, SAL_NO_ACQUIRE) : OString(); } -//Create a OUString of nLen sal_Unicodes from rStream +//Create a OUString of nLen sal_Unicode code units from rStream OUString read_uInt16s_ToOUString(SvStream& rStrm, std::size_t nLen) { rtl_uString *pStr = nullptr; diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index d59fdc46eff2..f4f47a553c4d 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -98,10 +98,10 @@ inline bool is_formatting_mark( sal_Unicode c ) */ OUString vcl::I18nHelper::filterFormattingChars( const OUString& rStr ) { - sal_Int32 nUnicodes = rStr.getLength(); - OUStringBuffer aBuf( nUnicodes ); + sal_Int32 nLength = rStr.getLength(); + OUStringBuffer aBuf( nLength ); const sal_Unicode* pStr = rStr.getStr(); - while( nUnicodes-- ) + while( nLength-- ) { if( ! is_formatting_mark( *pStr ) ) aBuf.append( *pStr ); diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 61e2323703b9..fa0fb5b494a0 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -288,7 +288,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) if( aConverter && aCvtContext ) { // determine the set of supported unicodes from encoded ranges - std::set<sal_UCS4> aSupportedUnicodes; + std::set<sal_UCS4> aSupportedCodePoints; static const int NINSIZE = 64; static const int NOUTSIZE = 64; @@ -320,7 +320,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) &nCvtInfo, &nSrcCvtBytes ); for( j = 0; j < nOutLen; ++j ) - aSupportedUnicodes.insert( cCharsOut[j] ); + aSupportedCodePoints.insert( cCharsOut[j] ); } } @@ -330,8 +330,8 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) // convert the set of supported unicodes to ranges std::vector<sal_UCS4> aSupportedRanges; - std::set<sal_UCS4>::const_iterator itChar = aSupportedUnicodes.begin(); - for(; itChar != aSupportedUnicodes.end(); ++itChar ) + std::set<sal_UCS4>::const_iterator itChar = aSupportedCodePoints.begin(); + for(; itChar != aSupportedCodePoints.end(); ++itChar ) { if( aSupportedRanges.empty() || (aSupportedRanges.back() != *itChar) ) diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 4cfbca205619..dce47529fa69 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -3050,14 +3050,14 @@ static void appendSubsetName( int nSubsetID, const OUString& rPSName, OStringBuf } sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, - sal_Ucs* pUnicodes, - sal_Int32* pUnicodesPerGlyph, + sal_Ucs* pCodeUnits, + sal_Int32* pCodeUnitsPerGlyph, sal_Int32* pEncToUnicodeIndex, int nGlyphs ) { int nMapped = 0; for (int n = 0; n < nGlyphs; ++n) - if( pUnicodes[pEncToUnicodeIndex[n]] && pUnicodesPerGlyph[n] ) + if( pCodeUnits[pEncToUnicodeIndex[n]] && pCodeUnitsPerGlyph[n] ) nMapped++; if( nMapped == 0 ) @@ -3085,7 +3085,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, int nCount = 0; for (int n = 0; n < nGlyphs; ++n) { - if( pUnicodes[pEncToUnicodeIndex[n]] && pUnicodesPerGlyph[n] ) + if( pCodeUnits[pEncToUnicodeIndex[n]] && pCodeUnitsPerGlyph[n] ) { if( (nCount % 100) == 0 ) { @@ -3099,10 +3099,10 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, aContents.append( "> <" ); // TODO: handle unicodes>U+FFFF sal_Int32 nIndex = pEncToUnicodeIndex[n]; - for( sal_Int32 j = 0; j < pUnicodesPerGlyph[n]; j++ ) + for( sal_Int32 j = 0; j < pCodeUnitsPerGlyph[n]; j++ ) { - appendHex( (sal_Int8)(pUnicodes[nIndex + j] / 256), aContents ); - appendHex( (sal_Int8)(pUnicodes[nIndex + j] & 255), aContents ); + appendHex( (sal_Int8)(pCodeUnits[nIndex + j] / 256), aContents ); + appendHex( (sal_Int8)(pCodeUnits[nIndex + j] & 255), aContents ); } aContents.append( ">\n" ); nCount++; @@ -3272,16 +3272,16 @@ bool PDFWriterImpl::emitFonts() sal_Int32 pWidths[ 256 ]; sal_uInt8 pEncoding[ 256 ]; sal_Int32 pEncToUnicodeIndex[ 256 ]; - sal_Int32 pUnicodesPerGlyph[ 256 ]; - std::vector<sal_Ucs> aUnicodes; - aUnicodes.reserve( 256 ); + sal_Int32 pCodeUnitsPerGlyph[ 256 ]; + std::vector<sal_Ucs> aCodeUnits; + aCodeUnits.reserve( 256 ); int nGlyphs = 1; // fill arrays and prepare encoding index map sal_Int32 nToUnicodeStream = 0; memset( aGlyphIds, 0, sizeof( aGlyphIds ) ); memset( pEncoding, 0, sizeof( pEncoding ) ); - memset( pUnicodesPerGlyph, 0, sizeof( pUnicodesPerGlyph ) ); + memset( pCodeUnitsPerGlyph, 0, sizeof( pCodeUnitsPerGlyph ) ); memset( pEncToUnicodeIndex, 0, sizeof( pEncToUnicodeIndex ) ); for( FontEmitMapping::iterator fit = lit->m_aMapping.begin(); fit != lit->m_aMapping.end();++fit ) { @@ -3292,10 +3292,10 @@ bool PDFWriterImpl::emitFonts() aGlyphIds[ nEnc ] = fit->first; pEncoding[ nEnc ] = nEnc; - pEncToUnicodeIndex[ nEnc ] = static_cast<sal_Int32>(aUnicodes.size()); - pUnicodesPerGlyph[ nEnc ] = fit->second.countCodes(); - for( sal_Int32 n = 0; n < pUnicodesPerGlyph[ nEnc ]; n++ ) - aUnicodes.push_back( fit->second.getCode( n ) ); + pEncToUnicodeIndex[ nEnc ] = static_cast<sal_Int32>(aCodeUnits.size()); + pCodeUnitsPerGlyph[ nEnc ] = fit->second.countCodes(); + for( sal_Int32 n = 0; n < pCodeUnitsPerGlyph[ nEnc ]; n++ ) + aCodeUnits.push_back( fit->second.getCode( n ) ); if( fit->second.getCode(0) ) nToUnicodeStream = 1; if( nGlyphs < 256 ) @@ -3426,7 +3426,7 @@ bool PDFWriterImpl::emitFonts() sal_Int32 nFontDescriptor = emitFontDescriptor( it->first, aSubsetInfo, lit->m_nFontID, nFontStream ); if( nToUnicodeStream ) - nToUnicodeStream = createToUnicodeCMap( pEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nGlyphs ); + nToUnicodeStream = createToUnicodeCMap( pEncoding, &aCodeUnits[0], pCodeUnitsPerGlyph, pEncToUnicodeIndex, nGlyphs ); sal_Int32 nFontObject = createObject(); if ( !updateObject( nFontObject ) ) return false; @@ -8177,8 +8177,8 @@ sal_Int32 PDFWriterImpl::getSystemFont( const vcl::Font& i_rFont ) void PDFWriterImpl::registerGlyphs( int nGlyphs, const GlyphItem** pGlyphs, sal_Int32* pGlyphWidths, - sal_Ucs* pUnicodes, - sal_Int32* pUnicodesPerGlyph, + sal_Ucs* pCodeUnits, + sal_Int32* pCodeUnitsPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[] ) @@ -8189,8 +8189,8 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs, return; const PhysicalFontFace* pDevFont = m_pReferenceDevice->mpFontInstance->maFontSelData.mpFontData; - sal_Ucs* pCurUnicode = pUnicodes; - for( int i = 0; i < nGlyphs; pCurUnicode += pUnicodesPerGlyph[i] , i++ ) + sal_Ucs* pCurUnicode = pCodeUnits; + for( int i = 0; i < nGlyphs; pCurUnicode += pCodeUnitsPerGlyph[i] , i++ ) { const int nFontGlyphId = pGlyphs[i]->maGlyphId; const PhysicalFontFace* pCurrentFont = pFallbackFonts[i] ? pFallbackFonts[i] : pDevFont; @@ -8221,7 +8221,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs, // add new glyph to emitted font subset GlyphEmit& rNewGlyphEmit = rSubset.m_aSubsets.back().m_aMapping[ nFontGlyphId ]; rNewGlyphEmit.setGlyphId( nNewId ); - for( sal_Int32 n = 0; n < pUnicodesPerGlyph[i]; n++ ) + for( sal_Int32 n = 0; n < pCodeUnitsPerGlyph[i]; n++ ) rNewGlyphEmit.addCode( pCurUnicode[n] ); // add new glyph to font mapping @@ -8508,10 +8508,10 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool sal_Int32 pGlyphWidths[nMaxGlyphs]; sal_uInt8 pMappedGlyphs[nMaxGlyphs]; sal_Int32 pMappedFontObjects[nMaxGlyphs]; - std::vector<sal_Ucs> aUnicodes; - aUnicodes.reserve(nMaxGlyphs); - std::vector<sal_Int32> aUnicodesPerGlyph; - aUnicodes.reserve(nMaxGlyphs); + std::vector<sal_Ucs> aCodeUnits; + aCodeUnits.reserve(nMaxGlyphs); + std::vector<sal_Int32> aCodeUnitsPerGlyph; + aCodeUnits.reserve(nMaxGlyphs); bool bVertical = m_aCurrentPDFState.m_aFont.IsVertical(); int nGlyphs; int nIndex = 0; @@ -8641,11 +8641,11 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool Point aGNGlyphPos; while ((nGlyphs = rLayout.GetNextGlyphs(nTmpMaxGlyphs, pGlyphs, aGNGlyphPos, nIndex, pFallbackFonts)) != 0) { - aUnicodes.clear(); + aCodeUnits.clear(); for( int i = 0; i < nGlyphs; i++ ) { // default case: 1 glyph is one unicode - aUnicodesPerGlyph.push_back(1); + aCodeUnitsPerGlyph.push_back(1); if (pGlyphs[i]->mnCharPos >= nMinCharPos && pGlyphs[i]->mnCharPos <= nMaxCharPos) { int nChars = 1; @@ -8663,22 +8663,22 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool } else if (nChars == 0) nChars = 1; - aUnicodesPerGlyph.back() = nChars; + aCodeUnitsPerGlyph.back() = nChars; for( int n = 0; n < nChars; n++ ) - aUnicodes.push_back( rText[ start + n ] ); + aCodeUnits.push_back( rText[ start + n ] ); } else - aUnicodes.push_back(rText[pGlyphs[i]->mnCharPos]); + aCodeUnits.push_back(rText[pGlyphs[i]->mnCharPos]); } else - aUnicodes.push_back( 0 ); + aCodeUnits.push_back( 0 ); // note: in case of ctl one character may result // in multiple glyphs. The current SalLayout // implementations set -1 then to indicate that no direct // mapping is possible } - registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, aUnicodes.data(), aUnicodesPerGlyph.data(), pMappedGlyphs, pMappedFontObjects, pFallbackFonts ); + registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, aCodeUnits.data(), aCodeUnitsPerGlyph.data(), pMappedGlyphs, pMappedFontObjects, pFallbackFonts ); for( int i = 0; i < nGlyphs; i++ ) { diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 1d491aa36936..d2f985a8f696 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -289,7 +289,7 @@ public: class GlyphEmit { // performance: actually this should probably a vector; - std::vector<sal_Ucs> m_Unicodes; + std::vector<sal_Ucs> m_CodeUnits; sal_uInt8 m_nSubsetGlyphID; public: @@ -302,14 +302,14 @@ public: void addCode( sal_Ucs i_cCode ) { - m_Unicodes.push_back(i_cCode); + m_CodeUnits.push_back(i_cCode); } - sal_Int32 countCodes() const { return m_Unicodes.size(); } + sal_Int32 countCodes() const { return m_CodeUnits.size(); } sal_Ucs getCode( sal_Int32 i_nIndex ) const { sal_Ucs nRet = 0; - if (static_cast<size_t>(i_nIndex) < m_Unicodes.size()) - nRet = m_Unicodes[i_nIndex]; + if (static_cast<size_t>(i_nIndex) < m_CodeUnits.size()) + nRet = m_CodeUnits[i_nIndex]; return nRet; } }; @@ -775,7 +775,7 @@ i12626 void appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); /* creates fonts and subsets that will be emitted later */ - void registerGlyphs(int nGlyphs, const GlyphItem** pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[]); + void registerGlyphs(int nGlyphs, const GlyphItem** pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pCodeUnits, sal_Int32* pCodeUnitsPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[]); /* emits a text object according to the passed layout */ /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */ @@ -824,7 +824,7 @@ i12626 /* writes a font descriptor and returns its object id (or 0) */ sal_Int32 emitFontDescriptor( const PhysicalFontFace*, FontSubsetInfo&, sal_Int32 nSubsetID, sal_Int32 nStream ); /* writes a ToUnicode cmap, returns the corresponding stream object */ - sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_Int32* pEncToUnicodeIndex, int nGlyphs ); + sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pCodeUnits, sal_Int32* pCodeUnitsPerGlyph, sal_Int32* pEncToUnicodeIndex, int nGlyphs ); /* get resource dict object number */ sal_Int32 getResourceDictObj() |