summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-26Version 4.1.4.1, tag libreoffice-4.1.4.1libreoffice-4.1.4.1Christian Lohmaier3-0/+0
Change-Id: I62199bb1704cae8987b0ff5df86851fcd4fc67c0
2013-11-26bump product version to 4.1.4.1Christian Lohmaier1-1/+1
Change-Id: I104a0f0c8f2ca132fec71d01bd019e0331e75b23
2013-11-26Branch libreoffice-4-1-4Christian Lohmaier3-0/+0
This is 'libreoffice-4-1-4' - the stable branch for the 4.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8b57a18b4c343a66fb61da2b33a90bc4c9aa7c66
2013-11-26Updated coreChristian Lohmaier1-0/+0
Project: translations 1815e3c04d6ee25edf53281df533c019881ea58c
2013-11-26fdo#62442: Move the InfoPlist.strings files into the app from langpacksTor Lillqvist3-11/+38
The digital signature of an app bundle includes an integrity check for the Resources subtree. This is the normal place for Mac apps to have their read-only non-code "resources". In LibreOffice it is currently not much used, though. The signature thus breaks when a lang pack installer is run and plops its InfoPlist.strings file into the "Resources" subtree. This file contains translations of strings in the app's Info.plist file. For LibreOffice, it contains translations only for some of the file type names in Info.plist. (Why only some, I don't know.) Files installed by a lang pack insaller into other locations in the app bundle don't harm the signature. Making the InfoPlist.strings files be distributed as part of the main app bundle instead of in langpacks should keep the signature valid even if a lang pack is installed. The InfoPlist.strings files are small so the size of the main app should not grow significantly. This required introduction of a new functionality in scp2: The possibility to generate a list of several complete File or Directory stanzas, one for each language for which translations are being built. (This is different from the existing functionality, used for files that go into lang packs, where a stanza contains several Name or HostName attributes (or whatever the term is) where the attribute names are qualified with the language code in parens.) Change-Id: I3afd9b08944fe1bccb5f0c881d740d260f589e39 Reviewed-on: https://gerrit.libreoffice.org/6251 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2013-11-26Resolves: fdo#41169 fix MacOSX non-Latin keyboard layout with Latin shortcutsCaolán McNamara1-0/+37
Change-Id: I168de52d6185d5df9c41fd2d7a68c0ff3f733852 (cherry picked from commit 82b5172954261e030a42bd6b3f4acc99807d0ee5) Reviewed-on: https://gerrit.libreoffice.org/6798 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2013-11-26set a 23 enigma timeout at RegexMatcher, fdo#70627Eike Rathke1-2/+24
Change-Id: I390bfec0d36dcc9529785e97994dad2b0704dc80 (cherry picked from commit d838ea200e7d6060d4a759616f9e1fcbf3c36c8e) Reviewed-on: https://gerrit.libreoffice.org/6808 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-11-25Related: fdo#41169 fix GTK non-Latin keyboard layout with Latin shortcutsCaolán McNamara1-22/+45
See also rhbz#958300 Change-Id: I5c3cf9652adb7b1c9ec53a32ed39f231a09ae1d7 (cherry picked from commit 8cef6c7ec67aec88b339ca647e784afbabf190f8) Reviewed-on: https://gerrit.libreoffice.org/6759 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> Tested-by: Khaled Hosny <khaledhosny@eglug.org>
2013-11-25rhbz#1030009 Remove global XModel refStephan Bergmann1-7/+0
...that is apparently effectively unused since 2627bdaddc6f694dc7fc6ba347a305af0f88ee2c "INTEGRATION: CWS fwk02ea: #i28639# always used supplied status indicator" anyway but causes crashes during exit when it holds an SwXTextDocument ref. Change-Id: I542545c793855b41731de72650bf07d5748fcb9f (cherry picked from commit a7464edb0a4368db02b1298b5710cf98b17e282b) Reviewed-on: https://gerrit.libreoffice.org/6804 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-25Resolves: fdo#67263 CRASH when deleting applied bulleted paragraph styleJulien Nabet1-1/+1
Change-Id: I70dc18363480e6c07577a93279ddd083631f6cc3 Reviewed-on: https://gerrit.libreoffice.org/6702 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 899c5ea9dc3c34892edfde642510514779132910) Reviewed-on: https://gerrit.libreoffice.org/6755 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-25fdo#70345 Reuse XStream for Windows platform create a new one for others.matt_511-4/+17
Reviewed-on: https://gerrit.libreoffice.org/6580 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3d12549335229aca1a6a57575292111274709992) Change-Id: I911c24b82b55445c6f95e14be29759e2fe3d9dfd Reviewed-on: https://gerrit.libreoffice.org/6761 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-25fdo#67742 Avoid autocorr of "--" before "-"Laurent Balland-Poirier1-0/+5
LibO 4.1 now uses '-' as word separator for AutoCorrection Then the sequence "---" is detected as word "--" and autocorrect as "–". This avoids autocorrection of "---", as word or as border This commit detects the sequence "---" and report autocorrection. Modified for LibO 4.1 (OUString => String) Change-Id: I1342c2ff83dd42683e683b3bb27280d61179b9a2 Reviewed-on: https://gerrit.libreoffice.org/6747 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-25fdo#67802: Fix PS printing of non-CTL text with ligaturesKhaled Hosny1-7/+5
The GlyphSet::AddGlyphID() was messing with glyphs of characters that can be converted to Windows-1252 encoding, discarding whatever glyph it was asked to use and using a random glyph that is supposed to belong to the converted character. For ligatures this means the ligature glyphs was discarded and the glyphs for its component was used, but this broken for just any glyph substitution. The code makes no sense at all, apart from the fact that it is verbatim copy of GlyphSet::AddCharID() since 9754ad8d979557ea03cbfe04708b62b698d1276c and just happened to work because we did not enable ligatures and other typographic features for non-CTL text before. Change-Id: I764f0b40f8acf61eae38a9038b0666d711c04a9d Reviewed-on: https://gerrit.libreoffice.org/6762 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-25Correctly check getFileURLFromSystemPath() successKhaled Hosny1-1/+1
Change-Id: Iadc34171235fec2d6aafd601f62a0bff8ed5b3ee Reviewed-on: https://gerrit.libreoffice.org/6770 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-25Make TTC fonts work againKhaled Hosny1-10/+4
osl::File::getFileURLFromSystemPath() does not return a boolean. I wonder how this worked before, if it worked at all. Change-Id: Iadc0e06236f43c24cbcd42e4fd79ac9116a58c13 Reviewed-on: https://gerrit.libreoffice.org/6769 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-24cp#1000016 DOCX/RTF import: fix RemoveLastParagraph() on WindowsMiklos Vajna1-0/+4
(cherry picked from commit a56bfe734a7bed40a175e0eeb7e86e7006a83f83) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I3f9d69ddbb2144c60a724e4242128b65ae167455 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-22resolved fdo#38592 do not insert extraneous parameter in importEike Rathke2-8/+9
Importing already a Calc-only number of parameters do not insert extraneous parameters. (cherry picked from commit 4b9304ecdd067307e24e4388fe1addcab9e85bd0) Change-Id: I011e3df24573fce9f2788c9311089af984650220 Reviewed-on: https://gerrit.libreoffice.org/6764 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-11-21fdo#69500: Revert "fix bug #60700 - de-crutify ODF files"Andras Timar1-1/+3
This reverts commit da06166015689eca260c702602bef4cea58afbd3. Change-Id: I8f88b68a9ab7bd8c95aad90984ddca20e3ca9d13 Reviewed-on: https://gerrit.libreoffice.org/6709 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2013-11-20fpicker: cleanup async requests, dung out comments.Michael Meeks2-28/+21
Change-Id: I016145d315ae1c4b5376e43583e2546a2b7f7b07 (cherry picked from commit acc0fcd96c940e42da27bb58ba1c89ae5de5a5b8) Reviewed-on: https://gerrit.libreoffice.org/6736 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2013-11-20Writer : Fix fdo#71694 by clearing old anchor frame before setting newArnaud Versini1-1/+2
Needed as otherwise AnchoredObjects can be in more than one SwLayoutFrm. See also 7eae50f9ff5877ef880be9a85d3f7e52b1fec49f ( Access by AnchoredObject of a deleted SwLayoutFrm ). Change-Id: I54582d6f9fb8b6f853352af27706faabe610874b Reviewed-on: https://gerrit.libreoffice.org/6720 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7726339a648ac94bb7c365950f23dabec5aa52e7) Reviewed-on: https://gerrit.libreoffice.org/6732 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-20fdo#67060 do not package RPM-only install script to DEB packsAndras Timar1-0/+6
Change-Id: I90c74f0d00804b80daeca2c69d1f12e094243a81 Reviewed-on: https://gerrit.libreoffice.org/6734 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-20fdo#66854 keep shadow distance of non-supported MSO shadow typeAndras Timar1-1/+4
this is a slight improvement of d7367b709dc4e97714fb2084b872a96389e768fb the rendering of star from #i119634# bugdoc was kept the rendering of the yellow circle shadows from fdo#66854 bugdoc was improved Change-Id: Ife53328ef665131fb954eb33c2e8269ad10da0fe Reviewed-on: https://gerrit.libreoffice.org/6719 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20n#828390: Export subscript text.Muthu Subramanian1-0/+13
Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-20added date acceptance patterns to Canadian locales, fdo#71664Eike Rathke3-0/+9
Complete set is now Y-M-D;M-D;M/D/Y;M/D Change-Id: I42ed59fb325b391943608a10ded7ce74c80656e1 (cherry picked from commit 2d8cac51c6d5205a27d90bd9237c8ed1e4b8deea) Reviewed-on: https://gerrit.libreoffice.org/6726 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20rhbz#1031989 Accept --pt in addition to deprecated -ptStephan Bergmann1-1/+1
Change-Id: I3593b3fc7e0ad405612216fb07e8632050b75cee (cherry picked from commit 5cb10c4c99e46c97984e4e1c1bca5915f83f0a1d) Reviewed-on: https://gerrit.libreoffice.org/6723 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20resolved fdo#70750 reverted inappropriate implementation of fdo#63546Eike Rathke1-59/+0
This is a combination of 2 commits. Revert "fdo#63546: set appropriate alignment when wrt direction of cells is changed." This reverts commit 706e3b8e43df94310b2fe8458da67875073a046c. Related previous commits that commit depends on will also be reverted. Triggered by fdo#70750 inspecting the code it turned out that the changes for fdo#63546 did several things wrong: * looping over individual cells of a large selected range results in slicing and merging ScAttrArray for each row in each column which is utterly slow (the reason for fdo#70750) * instead of executing the changes in ScFormatShell calls should had been forwarded through ScTabViewShell to be passed down to ScViewFunc, ScDocFunc, ScDocument, ... * setting hard attributes on all cells (except if already centered or block justified) is not wanted * value cells for example should stay automatically right justified if no justification is given yet * overwriting already existing left or right justification may not be what the user expects * applied styles' justification is overridden this way (cherry picked from commit 2f29e544932633a01162ecb80e50872eabdd2bc1) Revert "fix fdo#63546 : set appropriate alignment when writing direction is changed." This reverts commit 16f508686c29bfa244ca6f81b5ab3bbaf5fef2a7. (cherry picked from commit 955281e50e2728932edc3b688ce3cf235bdfd0c9) Conflicts: sc/source/ui/view/formatsh.cxx Change-Id: I53fc56a09f2b396577fff3ec679b39837fc2f649 Reviewed-on: https://gerrit.libreoffice.org/6691 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-19Fix some wrong copy pasteJulien Nabet1-3/+3
Change-Id: I3ad6f62393cb22b350d6b50086963ebc7d2a8f5e Reviewed-on: https://gerrit.libreoffice.org/6715 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-11-19fdo#66232 fix opening files via COM serverAndras Timar1-1/+1
Thanks to Noel Grandin & Stephan Bergmann for the hint on IRC. Change-Id: I2b407a53b02a7ecdbff553ad47674c1e00455180 Reviewed-on: https://gerrit.libreoffice.org/6721 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-11-19fdo#68788: Don't use systemPathToFileUrl hereXisco Fauli1-1/+1
it works on Linux but not on Windows. Change-Id: Ia9af362c09d46c678fa4ebe8cf4922dae3dddccf Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-19fdo#69025 Remove unused textXisco Fauli3-30/+10
Change-Id: I9fc60d52e1bc4b38b79e3e29ed1b04b3e8a777a1 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-19pywizards: Fix date and time fieldsXisco Fauli3-33/+34
Change-Id: I7be16558bab7c4dde2d326808b9fb115a6878894 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-19pywizards: fix the switch between elements in the listboxsXisco Fauli1-0/+3
Change-Id: I4603232d158ad3adb60697dbf1425eb5dfe5d71f Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-18Resolves: #i122820# Corrected graphics creation...Armin Le Grand1-22/+69
allow bigger limits if directly requested (cherry picked from commit 50f1445bda91cb44a1a1e8636ab0bcb6a8c4f381) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: svx/source/unodraw/UnoGraphicExporter.cxx Change-Id: I33576ef9f95b9f8a9fa0ab6f6d83c93ecec8da9f
2013-11-18Related: rhbz#1014990 valgrind reports uninitialized variableCaolán McNamara5-33/+62
(cherry picked from commit f3660062ce8a2c65d483b83c2800d9b958d12f08) Conflicts: sd/source/filter/eppt/epptbase.hxx Change-Id: Ibaa2ed0ee2f1f3f00bceec91ccced968e4913e47 Related: rhbz#1014990 valgrind reports uninitialized another variable Change-Id: I77f082ea145b0f20daa93c3ee04067ecb6c3b108 (cherry picked from commit b7069ad07dc651f5326cd3a671588d8c1ecf2534) Related: rhbz#1014990 valgrind reports yet another uninitialized variable Change-Id: Idf15ee825a34aa7788c422475aa6cea8ff802581 (cherry picked from commit e0840f70565062b712e544f952640ee35cfb6a27) Related: rhbz#1014990 valgrind reports yet another unint variable Change-Id: Idf6a0a1e12fffee6c090add41247723f1d9cf576 (cherry picked from commit b211b8b2e14bd961a7b32033468a94cbff52b5c4) Reviewed-on: https://gerrit.libreoffice.org/6712 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-17m_uInt8 not m_nInt8Julien Nabet1-1/+1
Change-Id: I54524b6c7c19202bee049b61edc3f8e0a1e4fde0 Reviewed-on: https://gerrit.libreoffice.org/6705 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-11-15Access by AnchoredObject of a deleted SwLayoutFrmCaolán McNamara4-5/+36
as demonstrated by abi10075-1.doc just register the AnchoredObjects in the SwLayoutFrm and inform them when the SwLayoutFrm goes away. This crash was triggered by "1e113cb7604e1509e7d598a9be329f1f7b6e9322" import different first page header/footer from doc. But that commit is blameless. Change-Id: Ia079cc635a81dff1ccbf740641f441aa784328a4 (cherry picked from commit b376eacdfae11f5d39eb7011efe67390d9f495e7) Reviewed-on: https://gerrit.libreoffice.org/6622 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-14fdo#46410 fix FindRangeAndras Timar1-2/+1
Change-Id: I7aada76bc2e8e767f36016eee5e57267b3718b13 Reviewed-on: https://gerrit.libreoffice.org/6657 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-11-13Resolves: fdo#71307 out polygons are limited to 16bit point countCaolán McNamara2-0/+5
Change-Id: I4dbe9145466d6d93ebd3dea7f4fe434c9ee3de19 (cherry picked from commit cdd351b1487a8a97f481a9165d9cd361aaee2ca4) Reviewed-on: https://gerrit.libreoffice.org/6655 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-11-13Resolves: fdo#69975 honour custom show settingsCaolán McNamara6-73/+39
if a custom show is set, then don't override it with current/first page, just accept it Change-Id: Icd04711028b3e11a576df6cd325ddb0db8974111 (cherry picked from commit 438f5cf4229dafe2100e36d818b05535091054d7) merge all three ShowSlideShow impls together Change-Id: If82f6313b258a79d59fbe34ab7846db5f9f45f76 (cherry picked from commit 368e94ce33bb4de1d2c0348082a349331a17f332) bStartWithActualSlide is always false (cherry picked from commit a1b0b68c0f1fe2467cddf021e09123085d043de2) Conflicts: sd/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.hxx Change-Id: Icf61858730e2576439fdc7bdd1c8a911f2b34bd7 Reviewed-on: https://gerrit.libreoffice.org/6374 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-11-13fdo#59256 hide this option when experimental features are disabledAndras Timar1-1/+6
GTK print dialog is experimental, the checkbox has no effect, if experimental features are disabled. On Mac OS X LibreOffice cannot use native print dialog at all. Change-Id: I7497f1da0ec74b9067675e34eb4314b7a4616f06 Reviewed-on: https://gerrit.libreoffice.org/6664 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-13fdo#69046 fix discolored thumbnail and background image of LushGreen templateAndras Timar1-0/+0
Change-Id: I71307b9f5d973b8282b793df1d71816fe002b541 Reviewed-on: https://gerrit.libreoffice.org/6667 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-13fdo#59542 smaller +/- buttons will not be truncated at the bottomAndras Timar1-2/+2
Change-Id: If937d72e5b10bfbf055cf5b9909d50bbf5ddac81 Reviewed-on: https://gerrit.libreoffice.org/6668 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-12Resolves: fdo#71309 Export SWF with Multiple files crashesLaurent Balland-Poirier1-3/+7
In case of unamed file, creation of sPresentationName crash. This patch forces creation of empty name Change-Id: I1b5319eb945f1959f2ad3c703365539508521861 Reviewed-on: https://gerrit.libreoffice.org/6598 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2cf96ae334491733a2bdbeb003da6e49df19cc9f)
2013-11-12Updated coreAndras Timar1-0/+0
Project: translations b278d9fa9559c5cf7feb31b81d93353303e556b1
2013-11-12Don't call Manager::addProvider(null) upon optional NoSuchFileExceptionStephan Bergmann1-3/+1
Change-Id: I62e953c886886158f227362fef7048459192217b (cherry picked from commit 49fa300703643a2e49df01944f1b1299138010c7) Reviewed-on: https://gerrit.libreoffice.org/6637 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-12Fix CompareIgnoreCaseToAscii -> matchIgnoreAsciiCaseAsciiL regressionStephan Bergmann1-1/+1
...introduced with 19ebc215d19ed9c7c5c6fdabf2f4acd5af02cbc4 "INTEGRATION: CWS ineturl1: #i34006# modify INetURLObject to use rtl::OUString and rtl::OUStringBuffer," where String::CompareIgnoreCaseToAscii returns StringCompare but rtl::OUString::matchIgnoreAsciiCaseAsciiL return sal_Bool. Change-Id: I009bd6f606850f4e971fda4a1b468e7b0d102685 Reviewed-on: https://gerrit.libreoffice.org/6635 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-11fdo#70812 writerfilter: check for nullptr after dynamic_castMiklos Vajna3-3/+14
Happens when we set "no number" in the default para style, which is already the case for Writer anyway. (cherry picked from commit 660d761bfeea81c0b76cf08b4c961a2ad8d09a06) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I3b262e633e52e4aae039c55d6edb744e36f0f354 Reviewed-on: https://gerrit.libreoffice.org/6636 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2013-11-08cp#1000015 DOCX export: fix not-well-formed XML on redline end + hyperlinkMiklos Vajna3-3/+12
(cherry picked from commit 7813bd3113beb2b2860f9eb213c5c67ef54f5bf0) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I3a87a0277952ba0a422df8988151f8b14e166e06 Reviewed-on: https://gerrit.libreoffice.org/6606 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-08"%1 is replaced to ..." ... maybe, or maybe notEike Rathke6-18/+33
Translations may have omitted the %1 placeholder in SCSTR_COLUMN and SCSTR_ROW, or not have it translated newly yet because it was introduced later. In these cases append the column indicator / row number as it was done before. (cherry picked from commit 9b10373edae490d2b9b7f8d733c59b4f63927bec) Conflicts: sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/pfiltdlg.cxx sc/source/ui/dbgui/tpsort.cxx sc/source/ui/dbgui/tpsubt.cxx Change-Id: I331cf0c529bebea02277784ea145c202eb6f6fda Reviewed-on: https://gerrit.libreoffice.org/6618 Reviewed-by: Ivan Timofeev <timofeev.i.s@gmail.com> Tested-by: Ivan Timofeev <timofeev.i.s@gmail.com>
2013-11-08fdo#71306: fix printing from basic ideIvan Timofeev1-1/+3
regression from e13a3d566ecc34a46e037aca1b2d70e58501e422 Change-Id: I0d734e112038746aa48df669d4b82b644a95c220 (cherry picked from commit 560b27613679d2a3b3ddb89c2afe481bcf2996e3) Reviewed-on: https://gerrit.libreoffice.org/6615 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>