summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-27Ditch "using namespace U_ICU_NAMESPACE;", qualify icu:: insteadEike Rathke
geez.. for two places.. Change-Id: I4855fc92290547b0e1ca6ff5b2f10a333c6caa3f Reviewed-on: https://gerrit.libreoffice.org/74815 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2019-06-27Ditch "using namespace U_ICU_NAMESPACE;", qualify icu:: insteadEike Rathke
Specifically no "using ..." in a header file. For the 5 places that actually need it.. Change-Id: I5a9d4efa3b19df51a05e7de0b4a825876290579c Reviewed-on: https://gerrit.libreoffice.org/74814 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2019-06-27tdf#126137: Do not dereference non-existing ObjectXisco Fauli
Regression from dfefe448c41921f2f1e54d3f69b8b9e89031d055 Use same logic as in c28ec6d9fbb21b363102faac0171de2754ea5d75 Change-Id: Ia489eb61873d38c31729fedb853b11570e562123 Reviewed-on: https://gerrit.libreoffice.org/74811 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-27Breeze: fix for tdf#125879rizmut
- Breeze & Colibre: Rearrange Navigator's element - elementary & KJ: Add some Draw's tabbed icons - Reenable menubar icons Change-Id: Ic10c80e4674393714664568ff0914acdc54b5990 Reviewed-on: https://gerrit.libreoffice.org/74791 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2019-06-27Update for Breeze, elementary & Karasa Jagarizmut
Change-Id: I002b68a803d754c094c3caf17772c70d4e4d9dc9 Reviewed-on: https://gerrit.libreoffice.org/74790 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2019-06-27protect against never gettting a size setCaolán McNamara
Change-Id: Ie7f40abaa5893bee46d64b85404ee733c0c11f85 Reviewed-on: https://gerrit.libreoffice.org/74797 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27Resolves: tdf#126116 keep original date format if detected type is identicalEike Rathke
Regression from commit 478e051f4ea13b15120fdf74faf94a6c2cfcb50c CommitDate: Tue May 21 15:35:07 2019 +0200 Resolves: tdf#125109 prefer edit format's acceptance patterns and YMD order Change-Id: If1240f75ca7c4d46c156966a72b6a98c83448770 Reviewed-on: https://gerrit.libreoffice.org/74803 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2019-06-27Fix name clash problemEike Rathke
Reportedly there can be confusion between names css::lang::Locale and icu::Locale if explicit namespaces are omitted due to (the bad habit of using) the using directive, since commit 942de6a01ba990e5f3bc55ce4ab3737a03f67f39 CommitDate: Thu Jun 20 01:57:20 2019 +0200 Resolves: tdf#92503 introduce TimeZone to calendar loading and default to UTC Rightly, because that via inclusion of calendar_gregorian.hxx pulls in unicode/calendar.h which in turn ... Didn't happen in TDF builds so far. Change-Id: Ie7fb7fce0ab5cd4b93fbbfd3abe04d7d18a8a081 Reviewed-on: https://gerrit.libreoffice.org/74795 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2019-06-27sw: avoid deleting the iterated SwRowFrame on tdf104188-4.odtMichael Stahl
The change in commit 1e6dec4b4313212a3bdc6bb06155fd65e795368b was not enough to fix this problem. SwContentFrame::CalcLowers() may move a SwTextFrame to the previous page; in that case Calc() on the upper is a bad idea because it may then call RemoveFollowFlowLine() and delete the SwRowFrame that is being iterated. There is one other (unknown) bugdoc with this problem, let's hope it's fixed as well... (regression from commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: I3c55a0d7ef0350a482fb150d3e96c3b34853400d Reviewed-on: https://gerrit.libreoffice.org/74793 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' - Remove old filepicker ref, fix links Remove ref of internal file picker Fix links of image export dialogs (previous links never worked) Adjust export behavior with system filepicker Change-Id: Ie38ac5c670a4a0364893563045cc94661a7e6bde Reviewed-on: https://gerrit.libreoffice.org/74767 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-06-27Update git submodulesGabor Kelemen
* Update helpcontent2 from branch 'master' - Fix ahelps on Form Controls - General page First cut at this beast with the ultimate goal of: - covering all the form control properties with descriptions & ahelps - killing sbasic/shared/01170101.xhp which is eerily similar to this one since "initial import" time Next step will be to save the usable parts of the duplicate file Change-Id: I6213b8447f9b33625ed5a604f3354f60dde06336 Reviewed-on: https://gerrit.libreoffice.org/74770 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-06-27Fix typoAndrea Gelmini
Change-Id: I52a0e3aaed903f48c39c900a085cee3cb5131fca Reviewed-on: https://gerrit.libreoffice.org/74768 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-27tdf#125751 sw: don't start recursive layout in SwTextFrame::EmptyHeight()Michael Stahl
Not sure if this has anything to do with the bug, but i noticed it while debugging... This is the only place that calls GetCurrFrame() *during* formatting, so make sure we don't do stupid recursive things. (regression from 56b2cf0c10d9caa01ebae1d80465e342d046a85c) Change-Id: Icd05f8d634bc9de4d5d16824d30075397e6c9960 Reviewed-on: https://gerrit.libreoffice.org/74750 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27tdf#125751 sw: fix crash on formatting in SwLayoutFrame::PaintSwFrame()Michael Stahl
It's less than ideal that the document is painted before being fully formatted, but let's try to apply a band-aid... 0x6120001a97d0 is located 144 bytes inside of 280-byte region [0x6120001a9740,0x6120001a9858) freed by thread T0 here: #1 SwFootnoteFrame::~SwFootnoteFrame() /home/ms/lo/master/sw/source/core/inc/ftnfrm.hxx:64:7 #2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 #3 SwContentFrame::Cut() sw/source/core/layout/wsfrm.cxx:1263:25 #4 SwFlowFrame::MoveBwd(bool&) sw/source/core/layout/flowfrm.cxx:2544:17 #5 SwContentFrame::MakeAll(OutputDevice*) sw/source/core/layout/calcmove.cxx:1522:17 #6 SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:366:5 #7 SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1791:37 #8 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3328:17 #9 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #10 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #11 SwRootFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3116:24 #12 SwViewShell::Paint(OutputDevice&, tools::Rectangle const&) sw/source/core/view/viewsh.cxx:1840:34 (reportedly a regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: Iff5e783985c180b704b273fa26b7c498820640ac Reviewed-on: https://gerrit.libreoffice.org/74749 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27tdf#125751 sw: tweak assert in SwFrame::PrepareMake() a bit moreMichael Stahl
This fixes 2 cases of the assert that was added in commit e14056e6e88d9b8d988b7b88b2776a8fc952031b * tdf#125751 bugdoc would assert because on a page there were a bunch of empty section frames preceding 2 SwTextFrames; the first SwTextFrame moved backwards skipping over the empty section frames, hence the second SwTextFrame is not the mpNext of the first one's follow * writerfilter_null_ptr_deref.sample had a SwTextNode with >80k characters; turns out there is a check in SwTextFrame::CalcFollow() to format only up to 10 follow frames, so the result is 2 follow frames on the same page Change-Id: Ia08afd5a0e227d0613421d74b469c409ee91cfca Reviewed-on: https://gerrit.libreoffice.org/74748 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27sw: fix SwXTextField::Impl::IsDescriptor()Michael Stahl
... to return false for a disposed instance. Follow-up to 36defda96fc62cef1e1ffb725f6768d54b0d9cd0 Unfortrunately have to resurrect the boolean flag again, because neither m_pDoc nor m_pFieldType can be used to check. (regression from e18359445fabad9ba1a704600e9ee327112cc6ae) Change-Id: I6009cb39cd49b930e042aa21f4b40877c4fdbdde Reviewed-on: https://gerrit.libreoffice.org/74739 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27NB review tab layout in all appsandreas kainz
Change-Id: I9cfac77b1931bd03edbbff5ee30ea9362a56644c Reviewed-on: https://gerrit.libreoffice.org/74781 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-06-27weld SwCustomizeAddressBlockDialogCaolán McNamara
a) use EditEngine instead of TextEngine as the former can be hosted in a foreign widget b) use a SfxGrabBagItem to hold the custom pseudo-field info inside the EditEngine c) use a proxy XDropTargetListener/XDropTarget to massage the treelist entry drag source into the textengine drop target destination Change-Id: I6bf1613ed91341c24b77564405f38b5dab0aacd7 Reviewed-on: https://gerrit.libreoffice.org/74699 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27tdf#126112 expander missingCaolán McNamara
Change-Id: Id931cd2242db229cdf7ea7c7e3fe8ad822ffedcc Reviewed-on: https://gerrit.libreoffice.org/74758 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27list too narrow in bibliography viewCaolán McNamara
Change-Id: Ie364823ad641469132973697228ca2ce556e9ba7 Reviewed-on: https://gerrit.libreoffice.org/74756 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27infinite focus changing in toc biblio pageCaolán McNamara
Change-Id: Ic2e36b8921d329d6f9cd2eb68524ed111f6fda75 Reviewed-on: https://gerrit.libreoffice.org/74754 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27Missing initialization of ScChildrenShapes::mbShapesNeedSortingStephan Bergmann
...introduced with 8fb35f06ddec551a6de887ce269d9196d9fe2337 "tdf#119388 calc, slow removing column, improve ScChildrenShapes". Caused -fsanitize=invalid-bool-load during JunitTest_sc_unoapi_1. Change-Id: Ib45b4f057c67077db7e4dfe39114362d414f7171 Reviewed-on: https://gerrit.libreoffice.org/74778 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-27tdf#99891 Update installer fonts to match newer versions of WindowsRoman Kuznetsov
Change-Id: I6f607e44b92ae9958b6013f9292743a1c7b76d34 Reviewed-on: https://gerrit.libreoffice.org/74185 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
2019-06-27Register versions from 1 to 5 for SharePoint OpenDocuments objectMike Kaganski
This is required fro two reasons: 1. For our custom LOSPSupport.OpenDocuments, it allows SharePoint site's js code to properly find out the supported methods of the object. Previously we only registered v.1 for it, and that made SharePoint to assume that only older subset of methods is supported. 2. For SharePoint.OpenDocuments, which is used to register MS component to point to our implementation, leaving out v.4 and v.5 made problems on systems with co-existing MS Office; leftover registration of v.4 and v.5 resulted in mixed results: when opened from web view, documents used MS ActiveX, while for documents opened from list view in SharePoint, our ActiveX was used. Registering all versions produces consistent results. Change-Id: I7e8d4216cce1708e676c834a465654751f079c89 Reviewed-on: https://gerrit.libreoffice.org/74776 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-06-27Review all NB's and compare each otherandreas kainz
Change-Id: I1f6b18cb604059d890e9a3796b7b4dbca9d05134 Reviewed-on: https://gerrit.libreoffice.org/74769 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-06-27Breeze: Fix for tdf#107144rizmut
- Update DB Form/Query/Report/Table - Add missing menubar icons - Clean SVG files - etc Change-Id: I6fc9943df01aad58e00d5c76cfd35bd808aef924 Reviewed-on: https://gerrit.libreoffice.org/74773 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> Tested-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2019-06-27tdf#45904 Move XElementAccess Java tests to C++Jens Carl
Move XElementAccess Java tests to C++ for ScTabViewObj. Change-Id: Iee151264033bee61a6a88ec0acb932ae069ede56 Reviewed-on: https://gerrit.libreoffice.org/74774 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2019-06-27tdf#125609c10 vcl/button: enforce only one radio selected on initJustin Luth
This patch does not solve the main LO 6.2 problem in bug 125609, but fixes the related problem from comments 10/11. This patch fixes two different scenarios: 1.) Sometimes buttons could fall through the other safety nets and have multiple radio buttons selected in a single group at display time. Since ImplInitStyle can be called multiple times for the same button, ensure that once everything is imported (IsRadioCheckEnabled) that any calls to this double-check that only one button is enabled. First come, first served if by programmer error multiple are marked as IsChecked in the same group. This problem existed pre-LO 6.2, so it had nothing to do with tabstops specifically. 2.) This patch specifically fixes the 6.2 regression with the Grammalecte extension Graphic Options dialog box. In this case Dialog::GrabFocusToFirstControl ended up being treated as a "click" on a tabstopped, unchecked radio, because setting the state never called the SetState/Checked function, but only the Init, and so the uncheckAllOther function never removed any tabstops. Change-Id: I98272d6c81cf582a15c2e6bf04e6ed60da1d9c71 Reviewed-on: https://gerrit.libreoffice.org/74108 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2019-06-26Fix typosAndrea Gelmini
Change-Id: I8163ad2712522e79d236a3e682b2bbce79dc16e7 Reviewed-on: https://gerrit.libreoffice.org/74760 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-26Fix typoAndrea Gelmini
Change-Id: Ia464eda79186aa60339def67fb2b3d399d6a916a Reviewed-on: https://gerrit.libreoffice.org/74765 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-26Fix typoAndrea Gelmini
Change-Id: I7cc008f709c8072681e216bbffd7ca68b4f86ba5 Reviewed-on: https://gerrit.libreoffice.org/74761 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-26Fix typoAndrea Gelmini
Change-Id: Ie1bf745980db686a45cd0b6fa0524baa65d3e66e Reviewed-on: https://gerrit.libreoffice.org/74763 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-26Fix typoAndrea Gelmini
Change-Id: I6297124f6a3ae7bc73d6a29195152e63fa7c78e5 Reviewed-on: https://gerrit.libreoffice.org/74762 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-26Resolves: tdf#117899 update condition entries' source position on inter-copyEike Rathke
Otherwise in the bug case it resulted in a source position pointing to the second sheet, which didn't exist in the clipboard target and thus writing the ODF format resulted in an empty base-cell-address which when read was source position 0,0,0 and with the [.$E3] reference yielded a relative row+2 offset instead of row+0 for a 2,0,0 base cell source position, effectively on row 3 then referencing $E5 instead of $E3. Change-Id: I4d7b373aa69363bc5eeefc3987087972fcad1393 Reviewed-on: https://gerrit.libreoffice.org/74747 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2019-06-26tdf#126061 Make text edit outliner view show cursorJim Raykowski
Change-Id: Ic4e8b5984d5b21c3b789eba943d35d4cad1ba867 Reviewed-on: https://gerrit.libreoffice.org/74676 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2019-06-26allow welded drag and drop into editviewCaolán McNamara
Change-Id: Ia03083b0507ef969300316034cde9bbcf5963b9a Reviewed-on: https://gerrit.libreoffice.org/74746 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-26tdf#126114 - Form fields are displayed twice (double)Tamás Zolnai
We need to make sure that IsFieldResultAsString() returns true for drop-down field, to ignore the placeholder string. Change-Id: I127800bdff78eb68e000fdbfe433bc88181ac2c3 Reviewed-on: https://gerrit.libreoffice.org/74752 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-06-26Draw popupmenu remove AnimationEffectsandreas kainz
Change-Id: Iab1a9b3e8343dee08c4b4565bbb6215fa0137fe8 Reviewed-on: https://gerrit.libreoffice.org/74745 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-06-26update creditsChristian Lohmaier
Change-Id: Ifd72d26db7303ef2e3dbb7ea1212884804889051
2019-06-26tdf#125573 Scale text to path for TextWarp, use fromWordArtRegina Henschel
LO uses not exactly the algorithm from DrawingML for Warp, but using 'ScaleX=false' gives similar results. MS Office uses scaling to path too for legacy shapes from category 'Follow Path', which were imported from binary ppt. It sets attribute 'fromWordArt' in that cases. This attribute is now interpreted on import and generated on export. Only in case of new 'Follow Path' shapes, the text is not scaled. 'ScaleX=true' is used in that case. Change-Id: I6fbc02eda436ef3bbc44783a16d79ce4bcd66f29 Reviewed-on: https://gerrit.libreoffice.org/74644 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
2019-06-26configure: reportedly Tempfile.mk fallback doesn't work on WNTMichael Stahl
... hence require $(file) support. https://lists.freedesktop.org/archives/libreoffice/2019-June/083004.html Change-Id: Ic7bdb3d47a78e4f620c2efd9ec58042378dbf2f3 Reviewed-on: https://gerrit.libreoffice.org/74730 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-26tdf#113112 insert a new sheet slowNoel Grandin
We were spending vast amounts of time in ScColumn::EndListening calling set_empty on the mdds_vector, which moved the block data around. So walk backwards through the data, which means we will delete from the end, and largely avoid any expensive moving around. Change-Id: I78cbecedf137972fb2a1b7042635f4e7b03d77ff Reviewed-on: https://gerrit.libreoffice.org/74738 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-26Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' - tdf#122840 Add bookmark for inc/decrease indents Change-Id: Ic6ab2894317b18b9b04296d755cc0eba5a2fafee Reviewed-on: https://gerrit.libreoffice.org/74691 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-06-26Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' - tdf#122842 Add how-to promote/demote levels in lists Change-Id: Ibaeea4c06f2c62493b919b8c20b10d793ef78862 Reviewed-on: https://gerrit.libreoffice.org/74706 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-06-26Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' - tdf#122753 Calc AutoFormat Styles update Change-Id: I7b099f3b94f901af1885b942ce71c5815c1a4918 Reviewed-on: https://gerrit.libreoffice.org/74711 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-06-26tdf#97925 writer, slow scrolling large RTF documentNoel Grandin
this document appears to have just enough fallback fonts on each page to make the cache useless, so just bump up the size of the cache considerably, since the cache key/values are really small Change-Id: I4983de92f66410fee3f04e1e126b2ddb4ec2cbf9 Reviewed-on: https://gerrit.libreoffice.org/74735 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-26force drag dest to track motionCaolán McNamara
if we configure something to be dropped on, then make it track drags Change-Id: I7beacae7012b8929f9bcfa4c72d713ed04ba576c Reviewed-on: https://gerrit.libreoffice.org/74733 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-26Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' - tdf#124606 Layers should be under sdraw/ Move layers relatated Help from simpress to sdraw. Change-Id: I1fce2a3a2cb03c522e153b0fd5949007631e31a3 Reviewed-on: https://gerrit.libreoffice.org/74685 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-06-26Index on WID+memberID in SvxItemPropertySet::aCombineListStephan Bergmann
...instead of just WID. For example when loading caolan/sdrobject_getmergeditemset_null_ptr_dereference.sample (from the crashtestdata files) under UBSan, > #4 0x00007fffeeacde54 in SvxItemPropertySet::getPropertyValue(SfxItemPropertySimpleEntry const*) const (this=0x607001a356d0, pMap=0x604000ec2e60) at /home/sbergman/lo/core/editeng/source/uno/unoipset.cxx:219 > #5 0x00007fffda713cb9 in SvxShape::_getPropertyValue(rtl::OUString const&) (this=0x6150015d7980, PropertyName="CharUnderlineColor") at /home/sbergman/lo/core/svx/source/unodraw/unoshape.cxx:1775 > #6 0x00007fffda70dbe9 in SvxShape::getPropertyValue(rtl::OUString const&) (this=0x6150015d7980, PropertyName="CharUnderlineColor") at /home/sbergman/lo/core/svx/source/unodraw/unoshape.cxx:1721 > #7 0x00007fffda713f3e in non-virtual thunk to SvxShape::getPropertyValue(rtl::OUString const&) () at /home/sbergman/lo/core/instdir/program/libsvxcorelo.so > #8 0x00007fff19e8cfa6 in SwXShape::_getPropAtAggrObj(rtl::OUString const&) (this=0x610000183540, _rPropertyName="CharUnderlineColor") at /home/sbergman/lo/core/sw/source/core/unocore/unodraw.cxx:1735 > #9 0x00007fff19e8b511 in SwXShape::getPropertyValue(rtl::OUString const&) (this=0x610000183540, rPropertyName="CharUnderlineColor") at /home/sbergman/lo/core/sw/source/core/unocore/unodraw.cxx:1665 [...] would first store an Any with value sal_Int32 -1 (representing an RGBA 255/255/255/255 color) in aCombineList for property CharUnderlineColor with WID = EE_CHAR_UNDERLINE = 4027 and member-ID = MID_TL_COLOR = 2, but then read back out that Any for property CharUnderline with the same WID but member-ID = MID_TL_STYLE = 1 and use it at > include/svl/eitem.hxx:47:20: runtime error: load of value 4294967295, which is not a valid value for type 'FontLineStyle' > #0 in SfxEnumItem<FontLineStyle>::SetValue(FontLineStyle) at include/svl/eitem.hxx:47:20 > #1 in SvxTextLineItem::PutValue(com::sun::star::uno::Any const&, unsigned char) at editeng/source/items/textitem.cxx:1016:13 > #2 in SvxItemPropertySet::setPropertyValue(SfxItemPropertySimpleEntry const*, com::sun::star::uno::Any const&, SfxItemSet&, bool) at editeng/source/uno/unoipset.cxx:178:19 > #3 in SvxItemPropertySet_setPropertyValue(SfxItemPropertySimpleEntry const*, com::sun::star::uno::Any const&, SfxItemSet&) at svx/source/unodraw/unoshape.cxx:4119:5 > #4 in SvxItemPropertySet_ObtainSettingsFromPropertySet(SvxItemPropertySet const&, SfxItemSet&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, SfxItemPropertyMap const*) at svx/source/unodraw/unoshape.cxx:638:29 > #5 in SvxShape::ObtainSettingsFromPropertySet(SvxItemPropertySet const&) at svx/source/unodraw/unoshape.cxx:656:9 > #6 in SvxShape::Create(SdrObject*, SvxDrawPage*) at svx/source/unodraw/unoshape.cxx:413:5 > #7 in SvxShapeText::Create(SdrObject*, SvxDrawPage*) at svx/source/unodraw/unoshape.cxx:3867:15 > #8 in SvxDrawPage::add(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) at svx/source/unodraw/unopage.cxx:234:13 > #9 in SwXDrawPage::add(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) at sw/source/core/unocore/unodraw.cxx:597:19 > #10 in SwXShape::attach(com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) at sw/source/core/unocore/unodraw.cxx:2056:22 [...] Change-Id: Ic0cf34440507c768b13d1b5b957425d6a43271ac Reviewed-on: https://gerrit.libreoffice.org/74635 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-06-26tdf#125518: docx export: save anchors for diagramsVasily Melenchuk
Previously all diagrams were saved as inline objects ignoring possible wrapping options and anchors. Change-Id: I0952fb33d4be4c288c919156af9549f8195b7ead Reviewed-on: https://gerrit.libreoffice.org/72291 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>