mirror of
https://github.com/LibreOffice/core.git
synced 2025-08-11 23:24:16 +00:00
0bd1df2d72
This specifically avoids a PPTX custom shape's editEngine flag
from bleeding into the remainder of the document
and affecting another shape's sizing calculations.
This bleeding was noticably affecting PPTX table sizes,
triggering the investigation that lead to this patch.
FALSE REGRESSION NOTE:
It appears that perhaps PPT/X tables SHOULD ALWAYS
be sized according to SDRATTR_TEXT_USEFIXEDCELLHEIGHT = TRUE.
In other words, tables currently match MS Powerpoint's table size
only when they accidentally have this setting bleed through.
With this patch, we are effectively always setting it to FALSE,
and thus tables will never be accidentally correct anymore.
... and the same possibly is true for all kinds of other shapes.
The problem with having a correct table size
is that the text inside the table needs to also
be in sync with this sizing calculation.
Otherwise it will either be too small (commonly),
or it could spill out of the table
(in cases where the font is designed with a large leading).
This patch's effect on tables is to allow
the table to only be defined by its own content.
Now when other actions cause a table recalculation
(like selecting text, drag and drop, editing)
the table size won't fluctuate (since in this re-draw context
there wasn't any FixedCellHeight bleeding into the calculation).
make CppunitTest_svx_unit \
CPPUNIT_TEST_NAME=testTdf165521_fixedCellHeight
Change-Id: I5239c78cf8f1e8fffd65b6aa285a840428e92e5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183172
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
193 lines
9.2 KiB
C++
193 lines
9.2 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 <test/unoapixml_test.hxx>
|
|
|
|
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
|
|
#include <com/sun/star/drawing/XDrawPage.hpp>
|
|
|
|
#include <extendedprimitive2dxmldump.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <svx/sdr/contact/displayinfo.hxx>
|
|
#include <svx/sdr/contact/viewcontact.hxx>
|
|
#include <svx/sdr/contact/viewobjectcontact.hxx>
|
|
#include <svx/svdpage.hxx>
|
|
#include <svx/unopage.hxx>
|
|
#include <vcl/virdev.hxx>
|
|
#include <sdr/contact/objectcontactofobjlistpainter.hxx>
|
|
#include <comphelper/propertyvalue.hxx>
|
|
#include <sfx2/viewsh.hxx>
|
|
#include <svx/svdview.hxx>
|
|
#include <svx/sdr/table/tablecontroller.hxx>
|
|
#include <editeng/editobj.hxx>
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
namespace
|
|
{
|
|
/// Tests for svx/source/table/ code.
|
|
class Test : public UnoApiXmlTest
|
|
{
|
|
public:
|
|
Test()
|
|
: UnoApiXmlTest(u"svx/qa/unit/data/"_ustr)
|
|
{
|
|
}
|
|
|
|
drawinglayer::primitive2d::Primitive2DContainer
|
|
renderPageToPrimitives(const uno::Reference<drawing::XDrawPage>& xDrawPage);
|
|
};
|
|
|
|
drawinglayer::primitive2d::Primitive2DContainer
|
|
Test::renderPageToPrimitives(const uno::Reference<drawing::XDrawPage>& xDrawPage)
|
|
{
|
|
auto pDrawPage = dynamic_cast<SvxDrawPage*>(xDrawPage.get());
|
|
CPPUNIT_ASSERT(pDrawPage);
|
|
SdrPage* pSdrPage = pDrawPage->GetSdrPage();
|
|
ScopedVclPtrInstance<VirtualDevice> aVirtualDevice;
|
|
sdr::contact::ObjectContactOfObjListPainter aObjectContact(*aVirtualDevice,
|
|
{ pSdrPage->GetObj(0) }, nullptr);
|
|
const sdr::contact::ViewObjectContact& rDrawPageVOContact
|
|
= pSdrPage->GetViewContact().GetViewObjectContact(aObjectContact);
|
|
sdr::contact::DisplayInfo aDisplayInfo;
|
|
drawinglayer::primitive2d::Primitive2DContainer aContainer;
|
|
rDrawPageVOContact.getPrimitive2DSequenceHierarchy(aDisplayInfo, aContainer);
|
|
return aContainer;
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(Test, testTableShadowBlur)
|
|
{
|
|
// Given a document containing a table with a blurry shadow:
|
|
loadFromFile(u"table-shadow-blur.pptx");
|
|
|
|
// When rendering the table shadow to primitives:
|
|
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
|
|
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
|
|
uno::UNO_QUERY);
|
|
drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence
|
|
= renderPageToPrimitives(xDrawPage);
|
|
|
|
// Then make sure that the cell fill part of the shadow has the expected transparency:
|
|
svx::ExtendedPrimitive2dXmlDump aDumper;
|
|
xmlDocUniquePtr pDocument = aDumper.dumpAndParse(xPrimitiveSequence);
|
|
// Without the accompanying fix in place, this test would have failed with:
|
|
//- Expected: 0
|
|
//- Actual : 2
|
|
//- In <>, XPath contents of child does not match
|
|
// i.e. the shadow's transparency was miscalculated.
|
|
assertXPathContent(pDocument, "count(//objectinfo/unifiedtransparence)", u"0");
|
|
|
|
assertXPath(pDocument, "//objectinfo/shadow[1]", "color", u"#ff0000");
|
|
assertXPath(pDocument, "//objectinfo/shadow[1]", "blur", u"141");
|
|
assertXPath(pDocument, "//objectinfo/shadow[2]", "color", u"#ff0000");
|
|
assertXPath(pDocument, "//objectinfo/shadow[2]", "blur", u"141");
|
|
assertXPath(pDocument, "//objectinfo/shadow[3]", "color", u"#ff0000");
|
|
assertXPath(pDocument, "//objectinfo/shadow[3]", "blur", u"141");
|
|
assertXPath(pDocument, "//objectinfo/shadow[4]", "color", u"#ff0000");
|
|
assertXPath(pDocument, "//objectinfo/shadow[4]", "blur", u"141");
|
|
assertXPath(pDocument, "//objectinfo/shadow[5]", "color", u"#ff0000");
|
|
assertXPath(pDocument, "//objectinfo/shadow[5]", "blur", u"141");
|
|
|
|
assertXPath(pDocument, "//objectinfo/group/sdrCell[1]/unifiedtransparence", 0);
|
|
assertXPath(pDocument, "//objectinfo/group/sdrCell[2]/unifiedtransparence", 0);
|
|
assertXPath(pDocument, "//objectinfo/group/sdrCell[3]/group/polypolygonrgba", "transparence",
|
|
u"80");
|
|
assertXPath(pDocument, "//objectinfo/group/sdrCell[4]/group/polypolygonrgba", "transparence",
|
|
u"80");
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(Test, testTdf165521_fixedCellHeight)
|
|
{
|
|
// Given a document containing a table whose size/text should match the textbox:
|
|
// (In this Liberation Sans unit test, the text is too small and doesn't fill the table,
|
|
// while in the bug report's Marianne font example, the text is too large, spilling out of it.)
|
|
|
|
loadFromFile(u"tdf165521_fixedCellHeight.pptx");
|
|
|
|
// When rendering the table:
|
|
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
|
|
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
|
|
uno::UNO_QUERY);
|
|
drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence
|
|
= renderPageToPrimitives(xDrawPage);
|
|
|
|
// TODO: Then make sure the text in both table and textbox are the same line height
|
|
svx::ExtendedPrimitive2dXmlDump aDumper;
|
|
xmlDocUniquePtr pDocument = aDumper.dumpAndParse(xPrimitiveSequence);
|
|
// const char sTextboxPath6[] = "/primitive2D/objectinfo[1]/unhandled/group/sdrblocktext/"
|
|
// "texthierarchyblock/texthierarchyparagraph/texthierarchyline[6]/"
|
|
// "textsimpleportion";
|
|
const char sTextboxPath7[] = "/primitive2D/objectinfo[1]/unhandled/group/sdrblocktext/"
|
|
"texthierarchyblock/texthierarchyparagraph/texthierarchyline[7]/"
|
|
"textsimpleportion";
|
|
CPPUNIT_ASSERT(
|
|
getXPath(pDocument, sTextboxPath7, "text")
|
|
.startsWith("Autofit Custom Shape forces Fixed Cell Height even in the table."));
|
|
// const sal_Int32 nTextBoxFontLineHeight = getXPath(pDocument, sTextboxPath7, "y").toInt32()
|
|
// - getXPath(pDocument, sTextboxPath6, "y").toInt32();
|
|
|
|
const char sTablePath6[] = "/primitive2D/objectinfo[2]/sdrCell[2]/group/sdrblocktext/"
|
|
"texthierarchyblock/texthierarchyparagraph/texthierarchyline[6]/"
|
|
"textsimpleportion";
|
|
const char sTablePath7[] = "/primitive2D/objectinfo[2]/sdrCell[2]/group/sdrblocktext/"
|
|
"texthierarchyblock/texthierarchyparagraph/texthierarchyline[7]/"
|
|
"textsimpleportion";
|
|
CPPUNIT_ASSERT(getXPath(pDocument, sTablePath7, "text").startsWith("Qualcomm Snapdragon"));
|
|
const sal_Int32 nTableFontLineHeight = getXPath(pDocument, sTablePath7, "y").toInt32()
|
|
- getXPath(pDocument, sTablePath6, "y").toInt32();
|
|
// Expected: 593.
|
|
// Actual (without the acompanying patch) 553
|
|
// CPPUNIT_ASSERT_EQUAL(nTextBoxFontLineHeight, nTableFontLineHeight);
|
|
|
|
// All of the text must fit inside the table,
|
|
// and the table must be approximately the same size as the lines of text.
|
|
sal_Int32 nTableHeight
|
|
= getXPath(pDocument,
|
|
"/primitive2D/objectinfo[2]/sdrCell[2]/group/polypolygoncolor/polypolygon",
|
|
"height")
|
|
.toInt32();
|
|
CPPUNIT_ASSERT_DOUBLES_EQUAL(7 * nTableFontLineHeight, nTableHeight, 1);
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(Test, testSvxTableControllerSetAttrToSelectedShape)
|
|
{
|
|
// Given a document with a table shape, editing cell text:
|
|
loadFromURL(u"private:factory/simpress"_ustr);
|
|
uno::Sequence<beans::PropertyValue> aArgs
|
|
= { comphelper::makePropertyValue(u"Rows"_ustr, sal_Int32(2)),
|
|
comphelper::makePropertyValue(u"Columns"_ustr, sal_Int32(2)) };
|
|
dispatchCommand(mxComponent, u".uno:InsertTable"_ustr, aArgs);
|
|
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
|
|
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
|
|
uno::UNO_QUERY);
|
|
auto pDrawPage = dynamic_cast<SvxDrawPage*>(xDrawPage.get());
|
|
CPPUNIT_ASSERT(pDrawPage);
|
|
SdrPage* pSdrPage = pDrawPage->GetSdrPage();
|
|
auto pSdrObject
|
|
= dynamic_cast<sdr::table::SdrTableObj*>(pSdrPage->GetObj(pSdrPage->GetObjCount() - 1));
|
|
SfxViewShell* pViewShell = SfxViewShell::Current();
|
|
CPPUNIT_ASSERT(pViewShell);
|
|
SdrView* pSdrView = pViewShell->GetDrawView();
|
|
pSdrView->SdrBeginTextEdit(pSdrObject);
|
|
CPPUNIT_ASSERT(pSdrView->IsTextEdit());
|
|
const EditTextObject& rEdit = pSdrObject->getText(0)->GetOutlinerParaObject()->GetTextObject();
|
|
SfxItemSet aSet(rEdit.GetParaAttribs(0));
|
|
auto pTableController
|
|
= dynamic_cast<sdr::table::SvxTableController*>(pSdrView->getSelectionController().get());
|
|
|
|
// When applying attributes which only affect the cell text, not the table shape:
|
|
pTableController->SetAttrToSelectedShape(aSet);
|
|
|
|
// Then make sure the text edit is not ended:
|
|
CPPUNIT_ASSERT(pSdrView->IsTextEdit());
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|