diff options
author | Aron Budea <aron.budea@collabora.com> | 2021-10-04 19:19:13 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2021-10-05 14:42:39 +0200 |
commit | e45f5ca3dd5e6064630272e39b3a2725b4b636eb (patch) | |
tree | 14304dff3e9a1a3581fe5aacbfe3284df125c9c1 /sw/qa/core/text/text.cxx | |
parent | 077352a58976f1b1f3c4a8744a32c3bd61f6559f (diff) |
Revert "tdf#144305 sw: fix rendering of ruby portions with...
...non-default ruby alignment"
Causing 301278b656e76b6f42af5cf8a6f5c6c02acfffeb will be
reverted in libreoffice-7-2.
This reverts commit 168065841250c190808261cf65afa00f9ecd52e7.
Change-Id: I9b23c9a1980c4ed06cc0c53086ad24f00e75053a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123086
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa/core/text/text.cxx')
-rw-r--r-- | sw/qa/core/text/text.cxx | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index 6832ad2cb436..be6406f6b654 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -21,12 +21,6 @@ #include <docsh.hxx> #include <unotxdoc.hxx> #include <wrtsh.hxx> -#include <IDocumentLayoutAccess.hxx> -#include <rootfrm.hxx> -#include <txtfrm.hxx> - -#include <porlay.hxx> -#include <pormulti.hxx> constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/text/data/"; @@ -176,46 +170,6 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testLineWidth) CPPUNIT_ASSERT_GREATER(static_cast<sal_Int32>(65536), nNewLeft - nOldLeft); } -CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testRuby) -{ - // Given a document with multiple ruby portions: - SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "ruby.fodt"); - - // When laying out that document: - SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); - - // Then make sure that no unwanted margin portions are created, making the actual text - // invisible: - SwFrame* pPageFrame = pLayout->GetLower(); - SwFrame* pBodyFrame = pPageFrame->GetLower(); - SwFrame* pFrame = pBodyFrame->GetLower(); - CPPUNIT_ASSERT(pFrame->IsTextFrame()); - auto pTextFrame = static_cast<SwTextFrame*>(pFrame); - SwParaPortion* pPara = pTextFrame->GetPara(); - bool bFirst = true; - for (SwLinePortion* pPor = pPara->GetFirstPortion(); pPor; pPor = pPor->GetNextPortion()) - { - // Look for multi-portions in the only paragraph of the document. - if (pPor->GetWhichPor() != PortionType::Multi) - { - continue; - } - - if (bFirst) - { - bFirst = false; - continue; - } - - // The second multi-portion has two lines, check the start of the second line. - auto pMulti = static_cast<SwMultiPortion*>(pPor); - // Without the accompanying fix in place, this test would have failed, as the portion was a - // margin portion, not a text portion. The margin was so large that the actual text portion was - // hidden. No margin is needed here at all. - CPPUNIT_ASSERT(pMulti->GetRoot().GetNext()->GetFirstPortion()->IsTextPortion()); - } -} - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |