summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)Author
2015-04-16fix 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 Change-Id: I121e1d1a9f08ea3731bb7f65c385f264b3c2d2f4 (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>
2015-04-16fix assert on re-export of ooo48994-1.ppt to pptCaolán McNamara
Change-Id: Ic8274e7d060f315d7891f8f5cf576f834ca89117 (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>
2015-04-14tdf#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-04bnc#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-04-04bnc#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-02-06fdo#80538 Show an infobar when document is in read-only modeSamuel Mehrbrodt
and remove the Edit icon from the toolbar Reviewed-on: https://gerrit.libreoffice.org/11182 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Conflicts: include/sfx2/sfx.hrc include/sfx2/viewfrm.hxx Change-Id: I27d9506bd0fb76b3f1ad056a9866f7744674a3e2
2015-02-06fdo#80536 UI: Menu entry for 'Edit File' -> 'Edit Mode'Joren De Cuyper
In this commit not only a menu entry is created, also the name is changed from 'Edit File' to 'Edit Mode'. Change-Id: Icd7998307cb0337dd2ee95b298452557ab37375b Reviewed-on: https://gerrit.libreoffice.org/10211 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-06Resolves: fdo#84887 TabBar::ImplShowPage crashCaolán McNamara
(cherry picked from commit ff7c2cd0dc89f0ffa6742f1f5dcf89f5a6f03839) Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Change-Id: I84250c6a40baeabd0d12958dfe0aea346d2b4fc8
2015-01-24rhbz#1136013: svx: try to make the ExternalToolEdit not crash all the timeMichael Stahl
This thing was starting a timer that re-starts itself forever, and when the file it was watching changed, it would just assume the drawing objects were still there (and the document, for that matter...) (cherry picked from commit 5f6bdce0c0ac687f418821ce328f2987bf340cda) Conflicts: sc/source/ui/drawfunc/graphsh.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/view/drviews2.cxx svx/source/core/extedit.cxx sw/source/core/uibase/shells/grfsh.cxx Converted to C++98. Change-Id: I35f187f0828097a05618dc1733dce819fc6bffc6 Reviewed-on: https://gerrit.libreoffice.org/13994 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2015-01-12fix Mac buildMarkus Mohrhard
Change-Id: Ie5a25da16753bd28df0514a831512e147de6a715 Reviewed-on: https://gerrit.libreoffice.org/13848 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 6280261ad37f25219c3f232724790f012372a7ef)
2015-01-08this horror depends on unsigned max increment to wrap-around to 0Caolán McNamara
understandable dbgutil out of bounds iterator checking regression from commit 3af368f0f8e6691aa2eef177ccfcfcb95885c84b Date: Tue Aug 14 21:03:04 2012 +0200 AnimationWindow: convert List to std::vector (cherry picked from commit 1c32b8747e0a2051b9abcb1e681c3ca08c039269) (cherry picked from commit 402e020c09ff0a003cfd8f84719ff3cde633a295) Conflicts: sd/source/ui/dlg/animobjs.cxx sd/source/ui/inc/animobjs.hxx Change-Id: I8ff3e0726cc0d6e643f2f4e08b0ca41e327e5efc Reviewed-on: https://gerrit.libreoffice.org/13497 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c0d269254514274fcb200efc8090e1bb81878757)
2015-01-08bnc#862510: PPTX import: Wrong text horizontal adjustment inside shape.Zolnai Tamás
When alignment is not specified, it should be set to the default "left" value just on time, when properties are pushed to the property set, otherwise uninitialized value is better. (cherry picked from commit 7a64988dbc7a1542aa38f0e8f9a8a47941fbc67d) Conflicts: sd/qa/unit/import-tests.cxx Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ic294c5d7cc477f7515aea1c071ad9b67275c012d Reviewed-on: https://gerrit.libreoffice.org/13607 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 50c9a8bf7473bf369ccd7e3060ef732ac6cf58f5)
2015-01-08bnc#862510: PPTX import: Wrong text color inside shapeZolnai Tamás
When theme index is 0, it means it's unset so we should not apply that. (cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365) Conflicts: sd/qa/unit/import-tests.cxx Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd Reviewed-on: https://gerrit.libreoffice.org/13606 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 4679ba35ad02a720789a8d0c571fafe4122d91a2)
2015-01-08bnc#822341: PPTX export of embedded text documentsZolnai Tamás
-Make embedded text documents exported by analogy with spreadsheet embedded documents. -Convert MS ole objects to LO sepcific objecst to allow exporting those ole objects too. Plus use gb_CppunitTest_use_rdb instead of wasting time on finding out which missing components cause test failing. Especcially when we have platform dependent components (e.g. related to embedded object) (cherry picked from commit 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae) Conflicts: sd/CppunitTest_sd_export_tests.mk sd/qa/unit/export-tests.cxx ERROR: Attribute 'spid' must appear on element 'p:oleObj'. As pointed out by CppunitTest_sd_export_tests. (cherry picked from commit 124c33dd1d6bf2040f0153de8c9ecaebe759c3bd) ERROR: Invalid content was found starting with element 'p:pic'. Again, as pointed out by CppunitTest_sd_export_tests. Sadly it seems that the spec and PowerPoint is not in sync here, so just do what makes both happy. This fixes the --with-export-validation build. (cherry picked from commit cf15306ccf49da290b391517e2c5dd22a4f1be45) Change-Id: Ic76d659b51274777a1669c215344a1169ebcba81 Reviewed-on: https://gerrit.libreoffice.org/13601 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 2f7a4c04c0531a74b92546a7b8808d03a51ecd99)
2014-12-13PPTX import: fix import of shape line properties defined by themeZolnai Tamás
See also: 81cd386facedfbb15be6dffc10351262abf733f3 (cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632
2014-12-13bnc#904423: Text(box) is rendered white on white when it is notZolnai Tamás
The problem was that the background color defined by theme was not imported correctly, because the different fill style comes from different sources (master slide, theme, direct formatting) were applied on the shape in wrong order. To solve this we need to store master slide defined fill style in a different variable so theme style can be applied after master slide defined style but before direct formatting. (cherry picked from commit 81cd386facedfbb15be6dffc10351262abf733f3) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I99ea981858b9fa391915570187c8ddfdf2be1f7a
2014-12-13fdo#82681: return IsUserDefined w/o negationKatarina Behrens
when the predicate is called StyleSheetIsUserDefinedPredicate Returning negation thereof somewhere, somehow, corrupts one of SfxItem pools. Thus, invalid read happens and crashes Impress and Draw. Now the loop in SdStyleSheetPool::UpdateStdNames does nothing (it iterates through user-defined styles, but its body does something for non-user-defined styles), so more investigation here is needed. This is partial revert of commit 3440766f0ad43454287a874b5fd34b6f2af6bdf1 Change-Id: I06f0da320c49674dac2adf43b7c374babbdadb57 (cherry picked from commit a784c33fd48eeb3394dc63610e384cf866233093) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-11-23limit width of list whose text can grow to silly widthsCaolán McNamara
Change-Id: I982602e829bbf3f2efccfcafae67d22df8daa2e9 (cherry picked from commit 98d311c651347a49f73e8e316be30887e5a99751) Reviewed-on: https://gerrit.libreoffice.org/12414 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-23Resolves fdo#85750: Custom Animation timeing does not retain settingsJulien Nabet
Conflicts: sd/source/ui/animations/CustomAnimationPane.cxx Reviewed-on: https://gerrit.libreoffice.org/12236 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 236819ecfa38360aa72d1061808b20204a0af594) Conflicts: sd/source/ui/animations/CustomAnimationPane.cxx Change-Id: Id6bbd113630348493ed1e67da72c7a42c5188b44 Reviewed-on: https://gerrit.libreoffice.org/12410 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-23fdo#85247: copy and paste of a slide results in a blue slide in presentation ↵Muthu Subramanian
mode. Seems like "Default" is handled specially or probably the copy-buffer is broken This now checks for slide 'type' as well, before cosidering it a duplicate Change-Id: If8c472bcefb54cee72e7411f92a76b4e2db2b6ce (cherry picked from commit 0bab8aee77cfc2ffdbc6d3ef6a869284bc12dff4) Reviewed-on: https://gerrit.libreoffice.org/12285 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-23fdo#79731 fdo#85813 drawingML export: fix handling of impress tablesMiklos Vajna
(cherry picked from commit 02e52b15908a6d89b4aeb3c349e7414240eb9563) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: oox/source/export/drawingml.cxx sd/qa/unit/export-tests.cxx Change-Id: Ia17b14c4b27e808ceab388aa33602875e67433a5
2014-11-23sd: fix STL assertion "dereference past-the-end iterator"Michael Stahl
(regression from 967a386bccb15b99915a1e878e42450fbe9a2d0e) Change-Id: I9408170eb155f433922e5b3887059078a141d78a (cherry picked from commit 9632045906baf165076d11a97f45b153d8e2acb7)
2014-11-23fix bnc#624546 (fdo#83733) slide pane cut/copy/paste in outline viewMarco Cecchetti
Problem: When I'm in outline mode, if I select a slide in the left slide preview pane, ctrl-c, then select another slide I would like it after and hit ctrl-v; it refuses to cut/paste. Analysis: This issue is due to the fact that the outline view always grabs focus when activated and a view is activated whenever is pushed to the sfx shell stack even if it is not the new top-most active view shell (see `ViewShellManager`, `SfxViewShell`, `SfxDispacther`). Solution: Make the `OutlineViewShell` grabs focus only if it is the top-most active view shell. Rationale: When `OutlineViewShell::Activate` is invoked, instead of removing the focus grabbing action completely, we check if the `OutlineViewShell` instance is the the top-most view shell and perform the focus grabbing action only in such a case. This change required to have also the `DrawViewShell` grabbing focus on activation (only when it is the top-most view shell). In order to implement this solution I needed to add a new method (and data member) to the `ViewShellManager` class. I named it `GetTopViewShell`. This method returns a pointer to the top-most active view shell of the internal stack. The returned pointer is updated in the `UpdateShellStack` method, before the sfx shell stack is updated. For more details see : https://gist.github.com/mcecchetti/15b3ebc505d6582ea0db (cherry picked from commit 967a386bccb15b99915a1e878e42450fbe9a2d0e) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/source/ui/view/ViewShellManager.cxx Change-Id: I619a406864f50f0e62dee3fcb9ac5d46e3d48272
2014-11-23Resolves: fdo#83588 Revert "center slide after changing zoom"Caolán McNamara
This reverts commit b179235f702e474b115ca479b603052f422346fd. (cherry picked from commit d1e9aa23a7b74e153479e0e23aac1c02cca48177) Change-Id: Ifb9444e77a28ac17e4dcc17725a4393ea0aa294e Reviewed-on: https://gerrit.libreoffice.org/12064 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-23Resolves: fdo#84417 restore focus window after previewCaolán McNamara
regression due to changes of sd/source/ui/slideshow/slideshow.cxx in cc5518ca61b209408a9d5262bbdcc39efccdd72d commit cc5518ca61b209408a9d5262bbdcc39efccdd72d Author: Steve Yin <steve_y@apache.org> Date: Thu Nov 28 12:09:19 2013 +0000 Integrate branch of IAccessible2 Change-Id: I6b399d68c1f3ef32b702135b981100a23760569b (cherry picked from commit 92360e7413daf35d6b3acf2e77cf3c6063c5f11f) Reviewed-on: https://gerrit.libreoffice.org/12062 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-14bnc#584721: invisible text because of wrong color (white)Zolnai Tamás
Color::getColor() method uses some caching mechanism which works wrong when the result depend on one of the input parameters. So avoid caching in these cases. (cherry picked from commit cfe658c289de030dc3a8fecd3bac0a0004a18061) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ifa9221e21e685715454de86d5cec09ff6c266307 Reviewed-on: https://gerrit.libreoffice.org/11724 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-14Disable sdremote by default, and improve flow control.Michael Meeks
It was intended to disable sdremote by default when it exited experimental mode. This reverts commit 576943b9bf7506829de97d2194c4bee35a485436. Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5 Reviewed-on: https://gerrit.libreoffice.org/11838 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-10-14bnc#657899: Paragraph vertical spacing differs from PowerPointTor Lillqvist
We need to set the "paragraph summation" flag also for .pptx import. (As is already done for .ppt import.) This is what in the Options (Preferences) UI is called "Add spacing between paragraphs and tables (in current document)", on the LibreOffice Impress:General page. This is a setting that when set becomes local to the document. I actually don't really understand why this needs to be a user-visible option, wouldn't it be enough for it to be an internal flag that is set for documents imported from .ppt and .pptx, and is clear otherwise? Change-Id: I525178957276e7d587b6ac4be8ae7919fc245a27 (cherry picked from commit 96d210bf9ca0a99fc8256d6e0a4952207cce69e0) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-10-14sd: fix up e5222cf76a94c4ec20664b3e6f5a48e00ee9669fMichael Stahl
Change-Id: Ib12f889e65f348b0313a64e8f3b7449d4708244a
2014-10-14coverity#1242906 Unused valueCaolán McNamara
Change-Id: I7a282e5adc60e4b123469f46fb480805377626b4 (cherry picked from commit a165aa38d9009bf46e203bbdfbac3b7cd8f71b4c) Reviewed-on: https://gerrit.libreoffice.org/11764 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-14fdo#63483: support for modify passwd in Impress and DrawKatarina Behrens
iow, allow opening Impress and Draw ODF documents read-only Change-Id: I379b9f92b9bfb20e99998177d9a5fae80069d98f Reviewed-on: https://gerrit.libreoffice.org/11758 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-14bnc#897769: OOXML import: Import border lines using reference too.Matúš Kukan
Do not ignore 'lnRef' element. Also fix typo to apply 'seCell' properties to the right cell (southeast). Change-Id: Ia45f7016f358b70e6db06a232c569335ce9d7051 (cherry picked from commit 18898e13fda25fe6dc85318dd0711355c7b2cc26) Reviewed-on: https://gerrit.libreoffice.org/11652 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-14fdo#83619 Retain dropdown part after customizationMaxim Monastirsky
(cherry picked from commit 99ace739828f9d79a2f9b04ef066b90d77f77bc4) Conflicts: sd/source/ui/controller/slidelayoutcontroller.cxx Change-Id: I84c33e5b646ba43b9cad1d9ed106e7ead911e5c0 Reviewed-on: https://gerrit.libreoffice.org/11466 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-23IsDraw doesn't mean the app/page is DrawCaolán McNamara
it means a slide in impress. commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c Date: Mon Jun 23 20:55:21 2014 +0100 Make Draw use paper size when printing - fdo#63905 Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. suggests the intent is for this to not affect Impress and to only affect Draw, so this does that (cherry picked from commit f1f89f0202232635e7fbbd7ca47de51755b2bce0) Conflicts: sd/source/ui/view/DocumentRenderer.cxx Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b Reviewed-on: https://gerrit.libreoffice.org/11510 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-09-23css::uno::Reference::query does not have side effectsStephan Bergmann
partial cherry-pick of c6eb208473109234886600ac299f0cc75ee94e9c "loplugin:staticcall" Change-Id: Icb2ee78db94ba3a87a5c8ff35d72d191f01d4900
2014-09-10bnc#480256: OOXML import: Respect table background properties a bit moreMatúš Kukan
Only getBackgroundFillProperties() (fill) was used. Use also getBackgroundFillStyleRef() (fillRef). Also, do not replace table background color value with cell color, we have to interpolate the two colors (if cell color is transparent). Unfortunately, we don't use background table property in LibreOffice, so this seems to be a best workaround. (cherry picked from commit 43efd9b40d40b791a2c2deedcac36b99f7efb2cf) And add unit test. (cherry picked from commit 5681725f1a2535a13b86104d8b8a33f750f34efc) Change-Id: I21bcc87a149c9f6d865ebee4012132ccc3a54af2 Reviewed-on: https://gerrit.libreoffice.org/11353 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-09-09crashtest: sep should be curSepCaolán McNamara
Change-Id: Ic83165ee4af86d0ed0bc77505aae8f50cfc1471a (cherry picked from commit 3669242804e59c4e4d9f3db3d4e4534e223cbd78) Reviewed-on: https://gerrit.libreoffice.org/11361 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-09-05Show the right tab for SID_CHAR_DLG_EFFECTMaxim Monastirsky
Change-Id: I3a8b7a9e973d20f06d423ec55cf689478ca98e0a (cherry picked from commit e201506a4cc7e1cac2d04ef3169ef37e34de379a) Reviewed-on: https://gerrit.libreoffice.org/11281 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-02n#708518: sd: check that master page matches when setting parent styleMichael Stahl
In ODF import it happened that the parent style of "outline2" etc. was always set to the "outline1" style of the first master page in the document, but it should be the "outline1" style of the same master page as the "outline2". (regression from e955433c3574cb602dedba96bc645898f97858bf) (cherry picked from commit 5b63c12ace2aec9a659e4b9125f6aa9ff204ed09) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ie563d5ee5c2040aeb6ca5c8bb25b195e15ea964e Reviewed-on: https://gerrit.libreoffice.org/11195 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-29Handle collada libraries seperately: --disable-colladaZolnai Tamás
Depends on gltf support. (cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507) Conflicts: config_host.mk.in sd/source/ui/func/fuinsert.cxx Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca Reviewed-on: https://gerrit.libreoffice.org/11193 Tested-by: Rene Engelhard <rene@debian.org> Reviewed-by: Rene Engelhard <rene@debian.org>
2014-08-28PPTX import: fix missing document metadataMiklos Vajna
Without this, the creation / modification date is lost on import. (cherry picked from commit ef2668bad976f1fbb70759887cafd35ea7833655) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I0b74ac91aee7b8b3e0bc763247086a3a39816bc1 Reviewed-on: https://gerrit.libreoffice.org/11167 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-20Resolves: fdo#82355 crash on loading pptCaolán McNamara
regression probably triggered by... commit 2e3c45afc6c5ea74f1f8b4a7dce806e537870546 Date: Fri Mar 4 07:38:16 2011 -0800 Remove usage of deprecated List container. but that just stopped at the first NULL by chance Change-Id: I767e3bc3130d99cedceb4172857d1741c677b19b (cherry picked from commit f47baab6d35752b0babba768e299416ea5dd447d) Reviewed-on: https://gerrit.libreoffice.org/11028 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20Make Draw use paper size when printing - fdo#63905Eilidh McAdam
Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. Change-Id: If90bae4ac59cd95dd50fcd8deb25fd900756193e Reviewed-on: https://gerrit.libreoffice.org/9866 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com> (cherry picked from commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c)
2014-08-19Fix Insert 3D Model file dialog's "All supported formats" filterZolnai Tamás
It seems on some system the file dialog does not like spaces between the formats. (cherry picked from commit fd63ba45742e0886f15f907c03025b9dcc84d8ab) Conflicts: sd/source/ui/func/fuinsert.cxx Change-Id: Ifa69f4f210061209f7f0aa9223417d06b06b577a Reviewed-on: https://gerrit.libreoffice.org/11016 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-18check TRG_HasMasterPage before TRG_GetMasterPageCaolán McNamara
bff + valgrind Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3 (cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0) Reviewed-on: https://gerrit.libreoffice.org/10955 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-11fdo#81933 do not select 1st slide unconditionallyDavid Tardon
This is a regression from commit ad0c4bf5790546242884da0c2ec281f2db9e14a0 . But I do not see why this code would be needed for that either. Change-Id: Ied3a5d25b2bec9542aa83c4d7fa36ed5313fc797 (cherry picked from commit 904fdac93b072cc5295cce0360f47926f049e6ea) Reviewed-on: https://gerrit.libreoffice.org/10869 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-11fdo#79917: Add 'Save a Copy' to Calc/Impress/Draw (LO4.3-Branch)Heiko Scheidt
Change-Id: Idb25c3682f0197b7764be026b4a71fb50c77606f Reviewed-on: https://gerrit.libreoffice.org/10840 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-08fdo#81552 Fail nicely if avahi doesn't let libreoffice publish itemsBryan Quigley
Change-Id: Ie264a032a71bda336158e18bd2b14c569f23f42d Reviewed-on: https://gerrit.libreoffice.org/10735 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3c57701cf0a169bd8d1893d1b2271d48b8072147) Reviewed-on: https://gerrit.libreoffice.org/10816
2014-08-05bnc#862514: Handle corner case in slide sorter correctly.Jan Holesovsky
We should never return -1 when bIncludeBordersAndGaps is true; but that could have happened in a corner case: * export SAL_USE_VCLPLUGIN=gen * start LibreOffice * open a presentation with many slides * resize the window so that it shows the slides _exactly_, no slide is cut off in the slide sorter * point the mouse pointer into the left "Slides" sidebar (slide sorter) so that it does not cause any mouse-over effect (somehow between the left border, and the slides - there is space that can do this) * turn the mouse wheel all the way down so that the last slide is at the bottom * turn the mouse wheel up _once_ * turn the mouse wheel down _once_ - it will look like the view does not change (the last but one is still at the bottom), but you can see the scrollbar jump to the top * and now you can again start turning the wheel all the way down to repeat the procedure :-) Change-Id: I0253c89513222a1f2eb3263068997d10eea0f130 Reviewed-on: https://gerrit.libreoffice.org/10683 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-17bnc#862510: Improve handling of OOXML gradientsTor Lillqvist
OOXML gradients can have an arbitrary number of "stops". LibreOffice gradients have just a start and end colour, plus an optional uniformly coloured border (on the "start" side). In addition, LibreOffice has the "axial" gradient mode, which means the gradient is reflected in the middle. It is thus obviously impossible in general to losslessly map OOXML gradients to LibreOffice ones. But let's try a bit harder than earlier to get visually more similar result, in at least some simple sample cases. We look for the widest gradient segment and use that for the start and end colours of the LibreOffice gradient. Also, map an OOXML gradient to an axial LibreOffice gradient only if it is symmetrical. Also, use the border property when suitable. In general, look for the widest OOXML gradient segment (once a segment corresponding to the LibreOffice gradient border, if any, has been accounted for) and use that as the LibreOffice gradient. Possibly some perceptionally better heuristic should be used... Like, if we have a three-segment gradient, with a wide gradient segment between two visually very similar colours (for example, two shades of red), and a narrower segment ending with a visually very different colour (for example, yellow), it probably would be best to represent that in LibreOffice as a gradient from the first red shade to yellow, instead of as a gradient between the two shades of red. Or even, if a first or last gradient segment is between very similar colours, equalize those start and end colours, thus using a border colour in LibreOffice instead. The possibilities for bikeshedding are endless. I am sure there are instances where the old code (by accident?) produced visually more pleasing results... But hopefully this works more pleasingly and consistently in a larger number of cases. Change-Id: If153e986ad943454307e3ba718479d5ac4cdc7ab (cherry picked from commit f4a2f1e647354efb75be8c90384d6cd3e5f9b9bd) Signed-off-by: Andras Timar <andras.timar@collabora.com>
generated by cgit (git 2.34.1) at 2024-06-09 13:05:49 +0000