summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)Author
2014-08-23Make 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. 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) Conflicts: sd/source/ui/view/DocumentRenderer.cxx Change-Id: If90bae4ac59cd95dd50fcd8deb25fd900756193e
2014-08-21Resolves: 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/11029 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21check TRG_HasMasterPage before TRG_GetMasterPageCaolán McNamara
bff + valgrind Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3 (cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0) Reviewed-on: https://gerrit.libreoffice.org/10954 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21fdo#81552 Fail nicely if avahi doesn't let libreoffice publish itemsBryan Quigley
Needed some minor changes for 4-2. 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) Change-Id: Ie264a032a71bda336158e18bd2b14c569f23f42d Reviewed-on: https://gerrit.libreoffice.org/10822 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-08-21bnc#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 :-) Reviewed-on: https://gerrit.libreoffice.org/10683 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 48272a9a720039e79c6a684f1f037811ea42ed0c) Change-Id: I0253c89513222a1f2eb3263068997d10eea0f130 Signed-off-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-22bnc#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 Reviewed-on: https://gerrit.libreoffice.org/10359 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-22fdo#81284 Don't write to zero length filesMaxim Monastirsky
Change-Id: I4eddcda3977f43b39abdaa8d9089ff661092361c Reviewed-on: https://gerrit.libreoffice.org/10310 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-22sd: stop calling graphics styles "Image Styles"Michael Stahl
(regression from a71a562a9958fc58a5fb914bcf7f8056a353f618) Change-Id: Ie3a44a80c720f59831bc2b1da91792fb8aa24d62 (cherry picked from commit b55b96589f7fe0b2f426c2472da7174ab95aab87) Reviewed-on: https://gerrit.libreoffice.org/10307 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-14Related cp#1000084: Make this work for other apps too and set proper defaultMatúš Kukan
Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default. (cherry picked from commit 37c3cf70c724b7402588d1d32d3aa76a965ee41b) Conflicts: sc/source/ui/drawfunc/fusel.cxx sd/source/ui/func/fusel.cxx Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604
2014-07-10Resolves: #i119287# corrected default style for draw objects...Armin Le Grand
created using UNO API (cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026) Conflicts: sd/source/ui/unoidl/unopage.cxx (cherry picked from commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/source/ui/unoidl/unopage.cxx Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e
2014-07-04fdo#63378 Enable Impress Remote Dialog menu item for all view shells.Andrzej Hunt
Change-Id: I47f040c1463b4be648d411c2f7f0070b8aed3e9c (cherry picked from commit d61468314bbfd2a79929b48e62d7e5ed354ab79b) Reviewed-on: https://gerrit.libreoffice.org/9976 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-30bnc#882631: Do not hide top of the first row when editing text in table cells.Matúš Kukan
This can happen when proportional line spacing is less than 100% and "FontIndependentLineSpacing" is set, so just keep the height of the very first line in case of IsFixedCellHeight() too. Change-Id: Id231fc1f2373645e5420f877e8c2568ce8a1f099 (cherry picked from commit 9388c45c0263a0090f9cb4be9c42b93b5f7985d0) Reviewed-on: https://gerrit.libreoffice.org/9891 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-06-29fixes for up-casting to Reference<XInterface>Noel Grandin
Fix regressions introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking Reference constructor to reduce code noise" Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4) Conflicts: framework/source/uifactory/menubarfactory.cxx Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687 Reviewed-on: https://gerrit.libreoffice.org/9921 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-19fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Conflicts: xmloff/source/chart/SchXMLExport.cxx sd/source/ui/view/sdview3.cxx chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx chart2/source/controller/main/ChartTransferable.cxx chart2/source/controller/main/ChartTransferable.hxx chart2/source/model/main/Axis.cxx chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/tools/AxisHelper.cxx chart2/source/view/main/ChartView.cxx comphelper/source/container/embeddedobjectcontainer.cxx dbaccess/source/ui/browser/dbexchange.cxx dbaccess/source/ui/inc/JoinExchange.hxx dbaccess/source/ui/inc/TableRowExchange.hxx dbaccess/source/ui/inc/dbexchange.hxx dbaccess/source/ui/querydesign/JoinExchange.cxx dbaccess/source/ui/tabledesign/TableRowExchange.cxx embeddedobj/source/commonembedding/persistence.cxx embeddedobj/source/inc/commonembobj.hxx include/comphelper/embeddedobjectcontainer.hxx include/svtools/embedtransfer.hxx include/svtools/stringtransfer.hxx include/svtools/transfer.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx include/svx/fmview.hxx include/svx/galmisc.hxx include/svx/svdobj.hxx include/svx/svdoole2.hxx include/svx/svdxcgv.hxx include/svx/view3d.hxx include/svx/xmlexchg.hxx include/xmloff/xmlexp.hxx reportdesign/source/ui/dlg/GroupExchange.cxx reportdesign/source/ui/dlg/GroupExchange.hxx reportdesign/source/ui/inc/dlgedclip.hxx reportdesign/source/ui/report/dlgedclip.cxx sc/inc/column.hxx sc/source/ui/app/drwtrans.cxx sc/source/ui/app/lnktrans.cxx sc/source/ui/app/seltrans.cxx sc/source/ui/app/transobj.cxx sc/source/ui/inc/drwtrans.hxx sc/source/ui/inc/lnktrans.hxx sc/source/ui/inc/seltrans.hxx sc/source/ui/inc/transobj.hxx sc/source/ui/inc/viewfunc.hxx sc/source/ui/view/viewfun5.cxx sc/source/ui/view/viewfun7.cxx sd/source/ui/app/sdxfer.cxx sd/source/ui/dlg/sdtreelb.cxx sd/source/ui/inc/TabControl.hxx sd/source/ui/inc/View.hxx sd/source/ui/inc/sdtreelb.hxx sd/source/ui/inc/sdxfer.hxx sd/source/ui/view/sdview2.cxx sd/source/ui/view/tabcontr.cxx sfx2/source/doc/objxtor.cxx svtools/source/misc/embedtransfer.cxx svtools/source/misc/stringtransfer.cxx svtools/source/misc/transfer.cxx svtools/source/misc/transfer2.cxx svx/source/engine3d/view3d.cxx svx/source/fmcomp/dbaexchange.cxx svx/source/fmcomp/dbaobjectex.cxx svx/source/fmcomp/xmlexchg.cxx svx/source/form/fmexch.cxx svx/source/form/fmview.cxx svx/source/gallery2/galmisc.cxx svx/source/inc/fmexch.hxx svx/source/svdraw/svdoole2.cxx svx/source/svdraw/svdxcgv.cxx svx/source/tbxctrls/colrctrl.cxx sw/source/core/uibase/dochdl/swdtflvr.cxx sw/source/core/uibase/inc/swdtflvr.hxx sw/source/core/undo/unins.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
2014-06-11Related bnc#862510: extend handling of txXfrmZolnai Tamás
We don't actually need to check mbAnchorCtr to change text spacing. This txXfrm workaround works only with rectangles, because other shapes' text area can be smaller then the shape size. So add some condition to avoid using it for other shapes. Plus fix typos cause regression introduced in: 53c376d35b7223d53e8c9403390afe53d1f69089 (cherry picked from commit 98dd0f2bb5801f974374ef341037e094e4275cbb) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I87917b8e0b2bb97ae1bba773e7dda7f81682736f
2014-06-10Resolves: fdo#79360 impress hangs on using sidebar new styleCaolán McNamara
because those styles are "pseudo-styles" and a new one cannot be added. The possibility is supposed to be disabled, and it is disabled in the floating stylelist. The old code assumes there can only be one of these stylelists and when a stylelist queries if the "new" should be disabled the callback asks the stylelist what family is selected, but only asks the floating one. So, floating closed, sidebar open, the new is not disabled. Implement the ancient TODO now that we have to. Instead of asking the stylelist what family is selected, query the frame for what is the current SID_STYLE_FAMILY as set by whatever is the active stylelist. What's disturbing is the SID_STYLE_FAMILY values are not SfxStyleFamily, but indexes that have to be mapped to SfxStyleFamily. I bet there are a pile of bugs around that, especially with little islands of different conversion codesites (cherry picked from commit 7a211e834fc271d3f28d7f8c49197c925242d862) Conflicts: sfx2/source/appl/appmisc.cxx convert from NId to FamilyId instead of FamilyId to NId should be equivalent for comparison purposes (cherry picked from commit f48f5138ecedd3bb9ec0b454b9fe216001610156) remove unused virtual method, slim this down initially (cherry picked from commit fa551c422426962194b6bff4234f12eb5bdf57ca) (cherry picked from commit 3988f17d14ee28b4bb117ca9961708ad3a867fb1) Conflicts: sd/source/ui/view/drviewsf.cxx sfx2/source/appl/appmisc.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx sw/source/core/uibase/app/docst.cxx Change-Id: I85c8032d7c26ae6eea245685748f89b2a860e767 Reviewed-on: https://gerrit.libreoffice.org/9573 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-06-10Resolves: fdo#78404 #i123468# Added SdrEndTextEdit before replacing...Armin Le Grand
EmptyPresObj, also secured ReplaceObjectAtView to check for active TextEdit, assert this and make an emergency correction (cherry picked from commit 623cd778689bd0851652b2db00b24c308dfb657a) Conflicts: svx/source/svdraw/svdedtv.cxx (cherry picked from commit 3b729ab35b5064dcd21f125dfd0aa7d7e709fd9f) Change-Id: I0e9ae1b1cd84e04c37c4de38aca7752804782384 Reviewed-on: https://gerrit.libreoffice.org/9482 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-06-10Resolves: fdo#78953 secured usage of LayerTabBar in Draw...Armin Le Grand
was #i87182# secured usage of LayerTabBar in Draw... ensured initialization when used as OLE (cherry picked from commit 903afaa8ea0766e01ba41a227d2794c2c40b129a) Conflicts: sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsb.cxx (cherry picked from commit b1cf64fe51fd0bb1e9bc8c3bb38d5cc7254d8d5f) Conflicts: sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx Change-Id: I86bb17bf422356247a319f89e54d1ead97b368b8 Reviewed-on: https://gerrit.libreoffice.org/9654 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-06-10fdo#39944: Add DOCUMENT_* accessibility UNO rolesJacobo Aragunde Pérez
Added a set of UNO accessibility roles for specific kinds of documents: * DOCUMENT_PRESENTATION for Impress * DOCUMENT_SPREADSHEET for Calc * DOCUMENT_TEXT for Writer The other applications still use the existing DOCUMENT role. These roles translates directly to ATK but in the other toolkits we keep using the same association that DOCUMENT role had. Change-Id: Ibac47527e5effdecb28d2314cde8558cf4fb010a Reviewed-on: https://gerrit.libreoffice.org/7847 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-06-10Integrate branch of IAccessible2Steve Yin
Change-Id: Ibf3be46e8619c2dce9636e8a90a6703f3e28ba33
2014-06-10fdo#79676: Initialize with a default chart only from the UI.Kohei Yoshida
When creating an embedded chart object during import, we don't want to create a default chart which would only mess up the chart data. With this change, ChartModel::initNew() is a no-op. (cherry picked from commit c5539bb585370f095cb6c09e38a7dd005d237295) Conflicts: chart2/source/model/main/ChartModel_Persistence.cxx sc/source/ui/drawfunc/fuins2.cxx sw/source/uibase/table/tablemgr.cxx Change-Id: Id29659c3885ec1e06bed26d2c851123fb63072cc
2014-06-06bnc#880763: PPTX import: wrong z-order becuause of wrong import orderZolnai Tamás
importExtDrawings() must be called as soon as possible, before parser starts to parse the next shape. Call it when graphicFrame tag is closed. This tag include the reference to the SmartArt. Plus fix up import tests. (cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48) Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae
2014-06-06c++03 vs c++11 enum namespacingCaolán McNamara
Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67 (cherry picked from commit e990e4d145f16c0c7e4e9e12c4882ddde63a3d5a)
2014-06-062nd part of bnc#870233: import font color from color fragment for SmartArtsZolnai Tamás
SmartArt import ignores some fragments during import if drawing fragment exists, which seems to be not complete. In this case font style is blank (white) in data (and drawing) fragment and the real value is defined in the ignored color fragment. So first make color fragment parsing work, then apply font color of "node0" style on nodes of the SmartArt. Actually, it's a workaround, because "node0" style label is hardcoded, for a proper solution layout fragment should be parsed too to get the right style label, but it interferes with the drawing fragment by now. (cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839) Conflicts: oox/source/drawingml/diagram/diagram.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8
2014-06-061st part of bnc#870233: wrong list style in shapesZolnai Tamás
Text list styles were copied, without proper copy constructor and operator. It lad to mix up list styles and so text font. (cherry picked from commit 31650d5b4255c484faec11d570cb98a80f0120cc) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Iee7a6c0c1f74322fd7b80e41a262849f948e463a
2014-06-02fdo#64047: n#863021: Add set-all language menu.Muthu Subramanian
Problems: * Doesn't reset the spell error markers * Modifies only at object level * Currently has only setting for 'all text' * Maybe provide a current slide only option? Change-Id: I4695423fed3ed9422185b23803eedd12ef434bea (cherry picked from commit 0833f4046a1afa77aeed97a131c5325c44be1bb3) Signed-off-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/9314 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02CustomAnimationCreateDialog: select previously set misc animationZolnai Tamás
Regression from 9695f38ca4ab26b40524f2eade98c45f0360131d. Change-Id: I8777fd8fa3e31c67b6645044d262fd4c5f645634 (cherry picked from commit dd1f8ac3575a929e71b39d5f7043be057ebaa727) Reviewed-on: https://gerrit.libreoffice.org/9480 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-31fdo#76953: cannot start show at selected slideZolnai Tamás
It was worked only in slide sorter view properly. It seems it leads undefined behaviour when a menu item is in the menubar.xml but has no definition in *.sdi file. I experienced that on windows menu item was disabled on linux it was enabled. Change-Id: Iba4dd1cbac60a3b3350604d64d60d10d050a4e2b (cherry picked from commit e20876b37d203642b5aa81a2d6c93979600376ed)
2014-05-31bnc#870237: wrong text position in grouped listZolnai Tamás
In grouped list text area does not cover the whole shape but just a part of it at the top. To get the same visual effect modify text distance attribute. (cherry picked from commit 53c376d35b7223d53e8c9403390afe53d1f69089) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I32f30d0afbc1975f940c4562ec65f46596e97060
2014-05-22cp#1000077: Set 'modified' document property more consistently.Matúš Kukan
Update document info at one place, so that it works for other formats like .doc, .docx, ... too. (cherry picked from commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4) Conflicts: sd/source/ui/docshell/docshel4.cxx sw/source/core/uibase/app/docsh.cxx Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260
2014-05-22Related: fdo#78151 fix 'pIds unsorted' warningCaolán McNamara
Change-Id: I00c533a25a851d8bf57f1b0758e98915d2291ee9 (cherry picked from commit 52871279e9811d437ebe881e30b6c76208c84e65) Reviewed-on: https://gerrit.libreoffice.org/9413 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-05-18Revert "fdo#45260: Objects having line thickness misplaced while pasting."Andras Timar
This reverts commit c35c4769d8cabe0f01ef9911056d7a9d1d2f4b04. Fixes fdo#78413 Change-Id: If0865cced045410d4e8f9603b55568ade6781b39 (cherry picked from commit de8f5f2af78877bc63b462195ce63341f6ba7817) Reviewed-on: https://gerrit.libreoffice.org/9297 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-18Related: rhbz#1071604 don't paint anim. effect iconDavid Tardon
... unless the slide does have custom animations. This drops dep of Draw on libanimcore, which is in module impress, so it might not be present. If it is not present, the Pages panel is not drawn. Change-Id: I9d7377a4fb3289e230887752bc4a105ca1c9f812 (cherry picked from commit 90af0348216a5a3c2eecd660e012500d2917b279) Reviewed-on: https://gerrit.libreoffice.org/9300 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-09rhbz#1071604 don't crash if slide layout configs are missingDavid Tardon
Change-Id: I5cbf4ed0683cc5736a45fb980827b1b56bd0c74c (cherry picked from commit df71f13b80c30cb98e310baf8f6aee11f8cbe81d) Reviewed-on: https://gerrit.libreoffice.org/9289 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-05-09Application::PostUserEvent returns a pointer dressed as sal_uLongStephan Bergmann
cherry picked from commit ce53796bfaf6df5c4415fda8f641cad8a3e144a6, plus more cases from 93f5d5a9190e0e03bf4822663652a4b068c44f75: "The opaque PostUserEvent IDs are actually pointers so declare them as such. This avoids the recurring mistake of storing such IDs as sal_uInt32, truncating in 64 bit environments, causing RemoveUserEvent to potentially not remove the event, it thus firing 'too late' and probably causing a crash." Change-Id: Ia5ca45e35766a7cebf0b53bcac1bd9dff29ad6ea Reviewed-on: https://gerrit.libreoffice.org/9259 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-01fix sd layout unit testAndras Timar
Change-Id: Ica34592788005cc3c96987b1c6c9625dd6359c76 (cherry picked from commit 2ea006fb605b886f9c9426783e4edf0de46c9af8) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-04-30Related: rhbz#1032774 slide restarter should disable auto-exitCaolán McNamara
The scenario is a pps that exits the app when the presentation is complete. But using "switch screens" in the presenter console will stop and restart the presentation. So protect that "stop" against existing by disabling the autoexit and restoring it afterwards (cherry picked from commit b7197cfe5d207b171412760c6d72353f31947e93) Conflicts: sd/source/ui/slideshow/slideshow.cxx Change-Id: Id986ad7e3cfafb8068540fb90d05443f329b554c Reviewed-on: https://gerrit.libreoffice.org/9166 Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com> Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>
2014-04-30Resolves: fdo#60040 crash after undoing master page applicationCaolán McNamara
regression since 839cb94a2bd9dfadb6a7e11a97f0540a78f79b6b Change-Id: Ie7068ecd1655ecae169948dc1e08330dc4200bf9 (cherry picked from commit f756fb84a1629d455ccbd7af1f3975ac307fb957) Reviewed-on: https://gerrit.libreoffice.org/9150 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-04-27do not crash when pasting impress page into another impress page (cp#1000067)Luboš Luňák
Put an Impress page into clipboard, create new document, click 'Click to add title', paste -> crash. Introduced by 5aee0c13cc62a81a38d4132db7972dc301c21b3d. Change-Id: Ibe61a780244ce98205e5ae3964971d7d75e30870 (cherry picked from commit dffcd67a9a9865c9eca9756eea4e85445b50a15e)
2014-04-22coverity#1202882 Dereference before null checkCaolán McNamara
Change-Id: Ie61df08c11b687c0b4a3ae212b3f9a6c95171396 (cherry picked from commit c152349f69acfb6bb873ed1cd12ca1b6dc325f1f) Reviewed-on: https://gerrit.libreoffice.org/9095 Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com> Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>
2014-04-22fdo#74697 Add Bluez 5 support for impress remote.Andrzej Hunt
This time we: - Don't break SAL_WARN with an fprintf like syntax. - Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might be building on dbus-glib versions that do not support it (however presumably anyone running bluez 5 will have a dbus version that is new enough to support this, i.e. purely a build-time issue). - Remove various C++11'isms. Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32 Reviewed-on: https://gerrit.libreoffice.org/8924 Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com> Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com> (cherry picked from commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c) Reviewed-on: https://gerrit.libreoffice.org/8931 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-04-22Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tabCaolán McNamara
(cherry picked from commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab) Conflicts: sd/source/ui/animations/CustomAnimationCreateDialog.cxx Change-Id: I38deeae3135badde23b9d454d548193af654caab Reviewed-on: https://gerrit.libreoffice.org/9076 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-04-16Slideshow: Fix regression related to media animationsZolnai Tamás
Misc effects tab page animations were lost. Regression from 9695f38ca4ab26b40524f2eade98c45f0360131d. Change-Id: I81f7321d7dd87f5b0f6b4acbecbd60241ab1e430 (cherry picked from commit 81e98150cc04ad764abc668dc12b91d3de90369e) Reviewed-on: https://gerrit.libreoffice.org/9054 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-16fdo#77027: ODF import: fix wrong version in check for embedded objectsMichael Stahl
SvXMLImport::LO_4x does not mean 4.0+ any more. (regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52) (cherry picked from commit 25a2eab22798373b8197f1e594568207eb7c5039) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a Reviewed-on: https://gerrit.libreoffice.org/9064 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-02Resolves: #i124085# disabled CF_DIBV5...Armin Le Grand
(no advantages but some problems), increased png support (cherry picked from commit c991f7cae8dcb306cb0d1f32bc5fcd8ea0a1ea81) Change-Id: I52bef1295b32eb3692a0428c96edd0c55287f34a Reviewed-on: https://gerrit.libreoffice.org/8784 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-02write (no)wrap of text only for custom shapes to .pptx (fdo#71961)Luboš Luňák
Apparently checking the TextWordWrap property in DrawingML::WriteText() gives false by default for objects that do not have it set, which happens to be everything except for custom shapes, which seem to be the only ones to actually obey it. So all normal text would be exported as nowrap to .pptx and read back as custom shape that has non-wrapping text. I tried to make the property return true (which is what it should be in practice), but that appears to be an exercise in futility, or I'm not mad enough to follow the complicated property sets and whatnot. So just write it out only for custom shapes. UNO purists, if any, are welcome to change the dynamic_cast to something UNO-better if they manage without an ambiguous base class error. Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I3ed906285fde88d902ac9c801986a82a7515638b Reviewed-on: https://gerrit.libreoffice.org/8774 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-25fdo#75328 Do DiscoveryService socket setup off the main thread.Andrzej Hunt
Change-Id: I795f365981d8e7983c9f32531c9ec2ae4793c8f4 (cherry picked from commit c0fb2640665d552b39deb2192d59fa11ea701d51) Reviewed-on: https://gerrit.libreoffice.org/8643 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-25cp#1000025: Import casemaps from pptx.Muthu Subramanian
(Ported from: 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec and 9dbcb79782d6a5b80c21a0c093537d18425b826f) Change-Id: I211491e06273aedf5c8ddbd0ca3fc35f3d168aaa Reviewed-on: https://gerrit.libreoffice.org/7848 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-25hidpi: Sidebar, fontwork, autoformat and other improvements.Keith Curtis
This is a second batch of HiDPI changes. It fixes the following areas: Sidebar * Impress Master pages preview * deck title height * tab (icon) bar * valueset dropdown control * wider maximum width * Draw and other misc. buttons which didn't get fixed by earlier change to Toolbar.SetItemImage There are several more sidebar issues, but it is much improved. Other changes * Writer and Calc auto-format dialog text * file-properties document image * fontwork gallery preview size * Calc table border control Change-Id: I95a0169a3b011836b1c75b3dcacb2733c9567ef3 Reviewed-on: https://gerrit.libreoffice.org/8519 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-25hidpi: Make many places Hi-DPI aware.Jan Holesovsky
This also introduces a getter for the mnDPIScaleFactor variable. Change-Id: I02ba6858fb1842f911d62976f4c54afc3bfa337f Reviewed-on: https://gerrit.libreoffice.org/8517 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>