summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-06tdf#96234: Type Formatting, Primary key checkbox may be checkedcp-5.0-12Julien Nabet
Right click on a field in Type Formatting (Base, paste a table from Calc for eg) makes a popup which takes into account now if the field is a primary key or not. Handles multi-fields primary key, too: the selected fields must be exactly those in the primary key, no more, no less. Cherry-picked from: b0658929bea09386f524879228b35996375537f4 Change-Id: I545b946bccd3fc02f4f6c3bdb99f914d181a3d40 Reviewed-on: https://gerrit.libreoffice.org/20410 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit c21d081d0d3a66f0b7695c6c82910a7f0b588af2)
2015-12-06Resolves: tdf#96072 export Chart format codes in Excel notationEike Rathke
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/20249 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 446a3a06098ef75c034ae00e6671255973e7e5a0)
2015-12-06tdf#94138 Use correct fonts for multiline edit when printingTomaž Vajngerl
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/20332 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 52fe817a32bf69417563e0b66d451e8fca19d212)
2015-12-06tdf#83126: Find All: Don't ignore Search Direction Rows/Col optionJulien Nabet
bAll (ie "Find All") seems a little tricky for GetBackward but not for GetRowDirection method Change-Id: I47d2b378fb493bcdc1ad30902a3a677eedc50789 Reviewed-on: https://gerrit.libreoffice.org/20067 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 71f0e4e5e2efee05bccf13698752e84f5059db5f) Reviewed-on: https://gerrit.libreoffice.org/20105 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit eea70492fb19b2dbd6edc0c37a2b0ed81b3ead5c)
2015-12-06update creditsChristian Lohmaier
Change-Id: I41b0ce2a024d7cc850fb7a380c992167fa004e72 (cherry picked from commit 44286a37cbb811661819e06ef5ab22cd89cde357) (cherry picked from commit 3e9a4df68232855de64ef5fe63db8d3e02c74c66)
2015-12-06Resolves: tdf#95629 quote CSV also if cell contains embedded '\r' CREike Rathke
Change-Id: I37fb62a53338a7edcac1c72153eefcee6096e6f9 (cherry picked from commit 129935443cfd9378e1263489fc4bf47aee1f1a46) Reviewed-on: https://gerrit.libreoffice.org/20340 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f7d37735bbe1ba2aa11fd5d0b4abee0fe088471a)
2015-12-06Resolves: tdf#95748 no group interpreter when calculations are runningEike Rathke
(cherry picked from commit d46203b55d92185ab2c1d3ac79761100d26aaee3) Conflicts: sc/source/core/data/formulacell.cxx Change-Id: I17283fc5e39da2d7222c302dd63522df69d0ad96 Reviewed-on: https://gerrit.libreoffice.org/20328 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 e389e2b2d9bc87e451628e6f3f227d0eb781cf8b)
2015-12-06unnecessary include brings in boost headers that are broken under rhel-7Caolán McNamara
(cherry picked from commit 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b) (cherry picked from commit 7587f8bab881303f77864dae03999048e43c642f) Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57 Reviewed-on: https://gerrit.libreoffice.org/20354 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a18fed7db4f4a5cd85b08dce516a38e874758be6)
2015-12-06Resolves: tdf#95960 displaced field value in user-defined propertiesCaolán McNamara
Change-Id: Idc9e8fd0c35de48a2366dca3850bcc4e69ef997f (cherry picked from commit afc565bf26464a4999b45d8bc57545fa1ff534e5) (cherry picked from commit 46c5197feec5e64544433f2d6e22cf986408552a) Reviewed-on: https://gerrit.libreoffice.org/20368 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 69725ffe0d17811984c8d52073262b5e76ae7080)
2015-12-06tdf#75256 - sifr updatesMatthias Freund
Change-Id: I222bd8bb4c647c2c7d2a673b95e4c9be3234ef86 Reviewed-on: https://gerrit.libreoffice.org/20273 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 224ceff5f2c64ff47f4e687ac674d0a320bb9872)
2015-12-06xmlsecurity: fix DrMemory warningMichael Stahl
Presumably that was the intent? (cherry picked from commit a933990a3f24f7c3ed40500f782f6fcb25462824) Change-Id: Ibfca90041d6913827d2f329bab448afe4d725b46 Reviewed-on: https://gerrit.libreoffice.org/20289 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 3faec544285e898c87cbeb37ef787d698d617bb6)
2015-12-06rhbz#1286416: Be more resilient during auto-recovery attemptsStephan Bergmann
...called from within the signal handler, so any bets are off Change-Id: Iedb5c7bc8d08350e5f3e3118c6713f5c25b238b6 (cherry picked from commit 9b3ca276dae6f8d4f337c78e64ed6b7f7e7662ef) Reviewed-on: https://gerrit.libreoffice.org/20282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 85a4677c201c3957db55ddd66506526d908e7947)
2015-12-06gtk3: implement GetIndicatorStateCaolán McNamara
(cherry picked from commit 503864037b2f6b73979f46d11df5d365b81f9dcf) (cherry picked from commit 6408b735283751cf6cacb8c758b99a2d90a9868a) Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a Reviewed-on: https://gerrit.libreoffice.org/20312 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 754990128f177779e3279a3b06bc768ea2954621)
2015-12-06gtk3: glitches because yours truly cannot tell x from yCaolán McNamara
(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)
2015-12-06cui: GCC 4.6 still doesn't do "override"Jan-Marek Glogowski
But you can use SAL_OVERRIDE instead. Change-Id: I2697593606ef3ff63f923e364d0ea7e5661b1b3a Reviewed-on: https://gerrit.libreoffice.org/20297 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 85cabc28b9a762a884972a857a6ac6f70e4bcb56)
2015-12-06try to fix MSVC buildMichael Stahl
Because i'm an idiot i pushed a commit without looking at the jenkins build failure... Change-Id: I8e7a02d6c1d20c2231288ea050986064f1f814c8 (cherry picked from commit b0c13c4927c536e845614f1e7a171b7eed680f35)
2015-12-06Resolves: rhbz#1283426 using vdevs based on now dead physical devs is unsafeCaolán McNamara
This is the same problem that commit 133e04fc1a870c0aad207e82eefeeeceaba5dc6d Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Jun 17 09:23:32 2015 +0100 Resolves: tdf#91880 Invalidate graphics when the gtk window is destroyed not just when the GtkSalFrame is dtored tried to fix, but that just made it more unlikely to fail (cherry picked from commit 26c32cfee9fc9a769adba19f455e4d6c13b6d89d) (cherry picked from commit aab8bed7c0c0cf4d72af7d8a9d84316280887417) Change-Id: Icba750c787adb6cd5c5ed0874ef07e6201c4cf25 Reviewed-on: https://gerrit.libreoffice.org/20231 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 43697500af7649ef74cf6bf4bb78abe2e99fed63)
2015-12-06tdf#94689 fix crash on new file, close file, open fileLászló Németh
partially cherry-picked from the commit 187445b2d2885ced92be37ffb11cd2a9bb11f8d6 Change-Id: I9e74fb41448c6be0b8daa6c0f8a0e207be0be6d6 Reviewed-on: https://gerrit.libreoffice.org/20250 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 6d101b6296962b444f535eeb2ff37580dc9bb60c)
2015-12-06Bump version to 5.0-12Andras Timar
Change-Id: I48c23a3c31b527164b365061c2b14a27c392802c
2015-12-06Revert "LOK_DEBUG=1 light red square transparency"Andras Timar
It does not work this way, VCL does not support true ARGB output devices. This reverts commit 79f97ee0135f632431531a07c71d07cd93c9e346.
2015-12-03build fixAndras Timar
Change-Id: I4cfc98bc7bb12b0f327a2b575dfea49483ce6519
2015-12-03LOK_DEBUG=1 light red square transparencyAndras Timar
Change-Id: I9782e9012abcde33994a9dde13703885f2ab4d42
2015-12-02svg export: no more an experimental featureMarco Cecchetti
Removed experimental feature check. Single slide exporting works as for multi slides exporting. Change-Id: I3b4f100f5ab9c76896e7f52d65ec27c364216c21
2015-12-01tdf#95614 fix freezing with linked graphicLászló Németh
When an unloaded linked picture comes into the visible view (including repainting a page), SwNoTextFrm::PaintPicture() starts a thread to load it in the background using the TriggerAsyncRetrieveInputStream() method of the graphic node. To avoid to start a second thread on the same graphic node, TriggerAsyncRetrieveInputStream() checks mpThreadConsumer, the graphic node member variable for the possible thread object. The problem is that when the thread finished and SwGrfNode::UpdateLinkWithInputStream() reset mpThreadConsumer, the graphic object of the graphic node is still in unloaded state (its type is GRAPHIC_DEFAULT or GRAPHIC_NONE instead of GRAPHIC_BITMAP or GRAPHIC_GDIMETAFILE) for a while, because its modification is solved asynchronously after several SvFileObject::GetData() calls. In the intermediate state of the graphic object, with the high priority repaints of the new scheduler, PaintPicture() could start new thread to load the image again. Using the new member variable SwGrfNode::mbUpdateLinkInProgress, this patch will prevent the graphic node to start newer thread unnecessarily. Change-Id: I9433f0fa4613294103a00a3955fc2f35d8863b59
2015-11-29Bump version to 5.0-11cp-5.0-11Andras Timar
Change-Id: I3f71be2a9ee0184382acf4a378882090af737d31
2015-11-29svg-export: text animation didn't work - fixedMarco Cecchetti
That was due to 2 problems: - The namespace for an animation attribute was wrong - For debug build the bullet placeholder is not the first child Change-Id: If10c362f6fcffd4a05164cc5ca3ff6cacf5c28c1 Reviewed-on: https://gerrit.libreoffice.org/20238 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1b26e2ef0a97ded5cc812664ef8455251468e847)
2015-11-29svg-export: slide transition did not work - fixedMarco Cecchetti
Slide transition didn't work anymore since the attribute parsing did not take into account the smil namespace prefix. Change-Id: I779f6408b1eac964f934019d219dc4111debe592 Reviewed-on: https://gerrit.libreoffice.org/20237 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 23f5c03d964c3a069eb692c7a2b1d586c124cfd1)
2015-11-29svg-export: animation sequence was wrongMarco Cecchetti
Animation sequence was wrong due to the priority queue and related compare functions implementation. Change-Id: I359abd087e922ffa0aa4f7770fcc0c9bdb029843 Reviewed-on: https://gerrit.libreoffice.org/20236 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1ed6d1423c7cffa5403dad69a9946ec790a374f2)
2015-11-29svg-export: now animation elements are exported with namespaceMarco Cecchetti
For debug build an assertion failed because of presentation, smil and anim namespaces were not registered before exporting. The JavaScript engine has been modified in order to handle qualified animation elements and attributes. Change-Id: I2415fd59c2d1afddb1c68b708feb62e446ea5252
2015-11-29svg export: fixed issue about text fields and shape bounding boxMarco Cecchetti
- issue: text fields were not displayed; this happened for debug build only: the problem was due to 2 facts: 1) the last fix for text decoration which changes the order in which tspan and desc elements are exported; 2) a workaround implemented for fixing the fact that date/time fields were not exported correctly when positioned chars are used (see commit c0a08eab). - issue: text fields were no more aligned correctly: this was due to the fact that the rect element representing the bounding box of the exported shape is not exported any more: I suspect that the rectangle was present in the generated GDIMetaFile representation of the exported shape. Change-Id: I3cd7b0d3a7f2bde8bfd8b933297cbdd7b90e6567
2015-11-29tdf#95356: unit test about text decorations for svg exportMarco Cecchetti
1) Fixed the trailing space issue in text decoration attribute value. 2) Changed the SVG export suite in order to make it more reusable for other tests. 3) Added a unit test for testing that text decorations are exported correctly. Reviewed-on: https://gerrit.libreoffice.org/19870 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 50506421f29d09fa4c44c46c3d60208a64a1c450) Conflicts: sd/qa/unit/SVGExportTests.cxx Change-Id: I2bd71974242a0007726fbdd5ef5637a9ec62fd47
2015-11-28Ctrl+3 keyboard shortcut for Set Optimal Column Width in CalcAndras Timar
Change-Id: I1e218a429b509fda35accc832d01fc1f12e8dddd
2015-11-28fix baseline build (old cairo) - 'cairo_rectangle_int_t' does not name a typeChristian Lohmaier
Change-Id: I723122069541bc5752164554e693268267969b1a Reviewed-on: https://gerrit.libreoffice.org/20240 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 8375e38606aba289e2be09bda43a47ecede54864)
2015-11-28update creditsChristian Lohmaier
Change-Id: I6f999f36d6ef57dadddd774e6ef60ceb9cb8033c (cherry picked from commit 9affe65c4d398c7f34e184b77c62e5ecd522b8f7) (cherry picked from commit 3cf3b0e54d8b4fdec46698e38f97c05627223939)
2015-11-28update emoji autocorrect entries from po-filesChristian Lohmaier
Change-Id: I58d60ee1121fcd1bf84ef998ed9116386dc3c70f (cherry picked from commit 4043ad46e15409ad9f4e5a98ff0620c3b3bb648d)
2015-11-28tdf#78902 VML import: workaround for extreme top marginMiklos Vajna
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> (cherry picked from commit d66df3d35030bf725fa7e3d78420344ddd44478c)
2015-11-28regex result offsets can be negative if a group was not matched, tdf#94810Eike Rathke
"(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> (cherry picked from commit a38963a40eed7f1d85767b393a316870c31bff5c)
2015-11-28Resolves: tdf#92687 implement drawPolyPolygon via cairoCaolán McNamara
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> (cherry picked from commit 7eb8f82a493b416203546a5bab6066f3e78fef33)
2015-11-28Resolves: tdf#95352 resize the columns when the edits repositionCaolán McNamara
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> (cherry picked from commit 6213ce4ab8621ad307df25c1fd2bfeb8de5dd1f6)
2015-11-28vcl: OutputDevice::GetTextArray() should always init pDXAryMichael Stahl
CppunitTest_writerperfect_writer file libmwaw/pass/Acta_1.0.hqx uses the font "Courier", and for unknown reasons we can't properly load that font, because the PhysicalFontFamily::mpFirst for "courier" is null. This causes OutputDevice::GetTextArray() to fail to create a SalLayout and return early before initializing the passed pDXAry, which then generates lots of DrMemory warnings. Let's hope the callers are happy about an all-0 pDXAry. Change-Id: I07b29a59660cf5cd060fd77da5d96021f9d8f9f5 (cherry picked from commit e6e409b684f9b046dcde9f0615018508f769c369) Reviewed-on: https://gerrit.libreoffice.org/20206 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 273be431c62aaf5fabe218cae57e8f3f9fe049e1)
2015-11-28Default off OpenGL until 5.1Caolán McNamara
Needs a bit more work, so lets play it safer and default off for windows for now and leave it on for 5.1 This partially reverts... commit 1bc91425e43f8bd30e3dcdec4a30771de54c55c8 tdf#93662 - allow GL by default only on recent drivers on recent windows. Feature for triple review for 5.0.2 - enables GL by default for some subset of very recent GL drivers, on Windows 7+. Change-Id: I7a12540afd9f1889db15810db448db466b35241d Reviewed-on: https://gerrit.libreoffice.org/19950 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 65bdad52a04dc1f5d771bdfdc8bce23e9ba74296)
2015-11-28tdf#61228: Wrong function names in Formula Writer are considered as SUMJulien Nabet
Unknown names make the formula fail PythonTest_sw_python, especially set_expression is ok Variables are taken into account Thanks to Mike Kaganski for his help on this patch. Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2 Reviewed-on: https://gerrit.libreoffice.org/20122 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit d667e3210b12c7ce3b3727e2a0e369a520fbaaa4) Reviewed-on: https://gerrit.libreoffice.org/20159 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 238a02cb567768ff0d7338ddab87441ec5e5d470)
2015-11-28tdf#92272: We need to twiddle the bytes from BGR to RGBTor Lillqvist
As far as I see, the surfaces created in the DX canvas are of D3DFMT_A8R8G8B8 or D3DFMT_X8R8G8B8 format, which means that the bytes (in memory order, on little-endian Windows) are B,G,R,A/X. So if the desired destination wants R,G,B,A, we need to swap the blue and red bytes. Let's hope this doesn't break anything else... Change-Id: I1b90d2cf95418f6557cac633ec6fce27599e8a61 Reviewed-on: https://gerrit.libreoffice.org/20161 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f7d1ea37a557d904caecb080deab162bd70e1a87)
2015-11-28tdf#95783: Don't calculate width of text with glyph fallback as way too wideTor Lillqvist
The old code in MultiSalLayout::GetTextBreak() only makes sense if the base level character width is zero where a fallback level has a non-zero character width, and vice versa. But this is not the case for Windows, at least not any more now when using UniscribeLayout and not SimpleWinLayout. This simple change fixes that: Only use the width from a fallback level if the width at the base level is zero. Hopefully it does not cause regressions for other documents or on other platforms. (But, I repeat, I find it hard to believe that the intent of the code could really have been to ever add two or more non-zero widths for the same character from different levels of fallback and use that.) Change-Id: Ic66c55db4b7463f9e04fcedec76f1c44f5e62e03 (cherry picked from commit a0d112a53023758a28d180ffd12766b4d325bf52) Reviewed-on: https://gerrit.libreoffice.org/20172 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 b8711f6600216ca482627a928099a33612008734)
2015-11-28assign macro dialog: correct event name "errorOccured"Lionel Elie Mamane
"errorOccured" is an English spelling mistake, but is the name of the event, which cannot / should not be changed for backwards compatibility reasons. Spelling was boguously "corrected" in: commit 60a9b5172bcbd90b5764125b76279c189dd5563c Author: Takeshi Abe <tabe@fixedpoint.jp> Date: Sat Dec 4 12:56:38 2010 +0900 Replace all occured, occurance etc. This was leading to impossibility of assigning a macro to that event, since it was not appearing in this dialog. Change-Id: Ib0373501cba8af8f4abb1c62faddf8d65c926a7e Reviewed-on: https://gerrit.libreoffice.org/20180 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5847c76dc3476f565cc40d2506808e6f34cb2f01)
2015-11-28tdf#91288 Does not display traditional Chinese variant ofMark Hung
Noto fonts correctly. LanguageTag()::getLanguage() would always return "zh" despite traditional Chinese were choose. hb_language_from_string() requires iso639-3 language tag except for Chinese, so we use use Bcp47() language tag for Chinese to differ zh-CN and the others. Change-Id: I6700a79a9c49a97d840b430def77741912935f72 Reviewed-on: https://gerrit.libreoffice.org/20027 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 4424daa225e73d291a3fd64d369cdda5857f3d51) Reviewed-on: https://gerrit.libreoffice.org/20204 (cherry picked from commit 48cf2d9fe9eea5e6fae310058b6f705553996635)
2015-11-28Fix tdf#80224 Custom text color changed to black on .PPTX exportMark Hung
1) Write endParaRPr so that PowerPoint display them properly. 2) Original design forbid properites with default value to be exprted, now fixed. 3) Automatic colors are written as white or black based on whether background is dark. Note that tdf#77881,tdf#80520,tdf#89525 depend on this. Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf Reviewed-on: https://gerrit.libreoffice.org/17472 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/19862 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 0b5e3885bc706ed02acac1c682c90171700b0cac)
2015-11-28filter: fix DrMemory/valgrind warnings in PPT paragraph importMichael Stahl
various uninitialized variables in CppunitTest_sd_filters_test hang-8.ppt Change-Id: Id0b9f146a7ab8b5bb2b36a5c2a39d65ee52e122d (cherry picked from commit 78407eea3ddb5717a501d9336e3b3cbef188d010) Reviewed-on: https://gerrit.libreoffice.org/20157 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d130afe6c04dd53b5500e3b9335ca2e615aa6bb6)
2015-11-28fix c++ snafu with msvcDavid Tardon
(cherry picked from commit b1e5983f04095346bee48dc3b413c0ae28789c27) Change-Id: I493b79e70fb8003ce215e602f9b4ce92afa50150 Reviewed-on: https://gerrit.libreoffice.org/20156 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 2dab392c3b72b728245d96ab82f6f591af980efe)
2015-11-28tdf#94810: fix reverse offset mappingMike Kaganski
With simple transliteration, TextSearch::searchForward used to use whole string to perform the search, then started to create substring to search. But it left the precautions from commit c00601dab0f5533b152cd63cec0a89bfec1ba95f by Eike Rathke: searching for $ may actually return a result set pointing behind the search string which it does with the ICU regex engine. The precaution made it to skip reverse mapping if index was 0. Commit 9aae521b451269007f03527c83645b8b935eb419 by Michael Stahl didn't consider the case when nStop is 0, and startPos > 0. Then it tried to get offset[-1]. Anyway, using value of startPos in those conditions seems illogical. Removed those precautions (and made assertions for that). Fixed handling zero indexes. Reviewed-on: https://gerrit.libreoffice.org/19840 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 4cf1d290bab29e18e1312b63ff862f5102e00387) remove comment that makes no sense, tdf#94810 follow-up nStart should not become <0, not even when searching for $ end. (cherry picked from commit 67ab2ce3c6fed2ceaacaad890a7d8683ce0397a7) similar to searchForward() use the correct offsets, tdf#94810 related (cherry picked from commit ce91f3c1292f3e9b84157acf10b67ad9ca16719d) Change-Id: I2066abc51fff7fb7323bc7f6198bdea06439d4f3 79586471f1a7908372fa3ee044a6f66499b1790f cb5a45acaad9029e0998594de8b3dc2e9211866e Reviewed-on: https://gerrit.libreoffice.org/20136 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit 028d7d8476980988e382d7b2fc0782946fbac740)