Age | Commit message (Collapse) | Author |
|
This is the DOCX equivalent of commit
6aba29576df7a2a40e54040d4dd09d94d6594741 (tdf#107773 DOC import:
consider page breaks for multi-page floattables, 2017-05-11): a specific
case where it's clearly superior to import a multi-page floating table
as a multi-page one, rather than a floating one.
Change-Id: I71a92d2b10e52e505665831caacad2948d22b4e1
Reviewed-on: https://gerrit.libreoffice.org/37683
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
See commit 3915bf2dc877d5f1140798e24933db0f21386a4a (tdf#95376 DOCX
import: fix incorrectly indented tab stops, 2016-01-26) for the various
sources that can determine the paragraph indentation.
In this case the problem was that too aggressive RTF style deduplication
removed a direct indent, which then meant a fallback to the ind-from-num
value, not to the ind-from-parastyle one.
Change-Id: I3b47b2bbeaaedf405baef24505d23dc49bd01865
Reviewed-on: https://gerrit.libreoffice.org/37660
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
found by temporarily marking Reference as SAL_WARN_UNUSED.
Change-Id: I18809b62654467f890016adcc92576980ced393b
Reviewed-on: https://gerrit.libreoffice.org/37511
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Ic1e953b5bcae6124ee6ce7d141ddac11a94b2a8b
Reviewed-on: https://gerrit.libreoffice.org/37464
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
* add only autoTxT gallery type
* new test with other types of entries
Change-Id: Ibf7751c73dcf3b6ebd69eec5f4931dbeaaf098c8
Reviewed-on: https://gerrit.libreoffice.org/37425
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
|
|
For some reason, sometimes items in GraphicZOrderHelper don't
have ZOrder property value, and so throw in getPropertyValue.
E.g., SwXFrame::getPropertyValue throws uno::RuntimeException
when its GetFrameFormat() returns nullptr.
The patch catches these to allow to proceed with fallback z-order.
Change-Id: I96140195f45364bccee7c5547d373158e2b49154
Reviewed-on: https://gerrit.libreoffice.org/37392
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
of include/vcl/window.hxx and include/vcl/vclevent.hxx
Change-Id: Iacb3cc942693a732de5899af26e08e0977a83102
Reviewed-on: https://gerrit.libreoffice.org/37338
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
|
|
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
|
|
Change-Id: Ia1a265b6a799c51a5ce1b855dc110ddeea1cc530
|
|
The m_xStartingRange is null at this point for whatever reason,
and the block immediately above this one already checks
xRangeProperties, so let's just do the same here. (Also IsNewDoc(),
where the logic between PageDescName and PageNumberOffset presumably
shouldn't differ?).
(started to crash with abaf6bde4ee91c628bd55a7ec2e876a5d0ecff6e
as previously that code was unreachable in RTF import)
Change-Id: I20539c3a753ecea357e556ea556c3c26983ce1d1
|
|
Change-Id: I52860115a65a23651b6f96363c6f8e5baa78cfad
Reviewed-on: https://gerrit.libreoffice.org/37278
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Ie14c4d76cb61cfbe0410103adfc1afc8ade0f3e0
Reviewed-on: https://gerrit.libreoffice.org/37146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Regression from commit 330b860205c7ba69dd6603f65324d0f89ad9cd5f
(fdo#68787 DOCX import: handle when w:separator is missing for
footnotes, 2013-09-04), the problem was footnote settings were modified
also in case there were no footnotes at all in the document.
Make the bug scenario and the original one working at the same time by
touching footnote settings only in case there is at least one footnote
in the current section.
Change-Id: I163d11769cbd97957662607fbedfba404181e002
|
|
+ extended model to parse <docPartPr> and <name> marks
+ names are inserted to the document before content
of each entry
+ SwDOCXReader interprets first paragraph of each section
as a name
Change-Id: Ib7de152ba1c6bea4f4665f98d321019c3f68863e
Reviewed-on: https://gerrit.libreoffice.org/37124
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
+ each entry is placed in a separate section
+ extended model and dmapper to react on docPart mark
Change-Id: I7e5213a09ae7352d1d09369bd0a209b6d4e18e82
Reviewed-on: https://gerrit.libreoffice.org/37107
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
|
|
Change-Id: Ia39f7e3a0937be19dade49e0837acdc0c7b4a5b2
|
|
Change-Id: If32d2bb0947d13c904da9514873f33c4c2641069
|
|
And not an UNO com.sun.star.text.WritingMode. This fixes the following
warnings during DOCX import:
warn:legacy.osl:12884:1:writerfilter/source/dmapper/PropertyMap.cxx:1484: Exception in SectionPropertyMap::ApplyProperties_
warn:legacy.osl:12884:1:writerfilter/source/dmapper/PropertyMap.cxx:1496: Exception in SectionPropertyMap::ApplyProperties_
Change-Id: Ib4f392b3e4328311baa5767b5a2079730218fca3
Reviewed-on: https://gerrit.libreoffice.org/37028
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
regression from...
commit b993942622897fc64a1f7462189fa0463eb30e1c
Author: Caolán McNamara <caolanm@redhat.com>
Date: Sat Apr 1 16:43:04 2017 +0100
ubsan: use WrapTextMode_MAKE_FIXED_SIZE instead of -1 as unset flag
cause WrapTextMode_MAKE_FIXED_SIZE is >= 0
Change-Id: I6b5adbcc38cc841c5df9a0af9acdf634d3c6c757
|
|
Change-Id: If99a944f7032180355da291ad283b4cfcea4f448
Reviewed-on: https://gerrit.libreoffice.org/36629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
This is the drawingML equivalent of commit
3d9ebded1358395ed81db7a63629b046aec2aeac (Misc improvements for docx VML
import, 2010-10-06), which made sure that shapes are never invisible
just because they have zero height or width.
For this particular bugdoc the Word-produced WW8 equivalent width is 20
twips, but let's be consistent with the VML import and just round up to
1 mm100.
Also fix two existing tests that wanted to test something else, but
implicitly asserted that some shapes indeed have zero width/height.
Change-Id: I9600424520d0a3deecc711b44622eccc041a59da
Reviewed-on: https://gerrit.libreoffice.org/36927
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: Ia28e35ae5af4f601e9a586a3deffbcd61702b0ca
Reviewed-on: https://gerrit.libreoffice.org/36896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
|
|
1. Use converted style name to assure the default style is found.
2. Switch off squared-page mode before setting the base text width and height.
3. Ruby text height is not effective per ODF spec.
Change-Id: I0f2901a453a9f7b344cac6989780688cc2d6c7b4
Reviewed-on: https://gerrit.libreoffice.org/36828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
|
|
No functional changes intended.
Change-Id: Ibc23de9cb33428765b8b0c85a221a2014ad4d7bd
|
|
- passing "ReadGlossaries" flag to the WriterFilter
- if set - WriterFilter reads glossary document
instead of the main content
- updated model.xml to read docParts and docPart nodes
- SwDOCXReader adds document content as an AutoText
entry
Change-Id: I9a0cc91c793d6accc8461e1c3aca791c5997d497
Reviewed-on: https://gerrit.libreoffice.org/36753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
|
|
Uwinapi is discontinued.
Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
|
|
As suggested at <https://gerrit.libreoffice.org/#/c/36142/>, and it
indeed matches the Word behavior.
Change-Id: I1ba5b70fc5a7acab52fa4baf816e9f6cd2f913ba
Reviewed-on: https://gerrit.libreoffice.org/36719
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: I038711a0c4d440d452d5b2ae1bfcba5c9305815b
Reviewed-on: https://gerrit.libreoffice.org/36646
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
See commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305:
writerfilter RTF import: override style properties like Word,
2014-06-17) for the context.
Here the problem was that various details of the top border were removed
during the style deduplication, but not the top border sprm itself. That
was interpreted (correctly) by dmapper as "no border", rather than
"inherit from style".
Change-Id: I3dec8df789fc7b75fccfff91ce66f457fecd2f6e
Reviewed-on: https://gerrit.libreoffice.org/36661
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Since MS Word 2013+ if you change cell margin at the table, the border won't be shifted.
The decision is to do the same ( see https://bugs.documentfoundation.org/show_bug.cgi?id=106742 ).
Change-Id: Ia58693c44f63ed21dca2cd99591002ba68927b65
Reviewed-on: https://gerrit.libreoffice.org/36084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: Ibd27ecf4d06f3982ae703f5e2fd01f063ce8f409
Reviewed-on: https://gerrit.libreoffice.org/36444
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: I43266bba61ae95386383b7080c9c5983804afe4a
Reviewed-on: https://gerrit.libreoffice.org/36478
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
git grep -l "[ _\.]THROUGHT" | xargs sed -i 's/THROUGHT/THROUGH/g'
git grep -l -i "[ _\.]THROUGHT" | xargs sed -i 's/throught/through/g'
In ENUMs: THROUGHT = THROUGH (preserved as valid alternate spelling)
In ooxmlexport8 - unit test confirms THROUGH = THROUGHT
Change-Id: Iae0fef9a8adcb96761989f38903a24ffb1b91e77
Reviewed-on: https://gerrit.libreoffice.org/35998
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Commit 1bf7f6a1a50ee9f24a3687240fe6ae390b905a6b (tdf#106690 DOCX import:
fix automatic spacing before/after numbered para block, 2017-04-04) made
sure that autospacing is only collapsed in case the adjacent text nodes
both have a numbering rule.
It turns out there is an additional condition: even if both text nodes
have a numbering rule, do the collapsing only in case they have the same
numbering rule.
Change-Id: Idb7a2b24d7eaa9094cc36f86b8a483045a33d028
Reviewed-on: https://gerrit.libreoffice.org/36400
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
It's not a newline but yet another one of those bizarre RTF-encodings.
(regression from 10e733908038407791f9c14af2a86417cc4a653c)
Change-Id: I568050b031b95ac0b6ebfa1a0c39107e62f68bed
|
|
Change-Id: I3237b93babc67de12c3771aa84766c2141ca93b2
Reviewed-on: https://gerrit.libreoffice.org/36137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
The context is text nodes with automatic before/after spacing and
numbering rules set, like:
A
* B
* C
* D
E
The correct behavior seems to be (though I haven't found this explicitly
written in the OOXML spec) to drop spacing between B and C and C and D,
but not before B and not after D. Originally no spacing was dropped,
then commit c486e875de7c8e845594f5043a37ee8800865782 (tdf#95031 DOCX
import: auto spacing inside numbering means no spacing, 2016-10-18)
removed spacing around all B/C/D.
Fix the problem by checking the numbering rules and automatic after
spacing of the previous paragraph, so spacing before B and after D is
not removed.
Change-Id: Icbdb36e31057ab0e8ac033888cf5cc7c52dad5d0
Reviewed-on: https://gerrit.libreoffice.org/36062
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: I30f9b6e68a7aa73782c980749e34f8f8d40ae57b
Reviewed-on: https://gerrit.libreoffice.org/36047
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Translate German comments and terms in UnoControls/, editeng/, filter/,
odk/, reportdesign/, sd/, sfx2/, starmath/, svl/, svtools/, toolkit/,
tools/, writerfilter/, and xmloff/.
Change-Id: Ibc401a425ddfdf41e4e4a78600f3fbce8cfaa2b1
Reviewed-on: https://gerrit.libreoffice.org/35992
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Id862544f27ebcbe8363f93dc83192d0f0cddb5cc
Reviewed-on: https://gerrit.libreoffice.org/36041
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I0d460c5a0c14d078623fb1669a529a411002cad0
Reviewed-on: https://gerrit.libreoffice.org/36009
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
An image saved in cache when NS_ooxml::LN_CT_NumPicBullet_pict
property is processed should not to be resized. It reduce quality
the image.
Just set the property "GraphicSize" of current level of the NumRule
instead of resize the image when processing
NS_ooxml::LN_CT_Lvl_lvlPicBulletId property.
Change-Id: I8ac80643decb7794de7a295cc7c2895a5bd24e2d
Reviewed-on: https://gerrit.libreoffice.org/35592
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I9247c75819425a97d19c95c48fbaf7a4f8d92c62
Reviewed-on: https://gerrit.libreoffice.org/35379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
|
|
Change-Id: I59afe1ec7096cc7d173baab2042254eb647587b5
Reviewed-on: https://gerrit.libreoffice.org/35918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
The problem is that Writer's layout can't handle the case where cells
are vertically merged and the last row has a fixed height; the vertically
merged cell will grow up to the height of the other cells in the non-
fixed rows plus the fixed row height, but no larger.
So for now, avoid setting fixed row heights in this case.
(regression from d1278ef4849661b9ae0eb7aaf4d74fbf91ccaf11)
Change-Id: Iac3689e0bb0d5b8a62115ca0fb1f2c553a6e6bbc
|
|
Introduction
------------
In MSWord, you can create a formula field (starting with =).
When you save your file as `docx`, this `FORMULA` field is registered
in you file (a field starting with `=`). In its current state,
LibreOffice can't parse the `FORMULA` field in `docx` file.
Context of this fix
-------------------
This fix is entirely located in the `DomainMapper_Impl.cxx` file
because it's where the parsing is done.
How this fix works
------------------
First, we add `FORMULA` support by adding it to the `aFields[]` variable.
Next, to handle the `FORMULA` constant, we add a condition (swith case) in
`DomainMapper_Impl::CloseFieldCommand()` to call `handleFieldFormula`.
Note
----
In function `lcl_ExtractToken`, if command starts with `=`, it's a
`FORMULA` field.
Change-Id: If7d25de5413aa3133b22523d8a3f34ab6961adfc
Reviewed-on: https://gerrit.libreoffice.org/34334
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Similar to DOC, DOCX doesn't enable kerning by default.
Change-Id: I070ff5f0d43c27107593d629a1ad681d29d2038c
Reviewed-on: https://gerrit.libreoffice.org/35890
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
An image saved in cache once when NS_ooxml::LN_CT_NumPicBullet_pict
is processed, may then be used multiple times (for each NumRule that
requires it) when NS_ooxml::LN_CT_Lvl_lvlPicBulletId is processed
for each of them.
If the image was released here for first processing, subsequent rules
couldn't find the image in cache and failed to create NumberingType::BITMAP
style for the rule.
The image is ultimately released in ListsManager::~ListsManager()
after it is no more needed.
Change-Id: Ib4c351437ba94d5a9d3e2927ccf459ec01f1b15f
Reviewed-on: https://gerrit.libreoffice.org/35591
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
The problem here was that while in general paragraph style / direct
formatting deduplication is supposed to happen in the tokenizer,
paragraph tab positions is an exception, and dmapper expects to see the
duplicated tokens.
Fix the problem by introducing a blacklist that contains tokens not to
deduplicate.
Change-Id: I1cca53e99cfdb082df389ff295f3447cc8f9d3b8
Reviewed-on: https://gerrit.libreoffice.org/35790
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Introduction
------------
In MSWord, you can create a variable with `SET` field and then
reference it later in a formula. When you save your file as `docx`,
this `SET` field is registered in you file. In its current state,
LibreOffice can't parse the `SET` field in `docx` file.
Context of this fix
-------------------
This fix is entirely located in the `DomainMapper_Impl.cxx` file
because it's where the parsing is done.
How this fix works
------------------
First, we add `SET` support by adding it to the `aFields[]` variable.
Next, to handle the `SET` constant, we add a condition (swith case) in
`DomainMapper_Impl::CloseFieldCommand()` to call `handleFieldSet`.
Finally, `handleFieldSet` works like `handleFieldAsk` with small
differences.
Note
----
I have renamed `lcl_ExctractAskVariableAndHint` to
`lcl_ExctractVariableAndHint` because this function is used for both `ASK` and
`SET` fields.
Change-Id: I2bf948e26e8506ac151d1d0bc8556721bbe0392b
Reviewed-on: https://gerrit.libreoffice.org/34333
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|