Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I217c0aedca4eadc347c103899d96c70cf9606038
(cherry picked from commit dbc830aecc722d34971d773470da478ef4c38714)
Reviewed-on: https://gerrit.libreoffice.org/20539
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d4b850fe8bc45bfb018f0a8750e09a436c49d7df)
Reviewed-on: https://gerrit.libreoffice.org/20696
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: Ia6502afde54dbf379bc9951c80c6594f1f436ef5
(cherry picked from commit fbd329800340a496def839181858964b1e3709a5)
Reviewed-on: https://gerrit.libreoffice.org/20579
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 564687e728c98fec5ba6ffa39007793b2b4aa4e8)
Reviewed-on: https://gerrit.libreoffice.org/20697
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ia50ac49c2e86a363ee27be6b8d095339b46e5cf8
|
|
Change-Id: Ibee5fdd8a59b1e06112bc32ee5dad7f1699fae9b
(cherry picked from commit f2070db3f2ad7e0c4b7d7233b5999bcf869226b5)
(cherry picked from commit ae0c350baae629b05b2591a96ae3703a58361915)
|
|
When drawing a multiline edit we need to use a different device
(current window) to get the correct font and adjust for the Draw
method's input device.
Change-Id: I7993790c02d10e4283c7a4e2caefff0c7747e978
(cherry picked from commit 6c41727484a04ab89005ffb052937dae5d7dc223)
Reviewed-on: https://gerrit.libreoffice.org/20398
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
- whenever SwClients are added or removed, the SolarMutex should be
locked
- locking the mutex there would be a performance killer
- thus only DBG_TESTSOLARMUTEX() and fixing the fallout on DBG_UTL
builds
- also fix SwXFlatParagraphIterator
- another missing SolarMutex in Writer UNO
- yet another member of SwXTextPortion needs to be guarded in the dtor
- another missing SolarMutex in Writer UNO: SwXCell
(cherry-picked from:
ffdc5db260b7c17c47109f707b3664a3f3caafaa,
c20930bfec4ce4953ffdaff1971216290fab0e4d,
e61465d25f5e52bf439db65ed7a641722637034a,
453cf8a4c44b7935c3029524bfd40fa9c1d87753,
f019f5d6fe05b15a83a7fea40d9448de2fabb00d)
Change-Id: I1c8413cd0b9baa7f38e452e94f33e29bc4cf6717
Reviewed-on: https://gerrit.libreoffice.org/19856
Reviewed-on: https://gerrit.libreoffice.org/20470
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Change-Id: Ifb43ca3d2512ed1cbc1312db82ed7bcd6200b33d
(cherry picked from commit 2776a6f840f4c015b838648950807a99c6e73845)
|
|
Project: translations 9e4e88df0efb143b397b6d844f8bac7c809ad27a
update translations for 5.0.4 rc2
and force-fix errors using pocheck
Change-Id: I60a7ba91db056f5cffde7d32542f556e031a8293
(cherry picked from commit a4d73b6c9d421623eef51d4ca9907954002cf8dd)
|
|
(cherry picked from commit 7e341379ecec218c0ff2ff0e8db9f14468b125f6)
Reviewed-on: https://gerrit.libreoffice.org/20543
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3b9e2bb22e782d073d8e67ae975ebb8ca5eea552)
Change-Id: I1d4825c2136e516baf759f4b2c40c911547b93d7
Reviewed-on: https://gerrit.libreoffice.org/20545
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
which leads to stack exhaustion when queries,
make m_BasedOnStyle private and replace it with
a call to GetBasedOnStyle which checks that
the base style is not itself
(cherry picked from commit da5e8ba393b8522a8f7501ebeb1e9a98d544a7ba)
Reviewed-on: https://gerrit.libreoffice.org/20531
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 7e5b93bf127aeb83e4ab22e0701b731ec1934253)
Change-Id: I093546793755f8a3a6e8a3c23fb8565ad27b75da
Reviewed-on: https://gerrit.libreoffice.org/20533
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit 2ca429e781cba94608e9838e2c1c50f1e8632b90)
(cherry picked from commit 9401a065d0d53b31427f85a936ef53244ac8a6b8)
Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5
Reviewed-on: https://gerrit.libreoffice.org/20311
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 81aeddfd6ae6f760fd11d73091b5891882dc1d62)
Reviewed-on: https://gerrit.libreoffice.org/20551
Reviewed-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit 66686e443b568ad5aab1b32b3f25eb73487cfef6)
Reviewed-on: https://gerrit.libreoffice.org/20554
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 282b1aa32c27a513eb2858ad6e7e534ef52c1b99)
Change-Id: Iabedfcce9d8ef21172e6bd0d654f3a258aae97e3
Reviewed-on: https://gerrit.libreoffice.org/20556
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit ae94fc5b28105c920b2e9d336f463b27cae5b0e1)
Reviewed-on: https://gerrit.libreoffice.org/20535
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d9f6f9063d34f29eb44d82159c411646dc19c83f)
Change-Id: I2d3369aed4b242acc936a71ee9be573c1ebc7a8f
Reviewed-on: https://gerrit.libreoffice.org/20537
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit 10de96bf0fb820b38607b0c25a0d3219ad343819)
Reviewed-on: https://gerrit.libreoffice.org/20569
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit cb6f34b370da1d45e1c2b945b60cbcaf7b9c3a45)
Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb
Reviewed-on: https://gerrit.libreoffice.org/20571
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I6b2945f1d5a1654f6b5d6a5f5287b4cb9514d97c
(cherry picked from commit d4d247866eac108162f43dae2c6ddbd9c12382a6)
(cherry picked from commit 6a9f91915afbcff71121b3485376ab6f1fdcecee)
Reviewed-on: https://gerrit.libreoffice.org/20597
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: If83e255da1683779458556a3ab1af4f00b19265b
(cherry picked from commit 8c67b1b51f21643036c5f5371a6af0a4558e7da2)
Reviewed-on: https://gerrit.libreoffice.org/20548
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ic7cc6c807905e0c4ffbf2a3f009b27be6100cdf0
(cherry picked from commit 0cde3ca230364492aa6b7f634b97178164268728)
Reviewed-on: https://gerrit.libreoffice.org/20542
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I7416d709de79ae88cf4a9546d8adfecec9935238
(cherry picked from commit 80297dd0f21bfeaa9bae09cacfa29ab2eee64c09)
Reviewed-on: https://gerrit.libreoffice.org/20530
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Iae617e9731dbdcedf8aa6bf02977911dce60bdd0
(cherry picked from commit 9d2a1c48b4a39967bc21776b471f1a4eca735cb6)
Reviewed-on: https://gerrit.libreoffice.org/20527
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I173b12f0a28f917f24d1923e531da1b798beb1f6
(cherry picked from commit d34cbe279cc8e1db941a4da1130d5a6d7429357d)
Reviewed-on: https://gerrit.libreoffice.org/20524
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Id5295d294b56d6504d962ee1941a350a595031e7
(cherry picked from commit c8b4fe55b8b50fc33a9157e93b42aed0f7d30534)
Reviewed-on: https://gerrit.libreoffice.org/20521
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I1c6b58b58ab489a17419dbf7cd4ecec63359b7f3
(cherry picked from commit 0f700d5bc9c0ebc1e1ebe60758fbbf02590790bc)
Reviewed-on: https://gerrit.libreoffice.org/20517
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I226f67c6c49bfcbc1fa0ef40fc9f7d5548fa043b
(cherry picked from commit 6c59adca37900dccc394061a730984ecb180aacf)
Reviewed-on: https://gerrit.libreoffice.org/20512
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I6ac074c7fe2821983b4a056e28fc5379f7a93974
(cherry picked from commit 130eaf02de89c8996ff6e817a005993dcbd586e6)
Reviewed-on: https://gerrit.libreoffice.org/20565
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ie7f4cd2b411eb678642ea859d261b1b672752d94
(cherry picked from commit 08fe513b89ea5102a3a233ee0bac472dc8e6b219)
Reviewed-on: https://gerrit.libreoffice.org/20568
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I9147dc2bab312639a04d2e822cf99745d38d3b8d
(cherry picked from commit 22ee3194c930682ad8ac7f994084e877aa00d191)
Reviewed-on: https://gerrit.libreoffice.org/20575
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I1149eb9f5946228a2448c121e7ec7211861b3b3d
(cherry picked from commit 65deab68f7918c82026951b04a414eefee2683b2)
(cherry picked from commit 84facdc8305f1d00f661e58aa0c474c7233d47dc)
Reviewed-on: https://gerrit.libreoffice.org/20594
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I11f6381374c7fc12374cd5089e581ddc777005e2
(cherry picked from commit c732a1ae8cc0cc94bfeddba243657a0b9e52a0f9)
Reviewed-on: https://gerrit.libreoffice.org/20581
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I04809443b5dc50904654936e608360b57c2e85c3
(cherry picked from commit 215516a52fd01170bb4a79828b0f0948884b727a)
(cherry picked from commit 6c296afad6b04328a596a92326aa50b1b480aba0)
Reviewed-on: https://gerrit.libreoffice.org/20585
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I43e195df570990f21c780311a98be64b682e5315
(cherry picked from commit 338c6ba3a0983009cfd1faff52ac56d6ea092d6f)
Reviewed-on: https://gerrit.libreoffice.org/20583
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ib08403edf805367c7392325fcfb66bc7ed4d6f6a
(cherry picked from commit 713d737b1ff73e76c6543198ce9299e1c83ac147)
(cherry picked from commit 5f469a2a1af8bff36fc3a5849a1500345febdba4)
Reviewed-on: https://gerrit.libreoffice.org/20587
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit 0c876483d278e3e5ba43e9eaf40ca713b6099703)
Reviewed-on: https://gerrit.libreoffice.org/20576
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4bc26e006dd4bde95eef706de43228679a41c4f7)
Change-Id: I4bc7a7283f63124ccb50957ea64791644e01e267
Reviewed-on: https://gerrit.libreoffice.org/20578
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
(cherry picked from commit 36d55980b1b3498fecc460d3c46667e5f5a17b8e)
Reviewed-on: https://gerrit.libreoffice.org/20504
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d387a99fce3f96f4fcd60c70909292255f12840f)
Change-Id: I3af47ab3af5e28a865a77a592f6a92edb46e4f2b
Reviewed-on: https://gerrit.libreoffice.org/20506
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: I788ec28424bb638f727901b7d25e48a284ab67d0
(cherry picked from commit 356109d4ead137ea22b358b20ed22a4bd09d35f6)
Reviewed-on: https://gerrit.libreoffice.org/20509
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: I214991e5d34c8e335cdd8ea482f8fa4913ba637b
(cherry picked from commit c88a23b9d44118e96de41a70ab7f87eb0aafb126)
Reviewed-on: https://gerrit.libreoffice.org/20503
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: Iad2788a7e5e7ee3b3107eab37cde2d3d38eae005
(cherry picked from commit fc943ea85a7924ce0552b08eef99ed8e02f0b965)
Reviewed-on: https://gerrit.libreoffice.org/20497
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: I02e507f4b7d78efacc5b735ca24adb83633749b9
(cherry picked from commit dcbef55a111405b4540856bf6910f81bce9785bb)
Reviewed-on: https://gerrit.libreoffice.org/20480
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I41b8514a127d463ac951e5855f09416fa0456b1b
(cherry picked from commit 85a2cd37fc60cd53a892b27a18d4b5272988361c)
(cherry picked from commit 34a03c676e618200292f187f8f96b74f23c962b5)
Reviewed-on: https://gerrit.libreoffice.org/20472
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
|
|
This is a combination of 4 commits.
Omitted are 2246f478e2505388ab253d08a1d86b897251223b and
7340872a3450e38a7f820945585a9ee60b2a9d41 that replace the Calc code with
calling the new SvNumberFormatter functions.
introduce SvNumberFormatter::FillKeywordTableForExcel()
... to conflate the places that do this on their own.
(cherry picked from commit b55548043e969a6aa4c211217cfc3fb85d50d2da)
use proper case "General" keyword
... Excel doesn't seem to care though.
(cherry picked from commit ea1db935b085507f11d05f8606a680d521db4838)
introduce SvNumberFormatter::GetFormatStringForExcel()
Taking implementation from sc/source/filter/excel/xestyle.cxx
GetNumberFormatCode(), slightly modified to ensure valid conversion and
force en-US locale data. Also don't unnecessarily convert if format is
for system locale and system locale is en-US.
(cherry picked from commit 2011b5412c4daa47bc5624a2efc996960e19c2a9)
Resolves: tdf#96072 export Chart format codes in Excel notation
As for the change in chart2/qa/extras/chart2export.cxx
Chart2ExportTest::testAxisNumberFormatXLSX() unit test: also Excel
writes string parts of format codes quoted, including minus sign in
negative subformat.
(cherry picked from commit 509cfa40691cf544519872a63335cff4a4d94006)
3697a808d8fee2417f0b0e03dba2b94ceea133dd
9223eaa655132b4106a35c94cb0005559d7575b1
201bb012df818129cbc65de0eee8eca59e57d829
Change-Id: Idde2173780e0515ad982b4be46fc4df23a7577ad
Reviewed-on: https://gerrit.libreoffice.org/20256
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: I41b0ce2a024d7cc850fb7a380c992167fa004e72
(cherry picked from commit 44286a37cbb811661819e06ef5ab22cd89cde357)
(cherry picked from commit 3e9a4df68232855de64ef5fe63db8d3e02c74c66)
|
|
Change-Id: I6249d979d9737610ceacfebdb38524f360e24dca
|
|
This is 'libreoffice-5-0-4' - the stable branch for the 5.0.4 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.
If you want to build something cool, unstable, and risky, use master.
Change-Id: I71ce94cc580bb7283cf61f8fc16151a38ca260da
|
|
Change-Id: I723122069541bc5752164554e693268267969b1a
Reviewed-on: https://gerrit.libreoffice.org/20240
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
Change-Id: I6f999f36d6ef57dadddd774e6ef60ceb9cb8033c
(cherry picked from commit 9affe65c4d398c7f34e184b77c62e5ecd522b8f7)
|
|
Change-Id: I58d60ee1121fcd1bf84ef998ed9116386dc3c70f
|
|
Project: translations 6d28ea63432c6b5844f224f68276096be053c1a3
update translations for 5.0.4 rc1
and force-fix errors using pocheck
Change-Id: I4d6d82a8ed09f9eb5874108b27ab758455a13566
|
|
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516:
DOCX import: fix context stack when importing header/footer, 2014-03-05),
though that just made an existing Writer layout problem visible.
RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those
import pictures as sw graphics, not draw ones.
<w10:wrap type="through"/> is normally mapped to our page wrap (as it uses
"through" in the "not only wrap around, but also in the holes of the shape, if
it has any" context, not in our "text should go through it, so no wrapping"
one), but for some reason in this case (most probably due to the extreme large
negative margins) Word handles the situation as our through, i.e. the text
should not go to the second page, as it would normally happen with a "Word
through" wrapping.
Work around the strange situation by ignoring the wrapping request for extreme
top margin values.
(cherry picked from commit 37b5f1ed3139b8569bfec0fcb5077f6b66b79acd)
Conflicts:
oox/source/vml/vmlshape.cxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937
Reviewed-on: https://gerrit.libreoffice.org/20212
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
"(abc)|(def)" matches "def" with result offset sequences
{0,-1,0},{3,-1,3}
And thus the assert() calls introduced with
4cf1d290bab29e18e1312b63ff862f5102e00387 and
ce91f3c1292f3e9b84157acf10b67ad9ca16719d were hit.
Change-Id: I571b6c7d47349a2cc7b1d1e34193b2865012a49f
(cherry picked from commit 4dd2d40673299966ad639d799e925e64ae5560cf)
Reviewed-on: https://gerrit.libreoffice.org/20174
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
|
|
modeled on the quartz impl
(cherry picked from commit 742da70e6dd2407641835cbcac54b09aeddcb9db)
Change-Id: I2f6776c14c7350954932df2bffcca36172f13473
Reviewed-on: https://gerrit.libreoffice.org/20083
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
instead of assuming they are in their final position when the
top level dialog resizes. Cause there's a timer/idle involved
so the final position isn't known yet
(cherry picked from commit d4d4e00a5a449bdf46608ce0cecbfa07c340e555)
Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca
loplugin:vclwidgets
(cherry picked from commit 4882664e39718109e2ae80348da8b914eb8b2ae6)
Change-Id: I3e5d88bdc2ecae6164c75da8ddf1b8cfe0ed325f
Reviewed-on: https://gerrit.libreoffice.org/19796
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|