summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-20bump product version to 4.3.7.2.0+libreoffice-4-3-7Christian Lohmaier
Change-Id: I6bb181a52d9189fa81c1757d8e4834ba8d9f57b2
2015-04-20Updated coreChristian Lohmaier
Project: translations e30f579f28aea76cd69e64044ad21a0234c78bb1 update translations for 4.3.7 rc2 and force-fix errors using pocheck Change-Id: I03ac41a78355216de2547f7b369677e5941edf5a
2015-04-20fix col limit crash on export of ooo103315-1.ods to xlsCaolán McNamara
Change-Id: Ic68ddc56d9cf9dd410c1f073ba83bfeea8220bf0 (cherry picked from commit cee6eb254fae1012bc6ffe1b2e440fe58fedac1b) Reviewed-on: https://gerrit.libreoffice.org/15317 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 005acacd306f068fc6aabdb3b85987c54727a7da) Reviewed-on: https://gerrit.libreoffice.org/15442 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-04-20fix crash on export of fdo68639-2.ods to xls with invalid mnLastIdxCaolán McNamara
mnLastIdx doesn't get reset when the color list is reset, the code already acknowledges that mnLastIdx is the last set index but that it may not be a valid position, so only set rnIndex if mnLastIdx is valid and the data at that pos is the desired data. Change-Id: I57ce32fd1a13bfe9049ed94be34229c8c2808b8e (cherry picked from commit 6c3b1361a97f5219f90bf2f09f3c3f2b70b8e30e) Reviewed-on: https://gerrit.libreoffice.org/15319 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e3c0596857ed8713de829ac9875892312f595504) Reviewed-on: https://gerrit.libreoffice.org/15443 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-04-20tdf#86793: vcl: speed up OutputDevice::GetEllipsisString()Michael Stahl
The ridiculous algrorithm used for TEXT_DRAW_CENTERELLIPSIS will go faster if we cut out most of the text at the beginning instead of one at a time. (regression from 912ecaf565e68d2ca3fb9584712313e712749f75) (cherry picked from commit c6ec3e4cee8c7c22380780f2661ac23946cdb050) Change-Id: I9310dda1847222215bafe372e3efef9d365e1ad9 Reviewed-on: https://gerrit.libreoffice.org/15356 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2cd486b1dd75d530d8c12eb223e5f215fa8f1944) Reviewed-on: https://gerrit.libreoffice.org/15439 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-20fix crash on re-export of fdo50057-2.odt to odtCaolán McNamara
(cherry picked from commit 66c9aec156d974b939b680dccbb27e18fb153a23) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: sfx2/source/appl/fileobj.hxx Reviewed-on: https://gerrit.libreoffice.org/15326 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 54e13b65a225dbb0778eb0bb6460dfa849064e0f) Change-Id: Ice7a754dd4f42b5cf62ae2038b63d893b8a92fd8 Reviewed-on: https://gerrit.libreoffice.org/15433 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-20Resolves: tdf#90583 3D pie-chart missing guide handlesCaolán McNamara
partial revert of commit db1d2af02861b49e4f53d726d59cd71c20cee9b1 Author: Armin Le Grand <alg@apache.org> Date: Tue Feb 18 21:18:13 2014 +0000 Resolves: #i123539# some optimizations for 3D chart... geometry creation using UNO API (cherry picked from commit bbe35be767d76d08891c4f3d3600d80e0e6805f2) (cherry picked from commit bca8d8985666d3fd22b91eb280f9baaeb933c2d0) Reviewed-on: https://gerrit.libreoffice.org/15284 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 488d09771dfbdae0b94898dd675bc39b8550b85e) Change-Id: If35f05fb62230e90cfc43a0beac053e8a87820d4 Reviewed-on: https://gerrit.libreoffice.org/15432 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-20tdf#82784: cui: Area tab page: do not override imported bitmapsMichael Stahl
Check that we don't clobber a custom bitmap in the dialog. The (non-obvious) trick is that the name of these is non-empty, so we can check that to filter out pool default items that Draw likes to put into item sets (?), as well as just plain weird items that Draw likes to put into item sets, while avoiding relying on the surprisingly implemented ImpGraphic::operator==(). (regression from 38d0047da7f964c862360b48d88cc869ad376b6b) (cherry picked from commit 171fb61c6526daf83d6948a543a1614215590946) Conflicts: cui/source/tabpages/tparea.cxx Change-Id: I0b94e49ef3a9a32c188c3b117a57f780f55e1584 Reviewed-on: https://gerrit.libreoffice.org/15372 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 00dc0e2a2d505e5281a9f5a32fa658e5fca6a6ea) Reviewed-on: https://gerrit.libreoffice.org/15438 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-20fix crash on export of fdo60365-2.ods to xlsxCaolán McNamara
Change-Id: I1a281b096e4d1831bcf67ca03180afff043fbcfd (cherry picked from commit 135907f2061550624ee1859745d94eee01849070) Reviewed-on: https://gerrit.libreoffice.org/15321 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit b748d80a408e822c367e9b87fe2c7f50322c2219) Signed-off-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/15434 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-04-20fix export of ooo120353-1.odp to pptx, mismatch of start and end elementCaolán McNamara
cut and paste error I guess from the block above it (cherry picked from commit 1d4e66a79453f7b020a3dcea328c03637407add9) Reviewed-on: https://gerrit.libreoffice.org/15309 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f9ac39aa8418745f959bc4daa0877fed23fc72c1) Change-Id: I121e1d1a9f08ea3731bb7f65c385f264b3c2d2f4 Reviewed-on: https://gerrit.libreoffice.org/15430 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-04-20Related: tdf#74018 fix int wraparound + crash on exportCaolán McNamara
of fdo74018-2.docx to doc nPoints is 16bit and accumulated value wraps around, so use a 32bit nTotalPoints instead and move 16bit declarations to use points to confirm no other wraparounds (cherry picked from commit ce705ac56a8709970356d634abb964adef105594) Reviewed-on: https://gerrit.libreoffice.org/15281 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a1e252733e3ddbab7b4854799acb05edc25dd07a) Change-Id: If97ccb46ed8eb7f4305cdfe328ae83bc2b0c778c Reviewed-on: https://gerrit.libreoffice.org/15431 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-04-20rhbz#1134285: Access dav, davs URLs via GVFSStephan Bergmann
...so that LO shares the credentials with Nautilus once the connection has been set up in Nautilus. The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS and successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME- specific gnomevfs resp. gio UCP since b07a5fcc600ad564315d36fbd18495184fdf69cf "INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at <https://bz.apache.org/ooo/show_bug.cgi?id=84676> "mixing neon and the hidden embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio one. So keep handling dav, davs URLs via LO's internal webdav UCP under legacy --enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the default --enable-gio. Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594 (cherry picked from commit 51e0d789c344547956764c3b5f0ef5a304f4e0aa) Reviewed-on: https://gerrit.libreoffice.org/15296 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ab0500bfb68982c2c3e1288e0f2d7dd31f531cd5) Reviewed-on: https://gerrit.libreoffice.org/15427 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-04-20string access out of boundsEike Rathke
Another UniString to OUString conversion fallout. Change-Id: I5e62b049da3e7f8b5a892ea6aae7110a33564a46 (cherry picked from commit 9f52efa43b2d65c0b6c92790cc2859e752bf975f) Reviewed-on: https://gerrit.libreoffice.org/15287 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 468b868c6209e26ab29d83ccacd007fcf785402a) Signed-off-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/15425 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2015-04-20tdf#89597: Resize formula buffers after adding a dummy sheetKatarina Behrens
for pivot table cache records. Regression from commit d17a83fa549f828f29e6939. On loading pivot table cache records, a dummy sheet is created to store them. Formula buffers are now vectors, not maps and need to be resized in such case. + add a const version of getDocImport method, need to use it in the new getAllSheetCount method Change-Id: I5d57a822da5fe5a97029b83406e8ff877a5dbd7c Reviewed-on: https://gerrit.libreoffice.org/15030 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/15325 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 589f7cbe3789224a8836f3cd4705f067be6789c5) Reviewed-on: https://gerrit.libreoffice.org/15441 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-04-20tdf#75614 RTF import: fix missing text after footnoteMiklos Vajna
(cherry picked from commit cec5f2eab25578a9859134d697c200089c597faa) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I5901094cb603c35a1cd8ac718fd434a9dd55729b Reviewed-on: https://gerrit.libreoffice.org/15271 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit dee3f93a9e82fe320ce2de7078a32ecaa25e9c1b) Reviewed-on: https://gerrit.libreoffice.org/15423 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-20tdf#82430: gcc-wrappers: command line *must* start with a spaceMichael Stahl
Yes, you read that right, if there's no space in front of the first argument, cl.exe will *ignore* it. Change-Id: I73d9bf026705538e53b5d91091a4c96eb15739b2 (cherry picked from commit c4a267215c10647ff281e9e629faa0a8a201f4b4) Reviewed-on: https://gerrit.libreoffice.org/15382 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 2c3f7421d550b6ae8c6bfdcde709dfba57aa1d3a) Reviewed-on: https://gerrit.libreoffice.org/15436 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-20fix assert on re-export of ooo48994-1.ppt to pptCaolán McNamara
(cherry picked from commit eece059c1f728059b536763bffd2d4fc3537833e) Reviewed-on: https://gerrit.libreoffice.org/15314 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d946f85440f4f225ecda88b121bad601b5573549) Change-Id: Ic8274e7d060f315d7891f8f5cf576f834ca89117 Reviewed-on: https://gerrit.libreoffice.org/15429 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-20tdf#84294: vcl: fix PDF export of transparent Writer frames in LO 4.3Michael Stahl
The transparent frame background is painted opaque because OutputDevice::DrawTransparent() records a MetaTransparentAction instead of returning early. Note that master and 4.4 use drawinglayer to paint backgrounds so the problem is only visible in 4.3. (regression from 36b59f2efc2bfb2c9256c39eb5687808deb) Change-Id: Ide7a076b72123097a9fe099b96d36cda7f7bb082 (cherry picked from commit 581314958f0ddd6c3a0536ce2d7e7e6f0c53a8ec) Reviewed-on: https://gerrit.libreoffice.org/15343 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 9ef6eea9c60ee82d7d56cd7dc99515ab3fbe2b17) Reviewed-on: https://gerrit.libreoffice.org/15349 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-19update creditsChristian Lohmaier
Change-Id: Iaf08b06eb20ac1722fcea2958e595417ee7baf43
2015-04-11rhbz#1197614: Fix calculation of m_bHasActive when removing active elementStephan Bergmann
Assume m_vEntries.size() == 2; assume first element (nPos == 0) is m_bActive, gets removed, so m_nActive would have stayed at 0 and m_bHasActive at true; then assume second element (again nPos == 0, due to the removed element) is m_bNew, so nPos <= m_nActive is true and m_nActive gets updated to 1 (and m_bHasActive remains true); then selectEntry(nNewPos) (nNewPos == 0) would have tried to reset m_vEntries[1]->m_bActive but now m_vEntries.size() == 1. Change-Id: I31d3bbe97ca99f880aa99bdea015f7c0457f8331 (cherry picked from commit 97d4c1a8100c63091401736c93d6bbbb371d5b37) Reviewed-on: https://gerrit.libreoffice.org/15232 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 816f949607c0e372f73ad87fe44b086b27235a01) Reviewed-on: https://gerrit.libreoffice.org/15236 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2015-04-11some compiler do not like >> but prefer > > in template syntaxNorbert Thiebaud
ebdaab9d4a042f1338f97628cf0c0f294d7dc059 introduced cppu::UnoType<uno::Sequence<OUString>>::get()); which made some compiler unhappy. Change-Id: I78b4f4a496b7c40d7b2dad46ad58d3500fd93aed Reviewed-on: https://gerrit.libreoffice.org/15251 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-11openssl build breakage on MacOSX 10.6Norbert Thiebaud
3217bae01e58e7fe6f075514cf8d2baf89e76afe changed the apply of openssllnx.patch to make it unconditinal which introduce a -Wa, option that is not supported by the 10.6SDK Change-Id: Ic9f68bad5c7d0694d206bc4d6899ab01009942c0 Reviewed-on: https://gerrit.libreoffice.org/15253 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-10bump product version to 4.3.7.1.0+Christian Lohmaier
Change-Id: I63d7585b0781c0c3f2ebd4ad02f430e460d3400a
2015-04-10Branch libreoffice-4-3-7Christian Lohmaier
This is 'libreoffice-4-3-7' - the stable branch for the 4.3.7 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ifb2e6290afd6db52fa1ededfe04505a55b6e2ca4
2015-04-10upgrade to openssl-1.0.2aCaolán McNamara
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one platform tests the patchs applying on all platforms ubsan.patch.0 was effectively applied upstream while need to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build under windows Reviewed-on: https://gerrit.libreoffice.org/15183 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 04a98015101b8fea3b200e0bf3a2469d8c75fdf7) Conflicts: external/openssl/UnpackedTarball_openssl.mk external/openssl/opensslosxppc.patch Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15222 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-04-10Related: tdf#90472 initial load of bibliography doesn't...Caolán McNamara
set bibliography type moving to a new row will set the new type, but initially its not set because the ListStore property was set after the model is connected to the database so at the initial connection time there isn't a available set of values to map the row to. So move that connection code from general.cxx to datman.cxx and put it before the connection is established we can then remove the intermediate aBibTypeArr list and those resources then need to be global bib ones. Change-Id: I12276c3df9955ec399e1b5de6d0836c69ebb1ebb Reviewed-on: https://gerrit.libreoffice.org/15220 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-04-09tdf#90404 OOXML chart legend import improvementAndras Timar
In the bugdoc, the chart legend had 6 entries in PowerPoint, but only 5 in Impress. I played a lot with padding and offset parameters in layout algorithm without success. Finally I introduced this 1mm tolerance, so the fixed legend frame can expand up to 1mm, if necessary. Change-Id: Id1ad1df67aab41d942133cea8d16fccf0f215167 Reviewed-on: https://gerrit.libreoffice.org/15149 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 6220362e844ad0e50a38c1627ddd05a082882009) Reviewed-on: https://gerrit.libreoffice.org/15154 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-04-09tdf#90403 PPTX import: use real table sizeAndras Timar
PowerPoint ignores a:ext cx and cy value of p:xfrm, and uses real table width and height. PowerPoint 2010 saves files where cx and cy contains good values, but I found files in the wild whose cx and cy values did not match to actual table width and height, and there was a visible difference between rendering of Impress and PowerPoint. Reviewed-on: https://gerrit.libreoffice.org/15123 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 037fe3671cbdad51f52d2f69f72f47f463dba7c2) Conflicts: oox/source/drawingml/shape.cxx sd/qa/unit/import-tests.cxx Change-Id: I3f80c0cea4cac46763d449f918bb78dca1a6562d Reviewed-on: https://gerrit.libreoffice.org/15133 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-04-09tdf#88847: Fields of query design can be moved to the left onlyJulien Nabet
Part of code 1299 ImplHeadItemList::iterator it = mpItemList->begin(); 1300 ::std::advance( it, nPos ); 1301 ImplHeadItem* pItem = *it; 1302 mpItemList->erase( it ); 1303 if ( nNewPos < nPos ) <-- case move to left 1304 nPos = nNewPos; 1305 it = mpItemList->begin(); 1306 ::std::advance( it, nPos ); 1307 mpItemList->insert( it, pItem ); So in move to right case, we erase and insert pItem at the same place We just have to use nNewPos in all cases regression from bd24a310be1459510b760b812838cb87923853c5 Also add back "ImplUpdate" call erroneously removed in merge commit 67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (there is an ImplUpdate call in each parent of that merge commit) Change-Id: I100b0c6874b366f777c5d38470fcee7a9a7326df (cherry picked from commit 63050dccbc50f148cd788730faa53d822d37e54f) Reviewed-on: https://gerrit.libreoffice.org/14787 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-04-09Updated coreChristian Lohmaier
Project: translations c93415da868b59df900ce470baa99071c26bd851
2015-04-08Resolves: tdf#86399 don't clobber cluster start caret posCaolán McNamara
with other cluster element bounds (cherry picked from commit b1030f75d3e47719ca63ec518f1da75196bead1a) Conflicts: vcl/source/gdi/sallayout.cxx Change-Id: I2cc976eb6a0ef42a2678be80637c7220e2247921 Reviewed-on: https://gerrit.libreoffice.org/15121 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-08Resolves: tdf#87548 don't create a new list for each multiselection portionCaolán McNamara
create one list and share it among all the subsections possibly a regression from/triggered by author Oliver-Rainer Wittmann <orw@apache.org> 2014-03-18 14:33:39 (GMT) Resolves: #i124371# When changing the numbering or bullet styling... of a set of paragraph which have more than one different List Style applied create a new List Style and put the paragraphs into a new list. (cherry picked from commit 0087ca89e3905009ed947c651f3dc70f3d61ea93) (cherry picked from commit db41e274747e6f1d3eee2bd5efb3321cfcbd6b75) Conflicts: sw/source/core/doc/docnum.cxx Change-Id: I9416b97d6afe323ac99150fdcc23f71ecea98a58 Reviewed-on: https://gerrit.libreoffice.org/15139 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-08Resolves: tdf#90138 don't try to save a marks OtherPos if it doesn't have oneCaolán McNamara
Change-Id: I522a236015c91c0744b3018d3d4e4d6c65ea19ab (cherry picked from commit 4fe5b44b15647542b1550deaeee43ec3d1e57591) Reviewed-on: https://gerrit.libreoffice.org/15141 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-08Resolves: tdf#83977 Push/Pop before/after messing with the cursorCaolán McNamara
otherwise we lose our selection with multi-page tables Change-Id: I4f52d3cfb7a6d3c2cc1dbb68bbd5ce5c0005b1c3 (cherry picked from commit 4c4a9767f7fb0c7891f1dd96cbe38a9c35e46083) Reviewed-on: https://gerrit.libreoffice.org/15143 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-08fix crash on re-export of fdo64646-4.xls back to xlsCaolán McNamara
Change-Id: Ic6d6e7d7d8d42af0fc739d964a1190d40f9dba2e (cherry picked from commit b56b5d449fc74809fddc9b9bbd1d9f8d244a0d10) Reviewed-on: https://gerrit.libreoffice.org/15188 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-04-08Updated coreAndras Timar
Project: dictionaries b61b40bae9f1466d71960344096f7c196672db27 Update Portuguese dictionary to version 15.4.4.1 Change-Id: Iee435bb01c8111612d0ee773c6ee4863a51db252 (cherry picked from commit 7991db3dd76ae9fe15faadbd25efb9bceed44e63) Reviewed-on: https://gerrit.libreoffice.org/15202 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-04-07Missing @since tagStephan Bergmann
cf. dd9c9a69da7b22c4166391df082ac23878312a01 "Add the 'quoteright' key to the list of available keyboard shortcuts." Change-Id: Ia064782505e317ee3d1c3622c273eb892e477b5e (cherry picked from commit 1856a9df67d12b2e829445274d2969d10845a820)
2015-04-03Resolves: tdf#88672 add missing return if error to not crashEike Rathke
Change-Id: Iae73c46d6ae5b141c3f5680b2623ee06205c22d2 (cherry picked from commit 3cae8ee10f297e42adf9f3b33809b4e7e3af2840) Reviewed-on: https://gerrit.libreoffice.org/15112 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-04-02fix hang with ooo71962-1.odtCaolán McNamara
script run ends after chunk we are rendering (cherry picked from commit 00bf3a4259c1f960eff05b17649cc734c275950f) Change-Id: Idbfe11c385db72a80d3d204f8638d67395580d1b Reviewed-on: https://gerrit.libreoffice.org/15116 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-04-01Resolves: tdf#42481 propagate errors as errors in matrix calculationsEike Rathke
... instead of setting an error string with an unwanted side effect that may lead to wrong results instead of error. Change-Id: I42ade52e86520535c879e9bd68156873d706f33c (cherry picked from commit 836d05d32e36aafc00de59ca51878f47f7ce816a) Reviewed-on: https://gerrit.libreoffice.org/15073 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-31bnc#910045 wrong cell fill color defined by table styleZolnai Tamás
Problems were with those table styles which used color themes to define cell fill color. Reviewed-on: https://gerrit.libreoffice.org/15089 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit debf3ffb87d607704ddea97f6710c3ceaa9a243d) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ibde90df81ff253ba65618dde4038093d1caabfe8
2015-03-31bnc#902652 OOXML: fix import of insets when shape and/or shape text is rotatedAndras Timar
5ac575ee3e109 did not get it right, the vert attribute (i.e. the rotation of text) is relevant, not the rotation of the shape. In that case both text and shape rotation were 270 degrees. I checked that the bugdoc of bnc#773048 looked good after this. Reviewed-on: https://gerrit.libreoffice.org/15076 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit af686aa8694903bde5952656cd69993c8c8393d7) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I6e0401cd138a82040df82d7da1a47311db7771e4 Reviewed-on: https://gerrit.libreoffice.org/15085 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-31RotateAngle of UNO type longStephan Bergmann
Change-Id: Id3aec16d17b55366c2a35810b21b0a1c73439741 (cherry picked from commit 44b2fb6d0ba8c3fc8aa6edb4e539c484e21b7fc5)
2015-03-31fdo#87488 Wrong text rotation inside a preset shape from docxGary Houston
Preset shape text rotation values are read in a few places and stored in moRotation. With these changes, moRotation is always read unchanged, but multiplied by -1 when it's used. Change-Id: I633d665c21daa69e15fa828a43300f10d2bf2054 Reviewed-on: https://gerrit.libreoffice.org/13561 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 921cea89da8adbe714ea8f71169dd6afc42354c4) Signed-off-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/15084
2015-03-31Resolves: tdf#90301 string access out of boundsEike Rathke
Apparently yet another leftover of UniString to OUString conversion where with UniString out-of-bounds accesses didn't harm and returned NIL. (cherry picked from commit eed393039a9067f7a1a318934ff1c5ff90bfe443) Include <algorithm> for std::min() (cherry picked from commit 3394ac816a573030feda145dbdabd2a1eabd78c4) Change-Id: Id88456a52df3fc8cdaf90d9d509e327b96269808 13ed47d23ed4b94501d9445555d99ce08af94698 Reviewed-on: https://gerrit.libreoffice.org/15075 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-27coverity#1267678 this is surely backwards (gold)Caolán McNamara
surely we clone from the source and return the newly created entry. Presumably this doesn't break all the time because aCloneLink is generally set ? coverity#1267678 Resource leak Change-Id: I3e02dfaef371e006f1510b186cdd881c991ef2cf (cherry picked from commit 9f1ecd3ac35f06746fe2a12ca52899f664679de5) Reviewed-on: https://gerrit.libreoffice.org/15023 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-26tdf#89774 oox: TotalTime is in minutesMiklos Vajna
(cherry picked from commit 302f413eec4da8c8572911d08e939186c5ac57cf) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport5.cxx Change-Id: Ie65a8adbd077997f4a13914dd8e0ba4d55afd7b7 Reviewed-on: https://gerrit.libreoffice.org/15017 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-03-23tdf#89437 Ordinal suffix should never be superscript in some languagesNiklas Johansson
Printing ordinal suffixes as superscript is just not done in Swedish and likely a few other languages but this change only cares for Swedish at the moment. Change-Id: Ib7600ceb0534793d900f13b2740e63c1f7f34ba9 Reviewed-on: https://gerrit.libreoffice.org/14913 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 307c25fe460857c52f0b9c2078e83f6d12f8bdc9) Reviewed-on: https://gerrit.libreoffice.org/14967
2015-03-22fix double delete on loading ooo123605-1.odtCaolán McNamara
if there are no listeners to send the event to then don't acquire and release the Source in the temporary used by forEach and so avoid double-releasing on loading ooo123605-1.odt Change-Id: I6843042d7cf8c0ffee01c7d519299fcb05b29a4e (cherry picked from commit 9527eeec237f5d797a6420371c76f95246adeb84) Reviewed-on: https://gerrit.libreoffice.org/14927 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-03-21Replace hardcoded UI string with string from .res fileAndras Timar
Change-Id: Iba362cc2ee624271dcc078d7e7ded1ef6ff44ae4 (cherry picked from commit 45c949c5a34cb73cdb08f85b2f33ae498c7c3c5c) Reviewed-on: https://gerrit.libreoffice.org/14934 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>