Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I799bfd30406025dfc90bba7f941e14622ddfacb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149555
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Similar to commit f3ffdc1a5fe965016550f20ada405ef638bf5f75
(Introduce non-static query() and queryThrow() to css::uno::Reference,
2023-03-23), this adds a syntactic sugar for css::uno::Reference ctors:
css::uno::Reference<css::SomeNamespace::SomeInterface> xSomeInterface(anAny, css::uno::UNO_QUERY);
would become
auto xSomeInterface(anAny.query<css::SomeNamespace::SomeInterface>());
and
css::uno::Reference<css::SomeNamespace::SomeInterface> xSomeInterface(anAny, css::uno::UNO_QUERY_THROW);
would become
auto xSomeInterface(anAny.queryThrow<css::SomeNamespace::SomeInterface>());
Change-Id: I06f8d97fe200a7dd03ecc965a431eb54b10a3c91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149549
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
In order to see wether this test keeps failing in the new file
or it's affected by another test
Change-Id: I73ef0287a81d0ea8c2b26f466cd0d623a62933c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149543
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
The function thought it was dealing with a wrap-through shape,
but actually it is wrap parallel.
Attempts to syncProperty of RES_SURROUND meet with instant disaster,
and likely this emulation works better if the doubled-up shape
only has one wrap anyway.
There is a helper function for this after all,
so that highly suggests workarounds are necessary
instead of just syncing the wrap property.
There were two existing unit tests identified:
-tdf123163-1.docx (doesn't even open in MS Word 2010/2003)
-testCustomShapePresetExport.odt (on round-trip)
-no differences noticed.
Change-Id: I7b0828ce6406fa9cfb1debb68040ea02e8d6fe45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149463
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
it already has 109 tests
Change-Id: I1e7adf3fa9c1cdb22fb1402306c2f9478d94038c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149546
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
Change-Id: Iab8001f8be8a8af437e8898079d55ff57dd6fa3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149494
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Pressing the "down" key in the middle of the last line of the A1 cell on
page 1 went to the end of the paragraph instead of going to the A2 cell
on page 2.
The problem was that fly frames don't have a "next" pointer to the
follow fly frame, so the cursor travel code thought there is no follow
frame to jump to.
Fix the problem similar to how explicitly chained frames do this in
lcl_FindLayoutFrame().
While at it, also fix the the "up" direction.
Change-Id: I8dd0c2d011300520b126abf3ca8d17722ab5ff92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149476
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
As a syntactic sugar for the respective ctors:
css::uno::Reference<css::SomeNamespace::SomeInterface> xSomeInterface(xAnotherInterface, css::uno::UNO_QUERY);
would become
auto xSomeInterface(xAnotherInterface.query<css::SomeNamespace::SomeInterface>());
and
css::uno::Reference<css::SomeNamespace::SomeInterface> xSomeInterface(xAnotherInterface, css::uno::UNO_QUERY_THROW);
would become
auto xSomeInterface(xAnotherInterface.queryThrow<css::SomeNamespace::SomeInterface>());
Change-Id: Ic42da364562b702cd468cc708fbda70394c4f2a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149368
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
The bugdoc has a split fly, the master is centered horizontally. That
means the follow should be centered as well, but it was aligned to the
left.
The problem is that the follow fly was positioned when the anchor was
not positioned at all (its top left was 0,0) and then there was no
invalidation of the fly position to recalc it later when the anchor got
positioned. The existing InvalidatePos() call is not enough because once
a fly is formatted, its position gets locked and only
unlockPositionOfObjects() at the end of the layout process will unlock
it.
Fix the problem similar to what lcl_InvalidateLowerObjs() for SwTabFrame
does: if we know that the position of the anchor changed, then unlock
the position before invalidating it.
If this leads to unwanted re-positioning of flys, it would be perhaps
possible to do this when the anchor position changes from 0,0 to a valid
position, but for now just do this all time the anchor position changes.
Change-Id: I811bdfa1eb6705ff3de6ec77111e9500617e8bee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149367
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I48bca01a495c2df86b3868a420b11ce4ab860bd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149354
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Change-Id: I734697f52df14ca5b316481df8a58fef72ab9571
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149254
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: I892a0185a94aadd902e55ee9b719f855edbdfc89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149258
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
|
|
Change-Id: I5a995349c168bfbb5c8933dafa72e06eddb74ac6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149257
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
|
|
In some cases the text box wasn't properly moved afeter it's position
had been calculated. Also now when the shape and text element are
brought together in the Z ordering, the one with higher Z moves down.
Change-Id: I0512db4b6466532b5af4e3c091fd65bd0a416381
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149221
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
UITest_writer_tests6's
tdf124675.tdf124675.test_tdf124675_crash_moving_SwTextFrame_previous_page
failed in the SW_FORCE_FLY_SPLIT=1 case, since the current page after
typing was 3, not 2.
It seems this change is wanted, since the total page count increases by
2, so it's consistent that the current page increases similarly with
typing. Also, repeating the UITest in Word (after positioning the cursor
at the top paragraph in the document) also produces page 3 as the
current page.
Fix the problem by locally enabling split flys for this test and then we
can assert that we match Word. This requires a new context manager, but
that set_config() is really similar to other context managers in the
class that return no value.
The original purpose of the test was to make sure we don't crash,
anyway.
Change-Id: Id0dfde23a8726c8799950a6e4fdd1d85f135eafc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149315
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Changing the anchor type should not move an image around.
The only time we have a prosition to fix AFAICS is when
the anchor changes and the RelationOrient is no longer appropriate.
In that case we always get a new p*OrientItem.
If GetPos changed, then that means the user (or earlier algorithm)
already adjusted for the change. If there is no difference in GetPos
even though the relation changed, then that is the only time we (likely)
need to recalculate.
So the typical example requiring an adjustment would be a change
from "to paragraph" at text position 0 to a "to page" anchor.
In this case "page" has no relationship to "text margins"
and thus needs to base the absolute position 0 on page instead of text,
meaning that the margins would need to be added to the absolute position.
This code is basically unchanged since initial import.
I have no idea why it could possibly be good to change
the position when there is no new information given
(no pHoriOrientItem/pVertOrientItem).
[I checked and "from top" and "from bottom"
are both == NONE, as well of course as "from left".]
make CppunitTest_sw_uiwriter3 CPPUNIT_TEST_NAME=testTdf135581
Change-Id: Ib89ad9ba26c8826ed43f6d4505a82502b9ad8af9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149012
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
CppunitTest_sw_uiwriter2's testUnfloatButton and testUnfloating failed
in the SW_FORCE_FLY_SPLIT=1 case.
The trouble was that it assumed that floating tables from DOCX are
imported as tables in non-split flys, which is no longer the case.
Fix the problem by limiting the test to ODT and DOC files.
Once the DOC filter is there for SwFormatFlySplit, this can be
restricted further to ODT files only (or perhaps it should be removed
completely).
Change-Id: Ie1db9a66c862c196aa3bf5326dfb20c67b9b493a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149291
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
The problem was that CppunitTest_sw_ooxmlexport9's testTdf79329 has a
normal outer table and a floating inner table; the inner table was
already not floating (so that's not a new problem), but
SW_FORCE_FLY_SPLIT=1 even failed the text-to-table conversion for the
outer table, so we just had 1 table, not 2 tables.
The problem seems to be that the start/end positions for the outer table
cell get invalidated by the inner table-to-frame conversion, so the
outer table conversion will fail as well.
Fix the problem by limiting the table-to-frame conversion for toplevel
tables: this avoids the failing text-to-table conversion in the
SW_FORCE_FLY_SPLIT=1 case.
At some stage I should revisit this, since the DOC import has working
floating tables for the inner case, for now just make sure that the DOCX
import result has two tables, as before.
Change-Id: I39aa00e46c12a32117c334cb97e1cc0270b77651
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149284
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Set the filter option explicitly, rather than inferring it from the test
name.
Change-Id: Idaf476756b477bf55a31598ce67028fcf1c9d4ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149256
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
Change-Id: I719c1a156dea095d391f94b42f78f2a8c99b0673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148938
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
|
|
Simple unit test for tdf#152203 allowed to create
bad ordering algorithm by accident without noticing
the problem, which caused problem for most of the DOCX
files, where serialization in footnotes.xml doesn't follow
the order of the footnotes.
Regression from commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357
"tdf#76260 DOCX import: fix slow footnote import".
Follow-up to commit 09ae3c01940bbc25ffde51963683b04e3cb4bb6a
"tdf#152203 DOCX import: fix mixed footnotes/endnotes".
Change-Id: I0628d96e3b8ad4df38d26e9288b47d39b958c441
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149176
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
The point is that the table is multi-page, which is preserved. The
detail that it's not in a fly is no longer true.
Change-Id: I8fa61391eb26b434cd7e8b8adb5012c4909e5553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149209
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
It should not be a problem if the table is in a frame, what matters is
that the frame is marked to split.
Change-Id: Ib289691dcdf78de494518a9afeac3ede9045ec1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149195
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
The point is that the table is multi-page, which is preserved. The
detail that it's not in a fly is no longer true.
Change-Id: I63ee8182638a2f0118584f5e985abaf1c3d7e337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149188
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I9d65f514979bbd24380210dc9006b6ed2649b37a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149165
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
CppunitTest_sw_ooxmlexport8's testN779642 failed in the
SW_FORCE_FLY_SPLIT=1 case.
The bugdoc has a floating table, then an inner, non-floating table. The
conversion to floating tables was disabled by the
c1eebcdac9f2b289fd363399130c485ca5ff444c (tdf#79329 DOCX import: fix
missing outer table with floattable at cell start, 2016-11-08).
Given that SwFormatFlySplit doesn't need the delayed text frame
conversion, we can get rid of this workaround.
Fix a similar problem on the export side as well, where the positioning
properties of the outer table leaked into the inner table. Once both the
import and export are fixed, the test passes.
Change-Id: I884ad38cbc247c885991b0faf0d37221b70a6ba7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149154
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Assert this at a layout level, which still passes:
- the table is split on two different pages
- the width of the floating table is correct
Change-Id: I580db33fc7c049d27c1b2c8da5aac4b37e989695
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149137
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
This asserted that the table is not floating, rather assert that the
floating table is allowed to split.
Change-Id: I1dec6027b0774a1fc5380e65c7221b3b9d289e59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149133
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I196e4539ad430a39415eff9d7170b33df7228230
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149062
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
The problem was that sw/qa/extras/ooxmlexport/data/tdf149388.docx
contained redlines but those were not imported for split flys.
This happened because split flys get imported directly in
DomainMapperTableHandler::endTable(), and the redling handling for
floating tables was only implemented in
SectionPropertyMap::CloseSectionGroup() (where delayed floating tables
are imported).
Fix this by extracting the redline import code for floating tables into
2 functions and then calling those also from
DomainMapperTableHandler::endTable().
Note that the !isExported() branch of the testcase looks like dead code,
since we always run this code after an export.
Change-Id: I860ee0168807077eb5ed33d79888f4cc1de9a717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149057
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I7a116345e479dd5344396e845ef840bc6b5a6c1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149003
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
|
|
CppunitTest_sw_ooxmlexport8's testN816593 failed in the
SW_FORCE_FLY_SPLIT=1 case because the re-import of the document merged
two tables into one.
The problem starts earlier, we didn't import the table with a <w:tblpPr>
as a floating table, but we should.
Fix the problem by never going via m_aPendingFloatingTables in the
SW_FORCE_FLY_SPLIT=1 case, since that was only a workaround for layout
limitations. This conditionally reverts commit
78d1f1c2835b9fae0f91ed771fc1d594c7817502 (fdo#68607 bnc#816593
DomainMapperTableHandler: don't always start a frame, 2013-09-03).
Also add a SwModelTestBase::FlySplitGuard, so it's just a one-liner
change to test the SW_FORCE_FLY_SPLIT=1 case from cppunit. The goal is
to have this on by default once it's mature enough.
Change-Id: I9d94a49f7a0c27dd43e8fd388867c65d6d25f2e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149044
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
The bugdoc has 2 rows: the 2nd row was split and the master row went to
page 1 and the follow row went to page 2. Word positioned the entire row
to page 2.
The problem seems to be that the layout code wants a "deadline" (so it
can grow the frame to that bottom position), but the deadline depends on
the height: split flys need to fit the body frame, then they can have a
vertical offset (resulting in an overlap between the bottom margin area
& the fly frame), in case the fly frame is still inside the page area.
This means that this deadline depends on the body height, the fly top
and the fly height at the same time. (Or in other words: the overlap is
only allowed if the fly would fit the body frame, but an additional
vertical offset pushes it to the bottom margin area, with an unchanged
height.)
Solve this fly height <-> deadline circular dependency by first checking
against the page size, using the current fly height; and then against
the body height, using the assumed / future fly height (assuming that
the fly will grow so its new height will match the deadline). This
results in a construct where usually you can't grow outside the body
area, but in some limited cases you can (till you only use the bottom
margin area), but only in case you grow your top position as well, which
is Word-compatible, but quite unusual at other places in Writer.
With this, the original tdf#61594 bugdoc gets rendered correctly, once
you opt in with SW_FORCE_FLY_SPLIT=1.
Change-Id: I016df1bad79f4b09abc7e2b4fe9ea613355e3794
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149039
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Update the view options string based on the theme when tiled rendering,
and make sure only the currently active view is updated
Change-Id: Ib24111848f2926fe7ae858ca2e18e946d980e83f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148943
Tested-by: Paris Oplopoios <parisoplop@gmail.com>
Reviewed-by: Paris Oplopoios <parisoplop@gmail.com>
|
|
... Outline for PDF/UA.
* change the dialog to disable the radio buttons if PDF/UA is enabled
* also change the configuration to make Outline the default
Change-Id: Iea8c5e0f8560c972dc250859198bea1cb9fc3597
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148883
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
|
|
The bugdoc was 1 page in Writer, but 2 pages in Word. There the entire
3rd row went to the next page.
The problem seems to be that the legacy mode in Word seems to allow
going to the bottom margin only in case the height of the floating table
still fits the body frame height, while we simply allowed the usage of
the bottom margin area unconditionally.
Fix this by extending GetFlyAnchorBottom() to explicitly check for the
body frame height.
Note that this doesn't solve cases where the current height fits the
body frame, but the new bottom won't; that still needs fixing in a
follow-up commit.
Change-Id: Ic55b93e7b53fc45a837c3245c0091f2c93d028aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148944
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: Ie212c86c6c0ac20878be88d88ade5eb1c989942d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148935
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
Change-Id: Id3ec97f0859cf7c702ad0a501c2431af1df997d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148923
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Iab415dadd3bc465d31bf14cbe2f384b9588466a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148929
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
Well, not really deduplicate, because it only existed once.
Added long ago with commit 4ac48167662c592c21025b89fe8f6925c680c6e0
Author: Miklos Vajna on Mon Feb 20 15:46:08 2012 +0100
n#695479 fix rtf/docx import of transparent frames
However, it didn't handle the situation where
{\stylesheet{\fs19\lang1033 \snext0 Normal;}}
was missing. In that case there is no "Normal"
paragraph style to inherit from, and thus his fix is also
needed in the no-style case.
make CppunitTest_sw_rtfexport3 \
CPPUNIT_TEST_NAME=testTdf154129_transparentFrame
Change-Id: Iaa5b92cd626192d44d11c1365b9b483bd46dff9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148815
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Change-Id: I94efea80df1fee9ecd338bfec3430edfdf418e3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148918
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Consider level settings of the various text nodes when creating a TOC
from custom styles.
Change-Id: I70759f9bcf63e8591ce89bc71afabb1da0c2f29c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148886
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
|
|
Even though the w:br occurs in the paragraph before the anchors,
the anchors stay on the first page, and don't move to the second page
(unless it is the last paragraph in the section/document,
which is not yet handled.)
make CppunitTest_sw_ooxmlexport18 \
CPPUNIT_TEST_NAME=testTdf153613_textboxAfterPgBreak3
Change-Id: Icfc7e2a5d7657f1eb8f94263a4bfc8dcca7e52de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148897
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Change-Id: I6cd82e83288724896987c591f308fb7ab0eb880a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148863
Tested-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
|
|
This patch depends on HAnchor, which created vProps.
XAlign is not like YAlign - which is invalid with a text anchor.
XAlign is still valid with a text anchor,
and so doesn't need to copy YAlign's special vAnchor default.
A unit test was added just to pre-emptively assert that.
There were no existing unit tests where the old and new method
produced different values.
Change-Id: Ib3066f3d67c01a1bca972c6a114bb726bccac5af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148714
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
|
|
This patch depends on previous patches for tdf#154129.
yAlign takes precedence over w:y. HOWEVER, there is a clause
in the documentation that complicates everything.
"If [yAlign is] specified, the position for this attribute
supersedes any value which is specified in the y attribute,
and that value is ignored, UNLESS the vAnchor is set to 'text',
in which case any relative positioning is not allowed,
and [yAlign] is itself ignored"
So if vAnchor is not defined, it defaults to text (FRAME),
but if yAlign is defined then it should mean margin
(or else yAlign has no meaning), unless of course w:y
is also defined, in which case "text" anchor has meaning again
and this unit test shows that w:y wins out in this case.
The anchor is not affected by wrapping.
[P.S. This was already set correctly in the code, but worth noting:
"The standard states that the default value for the vAnchor attribute is page.
Word uses a default value of 'text' for this attribute."]
make CppunitTest_sw_ooxmlexport5 CPPUNIT_TEST_NAME=testTdf112287
make CppunitTest_sw_ooxmlexport5 CPPUNIT_TEST_NAME=testTdf112287B
Change-Id: I953afa89e3c0974a16d43500ce590e1a481c2251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148691
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
|
|
The problem was that the second row in the doc model was split between
page 1 & page 2, but it was expected that row 2 is entirely on page 2.
The underlying reason seems to be similar to what commit
913b71dbe06c33773c4d779e00c6ec4b6a4af59f (sw floattable: ignore height
of masters in lcl_CalcMinRowHeight(), 2023-03-10) fixed: again the
minimum row height is meant to be enforced for each row frame of the
row, so in case the remainings size on the page is 566 twips and the
minimum row height is 1134, then we should not split the row, instead we
should move the entire row to the next page.
Fix the problem by checking for this (relatively) at the start of
SwTabFrame::Split(), so we don't even try to split the row in this case.
I assume that this would be correct to do in general, but have no such
sample to confirm this in Word, so keep this specific to tables in split
flys for now.
Change-Id: Ic9171683ef7e14a70f7f8d5305198bbc16277d92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148834
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
This patch depends on HAnchor, which created vProps.
A style can inherit its properties from another style,
but the code was naively just checking the first paragraph style,
and not any of the parents.
make CppunitTest_sw_ooxmlexport18 CPPUNIT_TEST_NAME=testTdf154129_framePr1
Change-Id: I72159321485aca18bc4bb8384221ff59cb685fe0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148689
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
|
|
to make sure that table formulas are re-evaluated after loading.
When a document has a wrong sum saved (which seems to happen sometimes),
this sum is used until user clicks into the table or otherwise
refreshes the formula.
Change-Id: I5cc3f983524b395089c17aa35d8641847a388bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148355
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
|
|
And adjust some tests accordingly
Change-Id: If81803ba48485273939f419ad589dc6dd2e9c531
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148303
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
|