e6fa52c2c3
We always compared border width and other aspects only after that, Word works with border weight according to their implementer notes. So extend svx::frame::Style to be able to collapse borders using weights and opt in for that from sw/ in case a compat mode (which is related to tables, off by default and is set by the DOC/DOCX import) is set. Change-Id: I1f682789302c88a0d326c6c0263ad3007441cb24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89052 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
69 lines
2.7 KiB
C++
69 lines
2.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <swmodeltestbase.hxx>
|
|
|
|
#include <vcl/gdimtf.hxx>
|
|
#include <comphelper/classids.hxx>
|
|
#include <tools/globname.hxx>
|
|
#include <svtools/embedhlp.hxx>
|
|
|
|
#include <wrtsh.hxx>
|
|
#include <fmtanchr.hxx>
|
|
|
|
static char const DATA_DIRECTORY[] = "/sw/qa/core/layout/data/";
|
|
|
|
/// Covers sw/source/core/layout/ fixes.
|
|
class SwCoreLayoutTest : public SwModelTestBase
|
|
{
|
|
};
|
|
|
|
CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTableFlyOverlap)
|
|
{
|
|
// Load a document that has an image anchored in the header.
|
|
// It also has a table which has the wrap around the image.
|
|
load(DATA_DIRECTORY, "table-fly-overlap.docx");
|
|
SwTwips nFlyTop = parseDump("//header/txt/anchored/fly/infos/bounds", "top").toInt32();
|
|
SwTwips nFlyHeight = parseDump("//header/txt/anchored/fly/infos/bounds", "height").toInt32();
|
|
SwTwips nFlyBottom = nFlyTop + nFlyHeight;
|
|
SwTwips nTableFrameTop = parseDump("//tab/infos/bounds", "top").toInt32();
|
|
SwTwips nTablePrintTop = parseDump("//tab/infos/prtBounds", "top").toInt32();
|
|
SwTwips nTableTop = nTableFrameTop + nTablePrintTop;
|
|
// Without the accompanying fix in place, this test would have failed with:
|
|
// - Expected greater or equal than: 3579
|
|
// - Actual : 2210
|
|
// i.e. the table's top border overlapped with the image, even if the image's wrap mode was set
|
|
// to parallel.
|
|
CPPUNIT_ASSERT_GREATEREQUAL(nFlyBottom, nTableTop);
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testBorderCollapseCompat)
|
|
{
|
|
// Load a document with a border conflict: top cell has a dotted bottom border, bottom cell has
|
|
// a solid upper border.
|
|
load(DATA_DIRECTORY, "border-collapse-compat.docx");
|
|
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
|
|
SwDocShell* pShell = pTextDoc->GetDocShell();
|
|
std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
|
|
MetafileXmlDump aDumper;
|
|
xmlDocPtr pXmlDoc = dumpAndParse(aDumper, *xMetaFile);
|
|
|
|
// Make sure the solid border has priority.
|
|
// Without the accompanying fix in place, this test would have failed with:
|
|
// - Expected: 1
|
|
// - Actual : 48
|
|
// i.e. there was no single cell border with width=20, rather there were 48 border parts
|
|
// (forming a dotted border), all with width=40.
|
|
assertXPath(pXmlDoc, "//polyline[@style='solid']", "width", "20");
|
|
}
|
|
|
|
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|