| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The bugdoc has a table with a single cell, and also a nested table in
that cell. Both tables have auto width. The problem was that the width
of the outer table was too large.
There is a trick in DomainMapperTableManager::startLevel() to get the
cell widths at the correct level: do the same in
DomainMapperTableManager::endLevel(), and that'll fix the table width
problem. (Because with that, the outer table will correctly have access
to its cell width.)
Change-Id: Ib750f0475364fd7e47c445cb54f2df34f3af085d
|
|
|
|
|
|
|
|
|
| |
And do the same for w:after / w:afterAutospacing. The spec says that if
w:beforeAutospacing is read, w:before should be ignored, this implies
that if we already had w:beforeAutospacing, w:before should not
overwrite the already existing top margin.
Change-Id: I9437cb5c6fc352a360e27aa279d0a789706c5578
|
|
|
|
|
|
|
| |
Paragraph auto spacing (before and after) without the
w:doNotUseHTMLParagraphAutoSpacing compat option was incorrect.
Change-Id: I56d6153f7c489de7fceaf6fab7325c42ee8f9cae
|
|
|
|
| |
Change-Id: I2aed7907c79905158714dc1b26ae1aefc1fcccc6
|
|
|
|
|
|
|
| |
This was in writerfilter, but we'll need it soon in sw as well, so move
it down to msfilter.
Change-Id: I8efe02b6bbe8f391d9e14857ed58dbae184d5632
|
|
|
|
| |
Change-Id: I15e09017eccc3f0e5ed8cab9c3de3677c8a580fa
|
|
|
|
|
|
|
|
| |
Change-Id: If4940b17bcee0d06fa8dc9bf9faa708cf6d0db1c
Signed-off-by: Adam Co <rattles2013@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/5528
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
|
|
|
|
| |
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65.
Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027
|
|
|
|
| |
Change-Id: I82ef1072bfeb1195152ef7f1ea743653ac102b37
|
|
|
|
|
|
|
| |
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.
Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 4a507f732d82c188ad81b022cbe3037951e58ac3 added an exception to
RTF_PARD (reset paragraph properties) handling: when we're inside a
table, it should not reset the fact that we're inside a table (which is
a paragraph property).
However, instead of just re-adding that property, it disabled resetting
for all properties, and we had a growing list of exceptions since then.
The next thing to add there would be the paragraph attributes, which
contains the style information. Instead of growing that ad-hoc list,
reset everything again and just re-add the "in table" SPRM.
This makes the second and later paragraphs in the A1 cell of the bugdoc
have proper font size.
Change-Id: I2de80894fcd5da3bf45d221af9a04a307c70a29b
|
|
|
|
|
|
|
| |
The bugdoc does not have a styles.xml but a stylesWithEffects.xml,
whatever that may mean. (the app.xml contains "Microsoft Macintosh Word")
Change-Id: If3d11c5d166dcaf3d94129339559787c20e6db46
|
|
|
|
| |
Change-Id: I8d2485962947eac8acc9ada384a9c1bd4cb22503
|
|
|
|
| |
Change-Id: I5bc51b739c663d3e123c9d7fb4c2a70f01f8c841
|
|
|
|
|
|
|
|
|
|
|
| |
Left margin wasn't implemented, that's simple. Right margin of the table
was set to the cell margin in commit
53d27a30ce5f2c9f7d37a4089286116854c16215, which turns out to be wrong:
it's true that the right margin should be >0, but not because of the
cell margin but because of the table margin. The new behavior matches
what the binary import always did.
Change-Id: Ifc24e4f086c49d5d575defdfca1d27e497fa03dc
|
|
|
|
| |
Change-Id: Ia3a95d785d19f7be750e3723c1c159395ae8476f
|
|
|
|
| |
Change-Id: I5cbb44df09291b8a1b74e8aa176d6471960b3391
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Word, just like normal tables, floating tables should be positioned
in a way that the start of the cell text has the same horizontal
position as normal paragraph text.
To emulate this, first the table should be moved left by the table
border distance, then also by the border with / 2; as done for
non-floating tables already.
Change-Id: I581311fbb08009e6c1839106e8f615d078a4a705
|
|
|
|
|
|
|
|
|
| |
m_nMaxFixedWidth wasn't reset across tables, so the counted width for
the first table in the bugdoc affected the second as well.
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa.
Change-Id: I69a5fa402f2e0170a1ea0269fd73e4ad8f7fede1
|
|
|
|
|
|
| |
Otherwise global w:spacing will be used even if overriden locally.
Change-Id: I01f0a3a323566f6e29faf73bf9d2ba874565eb42
|
|
|
|
| |
Change-Id: I566c491d65b65def65b78afb583624d8272027e0
|
|
|
|
| |
Change-Id: I7892224a118b6566e26b3ffc472c88f3c7f58620
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There were multiple problems here:
- xFoo->createTextCursorByRange() got a text range argument,
where the text range wasn't from the xFoo text
- it was assumed that all XText implements text::XParagraphCursor as
well, but this is not true for e.g. comment text
- commented text ranges were pasted as normal comments (once again, the
insert position wasn't passed around)
Change-Id: I9a975a08b08a7f32b1ee71e42f58736cc0dbb09d
|
|
|
|
| |
Change-Id: Ifbf7db8044ee28f5f24c03480391a315358a2db4
|
|
|
|
|
|
|
|
| |
It was a customshape, but Word seems to handle the shape as a rectangle
when shapeType is missing. This makes the text in the textboxes of the
bugdoc wrap properly.
Change-Id: I56e044f42ead348bbb79addc36fa13c82a7ffc29
|
|
|
|
|
|
|
|
|
|
|
| |
The real change is in RTFSdrImport::applyProperty(), the rest is just
refactoring to be able to read the "is textframe" property from that
method.
With this, the transparent big rectangle in the bugdoc no longer hides
the text on the first page.
Change-Id: I04cca3ade93a63edf608df047bef3bdccf8d3605
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The document itself is stupid and uses a SURROUND_THROUGH object with a number
of empty lines that make it act is if it in fact was SURROUND_NONE, rather
than actually disabling wrapping for the object and be done with it.
But the difference was that Word still managed to fit those empty lines
next to the object into the little space that was there, while LO already
considered the space too small. So keep a compatibility setting for Word
documents in order to avoid problems with such lame documents and hopefully
that's enough.
Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
|
|
|
|
|
|
| |
Previously this was only handled for drawinglayer shapes.
Change-Id: I7ce440a27ebe44fc867b8a7f4ee62217076677f0
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The document had 3 sections, separated by continuous section breaks.
Previously only margins from the last section were imported, this way
the first page had default margins.
Now margins are also applied when we hit continuous section breaks. This
way margin values from the last section break affecting the page wins. A
later commit could improve this further by setting the minimum of these
and setting a section margin for each non-minimal sections.
Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71
|
|
|
|
| |
Change-Id: If1bd91f28a96bd0eb53e4057e51db900f8b2c52b
|
|
|
|
| |
Change-Id: I487e1a941f499ab3d0a820c790af051a9b972376
|
|
|
|
|
|
|
|
| |
In theory, this is not needed since
01292f171cc851ba092510f10a97cd293670829e, and in practice it even causes
a problem here.
Change-Id: Id2c2f3f7815efada138f3f84724af77be3372fc1
|
|
|
|
| |
Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4
|
|
|
|
|
|
|
|
| |
Instead of checking if any cells have fixed width, check if all calls
have fixed with. Regression from
74c5ed19f430327988194cdcd6bdff09591a93fa.
Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7
|
|
|
|
|
|
|
| |
Without this, the groupshape itself was created, not it had no child
shapes.
Change-Id: I5d3276498eb3ffe840f3d42dad16661849596da4
|
|
|
|
|
|
|
| |
This is the RTF equivalent of f5b7acac624f07fa95835b6054b8d295901bb1dd,
which avoided TO_PAGE-anchored shapes in the VML importer.
Change-Id: I58a5cdb311ac43ddba00bc441005fb37a4899cee
|
|
|
|
|
|
|
|
| |
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I14b0ce9ae096eae4759793a49865eefe16ec1afd
Reviewed-on: https://gerrit.libreoffice.org/4818
|
|
|
|
| |
Change-Id: I500c6af08326ea226b3774fb1e02709d278fa509
|
|
|
|
| |
Change-Id: I10448edd04c6c7e7f03c539bf85aba4e00c7e311
|
|
|
|
|
|
|
| |
Change-Id: I571e0271d9432118d886561e140d689b2d1b8713
Reviewed-on: https://gerrit.libreoffice.org/5042
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7cbf9c9e0a34937783dfa7f78d460dcf70504841.
Revert "Trying to fix the windows build"
This reverts commit d1f58e5ea695e823e931aad1bfb1d7b4bf17634c.
Change-Id: I67d00ec010a834e27b0e79b0afd92c5a2e7d47d6
|
|
|
|
| |
Change-Id: I19d17a490c9af3d14a315a92ae2af86cc2e92d51
|
|
|
|
|
|
|
| |
Change-Id: If2500bf09f8bb23f70d46d8dbef5d8bbf9fc3fb3
Reviewed-on: https://gerrit.libreoffice.org/5041
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
|
|
|
|
|
|
| |
Instead of unconditionally calling addProperty(), first check the
existence with hasPropertyByName() and call setPropertyValue() instead,
if necessary.
Change-Id: Ie0a075bbfe6eaa1f66726c456105dcdef9001d30
|
|
|
|
|
|
|
| |
Change-Id: Id8cc3829ccd5806295b0f240a570dc1d66ed0c87
Reviewed-on: https://gerrit.libreoffice.org/5002
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
|
|
|
| |
Change-Id: I9ebc91d5f0e706dc1e316e0aa8494af7aec4da4e
(cherry picked from commit 43f7bc96c0117a77610bfa5e1edfa870123f56f1)
|
|
|
|
|
|
|
|
| |
One element is pushed to that stack in the constructor, so calling top()
on it always OK, as long as we check during pop() that the stack won't
be empty.
Change-Id: I010bd77897ab2a3684e7d9c5c0450e7bda626fc0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was that in case we had
{\deleted foo\b bar}
then both "foo" and "bar" triggered a trackchange, but "}" only ended
one, resulting in overlapping redline ranges. This was cought by core,
but caused a performance problem.
For the first bugdoc, before:
real 3m57.803s
after:
real 0m3.072s
Change-Id: Ibf6f2db30109f0b9a2571d2e4fb3cc76294f68d1
|
|
|
|
|
|
|
|
|
| |
The end is an attribute since 0211e8bc457a12570988f4aee7dea42c2fc6d56f,
but this just confuses dmapper. With this, the DOCX version of the
bugdoc can now be imported without getting an exception in
DomainMapper_Impl::CreateRedline().
Change-Id: If820b43a267a62ecdc323eef49bf13d576165269
|
|
|
|
| |
Change-Id: Ie1a86e6b59c43c3ee54076d5d68aa3fca0d6a515
|