diff options
author | Regina Henschel <rb.henschel@t-online.de> | 2020-10-10 17:55:31 +0200 |
---|---|---|
committer | Regina Henschel <rb.henschel@t-online.de> | 2020-10-31 15:36:00 +0100 |
commit | 1f0b3c7a40edfa81bbc7a58d123a6a2dfd83e4ca (patch) | |
tree | f731afbd007f6b19bbe369342b81cdf6c7141d8d /test/source | |
parent | a4d8f8930d96da59505f73e9f063243eafa1efc9 (diff) |
Improve 'resize with cell' handling
The patch contains a larger rework of RecalcPos and connected areas
and covers several bugs. Essentials in short:
Move initialization from RecalcPos to own method and use it in
ScXMLImport::endDocument
Do not change hidden objects, which includes not setting width or
height to zero, and be consistent in using object visibility.
Special handling of vertical flipped customshapes.
Repair anchor on import of line and measure line.
ODF conformance: Create logical rectangle from anchor instead using
size.
Details:
tdf#137044
ScDrawLayer::SetPageSize is called several times while loading a
document. It includes a call to ScDrawLayer::RecalcPos for all cell
anchored objects. An object gets initialized with the first call.
Problem was, that the row heights were not finished at that time and
anchor cells and offsets were partly calculated based on default cell
height. That results in wrong height and offset of objects.
The solution separates initialization from RecalcPos and puts it into
an own method ScDrawLayer::InitializeCellAnchoredObj. This is then
called from ScXMLImport::endDocument when row height settings are
finished.
The call to RecalcPos is not totally removed from SetPageSize but only
excluded while loading, because it is needed for size changes after
the document is loaded.
tdf#137576 partly
For measure lines and ordinary lines, which were anchored 'To cell
(resize with cell)', LibreOffice has written wrong end-cell info to
file. So reopening results in wrong lines. The geometry of lines is
based on two points. Fortunatelly the combination of position of the
cell, which contains the shape, and start and end points gives correct
absolute position of these points.
Solution is, to regenerate the initial ScDrawObjData infos from these
points and do not use the stored end-cell info. For a total fix
implementation of NbcSetSnapRect for SdrMeasureObj is needed, which is
not included here.
tdf#137020
Cell anchored shapes are contained in a cell in file. To determine
size and position of the shape a rectangle is used, so defined, that
after applying transformation you get the desired shape. In case of
custom shapes, a vertical flip is not contained in the transformation
but it is an attribute inside the shape and flip is done at the shape
center and will not change the rectangle.
This rectangle determines start and end addresses and offsets in
ScDrawObjData in rNoRotatedAnchor. The info is used directly in XML
export. It is correctly build while loading the file.
But in case of vertical flipped custom shapes the logical rectangle
of the shape has an additional 180deg rotation. Changing that behavior
is currently out of scope. Therefore special handling of vertical
flipped custom shapes was added.
tdf#99549
ODF specifies that in case of existence of end-cell attribute, size
attributes have to be ignored. But LO has based the logical rectangle
on size. In addition it has written zero width and height in case of
hidden row and cols. Result was, that objects are 'lost' on opening
although they still exists in the file.
With the patch the object size is recalculated from anchor on opening.
tdf#137355, tdf#137044, tdf#115655
The old solution has recalculated the snap rectangle based on current
state of hidden row or column. That has produced shapes of zero width
or height and loss of offset in case start or end cell of the shape
was hidden. In running LO it was partly offset by using cached infos
in ScDrawObjData. That failed in case of save and reload.
Solution is, to only change visible shapes. It is enough to adapt the
shape when it becomes visible. That is introduced in RecalcPos and
SetCellAnchoredFromPosition.
tdf#137216
Shapes anchored to cell were not hidden, if the column of its anchor
was hidden, and undo of hiding an image in a cell by hiding its column
didn't work. Reason was, that the shapes were not set to hidden in the
shapes geometry.
Solution is to copy a similar part from SetRowHidden to SetColHidden.
without bugreport, but detected while debugging
LO has used a cell reference with bHiddenAsZero as true in shape
export. That has resulted in wrong offsets.
Unittest changes:
Test::testGraphicsInGroup()
ScShapeTest::testCustomShapeCellAnchoredRotatedShape()
Set expected values so, that they correspond to anchor in file.
ScFiltersTest::testLegacyCellAnchoredRotatedShape()
FIXME is solved now and the test is adaped to reflect that.
XSheetAnnotationShapeSupplier::testGetAnnotationShape()
Expected value is adapted to the fact, that now annotation shape
gets its position after optimal row height is applied.
Change-Id: Iffee996054ebf79e04044da5520f8d1a8a48b7c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104643
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'test/source')
-rw-r--r-- | test/source/sheet/xsheetannotationshapesupplier.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/source/sheet/xsheetannotationshapesupplier.cxx b/test/source/sheet/xsheetannotationshapesupplier.cxx index 9b2cd6d773ee..dac446b72b52 100644 --- a/test/source/sheet/xsheetannotationshapesupplier.cxx +++ b/test/source/sheet/xsheetannotationshapesupplier.cxx @@ -28,7 +28,7 @@ void XSheetAnnotationShapeSupplier::testGetAnnotationShape() CPPUNIT_ASSERT_EQUAL_MESSAGE("getAnnotationShape() wrong X position", sal_Int32(7373), xShape->getPosition().X); CPPUNIT_ASSERT_EQUAL_MESSAGE("getAnnotationShape() wrong Y position", - sal_Int32(426), xShape->getPosition().Y); + sal_Int32(451), xShape->getPosition().Y); CPPUNIT_ASSERT_EQUAL_MESSAGE("getAnnotationShape() wrong width", sal_Int32(11275), xShape->getSize().Width); |