Age | Commit message (Collapse) | Author |
|
according to correct hyperlink handling, avoiding various editing
and layout problems; "sticky" and not easily removable character style
around the hyperlink and multiple blue hyperlink colors.
Set also Visited/Unvisited link character styles when the style of
the hyperlink is not the requested "Internet Link".
Change-Id: I3d7ba8dd225c693cc9f521b37767cf1e1e09d7c0
Reviewed-on: https://gerrit.libreoffice.org/80449
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
|
|
Password protection of enabled record changes has been grab-
bagged, yet, but it was possible to disable the protection
without password verification, eg. by a simple click on
Record Track Changes. Now it's forbidden to disable the
protected Record Changes, using a dummy password temporarily.
Change-Id: Ibc1c9016ea164ebb588265579fb9fa589ddee114
Reviewed-on: https://gerrit.libreoffice.org/80643
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
mostly so that my stringadd loplugin can point out places to improve
Change-Id: I9920ee1c99cdb6b811ba67ff9d8e32aa261884b5
Reviewed-on: https://gerrit.libreoffice.org/80618
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Iff8171b48a2687bbadb4e2638675a73de96a7545
Reviewed-on: https://gerrit.libreoffice.org/80074
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
|
|
when the table is started on a new page. Undefined
w:before in w:docDefaults/w:pPrDefault resulted 0.5 cm
paragraph top margin instead of 0 cm.
Change-Id: I94a2aa9e9c5fcee6443b74bb261c300c6a8e1303
Reviewed-on: https://gerrit.libreoffice.org/80445
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
Actual text content lost its page break, when the last
paragraph of the section was empty and preceded only with
tracked deletion.
See also commit b696600821d8aafb63b6a88016d299ef89478f56
"n#766481 dmapper: don't import fake paragraph containing sectpr only, take two"
Change-Id: I6b1c47da2b618f10ca4887f050469f94efa2a7cb
Reviewed-on: https://gerrit.libreoffice.org/80540
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
...for tdf#99602 specifically, but I've intended to do this for a
long time.
Currently GetAnyProperty doesn't look in Character Styles for the
requested property. But it should. GetPropertyFromCharStySheet
can re-use a lot of the code for GetPropertyFromStyleSheet,
so split that up and explicitly identify the existing function
as ParaStyle.
Change-Id: I9843153a6c09a10d63a575cb1f35a56c21c9cb9c
Reviewed-on: https://gerrit.libreoffice.org/80180
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Miklos Vajna <vmiklos@collabora.com>
|
|
as well as unique_ptr
Change-Id: I54842bca161ee460fb96c46ca31b6f9c0a7dbbdf
Reviewed-on: https://gerrit.libreoffice.org/80455
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Regression from commit ff17478e069cc82681df62514876c06365dd5cd6 (sw btlr
writing mode: implement DOCX shape import for tbrl, 2019-04-25), there
were two problems here:
1) Relative size currently only works properly for the lrtb direction,
so disable that during import till sw core is improved.
2) When SwFlyFrame::Format() auto-grows a text frame which is the
textbox of a shape, it needs to notify the shape about the physical size
of the frame, not the logical one. So going via the SwRectFnSet
abstraction is not correct in this case.
Change-Id: Ie185c7415d90594434eac8f459630d6a3212328a
Reviewed-on: https://gerrit.libreoffice.org/80398
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
Change-Id: I3b283a3283d865f5f96d872bad219ce9c3f872df
Reviewed-on: https://gerrit.libreoffice.org/80356
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: Jenkins
|
|
The existing code handled two situations:
1.) if both position(escapement) and fontsize set via direct properties
2.) if fontsize came from the document default properties.
That misses both paragraph style fontsize (very common)
and character style fontsize. This patch adds checking for
the paragraph style's fontsize.
Change-Id: I25312cd4544cfd1be09b21c96a270cb05e4f5b8f
Reviewed-on: https://gerrit.libreoffice.org/80179
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
presumably since...
commit f9aac900ada3d507526eeeed5b51fc7a10ab4cae
Date: Wed Oct 2 14:57:16 2019 +0200
tdf#81100 DOCX import: repeat header according to table style
Change-Id: I4f093606a15909c8e29b18dfb792abd938a80c5b
Reviewed-on: https://gerrit.libreoffice.org/80234
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: Jenkins
|
|
...so don't add deferred properties during style import.
Otherwise, the first paragraph picks up those attributes and
applies them.
Regression from 2012 - only affects subscript/superscript.
Truly fixing this for Character Styles will be tricky,
because it depends on the final fontsize - regardless of
where it is set. So at the style level, the deferred
property needs to be percentized based on SOMETHING, and then
at appendText time the fontsize needs to be determined.
If escapement is inherited from a style, then the escapement needs
to be converted BACK into pointsize (based on style charsize),
and then the final percentage can be calculated and
directly applied. Yuck. I'm inclined to treat charstyle
escapement like pre-2012, which just assigned default
values and ignored the actual/given amount.
Change-Id: I8e3783533ec18740e1c7d0b36c58b6c7e8ce107f
Reviewed-on: https://gerrit.libreoffice.org/80178
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
|
|
Change-Id: I9790d053248ae6bd58ecc026c774014c4e5e04aa
Reviewed-on: https://gerrit.libreoffice.org/80115
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Table style based repeating table header wasn't repeated,
only direct table formatting.
Change-Id: I119e6d32bf22c6c85a84aa42ae4cd6c5f60166b2
Reviewed-on: https://gerrit.libreoffice.org/80053
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
Change-Id: Ib5292f4c702cc1e2994c736250a93e6fb18d1a20
Reviewed-on: https://gerrit.libreoffice.org/79988
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
...MSO 'washout' to our watermark colormode
After d151ed35ad4c4e7aa9fbb807930fcf91dea2eba7,
Contrast and Brightness was reset only in writer,
so do it earlier for Impress and Writer
Change-Id: Icaf2b565880e31d86e09e2f56bac25eba52c8467
Reviewed-on: https://gerrit.libreoffice.org/79905
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
|
|
during round trip by grab-bagging //tblStylePr/trPr/tblHeader.
Change-Id: Id9d3150ca48031791aeda19c126bc4d4ac16fb8f
Reviewed-on: https://gerrit.libreoffice.org/79597
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
|
|
Change-Id: I1e1c4e574e910ef9683520ae950b14eb4ebbc63f
Reviewed-on: https://gerrit.libreoffice.org/79784
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
The SvxUnoTextBase::finishParagraph() returns null because there's no
GetTextForwarder(); in any case the ListId property isn't supported by
SvxUnoTextRange.
(regression from 7992bd73a2307edce96a145e954f8e4c3ab9f57d)
Change-Id: I8f63d805a593a5950c8cb08eaeebd34e977b4700
Reviewed-on: https://gerrit.libreoffice.org/79552
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
|
|
use compact, cache-friendly structures for some static const stuff
and add a std::initialiser_list constructor to o3tl::sorted_vector
Change-Id: I6a6049bf19a7f48dae1843a81cd2257944ada9d5
Reviewed-on: https://gerrit.libreoffice.org/79470
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
This reverts LO 6.2 commit 49ddaad2f3ba4e17e1e41e94824fb94468d2b680.
tdf#127617 proves it simply was not the correct solution.
I replaced the unit test document with one that clearly demonstrates
that spaces/tabs should NOT be used in line height calculations.
Example document tested with Office 2003, 2010, 2016.
Change-Id: I2833384a017526d665adef0cae968bc4aef0dd94
Reviewed-on: https://gerrit.libreoffice.org/79473
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
|
|
The map and set are made function-local statics instead of members, to
only create them once (as comment says).
This also fixes the problem with missing comma between "page number" and
"TableNormal", which presumably had prevented all entries starting from
"PageNumber" from working properly.
Change-Id: Iddfefb05b1ffd00d16f189ddb5a679adf7561aa6
Reviewed-on: https://gerrit.libreoffice.org/79430
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
This is nominally a regression from commit
c12a78e42e1cbaaf4ea021c82acbec5ea177b1f6 (writerfilter: reset properties
of reused styles, 2014-06-04), which assumed that style names are
unique.
They are not unique for the bugdoc, as it has paragraph styles named
'heading 1' and 'Heading1', both mapped to 'Heading 1'.
The mapping for the style name without a space was added in commit
1d2af74e226bf44e1a0f1e1981ca965cffeaa0b2 (INTEGRATION: CWS xmlfilter02
(1.27.12); FILE MERGED, 2008-01-10), in the "2007/11/22 14:53:43 os
1.27.12.9: Tab stops almost perfect now" part, sadly without any
indication on why that would be a good idea.
The binary DOC import never mapped Heading1 to Heading 1, so it doesn't
have this problem.
Fix the problem by removing this mapping, it leads to formatting loss
when a document has both HeadingN and Heading N styles.
Change-Id: I26dd999f5a536e079ac351ba5d40d20c83b99310
Reviewed-on: https://gerrit.libreoffice.org/79422
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
The problem is that StyleSheetTable::ApplyStyleSheets() inserts a
SwNumRule with name "WW8Num1" and then ListDef::CreateNumberingRule()
also wants to insert a SwNumRule with name "WW8Num1" but gets an
exception instead, leaving ListDef::m_xNumRules null, and then
finishParagraph thinks it's numbered but there's no ListId.
Try to avoid collisions of the generated names in
ListDef::GetStyleName(), by checking what styles actually exist in the
document (which works better in the Insert->File case), and
on the assumption that the initialising call always happens before
the using calls.
(regression from 7992bd73a2307edce96a145e954f8e4c3ab9f57d)
Change-Id: I91c98aa897c12778fb214e9690da0bae99550b93
Reviewed-on: https://gerrit.libreoffice.org/79312
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
|
|
Change-Id: I7b3a22584bb2e4d501f509ffcd80929feed23a4c
Reviewed-on: https://gerrit.libreoffice.org/79360
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
|
|
Which also made it necessary to support allow-overlap=no for not only
shapes, but for shapes-with-text in the layout.
Change-Id: Ibd229d21995c0a1053db6bbab0a6ccbbf75f36d3
Reviewed-on: https://gerrit.libreoffice.org/79277
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I63eb9e64ce1dbacdcdaf77beb1a5a87c3a8d26e8
Reviewed-on: https://gerrit.libreoffice.org/79073
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
The DOC import does the same in
SwWW8ImplReader::AdjustLRWrapForWordMargins(). This fixes one
sub-problem of the bugdoc, so now the shape anchored in the header has a
correct position.
This made it necessary to re-visit the tdf#115719 testcases, which are
minimal reproducers. The original document had from-left alignment
(instead of align-to-left), but this did not matter before. Bring the
test documents closer to the original large document, so the tests still
pass and don't depend on LO mis-handling the above mentioned
left-aligned situation. (The interesting property of tdf115719.docx,
where Word 2010 and Word 2013 handles the document differently is
preserved after this change.)
Change-Id: I973c13df47b0867e2c4756f0c448495257b7c9d5
Reviewed-on: https://gerrit.libreoffice.org/79049
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
The problem here is that Word allows formatting the paragraph end
marker, and applies the same formatting to the generated numbering
string; Writer has no such marker thing.
This is currently represented by an empty AUTOFMT hint at the end of the
paragraph, which is created almost by accident in
SwXText::finishParagraph(), because the paragraph properties are set on
a SwPaM that doesn't select the whole paragraph but sits at the end.
This is a bit fragile and the hint may have unfortunate accidents such
as being merged into a preceding AUTOFMT hint if it happens to have the
same items in it.
It ought to work better to have an item in SwTextNode's SwAttrSet to
store these special items; has the advantage that the items will also be
copied when you split the paragraph, like in Word.
Add a RES_PARATR_LIST_AUTOFMT and UNO property "ListAutoFormat" (which
should be considered a first draft...) and use it in preference (where
possible) or in addition to (where necessary due to other missing
pieces) the empty hint.
Also revert the change in checkApplyParagraphMarkFormatToNumbering() to
consider hints that start before the end of the paragraph, as it has
unintended side effects as pointed out by Mike Kaganski.
Change-Id: Ic1d5dd9db2bab0c5e4594712bb45973aa1442da3
Reviewed-on: https://gerrit.libreoffice.org/78729
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
If the actual numbering style was associated to a base
paragraph style, indentation of the base paragraph
style has also priority over the indentation defined
in the numbering style.
Change-Id: Ic57b6b854be291c75c0eb7a9dfd4c376585fe26b
Reviewed-on: https://gerrit.libreoffice.org/78659
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
Images as hyperlinks didn't work with internal bookmark targets.
Change-Id: I5f3bf150f62d11837b45851e221119dcff93dcaa
Reviewed-on: https://gerrit.libreoffice.org/78639
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
|
|
The problem is that the bugdoc has multiple w:num numbering definitions
that refer to the same w:abstractNum abstract numbering definition.
Apparently (and i can't find this documented anywhere) w:abstractNum
corresponds to a SwList in Writer, i.e. all w:num that refer to the same
w:abstractNum share the same numbering tree, but they may have different
numbering properties via w:lvlOverride.
So i think this should be imported as a single SwList per w:abstractNum,
and every use of w:lvlOverride should create a new SwNumRule, but still
share the same SwList; the previous situation was a SwNumRule + SwList
per w:num element.
This implements simply a SwNumRule per w:num (regardless of
w:lvlOverride) because that was easy; the AbstractListDef class gets a
member to store the ListId of the created SwList when any of its
associated w:num / ListDef is used first, and the non-first ones get
this ListId set to force them into the same SwList.
Unfortunately it turns out the export has the same
SwNumRule->w:abstractNum problem, which remains to be fixed.
Change-Id: I92ce989afd15f24e36b6be6ccaf67ba3e0128963
Reviewed-on: https://gerrit.libreoffice.org/78556
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
Change-Id: I71bacf86938af2b89a706c435c4f72a194ec8343
Reviewed-on: https://gerrit.libreoffice.org/78417
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Includes adding SYMBOL_CHICAGO translations to .docx import/export filters
Change-Id: I5212739d7d04ab400a3d2aa549cb7cfd8531a4b8
Reviewed-on: https://gerrit.libreoffice.org/78114
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
Formatting changes of empty paragraphs weren't imported.
Change-Id: Ife7c83d52549563ab4c3a00a3daff4d8f4fa8386
Reviewed-on: https://gerrit.libreoffice.org/78233
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
To complete this:
https://gerrit.libreoffice.org/#/c/78312/
This is a massive replace for
".." instead of "..." between words.
It passed "make check" on Linux.
Change-Id: I144d8061fca9f545c762941551e59dffdd3650e8
Reviewed-on: https://gerrit.libreoffice.org/78357
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
|
|
Change-Id: Ic1aab40c8a4abdd73c616b2faaf95ef183fa2e38
Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/77556
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Four lambda expressions were declared doing the same thing,
which leads to the creation of four internal different
types for the same thing. That makes no sense.
Class RTFSprms_compare allows to factorize this code and
makes code shorter where it is used.
Change-Id: I5ed6821a67a50e96d9425064841c2b3421323001
Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/76214
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
Change-Id: If2fcd9aaf920f30b49a7bb828ba174939b13a3e7
Reviewed-on: https://gerrit.libreoffice.org/78091
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
|
|
in tracked deletions, instead of importing them
as normal comments of the actual text content,
ie. showing them in the Hide Changes mode, too,
without crossing out.
Change-Id: I7f84d2e9f2dd280bbca2236b40bab83b94d40c68
Reviewed-on: https://gerrit.libreoffice.org/78018
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
Change-Id: Iea7d15f0a54921514cc4b71c5dc8caaa2ee573c8
Reviewed-on: https://gerrit.libreoffice.org/78063
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
RTFSprms::equals and RTFValue::equals
are mutually dependent, which is insane.
Change-Id: Ib6de7954e97d5a1620ea3f8db92fe9a989ee8667
Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/76211
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
A default RTF space character is longer by an extra six-per-em
space in a space sequence. To get the same layout of documents
formatted with consecutive spaces, insert six-per-em space before
every space in a space sequence. Extra spaces are removed during
the RTF export.
Note: This is a workaround to get the same layout in documents based on
RTF templates, often used for example by bussiness applications.
Instead of adding a new RTF specific core/text layout feature,
with this workaround the layout will be compatible with ODT and DOCX
documents, too. (In contrast, MSO's DOCX export messes up the document
layout silently, shortening the length of the space sequence.)
Change-Id: I620807e1d4497e86c18732e5aa3131cf817ed94a
Reviewed-on: https://gerrit.libreoffice.org/77172
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
|
|
The problem was with the empty combobox. The implemenation before this
commit imported a combobox only when the combobox had any item.
Change-Id: I945098277d1ed34c65b43f0f6ad8eb361cf41b53
Reviewed-on: https://gerrit.libreoffice.org/78024
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
|
|
Change-Id: I227d149d07ea0f7b2569e5df5a5589834374fac9
Reviewed-on: https://gerrit.libreoffice.org/77992
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
|
|
Makes no sense to support btlr, Word can't handle it. (UI is disabled.)
Change-Id: I036a1e98e8b1ac07e688eedf45b4a2c21c4a8859
Reviewed-on: https://gerrit.libreoffice.org/77986
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I67ee714739800f3718f9d3facf57474cd564d855
Reviewed-on: https://gerrit.libreoffice.org/77415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
to speed up loading document with lots of footnotes.
Takes the load time from 29s to 27.3s for me
Change-Id: I911e4a7d7db8a2cdff1271d04e5535e76fd137a0
Reviewed-on: https://gerrit.libreoffice.org/77778
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I8ab75eb5cd54d14fda42bcdb1a251e9e2b6fefdf
Reviewed-on: https://gerrit.libreoffice.org/77612
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
|