Age | Commit message (Collapse) | Author |
|
Change-Id: I2ad3e07d91c47201adc5d5ffb7664c55f9edab93
|
|
Change-Id: I004daf7cf792fbcfd289f313a366ad0f1a25ff3a
|
|
Project: translations 3d704d365185550f0f75df38e00c034c843ae3d0
update translations for 4-4
and force-fix errors using pocheck
Change-Id: I232cdd7782671493693fcf62f8f816a922f4bbd8
|
|
Change-Id: I8071a54ffe7806192616c944fe980a8aba0bf3c5
|
|
Change-Id: If3b10f9a5e40b2a30ca7682066f49ce407f01426
|
|
When image is set to a Button control the correspoding graphic object
lives only temporarily, after the graphic is copied from the graphic
object it's destroyed so save can't find it by graphic ID.
Use the same solution which works for ImageControls: use a graphic object
member for the control, so save can find it.
(cherry picked from commit 70f152983f3425a77df2f65b4798417640d47b76)
fix windows build (from Noel Grandin)
(cherry picked from commit 4c5498ec5ee478e27fd62bdcf9de1208c692422c)
Conflicts:
forms/source/component/clickableimage.cxx
Change-Id: Iad31904bef65e30796538685f7cd7ae8f59762dc
Reviewed-on: https://gerrit.libreoffice.org/17111
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
(cherry picked from commit d24c6a0280b0287ee6c23ca89068323c6b7c3dd7)
(re-)introduce ScComplexRefData::PutInOrder(), tdf#92468
(cherry picked from commit ad3d2b6c2e88d191d76f90eb5be927f7ca76c670)
introduce ScTokenArray::AdjustReferenceOnCopy(), tdf#92468
(cherry picked from commit 369ee0b1faf79f1bd23c75ee04dd0dcc5bf283af)
call ScTokenArray::AdjustReferenceOnCopy() in ScFormulaCell clone, tdf#92468
(cherry picked from commit 3ddaeaab37d585971e376de6ad7b0f06f55f2e1a)
f551e02a77a416b95f74266de896391d1d72eb3c
0a7ac0d9d10e96223cd5f095a771aa6f9d271417
0dc0c3528b35bc6ea2525bafb94d72ee65e4791a
Backported.
Change-Id: Id69c58800d28f1733777f7931a20d8ee7bdf034f
Reviewed-on: https://gerrit.libreoffice.org/16842
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Project: translations 3b079429a27b80700c8f89d0ee4d735c812bbdf2
update translations for 4.4.5 rc2
and force-fix errors using pocheck
Change-Id: I1d3718d7e5f3f8332886cd810c73239ecb13a2f0
|
|
Reproducer:
* in A1 enter =SUM(B1:C4)
* copy A1 to clipboard
* paste to A2 and A3
* formula in A2 is =SUM(B2:C5) A3 is =SUM(B3:C6)
* select A2:A3
* hit Del key to delete the two cells
* enter any numeric value in B2
=> formula result in A1 is not updated
Shift+Ctrl+F9 hard recalc updates
Change-Id: I55e55b8cfe69e9273170ceaea4e6c046b3d4f7b7
(cherry picked from commit a49b8af4cf03ae08cb7a28f66e24368a7b08ae3f)
Reviewed-on: https://gerrit.libreoffice.org/16843
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
The attribute is not imported currently due to the typo, but is exported
with the correct spelling from shapeexport.cxx:4377 with
XML_EXTRUSION_FIRST_LIGHT_LEVEL.
Change-Id: I83d77e7eabbbc961fa4f7faf8e20b47601ba071b
Reviewed-on: https://gerrit.libreoffice.org/16641
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 9fb8b3968670645b257982773ece9d9413f404c6)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 77335b90a810b3e8c10cdd6547cfdfe2029d977d)
Reviewed-on: https://gerrit.libreoffice.org/17082
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I04b2e2aa5fffd570f33b69d8df99b9a88481a3a2
(cherry picked from commit d8208da8576874fdb07014287e6cbc0aeba741bb)
Reviewed-on: https://gerrit.libreoffice.org/17047
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I7708ecaf5412535055584ed6c71beaa9cd71c10c
(cherry picked from commit 0934ed1a40c59c169354b177d7dab4228de66171)
min legal size here is > 4
(cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)
Change-Id: I9f68d000b32623db4d949d13284043630f5689f4
(cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)
Reviewed-on: https://gerrit.libreoffice.org/16984
Reviewed-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: I667bb264f92024b72f230c2ddbba3887471345f2
(cherry picked from commit 755b9320c81948358a1d4104c8875594b5700d39)
Reviewed-on: https://gerrit.libreoffice.org/16982
Reviewed-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
... which aren't implemented at ScMatrix yet. Using IsValue() worked
when errors were not propagated, and before that when errors were
propagated because ScMatrix didn't have empty elements but instead was
initialized to 0.0
Change-Id: Ib9c6d34f2e6a68e483b606923cbcc41a3c1d2f51
Reviewed-on: https://gerrit.libreoffice.org/16841
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
(cherry picked from commit bf35419b68d7f100a634572236f7d593638981c8)
Conflicts:
sc/source/core/data/documen7.cxx
Change-Id: I38f69bcbb9eb550fb97b0f84bc0cb486863060b4
Reviewed-on: https://gerrit.libreoffice.org/16874
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
regression from
commit 42b521f800a08b11432cf906ce1bdf9fcbfffdeb
Date: Wed Apr 22 23:31:43 2015 +0200
tdf#88056: Implement ODF import/export of page title field
Change-Id: I577a7c52836bbb13cc93910b4458aee5482ffc86
Reviewed-on: https://gerrit.libreoffice.org/16852
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: I0d65ea7c7d019e56bcf4bf6f7054091933725849
|
|
This is 'libreoffice-4-4-5' - the stable branch for the 4.4.5 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.
If you want to build something cool, unstable, and risky, use master.
Change-Id: I2a85e041478d9d4d96d0bd44a3d215e655c12bb5
|
|
Change-Id: I05b92ee50757165652710b0ed4e3c7d09264dd3b
|
|
Project: translations 2f3952c0272985376c1cc4d827c3fa1bac41d608
update translations for 4.4.5 rc1
and force-fix errors using pocheck
Change-Id: I5dc692a21fa7e8db5460e816632dd84126e32c4a
|
|
Commit 3d7e168a2a43c2414b0633379102ddb29437e75b (n#783638 DOCX import of
wp:inline's distT/B/L/R attributes, 2012-10-11) was about a picture that
had non-zero spacing in LO, but zero in Word. The hope was that the
problem is just that the value is not imported.
Then commit a88ac708403c03d0f950f09ec29c0d5a1e5a85b4 (fdo#63685
wp:inline's distT/B/L/R is in EMU's, not twips, 2013-04-19) was about a
picture that had so large spacing that the picture become invisible.
Fixing the unit of the spacing value made the picture visible again.
What was missed is that this value is just stored in the doc model, but
layout in Word doesn't use it at all till the anchoring is as-char.
Given that in LO as-char anchoring supports real spacing, just don't
import these values to have the same layout. That's what the WW8 import
does, too.
(cherry picked from commit 9781a8786da5c32e2250cbe1ae97bd10f84f39bb)
Change-Id: I1244269e06c5d190e8340349ddc12ae7b0572a4d
Reviewed-on: https://gerrit.libreoffice.org/16786
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit d6db7e20d31280547ab15455ad1bc2a6d84ca76e)
Change-Id: I4c1d4c9228113bf83e8aabb50f153d2658c3cf59
Reviewed-on: https://gerrit.libreoffice.org/16776
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
The original work of tdf#55430 tries to select an object under
another one on the second click, but these images are unselectable
so this fails. Red Hat has a whole new shiny bunch of templates which
have such images in their masters.
Check if the object is selectable before continuing
(cherry picked from commit abbe4f9d64073d77c4be93b7c89c03d0651bacef)
(cherry picked from commit 4189530530320a82adc785a4426735423a1188c1)
Change-Id: I182abaf50e8bb1084c5819dc9e1ffd8b386a9e93
Reviewed-on: https://gerrit.libreoffice.org/16742
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Inserting a symbol in Writer set all fonts including CJK and CTL
to the same one. This patch makes the behavior consistent with that,
allows CJK and CTL user to see the symbols.
Reviewed-on: https://gerrit.libreoffice.org/16604
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Conflicts:
sw/source/filter/ww8/ww8par6.cxx
Change-Id: I7a61868e8078c81c68e471760f080b3ce7df589f
Reviewed-on: https://gerrit.libreoffice.org/16820
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Change-Id: Ief207205b3f05dd0ed92a2d1d30e265cbdb914e3
(cherry picked from commit 5aff134960b046a05f6255d10fd6d8ec72a3ff41)
-1 -> Z_ERRNO for clarity
Change-Id: I29aa8531646f416a72b89f7571b757c39705c31a
(cherry picked from commit 8cb69cc82c11b640c0328f4788c05bed1ac15e90)
Reviewed-on: https://gerrit.libreoffice.org/16827
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I64bb088320099303b0da6d272c3cd6a9ba954f87
Reviewed-on: https://gerrit.libreoffice.org/13957
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ee21771db0292315ff3e1b87ff58294335106bd3)
Reviewed-on: https://gerrit.libreoffice.org/16824
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
A regression of 1166966eb4112fdf332c656eae5082d82a3ec2f2.
We need to consider 2 use-cases:
1. Protecting an existing document with a password (by overwriting
the original file). In this case we don't want to generate a
thumbnail from the now encrypted file, but we do want to erase
the stored thumbnail and show a generic icon instead.
2. Closing a modified document without saving the changes. Here we
don't want to generate a thumbnail either, because it may
contain the unsaved changes, but either we don't want to replace
the stored thumbnail, because most likely it correctly represents
the last saved state of the document.
Conflicts:
sfx2/source/appl/newhelp.cxx
sfx2/source/appl/sfxpicklist.cxx
Reviewed-on: https://gerrit.libreoffice.org/16659
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit d9c476bfbb4a8f1858c072d2fba33aa9e8e0ae92)
Change-Id: Ia7b1f3dbc9fbbc2ef1d87442c1dee25306f65826
Reviewed-on: https://gerrit.libreoffice.org/16765
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Change-Id: I017049a8f3578ad4c2a1f549be1c683f98c20318
Reviewed-on: https://gerrit.libreoffice.org/16691
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Id69b55b266fe62934b53fc765030cfd044d0c74a
(cherry picked from commit 4a121d402f2a66d30cd01ed1b890284d8d4f465a)
Reviewed-on: https://gerrit.libreoffice.org/16778
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
We don't have there Select(bool) since
c3a89936abc7967ebe8916ca83cb38f6837f9aa1.
(cherry picked from commit 4604a6a7cd66907fc29e01aacf2146f17fa19d34)
(cherry picked from commit bc3c7f2557a1871fb1e41fc9cac4426a6b208901)
Conflicts:
sc/source/ui/cctrl/tbinsert.cxx
sc/source/ui/inc/tbinsert.hxx
Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16773
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
|
|
regression from some 16->32 bit listbox limit changing
Change-Id: I045eeef935afed4154fe11bfd11916c2d6a722e9
(cherry picked from commit c51d5706205cd0282c07d778ffac5f265c3eaf5f)
(cherry picked from commit a8ddd3b0280baa1b770f439fbbca9ff073faa16b)
Reviewed-on: https://gerrit.libreoffice.org/16699
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
The inactive pageindicators had the same grey like the active ones, I correct
this and changed the dark grey into light grey.
Change-Id: Iea810d466504ceb80750c45358a01f8b8d3c8b9e
Reviewed-on: https://gerrit.libreoffice.org/16621
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-on: https://gerrit.libreoffice.org/16750
Tested-by: Yousuf Philips <philipz85@hotmail.com>
|
|
Writer doesn't support foot or endnotes in TextFrames, so they are not
supported in OOXML floattables, either. In the past, floattables were
imported as normal tables, that's how this worked. Restore the old
situation till the core limitation is there, so we at least don't
regress.
(cherry picked from commit 2fe248f2b36d541c0d243a620c217058a50a9d5d)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableHandler.hxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Change-Id: I4eb62617e3131176f7371e9ca69f11bc9e948a0b
Reviewed-on: https://gerrit.libreoffice.org/16690
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ic3ba292e28fe12d7dcc2c2e67aeea48a4c8aaac2
(cherry picked from commit b161552bd9f7d6b6de9752e4f0e7d6f65bbcf42e)
(cherry picked from commit ea228fdffd17b87e398216625213a691fcb34825)
Reviewed-on: https://gerrit.libreoffice.org/16714
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
IMDeleteSurrounding is used by input methods to take multiple
keystrokes and convert them into a special character. Then the
composing keystrokes are removed.
Before this fix, the cursor placement was not adjusted,
so the special character was inserted in the wrong position
and if 3+ keystrokes were involved, the wrong characters were deleted.
Also fixes "editLine should have focus on accessibleText init."
The first time an accessibleEdit is created, it didnt recognize any
focused text when editing in the "Input Line".
Change-Id: Ib2608c46bba1c84bb49aa29619a004c125a3bf98
Reviewed-on: https://gerrit.libreoffice.org/16637
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
... in Writer.
This (partially) reverts commit ebabf6d1fa648d62dd63529e9fe64dcb631caee8.
I did not see the point to open Fields dialog by default, but other uses
are fully valid.
Reviewed-on: https://gerrit.libreoffice.org/16221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit a2716e53c140b09d886591a3d6611ee8f166e417)
Change-Id: Ia06803fbb956266fb40c53f51099f9a32ddd6548
Reviewed-on: https://gerrit.libreoffice.org/16693
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
2 changes for the 2 following bts
First bt: see https://bugs.documentfoundation.org/attachment.cgi?id=116883
Second bt: see https://bugs.documentfoundation.org/attachment.cgi?id=116888
Reviewed-on: https://gerrit.libreoffice.org/16557
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit cb813b392d1f59ad8927b87e899d8a33d1db2504)
Change-Id: I92ed3b7305bb5b714532f2dcffd615a8337db8b6
Reviewed-on: https://gerrit.libreoffice.org/16618
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
This reverts commit 6c84442f99de109b585d3ba8964deb8dcf261c0f.
"tdf#87820 Images not displayed properly in Calc"
and replaces it with an alternative solution
Change-Id: Iecb560d43767f0e41e442a307eefcdcecb7589ef
(cherry picked from commit 2d196d0ee26b3840e56ec6537066a3b4a2f08691)
(cherry picked from commit 72da6ef835982e1927fd7405bb42f403c2fee5f9)
Reviewed-on: https://gerrit.libreoffice.org/16574
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I70218bc41df0d56ab42d652aa7ac51733dc06f4b
(cherry picked from commit 71dba79c1c84d693a59c53a8965caef0ddd1c2cc)
Reviewed-on: https://gerrit.libreoffice.org/16496
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
... that take relative/absolute addressing and sheet 3D flag into
account to be fed to reference extension via range operator.
(cherry picked from commit fb6dd2a73074b9695bd8ddf7ba40f1819b03024e)
properly inherit relative and 3D flags when extending, tdf#83365 related
Commit 194e9f9bae28bdf22a9ed4779c1656ee693f3302 oversimplified things.
(cherry picked from commit e503addfbbe45efe1a3c06392c66fb79c3c72d07)
Change-Id: Iabe13ae384577e2d71ca87af6482ddccbf7ad0ac
ea6a84c4a7be49af036690afbb1512ae2c1045a2
Reviewed-on: https://gerrit.libreoffice.org/16352
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
A missing seek in the \footnote handler could result in a situation that
the missed text contained a "{" but not its matching "}", which resulted
in the parser terminating earlier than the end of the document.
(cherry picked from commit 7b08304b55cf2284a3c583426c60baef618ba206)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I6df476b2d6397dfa918111b33854dc2f95fbe81d
Reviewed-on: https://gerrit.libreoffice.org/16501
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Try to resync shared group top and length.
Change-Id: I31bd0db7c1dceb880a22274edc4c3f20ce253095
(cherry picked from commit d8541c2a62121894bf87c91f1f89aea1ea30d680)
Reviewed-on: https://gerrit.libreoffice.org/16533
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Iac8574329c8c8e0bc0ac956993ccdd085372a6cc
(cherry picked from commit 5e83f49e5d62587f427ad416f5188ce81506c05b)
Reviewed-on: https://gerrit.libreoffice.org/16598
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I214f49ada17ddb350586426085d27290ad46ee61
Reviewed-on: https://gerrit.libreoffice.org/16605
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
No trailing characters must be present in 1:1 or A:A full row/column
references, e.g. 2:2,2 is not valid. The original cause is the lexical
analyzer that accepted 2,2 as the second part after the range operator
because ',' is also the group separator here, which needs further
changes.
Change-Id: Iff354469f7dcb4e0b6fa645c39cc1f8ebad4a6ea
(cherry picked from commit c48af2b55a60492565b987ee65d98edc6bd94533)
Reviewed-on: https://gerrit.libreoffice.org/16490
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ib00273452a67bd535e2f879d9801ae611e42cc7e
(cherry picked from commit 42713c52c6e145362e0d1409d2db1bb1f048b1c3)
(cherry picked from commit fc61dbd5fa32307081a26a1223ca3db65892bf44)
Reviewed-on: https://gerrit.libreoffice.org/16427
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit f7a7a9dd84d1cd8b49d59e1fb1853ea7e9f40edf)
Conflicts:
sal/qa/rtl/strings/test_strings_replace.cxx
sal/rtl/ustring.cxx
(cherry picked from commit e36ca8d3c69d0c08ad28ceea278b05a0af81e102)
Conflicts:
sal/qa/rtl/strings/test_strings_replace.cxx
Change-Id: I745b09d8a248f08afdd3387f4cfcf69d71ec3c39
Reviewed-on: https://gerrit.libreoffice.org/16465
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Project: dictionaries 8f512198b9765c6ed422ad2e1d4ca82427d22264
tdf#91675 updated Catalan dictionary to version 3.0.0
Change-Id: Ie69743104482732bf6893d42240d3f6f314ffbb4
(cherry picked from commit ab55a4aa9fc37997d69ab8a372baa68031a0866c)
Reviewed-on: https://gerrit.libreoffice.org/16443
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I4f0b2e8a36bdb385abea1843b2a84b03553f0126
|
|
commit 9f01951b858453684f2622541af0eb85d4544fc6 also did the extra
Remove/Add for Draw fly objects, and it turns out that that's actually
wrong because SwTextFlyCnt::SetAnchor() will set the anchor without
locking anything if it's a Draw object. Replace it with a different
hack in SetAnchor() that applies only if it calls LockModify().
Thanks to Varun Dhall for creating a reproducer document.
Not sure if the LockModify() could be replaced completely, perhaps it's
just an optimization to avoid re-creating layout frames for the fly.
(cherry picked from commit fae87e03ea3829718ec0381ed3b04ceb52c23720)
Conflicts:
sw/source/core/txtnode/atrflyin.cxx
sw/source/core/txtnode/thints.cxx
Added test for redline with as-char frame
fixed by commits 4dd2e61 and fae87e0
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f36ac1aa3bef5ba218f3dae24f260ce7e4afba95)
Change-Id: Ib3236f289c2c4202d48ac378a53ce02130d4ce2c
Reviewed-on: https://gerrit.libreoffice.org/16323
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|