Age | Commit message (Collapse) | Author | Files | Lines |
|
In MSWord, Footnote Reference applies to both in-text and in-footnote
formating of the reference number, while LO uses two.
Convert into one style, and copy into the other style.
Change-Id: I8cf731d5d1236c86fc1c82e798d8a459ca95d0ba
Reviewed-on: https://gerrit.libreoffice.org/38374
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I782713940fc978f38193c59d16667633167535d7
Reviewed-on: https://gerrit.libreoffice.org/38949
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
|
|
Some paragraph-level run properties affect the current list style since
commit 2123ede032ca64f696ef54af4ad3238974ca2b5d (n#758883 dmapper:
paragraph-level run props should affect numberings as well, 2012-06-19).
This was extended for any run properties in case of RTF since commit
c1f8437dbed0e8b989e41a345ef7e658a6e8a4cd (fdo#83465 RTF import: handle
font of numbering, 2014-09-25), as RTF doesn't really separate the
paragraph-level and the other run properties.
However, field formatting clearly should affect only the field itself,
so disable this mechanism in that context.
Change-Id: I6df7488e99e44f3ba7e17bf09ce590c88151e043
Reviewed-on: https://gerrit.libreoffice.org/38980
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I2f74dee5c05420275aae57485b8d81f60fff2d5d
Reviewed-on: https://gerrit.libreoffice.org/38823
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I93d1ae29bc414c5a60e793acd9e92d35608552ee
Reviewed-on: https://gerrit.libreoffice.org/38940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I704919e0a834e1431e153cd57f48de08c0f09c11
Reviewed-on: https://gerrit.libreoffice.org/38948
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
in commit 42922c40362f414ee06e65636f61798ef28cdcde
"RTFDocumentImpl::popState: use switch here"
found while running the unusedfields plugin
Change-Id: I4be41dba976a13dc6d39155fb2a04d039dc0443a
Reviewed-on: https://gerrit.libreoffice.org/38950
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
When Watermark size is set to Auto in the MSO,
the saved value is equal 1pt. Before this patch
in this case Watermark was invisible due to small size.
Change-Id: Ia2028a6547cf98dd31031305bcc5375625b83fe0
Reviewed-on: https://gerrit.libreoffice.org/38883
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ie7d06e972dfa3ffb00c66a4fa5f062e3ea93f787
Reviewed-on: https://gerrit.libreoffice.org/38939
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I87bc0bea5db27a967f996c7597b6f4884a748b56
Reviewed-on: https://gerrit.libreoffice.org/38938
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
|
|
Change-Id: I0c31593cc03ae795df458233f33323e7a5f38894
Reviewed-on: https://gerrit.libreoffice.org/38937
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
|
|
Change-Id: I3b50e45fdb99e9cd8bfda07356ee3ddb4dd0f8bb
Reviewed-on: https://gerrit.libreoffice.org/38905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
|
|
Only font name switch (f) is implemented.
Change-Id: I09df8230dff3cf0619065da69bfaf3caad0a39ae
Reviewed-on: https://gerrit.libreoffice.org/38654
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
|
|
Field commands were closed when a seperator appeared. Those
fields that only had begin and end fldChar just disapeared.
Change-Id: I77928393826a3ffd4a35fb8fe9adeb1892f99683
Reviewed-on: https://gerrit.libreoffice.org/38653
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
|
|
Also made changes in FastParser impl. to emit this event. I've made use
of existing namespace and element name strings to store target
and data for this event.
Change-Id: I6f00cd1172552dd9a74ec22190bef3d2289ae515
Reviewed-on: https://gerrit.libreoffice.org/38784
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
* font size
* font family
* rotation
* TextPath geometry - working transparency & color
* revert TextBox export removed by mistake
Change-Id: I3f6df86809ae57dc40c275652a96b19d2a3d7eba
Reviewed-on: https://gerrit.libreoffice.org/38494
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
DOCX/DOCM uses com.sun.star.comp.oox.FormatDetector for filter
detection, this one is unused.
Change-Id: I01776d130b0f8f0a75ee39a0cfbf974639c94216
Reviewed-on: https://gerrit.libreoffice.org/38800
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
- teach comphelper::containerToSequence to handle sized arrays
- also use range based for-loop where appropriate.
Change-Id: I73ba9b6295e7b29c872ee53de7a9340969e07f99
Reviewed-on: https://gerrit.libreoffice.org/38769
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Made it so Header/Footer of a certain section can only be added once.
This change should only affect RTF-Files.
Added Unittest
Change-Id: I55025984e343d04da7fc0f201164ef39e3a26202
Reviewed-on: https://gerrit.libreoffice.org/37814
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I72d7b13a23ce306b752b39187a0e9fbb7028643a
Reviewed-on: https://gerrit.libreoffice.org/38606
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Since ea890b1d4bcd6dd59db9f52dce1609c020804e24 "tdf#108408: support unit
specifications for ST_HpsMeasure", the OOXMLUniversalMeasureValue ctor is
converting textual data to mnValue via intermediary double instead of sal_Int32,
so textual data representing negative values now triggers UBSan warnings (e.g.,
"writerfilter/source/ooxml/OOXMLPropertySet.cxx:630:43: runtime error: -70 is
outside the range of representable values of type 'unsigned int'" during
CppunitTest_chart2_export; it appears that, while HpsMeasure may be documented
to only cover positive values, TwipsMeasure may be negative).
But OOXMLUniversalMeasureValue::mnValue is apparently only used in
OOXMLUniversalMeasureValue::getInt, to return an int value, so just change its
type.
Change-Id: I44eabb78f09100c05cc9d1e79a739648f34ea743
|
|
w:ST_HpsMeasure is defined in ECMA-376 5th ed. Part 1, 17.18.42 as
This simple type specifies that its contents contain either:
* A positive whole number, whose contents consist of a measurement in
half-points (equivalent to 1/144th of an inch), or
* A positive decimal number immediately followed by a unit identifier.
...
This simple type is a union of the following types:
* The ST_PositiveUniversalMeasure simple type (§22.9.2.12).
* The ST_UnsignedDecimalNumber simple type (§22.9.2.16).
This patch generalizes OOXMLUniversalMeasureValue to handle standard-
defined units, and introduces two typedefed specifications:
OOXMLTwipsMeasureValue (which is used where UniversalMeasure was
previously used), and new OOXMLHpsMeasureValue.
Unit test included.
Change-Id: Iccc6d46f717cb618381baf89dfd3e4bbb844b4af
Reviewed-on: https://gerrit.libreoffice.org/38562
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
The char property values as defined in w:rPr were not connected
to the in-text footnote or endnote.
Change-Id: I7729c534879e59ff5c9500dd1b16f9f1476abd76
Reviewed-on: https://gerrit.libreoffice.org/38372
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
|
|
Which means the DOCM-specific code to roundtrip VBA things (project,
data) can be removed. The oox part has to be extended a bit, as at least
for this DOCM bugdoc there is an XML relation of the binary data, while
existing shared code assumed the full VBA project is just a single OLE
blob.
Change-Id: I4085e4dba24475e6fd555e5f34fe7ad0f305c57d
Reviewed-on: https://gerrit.libreoffice.org/38504
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
With this, the project stream import is shared between DOCM and XLSM.
Change-Id: I8fbffefc5acf28adea4875fa6bc4148a99b5ebef
Reviewed-on: https://gerrit.libreoffice.org/38495
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
* "wzName" should contain shape name
* MS Word watermark has text inside the "gtextUNICODE"
(do not create additional shptxt)
Change-Id: I7929ec83a9219d6087d36ccbf6d7e735acf63722
Reviewed-on: https://gerrit.libreoffice.org/38219
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Make sure that even if the text append stack is empty (and we return
early) the table manager push/pop operations are in sync with the shape
start/end, otherwise we'll have an empty table manager stack.
That is a problem as
writerfilter::dmapper::DomainMapper_Impl::getTableManager() assumes that
it always has at least one element.
Change-Id: I92b3381e820bc8eaeb351532a6ce8909490c0f30
Reviewed-on: https://gerrit.libreoffice.org/38490
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Using Calibri will allow to keep originally intended font
on round-trip. If Calibri is absent on a system, LO will
fallback to Carlito for rendering, but keep original font
intact.
Change-Id: I8f29bed29bc7f48912b2637053ff128ea904c7a1
Reviewed-on: https://gerrit.libreoffice.org/38456
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
In OOXML (i.e. Word since 2007), the default document font is Calibri
11 pt. If a document doesn't contain font information, we should assume
our metric-compatible equivalent Carlito to provide best layout match.
A unit test included.
An existing unit test (testN766487) was corrected to match the font
size that Word uses (11; was 12 which doesn't match Word's size).
Change-Id: I3040f235696282dc7a124cd83fb34a6d95a29a17
Reviewed-on: https://gerrit.libreoffice.org/38421
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
In MSWord, there is a single character style (Footnote Reference) that
affects both the in-text anchor number and the in-footnote number.
In Writer, that is split out into "Footnote anchor" for in-text and
"Footnote Characters" for in-footnote.
The biggest difference in LO is that Footnote Characters does NOT
default to superscript, while Footnote anchor does.
In order to handle the default situation, it is best to map
"Footnote Reference" to "Footnote Characters" so that the style
differences between the two will be removed. It seems
that WW8 also does the same thing.
The "regression" will come if someone has done custom formatting that
they prefer to show up in-text rather than in-footnote. Now it will be
reversed, where the custom formatting will show up in-footer and not
in-text. However, it is preferable to handle the default case and
"fix" the missing superscript problem.
(In WW8, the stiXnoteRef's are RES_POOLCHR_FOOTNOTE/ENDNOTE,
as mapped in sw/source/filter/ww8/writerwordglue.cxx,
which turns out to be "Xnote Characters" styles.)
Change-Id: I9152b4a85f6facf3f8192c943e66312988718b0d
Reviewed-on: https://gerrit.libreoffice.org/38306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
In commit:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=ad90e22f1970d019e1f2a1e8ba8020c0f0cb36c4
the refactor was made. Unorfunately due to mistake
the embedding was always resetting.
As a result only one embedding document was added.
Change-Id: Ie268b1bf8906ac7b8e061526a9186b3b4b46bef6
Reviewed-on: https://gerrit.libreoffice.org/38369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
This means 2 new streams when roundtripping DOCM files that actually
have macros: word/vbaProject.bin and word/vbaData.xml (+ the relation
pointing to the second from the first).
Change-Id: Iba24eea4c5bca8f743a53027c71ed2aae48f1934
Reviewed-on: https://gerrit.libreoffice.org/38360
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: If48795746adecf6762a5f1173171c62faf1ac345
Reviewed-on: https://gerrit.libreoffice.org/38290
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
The string variable is never initialized or set,
and the only use is if it is not empty.
In 2007, author Oliver Specht 2007-06-12 04:41:16 in
range fe8e4e774087465a10ecd8f366b7f0c272d8319a
introduced m_sFootnoteFontName in a pair of commits.
The call to SetFootnoteFontname() was removed in 2008
with commit 009e3f4841378f13a2764a2c84e147e401b70525
The SetFootnoteFontName() function was removed as unused in
commit 6ea66657ebca5b3ec63f93b496b812888e0d53c9
Since the footnote name is never set, it is always
empty, and thus this code is useless.
Change-Id: I64898ce9fa6673fbef0106054b5aa5a817c145d5
Reviewed-on: https://gerrit.libreoffice.org/38257
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Iac8ccd17d9e46ebb2cb55db7adb06c469bbd4ea0
Reviewed-on: https://gerrit.libreoffice.org/37910
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Depends on unit test modifications in commits
71229da3cb05fc8f3e94fe6a6a5d9ad43cdf8702
a9118665637dafddd41ca549d0f73948cf1d332c
One known effect is that Word's "footnote reference" formatting in docx
will now affect Writer's "Footnote anchor".
Change-Id: I84f21dcff86f727869a49fa4b53727c24337f63f
Reviewed-on: https://gerrit.libreoffice.org/37936
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Ie7182fa30155a8090421cf9a669525be99f0e0a7
Reviewed-on: https://gerrit.libreoffice.org/38042
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: I70c1de8a02523ae5de4b6110335849858637f87a
|
|
MS documentation for splitPgBreakAndParaMark
only mentions page breaks, not column breaks.
(Always Move Paragraph Mark to Page after a Page Break)
This element specifies whether a page break shall automatically
complete the line on which it appears, moving
the end of the paragraph to a new line on the next page,
or if it shall behave as true run-level content within its
current paragraph.
Typically, a page break defined using the br element
is treated as run-level content, which means that
although it delimits the end of the page, if there is no content
after it within the current paragraph, that the
paragraph shall also end on that page. This element, when
present with a val attribute value of true (or
equivalent), specifies that a page break shall always
immediately end the current page, moving the paragraph
mark which delimits the end of its parent paragraph to
a new line on the next page.
Note that this setting only affects the case where there
is no run-level content after the page break within the
paragraph - if any further run content appears in the
paragraph it shall appear on subsequent lines on the next
page
I borrowed the !footnote code from the if newline ELSE
section. It seemed appropriate to take the same
precautions here.
|| bSingleParagraph was added specifically for
COLUMN_BREAK. That is obsolete now, so removing.
There is a lot of old code here that I have questions
about. I tried to change as little as possible, but
likely lots of the existing logic is just wrong.
Change-Id: Ib988c6623acb2b6152118098b706314bfbfb99e3
Reviewed-on: https://gerrit.libreoffice.org/36421
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
|
|
and fix the fallout
Change-Id: I8f59944bcc01a8e2ab371808c40eaf9b5198c143
Reviewed-on: https://gerrit.libreoffice.org/37785
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
This reverts commit 26a67002fcb9381b54de6cae1aaa37120d49066a. "Iff" is not a
typo, see 2a65bf32ec270484dcea4d22d3c93552dc0c24dd "Revert 'Typo: iff->if'".
|
|
Only replaced "iff" with "if"
Change-Id: Ib9dfa5c12b05500043147fe3b65f923b1b12a581
Reviewed-on: https://gerrit.libreoffice.org/37782
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
|
|
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>
|