mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use helper GetTextArray() in all places

Browse Source 
Change-Id: Icec4326cf614574d7dabe6752f985b3ac4462fb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132744
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2022-04-08 14:35:34 +02:00
parent bc0acc7bd0
commit 7cc4b06fc4
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/source/core/inc/fntcache.hxx
View File

@@ -78,13 +78,6 @@ class SwFntObj final : public SwCacheObj
bool m_bSymbol : 1; bool m_bSymbol : 1;
bool m_bPaintBlank : 1; bool m_bPaintBlank : 1;
static void GetTextArray(const OutputDevice& rOutputDevice, const OUString& rStr,
std::vector<sal_Int32>& rDXAry, sal_Int32 nIndex, sal_Int32 nLen,
const vcl::text::TextLayoutCache* layoutCache = nullptr);
static void GetTextArray(const OutputDevice& rOutputDevice, const SwDrawTextInfo& rInf, std::vector<sal_Int32>& rDXAry,
sal_Int32 nLen);
static void GetTextArray(const OutputDevice& rOutputDevice, const SwDrawTextInfo& rInf, std::vector<sal_Int32>& rDXAry);
static tools::Long s_nPixWidth; static tools::Long s_nPixWidth;
static MapMode *s_pPixMap; static MapMode *s_pPixMap;

14
sw/source/core/txtnode/fntcache.cxx
View File

@@ -756,20 +756,20 @@ static void lcl_DrawLineForWrongListData(
rInf.GetOut().Pop(); rInf.GetOut().Pop();
} }
void SwFntObj::GetTextArray(const OutputDevice& rDevice, const OUString& rStr, std::vector<sal_Int32>& rDXAry, static void GetTextArray(const OutputDevice& rDevice, const OUString& rStr, std::vector<sal_Int32>& rDXAry,
sal_Int32 nIndex, sal_Int32 nLen, const vcl::text::TextLayoutCache* layoutCache) sal_Int32 nIndex, sal_Int32 nLen, const vcl::text::TextLayoutCache* layoutCache = nullptr)
{ {
const SalLayoutGlyphs* pLayoutCache = SalLayoutGlyphsCache::self()->GetLayoutGlyphs(&rDevice, rStr, nIndex, nLen, const SalLayoutGlyphs* pLayoutCache = SalLayoutGlyphsCache::self()->GetLayoutGlyphs(&rDevice, rStr, nIndex, nLen,
0, layoutCache); 0, layoutCache);
rDevice.GetTextArray(rStr, &rDXAry, nIndex, nLen, layoutCache, pLayoutCache); rDevice.GetTextArray(rStr, &rDXAry, nIndex, nLen, layoutCache, pLayoutCache);
} }
void SwFntObj::GetTextArray(const OutputDevice& rOutputDevice, const SwDrawTextInfo& rInf, std::vector<sal_Int32>& rDXAry) static void GetTextArray(const OutputDevice& rOutputDevice, const SwDrawTextInfo& rInf, std::vector<sal_Int32>& rDXAry)
{ {
return GetTextArray(rOutputDevice, rInf.GetText(), rDXAry, rInf.GetIdx().get(), rInf.GetLen().get(), rInf.GetVclCache()); return GetTextArray(rOutputDevice, rInf.GetText(), rDXAry, rInf.GetIdx().get(), rInf.GetLen().get(), rInf.GetVclCache());
} }
void SwFntObj::GetTextArray(const OutputDevice& rOutputDevice, const SwDrawTextInfo& rInf, std::vector<sal_Int32>& rDXAry, sal_Int32 nLen) static void GetTextArray(const OutputDevice& rOutputDevice, const SwDrawTextInfo& rInf, std::vector<sal_Int32>& rDXAry, sal_Int32 nLen)
{ {
// Substring is fine. // Substring is fine.
assert( nLen <= rInf.GetLen().get()); assert( nLen <= rInf.GetLen().get());
@@ -2246,7 +2246,7 @@ TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo const & rInf, tools::Long nTe
const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc); const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
std::vector<sal_Int32> aKernArray; std::vector<sal_Int32> aKernArray;
rInf.GetOut().GetTextArray( rInf.GetText(), &aKernArray, GetTextArray( rInf.GetOut(), rInf.GetText(), aKernArray,
sal_Int32(rInf.GetIdx()), sal_Int32(rInf.GetLen())); sal_Int32(rInf.GetIdx()), sal_Int32(rInf.GetLen()));
tools::Long nAvgWidthPerChar = aKernArray[sal_Int32(rInf.GetLen()) - 1] / sal_Int32(rInf.GetLen()); tools::Long nAvgWidthPerChar = aKernArray[sal_Int32(rInf.GetLen()) - 1] / sal_Int32(rInf.GetLen());
@@ -2277,7 +2277,7 @@ TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo const & rInf, tools::Long nTe
const tools::Long nGridWidthAdd = EvalGridWidthAdd( pGrid, rInf ); const tools::Long nGridWidthAdd = EvalGridWidthAdd( pGrid, rInf );
std::vector<sal_Int32> aKernArray; std::vector<sal_Int32> aKernArray;
rInf.GetOut().GetTextArray( rInf.GetText(), &aKernArray, GetTextArray( rInf.GetOut(), rInf.GetText(), aKernArray,
sal_Int32(rInf.GetIdx()), sal_Int32(rInf.GetLen())); sal_Int32(rInf.GetIdx()), sal_Int32(rInf.GetLen()));
tools::Long nCurrPos = aKernArray[sal_Int32(nTextBreak)] + nGridWidthAdd; tools::Long nCurrPos = aKernArray[sal_Int32(nTextBreak)] + nGridWidthAdd;
while (++nTextBreak < rInf.GetLen() && nTextWidth >= nCurrPos) while (++nTextBreak < rInf.GetLen() && nTextWidth >= nCurrPos)
@@ -2394,7 +2394,7 @@ TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo const & rInf, tools::Long nTe
else if (nLn > nTextBreak2 + nTextBreak2) else if (nLn > nTextBreak2 + nTextBreak2)
nLn = nTextBreak2 + nTextBreak2; nLn = nTextBreak2 + nTextBreak2;
std::vector<sal_Int32> aKernArray; std::vector<sal_Int32> aKernArray;
rInf.GetOut().GetTextArray( rInf.GetText(), &aKernArray, GetTextArray( rInf.GetOut(), rInf.GetText(), aKernArray,
sal_Int32(rInf.GetIdx()), sal_Int32(nLn)); sal_Int32(rInf.GetIdx()), sal_Int32(nLn));
if( rInf.GetScriptInfo()->Compress( aKernArray.data(), rInf.GetIdx(), nLn, if( rInf.GetScriptInfo()->Compress( aKernArray.data(), rInf.GetIdx(), nLn,
rInf.GetKanaComp(), o3tl::narrowing<sal_uInt16>(GetHeight( m_nActual )), rInf.GetKanaComp(), o3tl::narrowing<sal_uInt16>(GetHeight( m_nActual )),