Age | Commit message (Collapse) | Author | Files | Lines |
|
Also add missing <w:tblLayout w:type=fixed/> to the bnc#780645 testcase
to avoid breaking the build.
(cherry picked from commits 7329df74df134a77d078f47d5c8b70d54c5d1edb and
4821d894f849a4939bbe6fb0a9a5ddd9e10b0467)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.hxx
Change-Id: I9af50a4c176168e2794eaa9b0e8eaeb6b9d06b13
Reviewed-on: https://gerrit.libreoffice.org/3058
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
|
|
Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b
Reviewed-on: https://gerrit.libreoffice.org/3042
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
In RTL UI, comment window is RTL and editbox’s (editeng) default writing
direction is LTR.
and i suspect, the bug is result of this RTL & LTR mix-up.
Change-Id: If3af4ae428b67151d66661907b9e60a97049e0e6
Reviewed-on: https://gerrit.libreoffice.org/2831
Reviewed-by: abdulmajeed ahmed <aalabdulrazzaq@kacst.edu.sa>
Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
(cherry picked from commit 79dd315e9b19ec3bc6601c359a0ecb6d576d4aa8)
Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
fix fdo#62050: for impress
Impress is also affected by fdo#62050.
In RTL UI, comment window is RTL and editbox’s (editeng) default
writing direction is LTR.
I suspect, bug is result of this RTL & LTR mix-up.
Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
Reviewed-on: https://gerrit.libreoffice.org/2922
Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
(cherry picked from commit 092bf2fb0052ca73855127dc03ff1ae3f9321506)
Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
|
|
(cherry picked from commit cadb3433b395b53a9eda584ed5fee79ca74e7483)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I10e9c0f1078e36710335a9a48f7f02292c764795
Reviewed-on: https://gerrit.libreoffice.org/2981
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Regression from 4a507f732d82c188ad81b022cbe3037951e58ac3. The problem
was that in some cases \pard can't reset all paragraph properties. The
original commit just made this keyword a noop when it occurred between
\cell and \row, but this is too much. At least margins do need
resetting.
Change-Id: I5cbb1df72bf1211f85ef69ab64d5b46cbce5c742
(cherry picked from commit 24d5261f5a122e22675210445056cdf67663237b)
Reviewed-on: https://gerrit.libreoffice.org/2906
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
(cherry picked from commits 287c254d5ebf9b58ca63a8c271e523adf0d34b82 and
1fba17854b2be4fdbe436f44da3ae57a1f75a27c)
Conflicts:
sw/qa/extras/odfexport/odfexport.cxx
Change-Id: Ifb850438586eb6589fde79d10ed9eef727368f42
Reviewed-on: https://gerrit.libreoffice.org/2873
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
|
|
In case we know there is a non-section paragraph at the end of the
document. Intentionally not adding a unit test as David Ostrovsky is
working on one already.
(cherry picked from commit 62344016de056965a58ea2016d912a68eac0d6b0)
Change-Id: Ia6026846981b5af014246a8a604c5f762d34c891
Reviewed-on: https://gerrit.libreoffice.org/2876
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
|
|
(cherry picked from commits 60c17b2873506ed8b068b34840aecda0c1d9bd65 and
c412cba28ebc00783041bcec74978fc959cc1351)
Change-Id: Ifa7b14e88231e5053c84dfbdd9b453715df1aaa6
Reviewed-on: https://gerrit.libreoffice.org/2817
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
I also merged (manually) the changes of the cleanup
commit of Michael Stahl ( commit id 859e94294bdfd8595c88dd7f14da09ead8b32a45 )
Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Reviewed-on: https://gerrit.libreoffice.org/2572
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-on: https://gerrit.libreoffice.org/2777
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
- remove PD_FIRST and GetFirstFmt:
This flag makes no sense at all, since there are no "first-only"
page styles (while there are left-only/right-only).
- instead add a parameter to GetLeftFmt/GetRightFmt to request a
first page format, if such exists and is not shared
(regression from 02a934d03b101ce463a232f9cbb7b43e684de37e
and fa0f42bafbf24e9141ddee728b160b5ab47077f2)
Change-Id: I4d50c2c0cc4f3cf231eacba891df22d0bcf6c4df
(cherry picked from commit 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a)
Reviewed-on: https://gerrit.libreoffice.org/2764
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: I6ae07e61b67fa321e80605e6e3a6fcdd56012b95
Reviewed-on: https://gerrit.libreoffice.org/2790
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Change-Id: I0f23e9f7f076f3a82d1d5df92d9d4d3919fc816d
Reviewed-on: https://gerrit.libreoffice.org/2737
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3
(cherry picked from commit ed740489ed39e0fc3ec43e3f3a1e6e9e366a2c5e)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
regression since 1c22545edf9085b9f2656ca92781158b6b123db3
Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704
(cherry picked from commit f42679fe7010284513cff3560d9aa47a49744ba8)
Reviewed-on: https://gerrit.libreoffice.org/2722
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
* sw/inc/numrule.hxx
* sw/source/core/doc/number.cxx
* sw/source/filter/ww8/attributeoutputbase.hxx
* sw/source/filter/ww8/escher.hxx
* sw/source/filter/ww8/rtfattributeoutput.cxx
* sw/source/filter/ww8/rtfattributeoutput.hxx
* sw/source/filter/ww8/rtfexport.hxx
* sw/source/filter/ww8/rtfexport.cxx
* sw/source/filter/ww8/writerhelper.cxx
* sw/source/filter/ww8/writerhelper.hxx
* sw/source/filter/ww8/wrtw8esh.cxx
* sw/source/filter/ww8/wrtw8nds.cxx
* sw/source/filter/ww8/wrtw8num.cxx
* sw/source/filter/ww8/wrtww8.cxx
* sw/source/filter/ww8/wrtww8.hxx
* sw/source/filter/ww8/wrtww8gr.cxx
* sw/source/filter/ww8/ww8attributeoutput.hxx
* sw/source/filter/ww8/ww8par.cxx
* sw/source/filter/ww8/ww8par.hxx
* sw/source/filter/ww8/ww8par3.cxx
* sw/source/ui/wrtsh/wrtsh1.cxx
Graphic Bullets Fidelity
Patch by: chengjh,<chengjh@apache.org>
Found by: chengjh,<chengjh@apache.org>
Review by: Fan Zheng,<zheng.easyfan@gmail.com>
Conflicts:
sw/inc/numrule.hxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/wrtw8nds.cxx
Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197
Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
|
|
* main/sw/inc/doc.hxx
* main/sw/inc/IDocumentContentOperations.hxx
* main/sw/inc/ndtxt.hxx
* main/sw/source/core/doc/docfmt.cxx
* main/sw/source/core/txtnode/thints.cxx
* main/sw/source/filter/inc/fltshell.hxx
* main/sw/source/filter/ww1/fltshell.cxx
* main/sw/source/filter/ww8/ww8par.cxx
* main/sw/source/filter/ww8/ww8par.hxx
* main/sw/source/filter/ww8/ww8par3.cxx
MS Word Binary compatibility
Patch by: Fan Zheng,<zheng.easyfan@gmail.com>
Found by: Jian Hong Cheng,<chengjh@apache.org>
Review by: Jian Hong Cheng,<chengjh@apache.org>
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Conflicts:
sw/source/filter/inc/fltshell.hxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
(cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474)
Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c
(cherry picked from commit 1c22545edf9085b9f2656ca92781158b6b123db3)
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
|
|
fdo#60259 prevent crash when searching backward for $ anchor regex
Old code wasn't prepared that searching for $ may actually return a
result set pointing behind the search string which it does with the ICU
regex engine.
(cherry picked from commit c00601dab0f5533b152cd63cec0a89bfec1ba95f)
Conflicts:
i18npool/source/search/textsearch.cxx
regex: handle zero-length matches, fdo#60259 related
Also in backward search ignore all zero-length matches except the text
end single $ anchor search. The anchor search is a valid match, treat it
as such in Writer.
This still doesn't solve the backward $ backward search, the convoluted
Writer code in that place apparently never worked, someone more familiar
with those internals should straighten out the mess.
(cherry picked from commit 3bc5cb3c485d67f1ce0541d349d11637f52ebda5)
regex: don't loop 10000 identical matches to find a single $ anchor
(cherry picked from commit ccc349d3abb70ef38cd2b7706da51b060a385908)
make forward replacement of $ work again, fdo#60259 related
broken with 3bc5cb3c485d67f1ce0541d349d11637f52ebda5
(cherry picked from commit d8dcfa0e5dbecf77c4d6a8d49caf61b339cf9b43)
Change-Id: I6b5eb28d0a54ceecb6873a3c05f18f70312ab1a2
Reviewed-on: https://gerrit.libreoffice.org/2679
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
i#118925# enhance textsearch's match-group references
to work for look-ahead/look-behind
(cherry picked from commit 3b83c404c56e5db5bab29ffee41f02822410d625)
Conflicts:
sw/source/core/crsr/findtxt.cxx
(cherry picked from commit 9a93475d6eba53b2e1fba1585dbd11c94ea4b4a3)
Conflicts:
sw/source/core/crsr/findtxt.cxx
i#120598 better emulation of regexp word-start and word-end operators
The emulation of the word-start and word-end operators provided
the previous regexp engine can be approximated much better
by using the ICU-regexp exngines powerful look-around feature.
Patch-by: Herbert Duerr
Found-by: ldgolds33@yahoo.com
(cherry picked from commit ec7ef30693f10315ce80a8f5d7325a0e40855e66)
(cherry picked from commit 8c26876fea085a1bc847abba63dffa97a9499c1d)
i#121482# fix attributed text search for regular expression patterns
(cherry picked from commit e7fc662799e7e936753e24db8d6d3849c12b3ff4)
(cherry picked from commit e6288a5d889da7db5bf23174f85c29ccfcaa44d5)
i#121482# fix backwards regexp search for matches overlapping search start
(cherry picked from commit 854f4ad6c57be62bd922df08f603d8bfb7b918a5)
Additionally fixed unit test, searching backward shall not produce a
different result from searching forward. (erAck)
(cherry picked from commit b514f0ce86e85d9be269ddf2e797befbbf3423f1)
i#121633# fix search for upper-case character classes
in ignore-case regular expressions
(cherry picked from commit b7ee1803453d3a766ce3a833892e1c208aacf8ff)
(cherry picked from commit 531538892795bec909bb8baff6bbf9e19baf809e)
i#121633# fix ignore-case problem caused by i18nsearch API mess
(cherry picked from commit 7644ec176049937b588fe171a553c9a07b375792)
(cherry picked from commit f932a3f1195290f9aa37b593190bd4c6ac5fe2f6)
Change-Id: I44d6216b12f17d0560c4e8cf355937797ddeee2a
Reviewed-on: https://gerrit.libreoffice.org/2678
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Not allowing flys or footnotes during string -> number conversion is
fine, but I don't see what's the reason for rejecting simple formatting
(like bold) completely.
(cherry picked from commit 332fa1344aaaf8ff190c594fe5829cf1551c5211)
Change-Id: I8f54aebeb6ea35d099a88570d3f7d365c7325dc0
Reviewed-on: https://gerrit.libreoffice.org/2606
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Change-Id: I88d5e49cc3fb915d25c1b2576cdda1fffc9e2f23
(cherry picked from commit 344e4a25eac6505678f4ce8a6c1c8cef83c68276)
Reviewed-on: https://gerrit.libreoffice.org/2587
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
This reverts a part of 51cfbf0cfaec395a99a00f2c20fcba96de9a4427, that is
no longer needed, but causes incorrect drawing objects position.
The problem was that a non-zero position doesn't mean the layout in a
later iteration doesn't change the position, but the referred commit
didn't allow later iterations to fine-tune the position.
(cherry picked from commit 4ae71885ec61f87c46285150ef4ca84192627b7a)
Conflicts:
sw/qa/extras/odfimport/odfimport.cxx
Change-Id: Id91a4c6952d1b58e0c5bc0b1a60991a284c29ddc
Reviewed-on: https://gerrit.libreoffice.org/2547
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
- fix line color default
- fix line width default
- fix z-order of shapes
(cherry picked from commits 9c7dbd9e1d2a131402a80e377630fe1ab5381a47,
cf2a1277acd4a29492f056a626b13e903d391027,
1eaab77c718ffa254068ae6032862dfb5a03db67 and
ea66024d4da38a619f44c941b65e6a28b74214b9)
Change-Id: Ib6097c844b2bc929c6ece31bcec62f27bfbf386c
Reviewed-on: https://gerrit.libreoffice.org/2569
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Also handle RTF_F inside RTF_LISTLEVEL. Word typically uses the Symbol
font to describe bullet characters instead of using a sane Unicode
value, the previous can only be handled if we parse the custom font set
for the list.
(cherry picked from commits 521586b328305c4466603438a9931993b92873c6,
2f82a08d3565239c2bfe8d21fbebd89bd4657708 and
58c30a3545a5725d704eabd79071db02f1f2cb23)
Change-Id: I1491f07c40953949e381a035c1596c207cdc4c35
Reviewed-on: https://gerrit.libreoffice.org/2503
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
The calls to upper_bound in SwDoc::FldsToExpand and SwDoc::FldsToCalc
unfortunately compare the pointers and not the values pointed to,
which causes all sorts of trouble around non-updated fields.
(regression from 2815396a1813cb3956c5aba066de49a7f34bc657)
Conflicts:
sw/source/core/doc/docfld.cxx
Change-Id: I48817247719671a16821fcb851b17b628c960a66
(cherry picked from commit 9ca5383abfb7f2f785e9f2e2d5b2565b9a60bbab)
Reviewed-on: https://gerrit.libreoffice.org/2504
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc
(cherry picked from commit 75b2f6b241046d4467a7c0c9cbf49b4533b46045)
Reviewed-on: https://gerrit.libreoffice.org/2467
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
There is a STL assertion in deleteMarks because the ReleaseDoc call will
recursively call into deleteMark again and delete marks that are in the
vector vMarksToDelete up the stack.
Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf
(cherry picked from commit 5bf6797e81d54177508d3eb370e8242e3b58a3f8)
Reviewed-on: https://gerrit.libreoffice.org/2466
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
In short, these commits make the RTF filter import and export unicode
characters in document title properly. Previously we failed to import
such files from Word, and the export result caused problems in Wordpad
(Word handled it fine).
(cherry picked from commits 0805b222f87bf99ec0c53ca678d1c670eb5293a2,
3a934d928e455eca38f124072c20a624a64aa225 and
5de52551a963b932cc23c2ea75f709fa1924520b)
Change-Id: Ic9417d0f23d44149acb3ae3dc9d4c281058a1b36
Reviewed-on: https://gerrit.libreoffice.org/2436
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|
|
Regression from 50cb1667020494906afaacb68d4163d1eda527cf.
Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
|
|
Fix the optimization to return only if both replacement and replaced
strings are empty.
(regression from b6d45f26ea5bcc848737921b59a16253eb1d8587)
Change-Id: I984fb151a5ac3e6eb8d03f854ad6a3df88f96000
(cherry picked from commit 3e6a0b6d04722d43a1fc8d3745b5e79b7ced90eb)
Reviewed-on: https://gerrit.libreoffice.org/2407
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
So if we have an INVALID_ATTR event in the queue and receive
INVALID_CONTENT, drop the attr and replace it with invalid-content
And anyway filter out the RSID change event from hitting the
a11y queue, humans don't care that this changed, it's just noise
Change-Id: I4842f217153fc90aa1dce75c3445053004c74536
(cherry picked from commit 8d08ccd5b84c121867d7b3102f9d10b26005c682)
Reviewed-on: https://gerrit.libreoffice.org/2401
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b)
Change-Id: Id60a08811f238db505d51b0e1381427a8f5df9cf
Reviewed-on: https://gerrit.libreoffice.org/2307
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
(cherry picked from commit 874f0a1be443b8027d5aba2285866f31cf4169e5)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I72996da79ca22a09fb490d06bcd34f741d7093ac
Reviewed-on: https://gerrit.libreoffice.org/2306
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
(cherry picked from commit 76bc43823a53d76e49260a601e893bc1a791fb03)
Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88
Reviewed-on: https://gerrit.libreoffice.org/2301
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Unfortunately selecting the field in SwEditWin::MouseButtonDown()
prevents the click field handling code in SwEditWin::MouseButtonUp()
from running. Instead select the field in MouseButtonUp and
SwWrtShell::ClickToField(), which seems to work better.
(regression from 94721b2aec614e0d99504138d484b2ad6cd550c7)
Conflicts:
sw/source/ui/wrtsh/wrtsh2.cxx
Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5
(cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671)
Reviewed-on: https://gerrit.libreoffice.org/2286
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
|
|
Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4
|
|
Change-Id: I1ca2075ab99fe1b09df700f55645b44f38cf5bcc
(cherry picked from commit 0e49d87d92a3f1aeeeda547f1a7e710dcd4fee95)
Reviewed-on: https://gerrit.libreoffice.org/2182
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
Also adjust SwUndoReplace to not assume that everything was inserted and
use the stored indexes instead in Undo.
Change-Id: I52f3aaf063c2b1bd52381bdc19e29a41a12c3847
(cherry picked from commit b6d45f26ea5bcc848737921b59a16253eb1d8587)
Reviewed-on: https://gerrit.libreoffice.org/2181
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
Return the actually inserted string from InsertText(), so callers can
check if the insertion was actually successful.
Especially InsertHint() will likely cause problems if it cannot insert
its CH_TXTATR; also Undo objects should not Undo more than was actually
inserted.
Change-Id: I87c9ea8b226ae4a2a6c20c112da76db07051a1bf
(cherry picked from commit d47218d79a2440e71efb66b2224063801ba6623b)
Reviewed-on: https://gerrit.libreoffice.org/2180
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
It's not a good idea to have STRING_LEN characters in a SwTxtNode
because then there is no valid SwPosition at the end of the paragraph.
Also it turns out that LO 3.6 and 4.0 do rather stupid things with a
full SwTxtNode. So enforce a limit, at first in the usual places that
are used during file import, SwTxtNode::InsertText() and
SwCntntNode::CanJoinPrev()/CanJoinNext().
Change-Id: Icb0f44acd20aa81635d42b84d4ae0f9b693a661c
(cherry picked from commit 549c0f785d4b6d4bc1b39b22827d77d66f48430a)
Reviewed-on: https://gerrit.libreoffice.org/2179
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
The UNO API provides the annotation field associated to a comment range
fieldmark when the fieldmark starts. To achieve this, it looks up the
annotation field by name, but it failed to ignore the fields which are
present only because the undo stack still holds a reference to them,
making the ODF export filter fail to export the document.
(cherry picked from commit f6a02947896e19160c137032a7fc2e56277656af)
Change-Id: Ia3b738a1eca7ed9981e1963b3d70ea8e3dbe8db8
Reviewed-on: https://gerrit.libreoffice.org/2231
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
This solves the conflicting requirements:
If the annotation has focus ("in annotation mode"), then we want to
be read-only only in case the comment anchor is inside a protected
section, or so. Ignoring the fact that in the main document, the cursor
is right before the annotation anchor, which is a read-only position.
OTOH, if the annotation has no focus and the cursor position is before
the annotation anchor position, then we do want to be read-only.
With this commit, the first case passes around a boolean flag, so the
annotation frame won't be read-only without a reason.
(cherry picked from commit 9104d5e8905c2ec2b576b5ca452d3e23d5555e49)
Conflicts:
sw/inc/pam.hxx
sw/source/core/crsr/pam.cxx
Change-Id: I25781a4501f752f7c4d024795d57b884cb800547
Reviewed-on: https://gerrit.libreoffice.org/2163
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
|
|
Change-Id: Iba94df67c21514cf4f5361bab28629c6d5d9d3e8
(cherry picked from commit 447bb5b5006051672ec526b75bec7db02d2db82e)
Reviewed-on: https://gerrit.libreoffice.org/2175
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
According to ODF 1.2 part 1 19.385 office:value-type, the attributes of
table:table-cell, namely office:value-type="string" and
office:string-value="foo", should override the element content of the
cell.
Change-Id: Ic580307effb046d127c4d64a4f963f0e91b3a2d1
(cherry picked from commit 1b5839f49c07beb6fbde6c7370a5636d22f9ab77)
Reviewed-on: https://gerrit.libreoffice.org/2177
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: Idfcf54013107ba6b7ce3de0d0bddbef306698f33
(cherry picked from commit 5a80c24b145c8efe0dd384ef88e7d31173522fb8)
Reviewed-on: https://gerrit.libreoffice.org/2176
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: Ie78819590bca52f36406022a3954651c42c52540
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
|
|
wwSectionManager::GetPageULData adjusts margins and header/footer
heights according to whether there is a header/footer or not.
It could be confused into thinking there was no header/footer when
indeed there was, in the case where a first page header/footer was
inherited from a previous section which contained but did not actually
show that header.
Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
Reviewed-on: https://gerrit.libreoffice.org/2137
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
(regression from f7d681dc34e60eb8532403079d007ca1250f4941)
Change-Id: Ida92854efe6ddffffb8fe10e5ef1f42c53747f40
(cherry picked from commit cbc722733bb272b0f26efec09b478bed9a3cdb96)
Reviewed-on: https://gerrit.libreoffice.org/2119
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.
Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)
Reviewed-on: https://gerrit.libreoffice.org/2122
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: I120acd40b83cad074869b404d4e74b5ec69d493d
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
|