summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-03-29Version 5.3.2.2, tag libreoffice-5.3.2.2libreoffice-5.3.2.2Christian Lohmaier3-0/+0
Change-Id: I1ecdefa43d30e17bb43ba73a60926851928665cc
2017-03-29bump product version to 5.3.2.2Christian Lohmaier1-1/+1
Change-Id: I9e66209cc893e0a01a0e007a470264a758dea123
2017-03-29update creditsChristian Lohmaier1-1616/+1724
Change-Id: I9175fb568d06688344e5a2ad8759f57563f9b229 (cherry picked from commit 261d9990228f4784f9a109e80657768b956e3d0d) (cherry picked from commit 2d1ccbe85654a5b2a64813263459ed9231832c37)
2017-03-29Updated coreChristian Lohmaier1-0/+0
Project: translations a2ea0cc1ebb402ac643166b75b120aa9bdc7924a update translations for 5.3.2 rc2 and force-fix errors using pocheck Change-Id: I11ff97ae9d122c20eea783525b1b8e7af7bd5dad (cherry picked from commit 7816e0f862d1637570d319f1783ac29ad678b6cc) (cherry picked from commit 16da308b0923a109ad7f1ff59d804276f8bc7c90)
2017-03-29changelog creation: "command | > file" doesn't flyChristian Lohmaier1-1/+1
Change-Id: If270d509fbbad6a390ab61345bd1b14ead6ccc21 (cherry picked from commit 9ec6519650280c8cda33ff921926d42840ef89c6) (cherry picked from commit 92668e74ee68a26ac5a21664ef9378d5ec0db675)
2017-03-29tdf#104447 sw: make lcl_DebugMarks output more readable, pos. at the startMichael Stahl1-10/+10
(cherry picked from commit f6596a35c2d9a8c365bb78e1256a2def57ee1a36) The pass-by-value is also fixed here which is a surprisingly expensive performance regression. Change-Id: If9c151faefa3d109af2df7933a275c667880fb75 Reviewed-on: https://gerrit.libreoffice.org/35492 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 4c7775247fbbf38cd397fd7649bf10810f27a0b4) Reviewed-on: https://gerrit.libreoffice.org/35525 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-29tdf#105843 : restore Application Start and Stop eventsJean-Baptiste Faure2-0/+4
Change-Id: Ifc99fcf84182edb49cac741f7bb10a1b239d5703 Reviewed-on: https://gerrit.libreoffice.org/35779 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 7c0054f1b7c3c475bff7a5adfdea0feaecf20748) Reviewed-on: https://gerrit.libreoffice.org/35812 Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 98399c291239e309769fe9a1099655343b21ccd2) Reviewed-on: https://gerrit.libreoffice.org/35835 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-29Resolves: tdf#105463 convert bmps to pngCaolán McNamara17-3/+3
because bmps aren't seen since... commit c3043a3072465c489d3b20991b17d222771305eb Date: Mon Oct 31 13:28:26 2016 +0100 tdf#103591 icon theme name resolving, ui fixes, prioritize png - Prefer "png" over "svg" because for Tango theme we include both (cherry picked from commit a3c4f39868226151b4b01906cbcf1b6d40740a28) convert from bmp to png (cherry picked from commit 1b7d1d16e3a6826433271b3eed4a2d542585961b) Change-Id: I93755ac95c170c457b32adac07557ed48ad8beee 7fe47f47f19b93eab5d0cef0afde63e6f61c21b4 Reviewed-on: https://gerrit.libreoffice.org/35535 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-27tdf#106529: Revert "tdf#80731 Closing parenthesis is now detected"Katarina Behrens1-5/+0
This reverts commit 65e294e221e0ad1d37c6667eecb995817ace870d, which breaks several widely used Basic extensions and hundreds of anonymous macros that miss closing parenthesis here and there Change-Id: I5d27e6d4e7c8aea3f0762c41ede46e35a5a24aaa Reviewed-on: https://gerrit.libreoffice.org/35340 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 660e394b893a045a077ccded263f94a1be03fcf9) Reviewed-on: https://gerrit.libreoffice.org/35527 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-03-23jvmfwk: fix JVM detection on 64-bit WindowsMichael Stahl1-3/+3
_WIN32 is also defined on 64-bit Windows so reorder these ifdefs. Should i be surprised that this breaks several dbaccess tests for me but all tinderboxes are green? (regression from 9143dd4ebe37b608e43d04434cf831624bf55b65) Change-Id: Id917952d3135768355af711688ff70bf6c019a6e (cherry picked from commit 2aa20cfb7a11dd8d86372af4065a5887a0b752ca) Reviewed-on: https://gerrit.libreoffice.org/35530 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c78d39066ace32e0324365bcf10882aa6e976a03) Reviewed-on: https://gerrit.libreoffice.org/35533 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-03-17bump product version to 5.3.2.1.0+Christian Lohmaier1-1/+1
Change-Id: I77c97c10d8a812a12f585f5ae1dfe34129d6f519
2017-03-17Branch libreoffice-5-3-2Christian Lohmaier4-1/+1
This is 'libreoffice-5-3-2' - the stable branch for the 5.3.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.3.x release, please use the 'libreoffice-5-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I158b488b1cba057dd211699fc67815ff844bbb54
2017-03-17Revert "Don't package unoinfo in case of Mac OS X like app structure"Stephan Bergmann1-1/+1
This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5. Whatever that commit was supposed to be good for, not packaging unoinfo on macOS breaks functionality, see e.g. <https://bugs.documentfoundation.org/show_bug.cgi?id=106292#c10> comment 10 to "XMessageBox#execute() in Java fails to draw a window on macOS Sierra". (cherry picked from commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8) Change-Id: I51cb79d157887bfcaf2dce6900675439d33d0be0 Reviewed-on: https://gerrit.libreoffice.org/35314 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-17tdf#106217: Wrong size and position of a shape inside chartTamás Zolnai3-0/+30
Same code which was added to the method DrawingFragment::onEndElement() in d178d7bef193565a7d6aacbc37a58dfc4bd7b316 A shape's size and position inside a chart object are primarily defined by <cdr:from> and <cdr:to> tags in drawing.xml, but in the same file we also have an <a:xfrm> tag which is used for the same thing (defining size and postion) in general. Testing with MSO it seems it ignores what values are set to <a:xfrm> and uses only the <cdr:from> and <cdr:to> values. The test document showing this problem must be created an earlier version of MSO, becuase <a:xfrm> is set to some random values. Editing the chart and saving it with MSO 2013 the <a:xfrm> values are set consistently with <cdr:from> and <cdr:to> pair. Reviewed-on: https://gerrit.libreoffice.org/35069 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit aa204f1c09a760d6753c408376ab7307fb13ad91) Change-Id: Icbaff78e5a6fcea36678c3b3755c97f57976b626 Reviewed-on: https://gerrit.libreoffice.org/35074 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-17the range should be updated after the references, tdf#104026Markus Mohrhard1-3/+3
Change-Id: I2cb674b8b3bc64df031b473b337d266a2eaab43d Reviewed-on: https://gerrit.libreoffice.org/35289 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 3f0f35c89f3f64fcb110483fd562a59f729dc344) Reviewed-on: https://gerrit.libreoffice.org/35297 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-17tdf#105729 RTF import: \ltrpar should not override \qc from styleMiklos Vajna3-2/+19
This is similar to commit 92fd894ea18672cba4cf961bdc4c0bc98f168102 (tdf#94435 RTF import: \ltrpar should not override \qc, 2015-10-05), except that here the \qc is inherited from the style, it's not a direct formatting. The problematic code was added in commit 2638faa2e834c2da4c195224fd88d32c29b3d0cc (writerfilter08ooo330: applied patch for writerfilter08, 2010-07-28), and it's not really clear to me what is its purpose, given that the DOC import equivalent in SwWW8ImplReader::Read_ParaBiDi() doesn't set the paragraph alignment. Fix the situation by not touching the paragraph alignment for the RTF case at least. (cherry picked from commit 2cc5f18d10cf6ef1349d9518e6f67977f7c5d9bf) Change-Id: I2baa2c8c8012d972740da7cf3f710117812859b3 Reviewed-on: https://gerrit.libreoffice.org/35190 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-17Resolves: tdf#102777 broadcast SC_TAB_INSERTED when inserting scenarioEike Rathke1-0/+3
So ScViewData::maTabData gets an entry added which deleting the scenario can remove again. (cherry picked from commit 4c8059a3e140171399ac85ceb882d23bb458599d) Change-Id: I166baeff5408ef67faef41364515a13b8d4610bb Reviewed-on: https://gerrit.libreoffice.org/34942 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-17tdf#103931 DOCX import: fix lost section breakMiklos Vajna3-0/+9
When there are multiple sections in a document, every <w:p> element triggers a handleLastParagraphInSection() call, and that's how the previous section is ended and the next one is started if necessary. In case the section contains no paragraphs at all, the section was lost on import. Fix this by also calling handleLastParagraphInSection() on <w:sectPr> as well. It's not a problem if there are both <w:p> and <w:sectPr> in a section (which is the usual situation) as only the first call closes the previous section / starts the next one. (cherry picked from commit 6603947329a7b372a173a3c60e013e532d0bc5cf) Change-Id: I64f2c403dcb2ceca76d444ab06df3052235d2795 Reviewed-on: https://gerrit.libreoffice.org/34718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-17tdf#106466: Use graphite2 shaper firstKhaled Hosny1-1/+1
We want to always prefer Graphite shaping when supported by the font, which is also what HarfBuzz does by default. Change-Id: I6670fc03b8e6b3d7e07e1b8e0062880524da1655 Reviewed-on: https://gerrit.libreoffice.org/35046 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> (cherry picked from commit 3cee50476e422e3ed84169cdcbe6bd9883fc9316) Reviewed-on: https://gerrit.libreoffice.org/35058 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-16ofz#877 reference to stack alloced obj outlives objCaolán McNamara2-12/+9
(cherry picked from commit ae174b009bcf0f84073b9ebbf01ad31b274b789e) Change-Id: I8c854e2f651f8bf0018e8249827aae0fe23057e7 Reviewed-on: https://gerrit.libreoffice.org/35271 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-16Resolves: tdf#106557 don't crash on missing line spacing argumentCaolán McNamara1-177/+174
this is all a bit addled, but at least don't crash Change-Id: I19c35205446cebc83b8299839bcab8e02ff7c07d (cherry picked from commit ab10f03ec4dc7d5d7659fb62c59972c80221f733) Reviewed-on: https://gerrit.libreoffice.org/35261 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-16ofz#876 avoid accessing empty rowsCaolán McNamara1-0/+4
(cherry picked from commit b9892037c303e645ee1a987d80734361700d91ac) Change-Id: Iba539fb03611bbe5627cc7976c1146d08a2ab5fd Reviewed-on: https://gerrit.libreoffice.org/35256 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-03-16Updated coreChristian Lohmaier1-0/+0
Project: translations 3005ac3c935b9916b30342794a87f5692479d656 update translations for 5.3.2 rc1 and force-fix errors using pocheck Change-Id: Id1d77adf5a89a0ce485273d3865ccf6771becf51 (cherry picked from commit fea957b43e56e72a50ab5c6e0d1a065b719ab84a)
2017-03-14Following tdf#106190 Treat blank after fraction barLaurent Balland-Poirier2-6/+7
To consider that denominator is found (bDenom=true) there must be some digits found after fraction bar Dummy format # ?/ ? can now work again (even with blank as thousands delimiter). However such format can not be saved (except in XLS) Change-Id: I657e97e09a6ae4c08a29ad6d0b586c85a9968e3d Reviewed-on: https://gerrit.libreoffice.org/35111 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 4e1448d43e08d3f0a6ff67e75346e9559ad2af09) Reviewed-on: https://gerrit.libreoffice.org/35196
2017-03-14don't forget to set the managed flag, tdf#105544Markus Mohrhard1-0/+1
Change-Id: I46d534a157b05ce22ba42e269ca8266e3403ecd2 Reviewed-on: https://gerrit.libreoffice.org/34229 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 0b9e33cceb635cd3c173bd1f461af98cfd6f6ed2) Reviewed-on: https://gerrit.libreoffice.org/35182 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-03-14tdf#106271 Cannot disable Menubar under UnitySamuel Mehrbrodt3-7/+33
Empty the global menu when the user wants to hide the menubar. When showing it again, the global menu is refilled. (cherry picked from commit f2fa5951bf3d02439a3e96d1f9d89962f0901edc) The following commits have been squashed into this commit: 1. Destroy menu widget when enabling Unity integration Like GtkSalMenu::ShowMenuBar did before f2fa5951bf3d02439a3e96d1f9d89962f0901edc ("tdf#106271 Cannot disable Menubar under Unity") Should fix https://lists.freedesktop.org/archives/libreoffice/2017- March/077225.html (cherry-picked from commit 27f89f08cf4086802ce67f12389414bef6ab64ca) 2. Don't use SetDisplayable when enabling Unity mode because now it tracks the global menu too, but all we need here is to hide the in-window menubar widget. (cherry-picked from commit 3daa6c66eb9a4c334d6f72a8fd4bb09d7360a913) Change-Id: I3c5e17100622cd8d22c4348cf90a76233dd0fd4c Reviewed-on: https://gerrit.libreoffice.org/34919 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-03-14Related tdf#54443 List only matching JREsSamuel Mehrbrodt4-2/+33
I.e. show only 64bit JRE for 64bit LO and 32bit JRE for 32bit LO Change-Id: Id5e890637c7e1014bcb4e6fdd9ed9a33765112d5 Reviewed-on: https://gerrit.libreoffice.org/35026 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9143dd4ebe37b608e43d04434cf831624bf55b65) Reviewed-on: https://gerrit.libreoffice.org/35162 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-03-14fix conditional format import from XLSB, tdf#105486Markus Mohrhard1-1/+3
Change-Id: I2b781f45221e434c8ec0ee079afb54c505faf2b5 Reviewed-on: https://gerrit.libreoffice.org/34396 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit aaea9beabcdfa16ffd36116591c5ebea25906b94) Reviewed-on: https://gerrit.libreoffice.org/35154 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-03-14tdf#106456, don't try to use invalid ranges in external ref codeMarkus Mohrhard1-0/+6
Change-Id: I38e622df87dd4b5e37dd248c5181978e13890fda Reviewed-on: https://gerrit.libreoffice.org/35132 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 951fcc6556346e19a028443c70dea27d0cbc9c36) Reviewed-on: https://gerrit.libreoffice.org/35180 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-03-14string access out of boundsEike Rathke2-12/+21
This is a combination of 3 commits. string access out of bounds Change-Id: I4f6e6e8e77cdabe593bca5719b6ef38aeecc5da7 (cherry picked from commit 77a8cf7eaf638276030d1c5be8705f5603f071a9) prevent string access out of bounds Though only the closing 0-character and the following check excludes that, dbgutil asserts. Change-Id: Ife1299042a60f6f058c4cf58b406d1cc022786a7 (cherry picked from commit c407fff205a270e02fe07885805b7250e71c28f8) guard against a (theoretical?) endless loop of blanks only Change-Id: I68d6cca1b359aa8fba42663bddb1107c31102415 (cherry picked from commit fe73eff36718b6d99d0cf92d750c457872cc4dcc) Reviewed-on: https://gerrit.libreoffice.org/35043 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-14Resolves: rhbz#1431540 crash in SwDBManager::releaseRevokeListenerCaolán McNamara1-2/+5
Change-Id: I8e61163de7e6192bdf613ab6b58906326499d6c2 Reviewed-on: https://gerrit.libreoffice.org/35137 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e1f36eddf4596901a51de42322ccbf8d1df9d139) Reviewed-on: https://gerrit.libreoffice.org/35138
2017-03-14rhbz#1431476 dnd has started copying instead of moving slidesCaolán McNamara1-1/+1
Is suspect something has changed in gtk3, and I think we're not supposed to use gdk_drag_drop_succeeded at this point, but instead we'd get a dragFailed signal on the failure case Change-Id: I6b305db56a29255b468ca9182d1f7e57cb4c10f4 (cherry picked from commit 4ea76db5e53235971b597a2810a6d12618d6aaea) Reviewed-on: https://gerrit.libreoffice.org/35135 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-14ofz#829 ensure palette can fulfil largest index usedCaolán McNamara1-25/+40
Change-Id: I95aa4796875ee71e8b06a2bb8985845f270b8817 Reviewed-on: https://gerrit.libreoffice.org/35104 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-14ofz#820 oom terminateCaolán McNamara5-42/+42
comments claim return is len of data, but negative numbers for compressed data errors are returned. Make things return the amount of successful data read and turn into unsigned size_t to match ofz#727 Change-Id: Iadddfae67bb5d4960ddf82e169fc2592ded85950 Reviewed-on: https://gerrit.libreoffice.org/35078 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-14Resolves: tdf#106459 3D reference can't be handled as vector referenceEike Rathke1-0/+4
Change-Id: Icba12a6218086079a7d5538f7263bccb1f2ee1b0 (cherry picked from commit ca1f051972946b24cb6658143fb0d0ac3587a988) Reviewed-on: https://gerrit.libreoffice.org/35051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-03-13ofz#801 avoid oomCaolán McNamara3-0/+15
Change-Id: Id3167d1eb3f058543ab7596008012d51b3d242b7 (cherry picked from commit 1353ebe535732022aef4377030d86ad7153c3144) Reviewed-on: https://gerrit.libreoffice.org/35036 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-13ofz: turn assert into throwCaolán McNamara1-1/+2
cause size arg is controllable by the file data Change-Id: Ia92b56c04271557afbec1ab47620bcb34f1c0e8a (cherry picked from commit 1e8d00719c851d69d36cd66eb115c517c1696b64) Reviewed-on: https://gerrit.libreoffice.org/35083 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-03-10tdf#95612: Print preview: page numbering starts with 1 (not 0)Katarina Behrens1-3/+3
unless otherwise specified. It was okay for 1st page & broken everywhere else. Possibly resolves tdf#95206 as well ... Change-Id: Ie69f770a28dd69f90d4f04ad4fa9e701fa2d56e2 Reviewed-on: https://gerrit.libreoffice.org/34759 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c07ac0d92ad830762906586164bab466a0f05531) Reviewed-on: https://gerrit.libreoffice.org/34946
2017-03-10ofz#798 oomCaolán McNamara3-57/+49
(cherry picked from commit 75f118da50b217956ee7a735e921524d0c2935ff) Change-Id: I6fa8dd999af7e00d6236a1ead5f8bb519f2d128d Reviewed-on: https://gerrit.libreoffice.org/35038 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-10tdf#106283: Registry settings are not read properly on WindowsTamás Zolnai1-0/+22
Read also a type value from registry so user can specify a type for a property of an extensible group. Reviewed-on: https://gerrit.libreoffice.org/34961 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 145accd9a5b55070959d40c9314d870dffa5e4bc) Change-Id: I4105ba559a64ce96bfe5a390660ad7f349ba894c Reviewed-on: https://gerrit.libreoffice.org/34973 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-10tdf#106462 old value and new value were swappedLionel Elie Mamane1-2/+2
in commit 66ccfcd2908445b8194c364c89778056374b02af Author: Jochen Nitschke <j.nitschke+logerrit@ok.de> Date: Fri Oct 21 09:36:10 2016 +0200 remove use of tryPropertyValue Any specialisation Change-Id: I3180cf5b9e63a3da9257b03ba02967a2d5402ec3 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Change-Id: I90dd3f6dba799eec9210dbb7560be105cb50e6d1 Reviewed-on: https://gerrit.libreoffice.org/35021 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-03-09Fix build with latest Cygwin updatesJan-Marek Glogowski2-14/+19
Stop bash complaining about \0 bytes in input (cherry picked from commit 8800292351dcf1f538c47ac6acf834ac2633ce6b) Strip newlines from UCRT detecion using tr (cherry picked from commit 37baabe6436037de604bfbc2702bfb0bc156c41b) Remove stray CR from input (cherry picked from commit 77779166569da389de44075b3d03413b353046a4) Just get rid of CR when parsing .bat output (cherry picked from commit 019ea173701eae4b8c5ffd45bb0063fc0a688ce0) Change-Id: Ieef2f8eb98181f5a4ea6a5527bc36de9b88716b5 Reviewed-on: https://gerrit.libreoffice.org/35010 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2017-03-09ofz#770 JOHAB_73 table starts at 0xA not 0x2Caolán McNamara1-1/+1
the start value is out by one row Change-Id: I77ed154358516ccd47a090cf7ed45bb609bc81a3 Reviewed-on: https://gerrit.libreoffice.org/34993 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-03-09CIA: unnecessary dllCaolán McNamara4-7/+5
Reviewed-on: https://gerrit.libreoffice.org/34972 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 587cf92e5cff091f863227fffa347df875fb86f7) Change-Id: Icbc3eaff000d90885cf85d8195868e1248493896 Reviewed-on: https://gerrit.libreoffice.org/34974 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-03-09ofz: leak in loading pptsCaolán McNamara1-7/+5
regression from commit 5e10e6937a8d5117555a4dcc9520aca173d75c95 Date: Sat Jan 18 10:15:10 2014 +0100 EDITENG : Remove usage of DBG_CTOR and DBG_DTOR. Change-Id: Id109f5bb23b1e4a93195548f880973ebc778515f (cherry picked from commit 0cbc0181d52433790bb607176ff01dcffc89ce99) Reviewed-on: https://gerrit.libreoffice.org/34952 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-03-09tdf#105656 only delete path if less than 2 pointsRegina Henschel1-1/+1
This prevents the crash. It might be related to gerrit #/c/33654 Change-Id: I92907c7874964af722b69ed8afd9249e110b3401 Reviewed-on: https://gerrit.libreoffice.org/33907 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 9e8f2afc2e2bbdbe136e74a24fb6c6eb94cde3c6) Reviewed-on: https://gerrit.libreoffice.org/34688 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-03-08tdf#104287 RTF import: handle bitmap shapes inside tablesMiklos Vajna6-15/+106
Regression from commit 015fd55c94b7b650ed8e572cafaf3b0f903b01b9 (tdf#96275 RTF import: fix anchor of shapes inside tables, 2016-05-10), the problem was that since shapes inside tables are now buffered, some previously hidden problems in the buffering became visible. For one, there was no code to make sure that a bitmap shape is not appended at the end of the buffer again when it gets re-played. For another, only the bitmap shape itself was buffered, not its size. (cherry picked from commit 8240be9170cc473506531dad2fda82469ae84443) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfvalue.cxx writerfilter/source/rtftok/rtfvalue.hxx Change-Id: I04d65eb794ff6b160ef77af85479ba25ea5f8aa7 Reviewed-on: https://gerrit.libreoffice.org/34953 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-03-08tdf#106218 sw: compare document: tweak special handling of EndOfContentMichael Stahl1-0/+22
In case the last paragraph in the document is inserted or deleted, the redline must not be positioned on the EndOfContent node (i#101009). But then rejecting the redline will have an additional paragraph as compared to the original document. Try to avoid that by tweaking the start position of the redline to the end of the previous paragraph. (regression from f4609c4c294a62023b6cd6baeb6a73d44992dec3) Change-Id: Iae75042a3124d0f3bca955fb856c94a6f478b986 (cherry picked from commit 9b3fa51e7ba4e2bfe9806295c3cbc8db347480d8) Reviewed-on: https://gerrit.libreoffice.org/34960 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-03-08Revert my fix for tdf#71409, to hopefully fix tdf#104381.Kohei Yoshida15-232/+258
This reverts commit 87e040fd0f04307534920d0765af6d5878794a98. This reverts commit a0ef7474521413c8967559a635e6fdc0d88f1df6. Conflicts: vcl/unx/gtk/a11y/atkutil.cxx Change-Id: Ib3a799e27b2495ebd1e7723f1cb5babf0dfbc702 Reviewed-on: https://gerrit.libreoffice.org/34730 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 10077a06d8f6d08f276f99024528ee31a57390a9) Reviewed-on: https://gerrit.libreoffice.org/34732 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-03-07tdf#101904 Fix Date deleting in SCalcJean-Sebastien Bevilacqua1-4/+65
Introduction ------------ In SCalc, when you want to clear contents, a dialog box asks you the data type you want to delete. For example, if you select `Date & time`, only cells of type `Datetime` should be deleted in the selected area. Currently, this feature is not working for datetime type. To delete datetime cells, you must select `Numbers` type. Datetime type is seen as number. Context of this fix ------------------- First, `DeleteAreaHandler::operator` function is called for each area to delete. In this context, area has a special meaning. An area is a group of consecutive cells (on column) of the same datatype (numeric, formula...). To locate area in the column, we use the `node.position` attribute which contains the row index of the cell (remember area can be only on one column) and `nDataSize` which contains the number of rows. How this fix works ------------------ In `deleteNumeric` function, we loop through area rows to detect if cell contains a numeric value or a datetime value. To optimize performance, we don't delete cells one by one but we get a range of the same datatype. As long as datatype stays the same, we add current cell to a "sub-area" but as soon as datatype switches (datetime -> number or number -> datetime), we delete this sub-area. Finally, at the end of `deleteNumeric` function, we delete the last "sub-area". Note ---- `deleteNumberOrDateTime` function deletes rows only if the corresponding flag in the dialog box is setted: `mbNumeric` for `Numbers` and `mbDateTime` for `Date & time`. Change-Id: I24c0b3c0a6195211af71aa18d867df82109fa941 Reviewed-on: https://gerrit.libreoffice.org/34068 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 4575d7cf657ae291c427c2318eb4600cec2f12b7) Reviewed-on: https://gerrit.libreoffice.org/34956