diff options
| -rw-r--r-- | sw/qa/extras/layout/layout2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 61 | ||||
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 7 |
3 files changed, 1 insertions, 69 deletions
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index b4b004951bf0..e9f2372c0d97 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -875,7 +875,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineMoving2) // text and numbering colors show moving of the list item // These were 0 (other color, not COL_GREEN, color of the tracked text movement) assertXPath(pXmlDoc, "/metafile/push/push/push/textcolor[@color='#008000']", 5); - assertXPath(pXmlDoc, "/metafile/push/push/push/font[@color='#008000']", 11); + assertXPath(pXmlDoc, "/metafile/push/push/push/font[@color='#008000']", 9); } CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineMovingDOCX) diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c0149d9a6573..a4ac4f675aea 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1099,16 +1099,6 @@ void SwSubFont::DrawText_( SwDrawTextInfo &rInf, const bool bGrey ) if (TextFrameIndex(COMPLETE_STRING) == rInf.GetLen()) rInf.SetLen( nLn ); - FontLineStyle nOldUnder = LINESTYLE_NONE; - SwUnderlineFont* pUnderFnt = nullptr; - - if( rInf.GetUnderFnt() ) - { - nOldUnder = GetUnderline(); - SetUnderline( LINESTYLE_NONE ); - pUnderFnt = rInf.GetUnderFnt(); - } - if( !pLastFont || pLastFont->GetOwner() != m_nFontCacheId ) ChgFnt( rInf.GetShell(), rInf.GetOut() ); @@ -1165,57 +1155,6 @@ void SwSubFont::DrawText_( SwDrawTextInfo &rInf, const bool bGrey ) } } - if( pUnderFnt && nOldUnder != LINESTYLE_NONE ) - { - Size aFontSize = GetTextSize_( rInf ); - const OUString oldStr = rInf.GetText(); - - TextFrameIndex const nOldIdx = rInf.GetIdx(); - TextFrameIndex const nOldLen = rInf.GetLen(); - tools::Long nSpace = 0; - if( rInf.GetSpace() ) - { - TextFrameIndex nTmpEnd = nOldIdx + nOldLen; - if (nTmpEnd > TextFrameIndex(oldStr.getLength())) - nTmpEnd = TextFrameIndex(oldStr.getLength()); - - const SwScriptInfo* pSI = rInf.GetScriptInfo(); - - const bool bAsianFont = - ( rInf.GetFont() && SwFontScript::CJK == rInf.GetFont()->GetActual() ); - for (TextFrameIndex nTmp = nOldIdx; nTmp < nTmpEnd; ++nTmp) - { - if (CH_BLANK == oldStr[sal_Int32(nTmp)] || bAsianFont || - (nTmp + TextFrameIndex(1) < TextFrameIndex(oldStr.getLength()) - && pSI - && i18n::ScriptType::ASIAN == pSI->ScriptType(nTmp + TextFrameIndex(1)))) - { - ++nSpace; - } - } - - // if next portion if a hole portion we do not consider any - // extra space added because the last character was ASIAN - if ( nSpace && rInf.IsSpaceStop() && bAsianFont ) - --nSpace; - - nSpace *= rInf.GetSpace() / SPACING_PRECISION_FACTOR; - } - - rInf.SetWidth( sal_uInt16(aFontSize.Width() + nSpace) ); - rInf.SetTextIdxLen( " ", TextFrameIndex(0), TextFrameIndex(2) ); - SetUnderline( nOldUnder ); - rInf.SetUnderFnt( nullptr ); - - // set position for underline font - rInf.SetPos( pUnderFnt->GetPos() ); - - pUnderFnt->GetFont().DrawStretchText_( rInf ); - - rInf.SetUnderFnt( pUnderFnt ); - rInf.SetTextIdxLen(oldStr, nOldIdx, nOldLen); - } - rInf.SetPos(aOldPos); } diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 0739cd25cd8a..5f8cce35e69e 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1338,13 +1338,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf145274) int nPageObjectCount = pPage->getObjectCount(); - // Without the fix in place, this test would have failed with - // - Expected: 6 - // - Actual : 4 - CPPUNIT_ASSERT_EQUAL(6, nPageObjectCount); - - auto pTextPage = pPage->getTextPage(); - for (int i = 0; i < nPageObjectCount; ++i) { std::unique_ptr<vcl::pdf::PDFiumPageObject> pPageObject = pPage->getObject(i); |