summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)AuthorFilesLines
2016-04-26tdf#99450/tdf#99462: fix insert twice the same object in Photo albumJulien Nabet1-1/+0
For tdf#99450, see https://bugs.documentfoundation.org/show_bug.cgi?id=99450#c6 for full details tdf#99462 is also a consequence of this double insert. See https://bugs.documentfoundation.org/show_bug.cgi?id=99462#c2 Change-Id: I474495457088b93e0e86ea2e504f61c383ba059d Reviewed-on: https://gerrit.libreoffice.org/24327 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 618e7622d08b20f6ea5f38144b61a187aced86af) Reviewed-on: https://gerrit.libreoffice.org/24330 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-04-14tdf#99224 PPTX export: implement support for images with textMiklos Vajna4-1/+31
In case an image had text, then ShapeExport::WriteGraphicObjectShapePart() wanted to write "only the text", but PowerPointShapeExport::WriteTextShape() had no idea how to write an image, so at the end nothing was exported. (cherry picked from commit fc70e4c4e192372f77511bc6ce2bc77b9c9539be) Conflicts: sd/qa/unit/export-tests.cxx Change-Id: I6c1ad0b41d4c5dc260b952322fb8a59e7f175603 Reviewed-on: https://gerrit.libreoffice.org/24017 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-03-15tdf#94370: Make previews of master pages finally appearKatarina Behrens1-0/+1
Just force the whole ValueSet to be formatted. Individual rectangles are already being invalidated (when PREVIEW_CHANGED event comes), but something naughty must be happening in ValueSet that those changes don't show. Change-Id: I4fd8af36e34c3a445d7b16b59e45256f016fd9df Reviewed-on: https://gerrit.libreoffice.org/23115 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 1b98d7a3c4f1de39226e44e5b27351d8bfbbe6c0) Reviewed-on: https://gerrit.libreoffice.org/23116 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 819166500c1b45e4241fdb47f2de6653e4495372) Reviewed-on: https://gerrit.libreoffice.org/23253
2016-02-29fix clang buildMarkus Mohrhard1-0/+4
Change-Id: I0a1ed390462e068dc59e360b9b5dd4a798bac21c Reviewed-on: https://gerrit.libreoffice.org/22746 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-02-27xmloff: tdf#97808: allow empty draw:marker-start/marker-end/stroke-dashMichael Stahl3-0/+71
Apparently these are allowed to be empty, which means "nothing". (regression from db1d278dcc308c73eb5edebc20481c96e7f479d8) (cherry picked from commit af57a81d0c28944b424649f024c28f444a1ab2d9) Change-Id: I13f7998e0986b26c34929afd40b1b4f0fc9efdff Reviewed-on: https://gerrit.libreoffice.org/22724 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-02-03tdf#91762: Check wether the row and the cell have text...Xisco Fauli1-2/+1
... in order to set the row's min height Regression from 4f2c8194f485b1527fb4f4dfe23ce804937f1f9c After this commit, the row's min height was set based only on the cells containing text in the row, but the problem appeared when the row didn't have any cell with text. Change logic to check wether there's text in the cell and in the row. Now, height in SdImportTest::testRowHeight() is 507 instead of 508 but I can't figure it out why. However, I believe there's no harm in change the test from 508 to 507 as, visually speaking, the difference can't be distinguish. Change-Id: I0b3a14c34eaeaa8e77227860ca290fb79a0302ce Reviewed-on: https://gerrit.libreoffice.org/21692 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 13d4398820ded5914f635757865e258db2db2b57) Reviewed-on: https://gerrit.libreoffice.org/22009 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2016-01-11tdf#96051: FILESAVE: Roundtrip any PPTX file with Shapes creates invalid OOXMLZolnai Tamás2-27/+0
Revert "bnc#584721: Import subtitle block to master slides" This reverts commit b3d50feaa87b670baf68288974005ac26ad31736. It seems the imported subtitle block makes export corrupt the output. Better to have a valid output. (cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc Reviewed-on: https://gerrit.libreoffice.org/20921 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-11-26Fix tdf#80224 Custom text color changed to black on .PPTX exportMark Hung5-1/+30
1) Write endParaRPr so that PowerPoint display them properly. 2) Original design forbid properites with default value to be exprted, now fixed. 3) Automatic colors are written as white or black based on whether background is dark. Note that tdf#77881,tdf#80520,tdf#89525 depend on this. Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf Reviewed-on: https://gerrit.libreoffice.org/17472 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/19862 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2015-11-10afl-eventesting: deref of null mpTextObjCaolán McNamara1-1/+1
Change-Id: Icdb7d1cc250640f428984b96b0a51ac950013cb2 (cherry picked from commit 0c39c456f47c14e2b7f86d1bc6857dc0e2ca6cb3) Reviewed-on: https://gerrit.libreoffice.org/19814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-05tdf#95298: corrected some out-of-bound accesses to arrayArmin Le Grand1-4/+6
the index variable m_FrameList used to reference the current frame uses the state EMTY_FRAMELIST to mark as invalid, which is the max integer number. Thus all usages have to be secured to not use m_FrameList if set to EMPTY_FRAMELIST. This was missing in some places. the max integer number. Thus all usages have to be secured to not use m_FrameList if set to EMPTY_FRAMELIST. This was missing in some places. Reviewed-on: https://gerrit.libreoffice.org/19753 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Cherry-picked from f0cef70cd4164342b218fbee34bf57eedc22c998 Change-Id: Ie1cf4ae2cb79d821f634ec78b621a2647abc61a8 Reviewed-on: https://gerrit.libreoffice.org/19787 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-29tdf#93587: insert table in draw ole objectJulien Nabet1-15/+7
Don't disable "Insert table" option in case of Ole object Change-Id: Ibe87d35db320f4a9d5c971e3f7b25199fcacbde4 Reviewed-on: https://gerrit.libreoffice.org/18897 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 2135b4a88d755c0b79a3b93b2269f08b709220c5) Reviewed-on: https://gerrit.libreoffice.org/19067
2015-10-22afl-eventtesting + VclPtr: missing dispose on impress annotation windowCaolán McNamara2-5/+5
regression from commit c72fac269626cd4c2c3f62a6eed69e47b59256a4 Date: Mon Mar 16 12:17:44 2015 +0200 vclwidget: convert lots more sites to use VclPtr Change-Id: Iac6a83003d9c395589acdc23fe511d2bb47e91ee (cherry picked from commit 8e4739b94de0bbc7ceb91705a7ba7946b8b70b94) Reviewed-on: https://gerrit.libreoffice.org/19497 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-10-19afl-eventtesting: deref of null GetMainViewShellCaolán McNamara1-1/+3
(cherry picked from commit cbe2b9cb69a685ab89384f98a9e62b2623afcd9b) (cherry picked from commit 2b942719d7132b0e055395ad8efb0ee3c60676cf) Change-Id: Ie6863f446aa688bc1bb3f725ee31e9984dadc7a4 Reviewed-on: https://gerrit.libreoffice.org/19466 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-10-19afl-eventtesting: pCursor is nullCaolán McNamara1-0/+2
Change-Id: I24d29ffc3cfcb00e513a5267619e143b028355ce (cherry picked from commit 6c39f7bba64fd55488f840675fa83c3ba241bc74) Reviewed-on: https://gerrit.libreoffice.org/19468 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-10-14tdf#91097 Substitute rectangle and ellipse uno commandsYousuf Philips1-2/+0
(cherry picked from commit 3080e4c09b7c4894d4f0f52c9beed4298f3fd23f) (cherry picked from commit fedf965c51a9f57e5cde203a3d15a6c244558002) (cherry picked from commit 4c2339d8177d610cc23619e787c1517ce8e8afd7) (cherry picked from commit 1bc911eca173131fdc6e7e3889d128fa03adbf72) Conflicts: framework/source/uielement/menubarmanager.cxx sc/uiconfig/scalc/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6 Reviewed-on: https://gerrit.libreoffice.org/19345 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-12xmloff: fix ODF import of gradient draw:angle attribute a bitMichael Stahl4-0/+275
ODF 1.2 part 3, 18.3.1 angle, says "An angle, as defined in §4.1 of [SVG]" and "If no unit identifier is specified, the value is assumed to be in degrees." Unfortunately OOo could only read and write 10th of degree here. See also https://issues.oasis-open.org/browse/OFFICE-3774 As the first step towards fixing that, implement the import for draw:angle values with an angle unit identifier, but leave the import as-is if the angle identifier is missing. Change-Id: Ib88d417c03998ebcfc569b01492f0e1f851bbc85 (cherry picked from commit aadda5d17f6e422da143ea774f759bfc5f629c5b) Reviewed-on: https://gerrit.libreoffice.org/19283 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2015-09-21tdf#91293: Preserve hyperlink on URL field OOXML exportKatarina Behrens2-0/+46
The fix is twofold: 1.Get URL property from the underlying text field, not from the text run -- put text field properties into rXPropSet (that's what GETA macro later queries), not into rRun 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/ afaics for no good reason 2. Retrieve string content from URL field early, so that the test for empty text content doesn't fire Reviewed-on: https://gerrit.libreoffice.org/18031 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Conflicts: sd/qa/unit/export-tests.cxx Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0 Reviewed-on: https://gerrit.libreoffice.org/18706 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-21valgrind, leak in SdStyleSheetCaolán McNamara1-0/+3
this is presumably a regression from commit 8904bf48e0cb4d5d0890684ce82dc2ff3252e41f Author: Michael Stahl <mstahl@redhat.com> Date: Tue Jul 7 23:57:07 2015 +0200 sd: dispose SdStyleSheet properly If it's disposed during document destruction it still retained pointers to SfxItemSet and SfxStyleSheetBasePool. where it was always deleted in the dtor, but now is optional in ::dispose lets set bMySet to true when pSet is created like sc does, rather try going to an unconditional delete in ::dispose Change-Id: I214675805e513f657e51c779758106194f6d14e3 (cherry picked from commit 217a22188274221035aec988eccea5e5c9768921) Reviewed-on: https://gerrit.libreoffice.org/18694 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-21check stream status and string lengthsCaolán McNamara4-42/+43
(cherry picked from commit 7af19f45b35c428d3e06972806e5a05489f45955) if nSize was 1 with unicode encoding nSize would wrap around in lcl_getMaxSafeStrLen (cherry picked from commit f6368c29bdc3a9017bcae3f064d2cd8c7e37ed10) rework this so we don't read the string, backup and re-read the string again (cherry picked from commit 8523e57e427ef5b0b7f7067dcdd07f01176d2160) Change-Id: I99f3d4a2ec760228f485d01fce856deb9c068431 Reviewed-on: https://gerrit.libreoffice.org/18690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-18reusing i here from the outer loop is definitely bogusCaolán McNamara1-2/+2
Change-Id: I4ee52c76b2c1723639185bc99b85d83be5b4fdd7 (cherry picked from commit 637ad743bb74a826ddd4db5efbcd33779b9132cd) Reviewed-on: https://gerrit.libreoffice.org/18686 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-09-11tdf#85303: SLIDESHOW cannot start at selected slide sometimesJulien Nabet1-7/+12
When Slide Show/Slide Show Settings is selected and Ok button is clicked the slide from "From" list box is stored in maPresPage and the fact that this var is not empty makes slideshow considers it must be used. So 2 things must be done: 1) Check first if "All Slides" has been selected In this case, don't read slide from "From" in next block (ATTR_PRESENT_DIANAME) and so let maPresPage empty 2) Empty maPresPage if "All Slides" has been selected to remove any existing value Change-Id: I6042ae2db6260e1f441a1c9db90f5de6de966f2a Reviewed-on: https://gerrit.libreoffice.org/18253 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 db9f846abfc683c622375191edb6ae9bf348f6e7) Reviewed-on: https://gerrit.libreoffice.org/18298 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-07tdf#93097 oox: fix import of metadata from non-relative stream pathsMiklos Vajna2-0/+12
Commit ef2668bad976f1fbb70759887cafd35ea7833655 (PPTX import: fix missing document metadata, 2014-08-28) implemented metadata import for the PPTX filter, but in case the metadata stream is not an existing one, then OHierarchyHolder_Impl::GetListPathFromString() invoked by OStorage::openStreamElementByHierarchicalName() throws. The bugdoc is generated by a 3rd-party tool that always starts the stream path with a slash, and MSO seems to just ignore that: so let's do the same to be able to open the document. Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28 (cherry picked from commit 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c) Reviewed-on: https://gerrit.libreoffice.org/18368 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-04Fix tdf#77881,tdf#80520,tdf#89525 bulllets lost issue.Mark Hung2-0/+35
Replace bullet char before write out font description since it may be altered if bullet font has been changed (i.e. StarSymbol to WingDings ). Change-Id: I0461cc0a5e4628b36177602bba7ed7f74a0751eb Reviewed-on: https://gerrit.libreoffice.org/17376 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/18318 Reviewed-by: Mark Hung <marklh9@gmail.com>
2015-09-02tdf#93830 txXfrm offset workaround works in rounded rectangle case as wellAndras Timar2-0/+25
Change-Id: I5d8df5c0d55e8dfd7c978b16b2b220c127f3dac9 Reviewed-on: https://gerrit.libreoffice.org/18226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit cc88a88caad591270760d947848ad0a032d32bdb) Reviewed-on: https://gerrit.libreoffice.org/18270 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-01sd: Don't crash when the sidebar is hiddenMaxim Monastirsky3-5/+6
Change-Id: I09a5019a98b529ba11f07392906a3e0fb7bc1bac (cherry picked from commit c511b2795dbf47186c0f7d83fe7a4cd737d4d765) Reviewed-on: https://gerrit.libreoffice.org/18243 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-01sids unsortedCaolán McNamara1-2/+2
since commit 74ef8a4148f7d8fdf0d40481f879cdd13b27aafb Author: Maxim Monastirsky <momonasmon@gmail.com> Date: Sun Dec 7 01:18:06 2014 +0200 Introduce ParaspaceIncrease/Decrease commands in Writer and Calc Change-Id: I53dab158160ed9840404e60917fbb8725517bcd3 (cherry picked from commit 34ebb26d4c63d73d42d711c9a6e09aae9afae61e) Reviewed-on: https://gerrit.libreoffice.org/18241 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-01check stream statusCaolán McNamara2-0/+8
Change-Id: I6b9537cf94ac1c5d996ba64ddf878745dadde254 (cherry picked from commit 452cd9e75de657e996e17510fe5d3539065489d1) Reviewed-on: https://gerrit.libreoffice.org/18128 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-31pClientData can be nullCaolán McNamara1-0/+0
Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc (cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1) Reviewed-on: https://gerrit.libreoffice.org/18149 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-29check stream statusCaolán McNamara2-9/+25
Change-Id: I609c8c4f4e843601361b61f55e0325ad99db3c23 (cherry picked from commit dc1be62d75e654e17c2f4c02804b7fd48d5a2515) Reviewed-on: https://gerrit.libreoffice.org/18115 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-29eof isn't a Error, so use good not GetErrorCaolán McNamara1-0/+0
Change-Id: Ie1df87c7eb9d391d0fa4a579f744051a1f1b2ae1 (cherry picked from commit 078235028a8c4ea36b6b366348016e19759c456a) Reviewed-on: https://gerrit.libreoffice.org/18114 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-29guard against 0 item sizeCaolán McNamara2-2/+9
Change-Id: I9c4c2f0fe2d892615b3c70e08da0cab6da13338a (cherry picked from commit 2aadad1e89e96cb80c15fe1069cb6365f0cade1d) Reviewed-on: https://gerrit.libreoffice.org/18113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-29check seeks and readsCaolán McNamara5-18/+32
Change-Id: I0c5c4784713376e0762bfbd197640f8d31b65562 (cherry picked from commit 1847753ab135f522df6a293a8539155437f0129f) Reviewed-on: https://gerrit.libreoffice.org/18112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28check stream state after read attemptCaolán McNamara1-0/+0
Change-Id: Ie3836f2e95acab963634181a07565343501f00f8 (cherry picked from commit 9a695e071020639926f8b038aba64eb016a1801a) Reviewed-on: https://gerrit.libreoffice.org/18092 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check for stream status after a read, not after a seekCaolán McNamara2-10/+15
Change-Id: I984e99c1a1484547aa4d60bf301167f3cbc9f716 (cherry picked from commit eea399ddd52a0de368321963bb828bc15632dd0b) Reviewed-on: https://gerrit.libreoffice.org/18088 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check seek for successCaolán McNamara2-1/+5
Change-Id: I02420ffb3af009d08ce54a0932e2c7a287703a72 (cherry picked from commit 1830b4f2e324090962a993315ce76752d24d4088) Reviewed-on: https://gerrit.libreoffice.org/18091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check status of SeekToCaolán McNamara2-2/+4
(cherry picked from commit 932f6de91904f86f38d2914b9ce07b94dfadac0c) Change-Id: Ia2bb397c3fdd783cab77a6b0dbc31c9e3d19326b Reviewed-on: https://gerrit.libreoffice.org/18094 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check SeekToEndOfRecord for successCaolán McNamara1-0/+0
Change-Id: I7413a4e9e491b65122eaadb38ad574161f1aa943 (cherry picked from commit d417ffb7dd93306be7c89526a75acab53dbd8831) Reviewed-on: https://gerrit.libreoffice.org/18090 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28clip strings to max available sizeCaolán McNamara2-6/+19
Change-Id: Icc1378c9c27b9b6d229bcffc6a63017f82be70d4 (cherry picked from commit 580d3837b26f09ed02fe3583de40fa045a3fde0f) Reviewed-on: https://gerrit.libreoffice.org/18100 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28avoid loops in atom chainsCaolán McNamara2-1/+7
(cherry picked from commit de71eae5807ff94c8eace0eccaabf1ffa08e77b6) Change-Id: Icc40c0ee6c7d8d305cf7cc60cbf3e511c763aedd Reviewed-on: https://gerrit.libreoffice.org/18093 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28avoid hang in certain pptsCaolán McNamara2-1/+1
Change-Id: Iedba71b72fc815b274ca5e0da0903a558947cb06 (cherry picked from commit 90dc4e38928fffc3ed5fcbed40109712eb97e203) Reviewed-on: https://gerrit.libreoffice.org/18089 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check seeks and offsetsCaolán McNamara1-0/+0
Change-Id: I2b6ded138b9101415fc49e93e1ec3ebcd3a9d2ae (cherry picked from commit 5ed690a3e8a575784ca25048e0229ebc52e6fccd) Reviewed-on: https://gerrit.libreoffice.org/18099 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28check seekCaolán McNamara1-0/+0
Change-Id: I358758999bb918e73cdee2224e575e72c2131453 (cherry picked from commit 0c713e45f9831073e34777f50abf9b5801f08ed9) Reviewed-on: https://gerrit.libreoffice.org/18098 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28check returns of SeekToEndOfRecordCaolán McNamara2-0/+0
Change-Id: Ia593dd0e2239a97f17bb03f005d22028da482445 (cherry picked from commit d400f155fdc3867ad4a067c2bf85588fc0fbb2a2) Reviewed-on: https://gerrit.libreoffice.org/18096 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-27extend seek, loop ending tests to ppt specific codeCaolán McNamara2-14/+21
Change-Id: Id4419b6b902b742117e248870b6a663c9c58955f (cherry picked from commit c249f93d96ec87b0acbd25ffe087543d6fe9fb14) Reviewed-on: https://gerrit.libreoffice.org/18052 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-26various hangs, check seeks and record lengthsCaolán McNamara2-2/+4
Change-Id: Ided7f9376f41ee8cb1f6903e54a2d51e0e07e1a7 (cherry picked from commit a8b2dc80c41022515c3a1df6f7ea245c3390dc39) Reviewed-on: https://gerrit.libreoffice.org/18024 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-26don't hang on unreachable record endsCaolán McNamara2-1/+6
Change-Id: I288f7ff0327831603eda6e827c8acbae678dfaff (cherry picked from commit cadac8400a018c8c566379f7767ea5edff78523d) Reviewed-on: https://gerrit.libreoffice.org/18017 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-26fix crash on loading certain pptsCaolán McNamara1-0/+0
Change-Id: I544a67e3706c7d12414cc075118ef2f0f5ddd0f6 (cherry picked from commit 334dba623dfb0c4fb2b5292c2d03741b7b33aef1) Reviewed-on: https://gerrit.libreoffice.org/18015 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-14tdf#80866, bnc#835985: Better solution to the original bnc# bug.Jan Holesovsky1-1/+1
The behavior was confusing from the user point of view - the "Default" meant the handout layout (that by default is 6 slides per page), not any kind of default. And it looked like the orientation does not work. Let's provide better wording instead of "Default" at least. The ideal would be also to disable the "Order" when "According to layout" is chosen. Unfortunately it is not easily possible, as the enabling/disabling is controlled by the UIControlOptions's mnDependsOnEntry, and that allows only one value; and we'd need "everything but the 0" there. Change-Id: Ife98c421bf8f52506a7dc32caea6af6c24ef17c6 Reviewed-on: https://gerrit.libreoffice.org/17696 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-08-13tdf#80866: Revert "bnc#835985: When printing ... 'Order' did not count."Jan Holesovsky1-3/+3
There is a follow-up commit in master that improves the UX, but it unfortunately changes the string, and we are past the UI freeze, so cherry-picking only the revert. This reverts commit a6a04658fb46d9e5ec40438955b777e2eb76b8d2. Change-Id: If2732ca1c847cd1502e07a6416134fe3669de35e Reviewed-on: https://gerrit.libreoffice.org/17681 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-13tdf#92885 - Incorrect cell border drawing in DOC file after saving in 5.0Noel Grandin1-1/+1
caused by commit 4b66829390b286010b37b37ec1537a320d8cea8f "convert BOX_LINE and BOXINFO_LINE to enum class" (cherry picked from commit 78446df26f45e2a71187873726388c9d2f6ba6e5) Conflicts: sw/source/filter/ww8/wrtww8gr.cxx Change-Id: I23eb359a40035dd40bdb60703de567b1c328e793 Reviewed-on: https://gerrit.libreoffice.org/17691 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 05:49:55 +0000