summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-23fdo#73986: Don't forget to receive returned object from for_each.Kohei Yoshida1-1/+1
Change-Id: Ia4ccb83c45ea3ce72a8e5c62a560ab1802bb2441 (cherry picked from commit 9ce7ba209d28cd284ab5ea584bc130d7a081b0f9) Reviewed-on: https://gerrit.libreoffice.org/7620 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-23Don't crash on unstarted tableFridrich Štrba2-0/+101
Change-Id: I68e596ea37133c89206333e8ca8aa3602878d2fc (cherry picked from commit 6f52d472393e4d92c0a4d988f28312edaeb5775c) Reviewed-on: https://gerrit.libreoffice.org/7616 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-01-21ucb: fix inverted condition in webdav lcl_sendPartialGETRequestMichael Stahl1-1/+1
(regression from a3f32769fc4bb23c64168b412dd10ec769a3854d) Change-Id: Ic72b0e874ebf19e25e43af1f8750c63c04ed8a8e (cherry picked from commit 3780738154b8c3b3f9d85c64cccf621d97574886) Reviewed-on: https://gerrit.libreoffice.org/7581 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-01-21Fix bogus mass-conversion equalsAsciiL -> startsWithStephan Bergmann57-229/+227
3af99e4d59d89c343965a928681a30f36b1007d2 "convert equalsAsciiL calls to startsWith calls" should rather have converted to oprator ==. (cherry picked from commit a3f32769fc4bb23c64168b412dd10ec769a3854d) Conflicts: sc/source/ui/unoobj/nameuno.cxx sc/source/ui/unoobj/styleuno.cxx sfx2/source/appl/sfxhelp.cxx stoc/source/security/permissions.cxx sw/source/core/unocore/unocrsrhelper.cxx (None of those bogus startsWith calls seem problematic enough to warrant backporting also to libreoffice-4-2-0.) Change-Id: Id4a8836c5d6d570e54661c40be7214632e202b21 Reviewed-on: https://gerrit.libreoffice.org/7578 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-21Resolves: fdo#73771 Non-standard behaviour for Function MidJulien Nabet1-1/+2
Change-Id: I90be516235228574dc219447a0eef3a34f83bee2 Reviewed-on: https://gerrit.libreoffice.org/7539 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd)
2014-01-21fdo#73764 partially revert 3998d1abb291Andras Timar1-1/+1
Change-Id: Ie9b6d6a318fad256f3f0999fe9c0810a4323f10d Reviewed-on: https://gerrit.libreoffice.org/7537 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-21fdo#72639: send proper ACTIVE_DESCENDANT_CHANGED eventsJacobo Aragunde Pérez3-3/+52
At ThumbnailView::SelectItem the piece of code in charge of the accessible events related to selection change was mistakenly using the accessibility helper class ThumbnailViewAcc instead of ThumbnailViewItemAcc which is the proper one for managing the events related to ThumbnailViewItem objects. The methods FireAccessibleEvent and static getImplementation had to be added to ThumbnailViewItemAcc to provide the full functionality required. Change-Id: Ia5ffb24c920f3c48854021700819be683c979411 Reviewed-on: https://gerrit.libreoffice.org/7551 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 01a9f7b2fb6b3445ba9a93a4278ffa3821f7d04b)
2014-01-21idl files need to be packaged relative to INSTDIR, not INSTROOTStephan Bergmann1-0/+1
...so that on OS X they end up in LibreOffice*_SDK.app/idl/, not LibreOffice.app/Contents/LibreOffice*_SDK.app/idl/. Change-Id: Id001aed334a0e1d8f835ce797a17f1f67d1a3abb (cherry picked from commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74) Reviewed-on: https://gerrit.libreoffice.org/7569 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-21fdo#71511: in autodetected a11y HC mode, pull background color from themeBjoern Michaelsen3-2/+39
- ... and reload ColorConfig after tweaking relevant a11y settings - dark theme default to high contrast - as per fdo#35365, having a dark document background is inconvenient for non-a11y endusers - a11y standard require the (rather ugly) background for a11y - thus, when "automatically detect high contract mode of operating system" in Tools->Options->a11y is enabled, use the dark document backgroundby default, otherwise use a white default note that the autodetect HC option is somewhat broken anyway: it resets the icon theme hard, so there are not simple roundtrips enableing/disabling it for that, but those havent been there before either. (includes: Ia35a41717224dfb7437054bb885c61d7e0b189d7) Change-Id: Id8ad1eb3d57b3708ac5a241092208e3a8d98ade0 Reviewed-on: https://gerrit.libreoffice.org/7484 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-01-21fdo#68959: sw: fix painting of tab fill characters in small caps textMichael Stahl3-9/+9
The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7566 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-21gbuild: UnoApi: fix rebuilds after IDL changesMichael Stahl2-0/+16
There used to be a dependency between .urd file and .hpp/.hdl files but that was removed; introduce a dependency between .idl files and .hpp/.hdl files to replace it so headers and stuff depending on them get rebuilt. Change-Id: Ibf1fe1db08c36ce42c392d27b794c2bc2a33738c (cherry picked from commit 0190a70e79efa437e1516e635f4f670d7a35bb2d) Reviewed-on: https://gerrit.libreoffice.org/7547 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-21fdo#73389 Writer does not show a docx-document with nested table correctlyZolnai Tamás3-15/+15
The table manager can work with more table simultaneously and so m_aCellWidths contains more table's properties.Only one item of it belongs to the current table (getCurrentCellwidths). Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa (cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920 Reviewed-on: https://gerrit.libreoffice.org/7543 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-21Coverity: Potential crash (?)Fridrich Štrba2-0/+12
Change-Id: I819b0df446cf95d511d6a7a5a65c381a2a837d00 (cherry picked from commit 7989850e9fc5fb2fb757ecf388b51bc3e96a0267) Reviewed-on: https://gerrit.libreoffice.org/7562 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-01-20resolved fdo#73836 do not apply format twice to stringEike Rathke1-4/+6
ScDocument::GetString() already returns the formatted string that then was formatted through number formatter. Format raw string instead. Change-Id: I806b4fc904d04169a6c1dbd4a3d00e2556eda7bd (cherry picked from commit f6b9b73a1f87d1815ed8ab8f2494e5526a710bb9) Reviewed-on: https://gerrit.libreoffice.org/7549 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-01-20fdo#73660: sw: fix Find of words containing soft-hyphenMichael Stahl1-1/+3
Soft hyphen was not detected if there is no hint (-1). (regression from ebeff3f074dd94dce4ce6cc55abd0495103684bd) Change-Id: I09108796a32429a01eff93f797a6de521ab1d08a (cherry picked from commit 156a0235bd8ff06840cecad1e70a57ffc5b8e7e1) Reviewed-on: https://gerrit.libreoffice.org/7511 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-20Updated coreMartin Srebotnjak1-0/+0
Project: dictionaries 7b8732d1195ee67b84d98d568904a1d8f4402f1b update Slovenian thesaurus Change-Id: I80c89e153fa4ada0c3793bee6e0d089f73041734 Reviewed-on: https://gerrit.libreoffice.org/7506 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-01-20fdo#73655: Don't adjust formula tokens on non-top shared formula cells.Kohei Yoshida1-0/+17
Only adjust tokens for non-shared formula cells and shared formuls cells that are the top of their respective shared groups. Change-Id: I9cd57653602c97504a802001947a28c4d03368a5 (cherry picked from commit 982a03d4e2baf4ca7e78c79014389d9b23e200d1) Reviewed-on: https://gerrit.libreoffice.org/7482 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-20WaE: macro is not usedTor Lillqvist1-2/+0
Change-Id: I7748517d2298c20e4fd6c6ebf403a2ccc8228054 (cherry picked from commit 3e7b69ae3504a32e142cbf538b751ade38fbfdba) Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-01-20WaE: variable 'itResEnd' set but not usedTor Lillqvist1-1/+1
Change-Id: I6594472b1e93c083fdc52133a6b120c031dff64a (cherry picked from commit 49ce8c126c962d75e2fefd5b4a578c213ff6a9bf) Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-01-19make strings localizable in *.ui (bin/ui-translatable.sh)Andras Timar4-48/+48
Change-Id: I60b74cecc17352681fac7dfa0e41114515dbd6f5 Reviewed-on: https://gerrit.libreoffice.org/7536 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-01-19fdo#73799: Make some items in the filter dialogs translatable.Kohei Yoshida1-40/+40
Change-Id: I67c54ae9cee0a57baf900c80f50b28572bc9465b (cherry picked from commit 6d7a4e5744c6ce5f1362b659464fb94465c2cb67) Reviewed-on: https://gerrit.libreoffice.org/7535 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-01-19fdo#73549 do not attempt to resolve an empty localeEike Rathke3-2/+5
... to match installed UI locales Change-Id: If0ad0fde392bc5ea3cf454f4858330f5e93a6666 (cherry picked from commit 8e826c7ff7c597e9f585377b2117f4dc24239dcc) fdo#73549 do not resolve empty locale here if not determined yet Change-Id: Iad03d6209a2b4024b27c6195195e5aa557c295fe (cherry picked from commit db6f8f9f8969b592ed90c841960fdd186e1cbc5a) do not resolve empty locale here when set, fdo#73549 related Change-Id: Id9c8c3926f64826fd2295e0f75f007ce435f5915 (cherry picked from commit 26fc9be1bf2d6aaeb52a571ea416f4527a52e146) Reviewed-on: https://gerrit.libreoffice.org/7529 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-01-18allow to codesign on Mac OS X MavericksChristian Lohmaier3-9/+40
codesign on Mavericks wants much more stuff to be signed apart from the actual Mach libraries and executables. However the signature for those data-style files are stored as extended files attributes, so one needs to take special care on how to package the dmg to not break the seal. Also explicitly remove some files from the signing, to allow adjusting user-config path or similar or for gallery. Change-Id: Ic4c4f7718df1bca7ffa2fecd3fb1d616146d7b14 Reviewed-on: https://gerrit.libreoffice.org/7490 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-17fdo#72530: drawinglayer: fix PDF export of lossless pictureMichael Stahl1-1/+2
Don't pass empty Rectangle to PDFExtOutDevData::EndGroup(), it will result in early return from PDFWriterImpl::drawJPGBitmap() and no picture in the PDF. Passing in the same Rectangle for the 3rd and 4th parameter will avoid cropping in PDFExtOutDevData. (regression from 677df250becd5cde71c6310f647e78ac3763347e) Change-Id: Icf110fe3e635319419fcacc7bc684c792a34d6ad (cherry picked from commit c8e9038b13c64df430fb4e3fecac65a3c507e3e8) Reviewed-on: https://gerrit.libreoffice.org/7502 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-17ellipsize incorrectly set here for some reasonCaolán McNamara1-2/+1
Change-Id: I85b89c59c3545aef538da47a3d3727110cff4a82 (cherry picked from commit 251f21699ef786557134fc00ff1293acb57e4158)
2014-01-17Updated coreAndras Timar1-0/+0
Project: translations 0c7ce2344438228bf57a34bbaaba299c94b60c00
2014-01-17Make all UIName localizable for filtersFridrich Štrba150-150/+150
Reviewed-on: https://gerrit.libreoffice.org/7492 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 450f4328551c8d9a542ca87c3cfebec90d14e6b5) Conflicts: filter/source/config/fragments/filters/mov__MOV.xcu Change-Id: Ie5c597f950c344a25c97aa990536ef66b001f41e Make UIName of filters from writerperfect module localizable Change-Id: I63974d71c8aa8b4b3ede8272fd0467fa0026b1ff Reviewed-on: https://gerrit.libreoffice.org/7491 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 4469a9c3e1df7f5e2eb79c30ba31b9be755279ab) Reviewed-on: https://gerrit.libreoffice.org/7496 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-17sign language pack on Mac, and add the locale name to the App nameNorbert Thiebaud1-7/+23
Change-Id: Ie05a03e1edc02527b6895da07cfede69df7ec157 Reviewed-on: https://gerrit.libreoffice.org/7386 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-01-17give an identifier to the app_bundle itselfNorbert Thiebaud1-2/+2
Language Pack did not seem to pick a decent default value for that Change-Id: I567f24882e16533e10d8ba91b777ad91dc507b87 Reviewed-on: https://gerrit.libreoffice.org/7385 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-01-17codesign: do not sign stuff that is inside the bundled pythonNorbert Thiebaud1-1/+1
bundled framework are signed as a 'framework'.. it does not seems like we should sign random piece of it while attempting to sign the App itself Change-Id: Ia9ea34f5ba484e4a15337aa4edabd86e3b5fe406 Reviewed-on: https://gerrit.libreoffice.org/7387 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-01-16resolved fdo#73555 compile statistics templates using English grammarEike Rathke7-11/+21
The statistics templates' formula expressions are setup using English function names, so compile the resulting expressions using an English grammar merged with the current address conventions. (cherry picked from commit 9570a27d3e2f56e9046a8bfacaafe9e3c9744ac5) Conflicts: sc/source/ui/StatisticsDialogs/TTestDialog.cxx sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx Change-Id: I7c782a42d007daeaaf99463beb8aa580c05c7363 Reviewed-on: https://gerrit.libreoffice.org/7412 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-01-16AbiWord Import filterFridrich Štrba21-28/+552
Reviewed-on: https://gerrit.libreoffice.org/7411 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 10eaaac020e32f0bbb3869cecee94df0955b6a3b) Conflicts: external/Module_external.mk writerperfect/util/wpftwriter.component Change-Id: I90dc115044e5f81fa3a2b105d30d7d39e438b086 Fix a silly with ABW footnotes/endnotes Change-Id: I026f9c664ff7dec51e511ad439ab563d2cc0c201 (cherry picked from commit 766f718ebb4deda1a294cc1cfe137a75dfb0f6f8) Fix ABW list shapes Change-Id: Ibbbfddf10677e8c5b654cee9c5fda1603a298a67 (cherry picked from commit f8bf3e3cd4b55099a1427d611af06a45460034e7) Fix ABW embedded images Change-Id: Ifd33ea9c1f91865d5ae5175eefa9b65107404bf0 (cherry picked from commit 7c3ca696543d0e9d6771d53f386086086d8b8643) Uploading libabw-0.0.1 (support of zabw files too) Change-Id: Ie04cae9b9a362cb43b671fe8986545865822a953 (cherry picked from commit 838c8889491b7e5b08f681b7f85740784c0c1a3b) Reviewed-on: https://gerrit.libreoffice.org/7478 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: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-01-16Environment variables can contain >127 charactersAndras Timar1-1/+1
Change-Id: Iaeb690429d835ab2e6c13a8890a1b27b9405796a Reviewed-on: https://gerrit.libreoffice.org/7476 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-01-16fdo#72397: vcl: do not enable A11y in Win32 message handlerMichael Stahl1-6/+1
On the libreoffice-4-2 branch, IA2 is experimental so it must be enabled by user explicitly; the automatic enabling when a WM_GETOBJECT is received will effectively enable the JAB which can be annoying. Change-Id: I16bd8d77657567ad29f3538cd3ab1de8145d531e Reviewed-on: https://gerrit.libreoffice.org/7443 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16fdo#51180 reset (Multi)Selection on Clear()Lionel Elie Mamane1-0/+7
Change-Id: I06dde63093eab4e5e1c692f6363aca70b89de96a Reviewed-on: https://gerrit.libreoffice.org/7430 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-16fdo#72788: sw: fix infinite loop in SwTxtAttr::RstTxtAttrMichael Stahl1-1/+1
The increment was erroneously moved into the else branch in commit c1c5feaff453cfbb23c43f2b423201b883ff048d. Change-Id: If71cb58967e215548aed5679da86af20de17a0f1 (cherry picked from commit 8c59c30153b8a67d9455d70a66b4a42c35120f97) Reviewed-on: https://gerrit.libreoffice.org/7414 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16fdo#70796 fix quoted printable encoding bug in internal PythonAndras Timar2-0/+202
Change-Id: I4e5563c47df83c50df75ccf330fbd38ec6da9170 Reviewed-on: https://gerrit.libreoffice.org/7437 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16fdo#72521 fdo#73103 Fix editable combo-boxes behavior under KDE4Maxim Monastirsky1-1/+5
Change-Id: I92a781a1e0f0adcb779155f8c477595e0dd762b1 Reviewed-on: https://gerrit.libreoffice.org/7287 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-on: https://gerrit.libreoffice.org/7462 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16sw: the Assign Styles dialog is not called Insert Database ColumnsMichael Stahl1-1/+1
Change-Id: I96e0ee5fa0c7e45989cee663378d2ea7516fddfe (cherry picked from commit c2b002ba96a9cd1ffc45281f7ba195063c94a54a) Reviewed-on: https://gerrit.libreoffice.org/7469 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16fdo#73043: sw: fix Index/TOC Assign Styles dialogMichael Stahl1-2/+2
SvTabListBox::GetEntryText(pEntry, 0xffff) will append 10 tabs to the returned string, so it will no longer be equal to a style name. (regression from 77173d8954c370bcaca80b48181c330b759b9517) Change-Id: I7d3bee47eabec9180d6352fb6cf1b2e948153d37 (cherry picked from commit 77a637fb8ddfc4b045b3453f8435822a21198b19) Reviewed-on: https://gerrit.libreoffice.org/7468 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16place some elements side by side to regain a lineCaolán McNamara1-55/+55
Change-Id: I9b838b6c00bc6e456adcf5d63c9936c08bf0d1aa (cherry picked from commit 5eaa0135c3ffc46ce601ea4cbaaa17eabe44e6ee)
2014-01-16fdo#73162: sw: un-break index entries that contain text separatorsMichael Stahl1-1/+6
SwFormTokensHelper::SearchNextToken() does some check that the ">" token terminator is not inside a pair of TOX_STYLE_DELIMITER; this check was broken by commit f4fd558ac9d61fe06aa0f56d829916ef9e5ee7b9 and finds a ">" outside of TOX_STYLE_DELIMITER bracketing. Change-Id: Ia8587d496999c561f57fd6f107ed8b9d1e3838d4 (cherry picked from commit c87f146a0cec31f080386d646bfb786ed6200280) Reviewed-on: https://gerrit.libreoffice.org/7439 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-16libodfgen produces strings in utf8 encodingFridrich Štrba1-4/+7
Change-Id: Iad17f4b4786473205669bd5b080b0a64d4a6a441 Reviewed-on: https://gerrit.libreoffice.org/7455 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9e5e7c9b556bf9386fb5ad3ecd28b3d43aeeb393) Reviewed-on: https://gerrit.libreoffice.org/7456
2014-01-16resolved fdo#72293 correctly split grouped formulas and regroupEike Rathke2-5/+14
Grouped formulas need to be split at both edges of the deleted area, regroup _after_ rows have been deleted. Change-Id: I840806f30cef592e17b4cd3a33c81fd2a8309055 (cherry picked from commit 42f551d524a1df46f6a311d5897ac30bd8fc1aaf) Reviewed-on: https://gerrit.libreoffice.org/7452 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-01-15String::Len was used in a non-bool context hereStephan Bergmann1-1/+1
...and apparently erroneously got rewritten as a call to OUString::isEmpty instead of OUString::getLength in the conflict resolution of 7ec7a9a68b4a9c5600840a34434fc800cda3d815 "Fix #120224# Mapping the text rotation in Writer table cell with MSO." Change-Id: If02687437848917f64b8f92f323979ccb51aaad2 (cherry picked from commit 60af010a98540b4785353b27ccbb545ef72e7791) Reviewed-on: https://gerrit.libreoffice.org/7450 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-15Fix brace positionStephan Bergmann1-1/+1
Presumably a typo during conflict resolution for d02f75a8c36705924ddd6a5921fe3012fafce812 "Resolves: #i121420# merge sidebar feature." Change-Id: Id328c2d2dd0e1a3bb60b7ffd34842fd789da332a (cherry picked from commit f86084ea6cc72ac282e3d262ec230d49807cd70f) Reviewed-on: https://gerrit.libreoffice.org/7446 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-15String::Len was used in a non-bool context hereStephan Bergmann1-1/+1
...so 79f52d249fe043e6ec54be6ffa0c71a748920394 "convert sw/source/ui/inc/e*.hxx from String to OUString" should have converted it to call OUString::getLength, not OUString::isEmpty. Change-Id: Ie5633a1ff87094eb22179f14aab4b1508735a747 (cherry picked from commit d0e4d1f01ef44474145469b7203ad3232e36de63) Reviewed-on: https://gerrit.libreoffice.org/7444 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-15fdo#73606: Avoid calling MarkDataChanged() when nothing is selected.Kohei Yoshida1-3/+9
MarkDataChanged() is quite expensive & in theory unnecessary when no selection is present. Change-Id: I6967b914735462403a77568010532b37a1d8f333 (cherry picked from commit 31533d47b24680f76e769949874d41f0fe27134f) Reviewed-on: https://gerrit.libreoffice.org/7426 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-01-15fdo#73606: Avoid excessive and unnecessary heap allocation of array objects.Kohei Yoshida8-28/+59
This is a leftover from the 1 million row conversion we did years ago. Change-Id: Ib50819ed51c7017bcc559bfc8b6062ff46615d09 (cherry picked from commit df9243626b39742a9a148bea95796f8824fee68a) Reviewed-on: https://gerrit.libreoffice.org/7425 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-01-15fdo#73095: fix invalid access in SwFntObj::DrawText()Michael Stahl1-1/+4
aStr may be 1 larger than pKernArray. Trivial fix by checking the largest index; not sure if it would be a good idea to allocate pKernArray with the larger size in the first place, but that would be a bigger change... (regression from 02ce734450559c9353ca7f42b2519239220dd265) Change-Id: Ia33feab001c34e85066b7596d8873f41588984e9 (cherry picked from commit 61ec8f086ba314b86c80a02b16072e88774abf6c) Reviewed-on: https://gerrit.libreoffice.org/7427 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>