summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-09-13Related: tdf#144389: merge ThumbnailView and ThumbnailViewBaseCaolán McNamara9-38/+20
only ThumbnailView inherits directly from ThumbnailViewBase and it will simplify a11y if ThumbnailView instead of ThumbnailViewBase is available Change-Id: I715faa3f9b2cec68c1de07479b7d1dbbd9ddbcc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121848 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-13tdf#144352 Revert "Fix widget placement problem on mailmerge result dialog."Gabor Kelemen1-1/+0
This reverts commit 0a3e5ba4db254549c15e55984f1764a352c8239b. Reason for revert: Causes the dialogs bottom part to slip on top each other, most visibly on Windows Change-Id: I6e5a30fbb4611a7b1250b173adccdb47c95eea02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121879 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit c10c32438025edda2f3c178b47d369e7979f25a8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121988 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-13Resolves: tdf#144389 get_accessible_parent should only be called on vcl implsCaolán McNamara1-16/+5
Change-Id: If5d8718fcd9bcccee37e162a99cc68ff4a77de8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121849 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-13crashtesting: threaded scaling crash on re-export of ooo24840-1.sxw to odtCaolán McNamara3-12/+26
#13 0x00007f1cb843752a in o3tl::cow_wrapper<ImplBitmapPalette, o3tl::UnsafeRefCountingPolicy>::operator->() (this=0x5596086d5968) at include/o3tl/cow_wrapper.hxx:329 __PRETTY_FUNCTION__ = "BitmapColor& BitmapPalette::operator[](sal_uInt16)" #14 0x00007f1cb843752a in BitmapPalette::operator[](unsigned short) (this=0x5596086d5968, nIndex=nIndex@entry=0) at vcl/source/bitmap/bitmappalette.cxx:139 __PRETTY_FUNCTION__ = "BitmapColor& BitmapPalette::operator[](sal_uInt16)" #15 0x00007f1cb849f5f5 in BitmapInfoAccess::GetPaletteColor(unsigned short) const (nColor=0, this=0x5596085989f0) at include/vcl/BitmapInfoAccess.hxx:114 __PRETTY_FUNCTION__ = "const BitmapColor& BitmapInfoAccess::GetPaletteColor(sal_uInt16) const" the mpBuffer member of BitmapInfoAccess is BitmapBuffer* mpBuffer; not const BitmapBuffer* mpBuffer; so mpBuffer->maPalette.foo() calls non-const variants of foo(), (BitmapPalette::operator[](unsigned short) in this case), which is presumably non the expected outcome, as the copy-on-write mpImpl of BitmapPalette unsafely creates a new copy its internals on the first dereference of mpImpl in a non-const method. Change-Id: I1ebb3c67386a9028e5b8bab4b2d1cc5862700aa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121888 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-13tdf#144425 Set sane lower bounds (1) for MM e-mail output rangesGabor Kelemen1-0/+2
Lower bounds were forgotten to be set in weld commit f1ca64800074530d95e507f93c764a687310b9eb for the new GtkAdjustments of the GtkSpinButtons This caused no visible differences until commit d9fa826769cd570814f3556d53493a78d2869873 when new default values (0) were added for VCL FormattedFields This made it possible to email MM results on non-GTK vclpugs starting from 0th mail if custom range is chosen, which causes an instant hang in the sending process since there is no -1st generated result. The default Send all option has still worked after this. Then commit ec44f87d5b99a3299322d0b79abc4c6808877865 started to use the default GtkSpinButton values for default range of result generation, breaking the Send all option as well. Change-Id: I2a9f2b0954045700f947f342e5928ef75ce23aed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121865 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit e85aaaecb5479660aa0cf600564ee3caa470aa3d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121877 Tested-by: Jenkins
2021-09-13tdf#144412 Qt5 reset m_nModKeyCode on key inputJan-Marek Glogowski1-0/+6
Switching the input direction on Ctrl + L/R-Shift is actually no bug but a feature. It is triggered on key release, so it can be distinguished from / doesn't interfere with shortcut handling. That's what should happen. So trying to implement that behaviour correctly and seeing the appearingly wrong modifier events for gtk3, I found gtk3 resets the frames persistent mnModKeyCode for key input events, which also seems to fix the problem for qt5. Some additional discussion is also in tdf#103158. Regression from commit 862fdb98ca271b60a831cd5420fd16d5f9c1c747 ("tdf#143298 Qt5 send SalEvent::KeyModChange events"). Change-Id: Iafcd1db7abcdf078001ca0602ae6e374f2a169ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121858 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 61cb81d67ebf6b342a1cdb46bf6eb25a49eb5ff4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121887 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-13Resolves: tdf#144457 Use weld::set_text() instead of replace_selection()Eike Rathke1-1/+1
... to replace entire field with modified text, instead of inserting the text at the cursor position without selection, thus effectively duplicating it (modulo modification). Fallout from commit 08101a1ab3b5d7c41488e93a2af518462286844f CommitDate: Tue Jul 30 14:04:17 2019 +0200 weld OfaLanguagesTabPage that did if (bModified) - { - // Do not use SetText(...,GetSelection()) because internally the - // reference's pointer of the selection is obtained resulting in the - // entire text being selected at the end. - Selection aSelection( rEd.GetSelection()); - rEd.SetText( aBuf.makeStringAndClear(), aSelection); - } + rEd.replace_selection(aBuf.makeStringAndClear()); replacing the workaround needed for the old toolkit with something similar from the new toolkit but behaving differently.. Change-Id: I9ff325eecd747bbecb36eb2a1150ae4472e475e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122000 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit db90a6cedbc261ad711ff13c4f69db65946486da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121978 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-12tdf#144085 XUsedAreaCursor broken: the methods don't accept formatted cells ↵Noel Grandin1-8/+4
as used This reverts commit 61386aa03cd166473a58dbb4be0dd5e0ce82195c. tdf#79049 speed up OOXML workbook load (3) which caused this problem Change-Id: I19a9cf75e8b2d3b5f87e1bd324c42a1dbae8ee63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121973 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit d8b765e6c45792bff5717cd0e0d9d42311c33461) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121977
2021-09-11Resolves: tdf#143777 Exclude recipient is always greyed outCaolán McNamara1-1/+1
Change-Id: I6ce94fad6ba518457665ae6d6b473cfe6f80849f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121882 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-10tdf#126426: support for hyperlinks in TextParagraphContextVasily Melenchuk4-1/+57
Usually hyperlinks are processed by TextBodyContext, but for grouped shape we accidentaly gone into TextParagraphContext It has almost all possibilities to process txbxContent, but not hyperlinks. Additionally some hyperlink char attributes (color and underline) can expand to follow up ordinal text. Additional small hack applied to avoid this. Unfortunately this is not a final solution: such document fails roundtrip and hyperlinks are lost after saving to DOCX. Conflicts: oox/source/drawingml/textbodycontext.cxx Change-Id: Ie954f53696bd872cb1f59cb586fb55f6cd7c73bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121172 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121904
2021-09-10drop stray fprintfCaolán McNamara1-1/+0
Change-Id: Ide4df588f8642b3eaad6dab4c819ba1914f3e2ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121880 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-10xmloff: ODF export: avoid mysterious crash while sorting shapesMichael Stahl1-0/+5
Apparently the draw page contains a null XShape. That sounds like a bug but OTOH this sorting feature from commit 9bc6160e0acbc78be998129ea55ed7e4529959faa isn't that important so let's sweep the problem under the rug. 0 swlo.dll sw::GetZOrderLayer::operator()(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const &) C:\cygwin64\home\buildslave\source\libo-core\sw\source\filter\xml\zorder.hxx:37 1 mergedlo.dll xmloff::FixZOrder(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const &,std::function<unsigned int > const &) C:\cygwin64\home\buildslave\source\libo-core\xmloff\source\draw\shapeexport.cxx:1003 2 swlo.dll SwXMLWriter::Write_(com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const &,rtl::OUString const &) C:\cygwin64\home\buildslave\source\libo-core\sw\source\filter\xml\wrtxml.cxx:190 https://crashreport.libreoffice.org/stats/crash_details/045adea4-c577-4164-9e69-bde5f892bd17 Change-Id: I1e67dc1c354cb14717cf9667314d6752e1b4c295 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121860 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a0d28d03ff40a77a2c88704a7b2bedb68e68563f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121878 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-10tdf#120129: don't forget to update buffer size to actual lengthMike Kaganski1-0/+3
Otherwise extra bytes get written to the resulting string from the too long buffer. Change-Id: Iccde16b8002f214df6f86f484f288ec464c6b674 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121872 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 541ddf4580cac8c3f9590be26a487f5fc8e2553c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121874 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-09Resolves: tdf#144376 focus into protected ScTextWnd shouldn't be possibleCaolán McNamara4-2/+11
the expectations are that this isn't possible and if it happens then under windows there is a QueryCharPosition which will trigger the deletion of the ScTextWnd EditView due to that expectation before it is then unconditionally dereferenced Change-Id: Ied5d8031ae7d74669a2958dbcdec87843a26d384 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121769 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-09tdf#142458 Set correct ScrolledWindow BorderWidth in the ctorCaolán McNamara2-36/+45
and keep it updated when the relevant properties that affect it change. This avoids the problem that the borderwidth can change during "Paint" (which is something we strongly want to avoid). a problem since: commit f39f21d92ec83c3a5062f29dd26214fc83012c06 Date: Thu Nov 19 11:51:13 2020 +0100 tdf#138010 (IV) VclScrolledWindow: Use actual border width and then remove the potential change of BorderWidth during paint Change-Id: I2ec317d86687fdb75e6323905f6d1c3b8fc655e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121557 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-09cui: fix spell check dialog pointlessly modifying text shapeMichael Stahl1-1/+4
In Impress, closing the spell check dialog without doing any changes will replace the entire text of a shape, creating an sd::UndoObjectSetText and messing up the formatting. Apparently in commit bbb1428e3666acc7503d86704bbf1e1a4ac04795 a check of the modified flag was removed, but it's not obvious why, so add it back, which appears to fix the problem. Change-Id: I8ce6c75f097baa82f11f7b1c813262845001ae7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121807 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 73c8bd42650dafc38c87b5e6dc1ef222d4f6175c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121768 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-09-09svx: try to avoid crash in AccessibleEditableTextParaMichael Stahl1-0/+4
There is an out-of-bounds access to a non-existant editengine paragraph: warn:legacy.tools:40400:40400:editeng/source/editeng/editdoc.cxx:1136: Index out of range in Adjust(2) warn:legacy.tools:40400:40400:editeng/source/editeng/editeng.cxx:1984: Paragraph not found: GetWindowPosTopLeft /usr/include/c++/11/debug/vector:438: Error: attempt to subscript container with out-of-bounds index 1, but container only holds 1 elements. 4 ParaPortionList::operator[](int) (this=0x6270d38, nPos=1) at editeng/source/editeng/editdoc.cxx:722 5 ImpEditEngine::CalcParaWidth(int, bool) (this=0x6270ca0, nPara=1, bIgnoreExtraSpace=true) at editeng/source/editeng/impedit2.cxx:3307 6 EditEngine::GetParaBounds(int) (this=0x6264a00, nPara=1) at editeng/source/editeng/editeng.cxx:646 7 Outliner::GetParaBounds(int) const (this=0x30fb510, nParagraph=1) at editeng/source/outliner/outlin2.cxx:414 8 SvxOutlinerForwarder::GetParaBounds(int) const (this=0x3424710, nPara=1) at editeng/source/uno/unoforou.cxx:326 9 SvxAccessibleTextAdapter::GetParaBounds(int) const (this=0x73d7d30, nPara=1) at editeng/source/uno/unoedprx.cxx:757 10 accessibility::AccessibleEditableTextPara::getBounds() (this=0x27c45c0) at editeng/source/accessibility/AccessibleEditableTextPara.cxx:1050 11 accessibility::AccessibleTextHelper_Impl::UpdateBoundRect() (this=0x73d7c90) at svx/source/accessibility/AccessibleTextHelper.cxx:799 12 accessibility::AccessibleTextHelper::UpdateChildren() (this=0x2ae5eb0) at svx/source/accessibility/AccessibleTextHelper.cxx:1658 13 accessibility::AccessibleShape::notifyShapeEvent(com::sun::star::document::EventObject const&) (this=0x73d7690, rEventObject=...) at svx/source/accessibility/AccessibleShape.cxx:926 14 SfxBaseModel::notifyEvent(com::sun::star::document::EventObject const&) const (this=0x2eb1b80, aEvent=...) at sfx2/source/doc/sfxbasemodel.cxx:3341 15 SdXImpressDocument::Notify(SfxBroadcaster&, SfxHint const&) (this=0x2eb1b80, rBC=..., rHint=...) at sd/source/ui/unoidl/unomodel.cxx:408 16 SfxBroadcaster::Broadcast(SfxHint const&) (this=0x2e6f120, rHint=...) at svl/source/notify/SfxBroadcaster.cxx:39 17 SdrObject::BroadcastObjectChange() const (this=0x30fb190) at svx/source/svdraw/svdobj.cxx:1028 18 SdrUndoObjSetText::Undo() (this=0x732acb0) at svx/source/svdraw/svdundo.cxx:1050 19 sd::UndoObjectSetText::Undo() (this=0x732acb0) at sd/source/core/undo/undoobjects.cxx:204 This was replaced when GetTextForwarder() apparently replaced the editengine object or something along those lines: 5 ParaPortionList::Insert(int, ParaPortion&&) (this=0x6270d38, nPos=0, p=...) at editeng/source/editeng/editdoc.cxx:740 6 ImpEditEngine::InitDoc(bool) (this=0x6270ca0, bKeepParaAttribs=true) at editeng/source/editeng/impedit2.cxx:241 7 ImpEditEngine::RemoveText() (this=0x6270ca0) at editeng/source/editeng/impedit2.cxx:678 8 ImpEditEngine::SetText(rtl::OUString const&) (this=0x6270ca0, rText="") at editeng/source/editeng/impedit2.cxx:694 9 ImpEditEngine::SetText(EditTextObject const&) (this=0x6270ca0, rTextObject=...) at editeng/source/editeng/impedit4.cxx:1139 10 EditEngine::SetText(EditTextObject const&) (this=0x6264a00, rTextObject=...) at editeng/source/editeng/editeng.cxx:1535 11 Outliner::SetText(OutlinerParaObject const&) (this=0x30fb510, rPObj=...) at editeng/source/outliner/outliner.cxx:568 12 SvxTextEditSourceImpl::GetBackgroundTextForwarder() (this=0x73d7990) at svx/source/unodraw/unoshtxt.cxx:553 13 SvxTextEditSourceImpl::GetTextForwarder() (this=0x73d7990) at svx/source/unodraw/unoshtxt.cxx:658 14 SvxTextEditSource::GetTextForwarder() (this=0x73c9580) at svx/source/unodraw/unoshtxt.cxx:936 15 SvxEditSourceAdapter::GetTextForwarderAdapter() (this=0x73d7d20) at editeng/source/uno/unoedprx.cxx:324 16 SvxEditSourceAdapter::GetTextForwarder() (this=0x73d7d20) at editeng/source/uno/unoedprx.cxx:339 17 accessibility::AccessibleTextHelper_Impl::GetTextForwarder() const (this=0x73d7c90) at svx/source/accessibility/AccessibleTextHelper.cxx:265 18 accessibility::AccessibleTextHelper_Impl::UpdateVisibleChildren(bool) (this=0x73d7c90, bBroadcastEvents=true) at svx/source/accessibility/AccessibleTextHelper.cxx:750 19 accessibility::AccessibleTextHelper::UpdateChildren() (this=0x2ae5eb0) at svx/source/accessibility/AccessibleTextHelper.cxx:1657 20 accessibility::AccessibleShape::notifyShapeEvent(com::sun::star::document::EventObject const&) (this=0x73d7690, rEventObject=...) at svx/source/accessibility/AccessibleShape.cxx:926 21 SfxBaseModel::notifyEvent(com::sun::star::document::EventObject const&) const (this=0x2eb1b80, aEvent=...) at sfx2/source/doc/sfxbasemodel.cxx:3341 22 SdXImpressDocument::Notify(SfxBroadcaster&, SfxHint const&) (this=0x2eb1b80, rBC=..., rHint=...) at sd/source/ui/unoidl/unomodel.cxx:408 23 SfxBroadcaster::Broadcast(SfxHint const&) (this=0x2e6f120, rHint=...) at svl/source/notify/SfxBroadcaster.cxx:39 24 SdrObject::BroadcastObjectChange() const (this=0x30fb190) at svx/source/svdraw/svdobj.cxx:1028 25 SdrUndoObjSetText::Undo() (this=0x732acb0) at svx/source/svdraw/svdundo.cxx:1050 So try to update the number of paragraphs when GetTextForwarder() was called. Change-Id: I5c0712cdf0c01d2aa0e8cd929ba51aaf1c710123 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121789 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 294a82dda5045ad71122f946b67ec3d1d2e278d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121767 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-09-08update creditsChristian Lohmaier1-1867/+1875
Change-Id: Ie9a3df3c6dc8af63023e579638f13026451a346f (cherry picked from commit 4a07a8963a74ef1659aa3e467d9288d1e3c7b9d4)
2021-09-08Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-7-2' to 2fd52f2e5b9aa66f3e685e89fa8a00b42c2917b3 - update translations for 7.2.1 rc2 and force-fix errors using pocheck Change-Id: I4b8c8e545d7aba21bf9e925bfb9018be6e4c04f8 (cherry picked from commit 4460c7babd574c5040a528d10fe51001c27680bc)
2021-09-08tdf#142129 vcl: add unit testMichael Stahl5-0/+105
Reportedly bug was fixed by commit 5fc6a601d7a1978db291fd0f7dcec638a7c25651 Change-Id: Iee32cacff0c939bdf498e9dc8102eb2d22a5a1c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121776 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 992f878e8c3424f7ce96a78ccf3a316b29ffd9ec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121763 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-07tdf#144242 no width-height swap for line and pathlineRegina Henschel2-2/+90
MS Office swaps width and height for rotation angle ranges 45..135 and 225..315. Line and Pathline objects incorporate the rotation into their points, so have no rotation. Line and open Pathline objects nevertheless report an rotation angle. That one is used to align the text direction to the line. But because of this reported angle, width and height were swapped. The patch excludes these objects explicitly. The case differentiation for the rotation range had forgotten to normalize the angle. Therefore, in a reopened spreadsheet, the line was accidentally exported correctly without width-height swap, because in this case the rotation angle is negative. Change-Id: I5f698d1cc734e17bcb02ff77db5224a228392e06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121661 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 84d6d704682a4d0e037a28895356b073e4f992a5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121752 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-07tdf#144245 - Case-insensitive operation for non-ASCII charactersAndreas Heinisch2-2/+82
Support case-insensitive operation for non-ASCII characters in the Collection object (VBA). Change-Id: Ie17560cb9aac5bfb32aa041744445dd4839681d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121534 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de> (cherry picked from commit ef32c3b4f9b80918d6018e14297fa41245afd381) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121759 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-07tdf#140951: fix crash on Base when accessibility usedJulien Nabet1-1/+3
See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=174832 Change-Id: Ia0a52b1e6aafc043f6be2d8406a98e7d4ebf55dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121735 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 970883a85ad1d714683a1d98fb45efc89cbdeb3b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121754 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-07tdf#144340: fix FB configure on WindowsMike Kaganski1-18/+28
./configure runs on Windows, and sets value of FB_ALIGNMENT, a define that affects the layout of FB's sort memory pool. Trying to include <semaphore.h> fails on Windows; the test in ./configure considers error value (equal to 2) as the value of the alignment (which should be 4 or 8 depending on arch). This makes the memory misaligned, chunks overlapping and re-written during the sort, memory corrupt, and so on. Removing the include (which is documented in a commit adding a similar include [1] to be needed for m68k) fixes detection. Additionally this cleans up the code added to config.h.in from autoconfig_msvc.h, because the former is auto-generated during configure, and the values get re-written in all occurrences of respective defines anyway. [1] https://github.com/FirebirdSQL/firebird/commit/7ba46163c74211ce4bf1051ee9998db58cb2f396 Change-Id: I8cdc5c764385a04efd130af09138149c748341fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121753 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c7b5e6566d9b24a0a996c739a945004d9aadee2f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121755 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-07Flatpak: Upgrade to 21.08 runtime, disable SkiaStephan Bergmann2-8/+2
For whatever reason, building Skia against the 21.08 SDK would fail with > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘void {anonymous}::colrv1_draw_paint(SkCanvas*, const FT_Color*, FT_Face, FT_COLR_Paint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:668:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 668 | case FT_COLR_PAINTFORMAT_TRANSFORMED: { > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:669:60: error: ‘union FT_COLR_Paint_::<unnamed>’ has no member named ‘transformed’; did you mean ‘transform’? > 669 | SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); > | ^~~~~~~~~~~ > | transform > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘bool {anonymous}::colrv1_traverse_paint(SkCanvas*, const FT_Color*, FT_Face, FT_OpaquePaint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:763:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 763 | case FT_COLR_PAINTFORMAT_TRANSFORMED: > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:768:74: error: ‘union FT_COLR_Paint_::<unnamed>’ has no member named ‘transformed’; did you mean ‘transform’? > 768 | colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); > | ^~~~~~~~~~~ > | transform > make[1]: *** [/run/build/libreoffice/solenv/gbuild/LinkTarget.mk:347: /run/build/libreoffice/workdir/GenCxxObject/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.o] Error 1 But including Skia in the Linux flatpak isn't too useful anyway (and just happened to be on by default): First, it is disabled by default on Linux, cf. UseSkia in officecfg/registry/data/org/openoffice/Office/Common.xcu. And second, on Linux it can only be enabled for SAL_USE_VCLPLUGIN=gen, but not for the gtk3 plugin that the flatpak normally uses, cf. OfaViewTabPage::UpdateSkiaStatus in cui/source/options/optgdlg.cxx. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121705 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 9d88f11de57bcbeb29fa6f1299d5d0867c1a75a4) Conflicts: solenv/flatpak-manifest.in Change-Id: Ifdc9c23676280caf19db0e9f09df15aaa21eef5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121712 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-07tdf#144319 fix formula loadNoel Grandin1-0/+3
regression from commit 67d83e40e2c4f3862c50e6abeabfc24a75119fc8 Author: Noel Grandin <noelgrandin@gmail.com> Date: Sat Dec 19 13:25:53 2020 +0200 speedup rational_FromDouble Change-Id: Icb728b63f950e827f1492087114f927c2f85ddb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121719 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit f8cf0d2cb4e5e18f48d6b3bfbc7d0e72e7ed5190) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121571
2021-09-06tdf#143384 DOCX import: fix SAXException at header with tableAttila Szűcs10-18/+83
Regression from commit d656191ec308d4280b93c7169372e543a255d108 "tdf#119952 DOCX import: fix negative page margins". Add SwXHeadFootText::CreateTextCursor(bool bIgnoreTables = false) (modeled after SwXBodyText::CreateTextCursor) to create text cursor for copying the header/footer also started with table during fly frame creation in convertoToTextFrame(). Note: add hidden property PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF to use the new feature in domainmapper (followed commit af4e5ee0f93c1ff442d08caed5c875f2b2c1fd43 "tdf#97128 DOCX import: fix frame direction"). Co-authored-by: Tibor Nagy (NISZ) Change-Id: I96e2cf2dddcecd146c53c12d7fdb44fc4d90fa0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119549 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit c1ad429d925855c1baacbdeca1ef42f4486eb9c2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120985 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-06Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann1-3/+3
Change-Id: I9c51aa37304089a2ada76dd7919f13371c9a999f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121714 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-06Revert "tdf#142214: autocomplete: do not search across empty blocks"Ilmari Lauhakangas3-73/+11
This reverts commit ca2ec443893731093970914feb750b31ea13e47f. Breaks user experience. Removed ScTiledRenderingTest::testAutoInputStringBlock as well. Change-Id: Id03bc645d78c29c0aa588b2133fc1cb96f3cceb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121640 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> (cherry picked from commit 223f3a6fac43580114bca86abb34d7cf3219f4bc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121569 Reviewed-by: Eike Rathke <erack@redhat.com>
2021-09-06tdf#105689: fix path management to retrieve Emoji toolbar buttonJulien Nabet1-3/+7
On Windows console logs show: warn:sfx:7060:6444:sfx2/source/control/emojiview.cxx:105: Emoji config data is empty Change-Id: I85baf2fedc20ff855183147e9a178bb048ac75ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121653 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 37357e3cae749c54f1b9645c6670240baf860bc4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121564 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-06tdf#144289 invert / disable default OpenGL supportJan-Marek Glogowski7-5/+8
... and as a result drop setting a default in SalSvpInstance. This is also more consistent: now you must explicitly implement CreateOpenGLContext() and set "m_bSupportsOpenGL = true". Change-Id: I591580bf134907213b8308e0843c278d2f470ed3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121632 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 50238bddf0e95169007cb90479cca86849a19007) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121635 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-05Sukapura: update cell alignment iconsRizal Muttaqin6-3/+3
Change-Id: I25a05a2d11e22ac1df1dcce496277ac0c872931a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121625 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <rizmut@libreoffice.org> (cherry picked from commit 033b4183b33eb83fc8cd0176e6072e6805c96efc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121566 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-05Sukapura:^ Superscript, Subscript, Clear Direct Formatting, Font ColorRizal Muttaqin18-9/+9
Change-Id: Id2fb746dd33eb7de24539c7931221c331e47c087 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121628 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit bcd823d31f7a2c670db81988e527d5c9682fe177) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121565 Tested-by: Jenkins
2021-09-04Colibre: tdf#142295 clear up unsaved state iconsRizal Muttaqin6-3/+3
Change-Id: I972f73dc35eda328663cdbfe1861110b4f69f8f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121630 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <rizmut@libreoffice.org> (cherry picked from commit 21c3894c5cc30e511429df89edd59f413d93550a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121559 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-03tdf#144155: Revert "tdf#36383 sc AutoFilter: fix changing row height"Xisco Fauli2-88/+2
This reverts commit 3678e0efcb8bedc58dd329a430da0ac3b1572df8. Conflicts: sc/qa/uitest/autofilter/tdf36383.py Change-Id: Ie1abd0cdea013571a27b187ffcb20125a0656442 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121512 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121550
2021-09-03tdf#142458 minimal width not including extra width needed by scrolledwindowCaolán McNamara2-0/+19
its only including the width of the panels and not the extra space possibly required by the container window. Which is 2x the m_nBorderWidth of 1pixel of VclScrolledWindow in this case. Change-Id: I56775c7183d7a8b87af263ddc8bb17373779e9ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121290 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-02tdf#144230: sanitize string length embedded in SQL_VARYING dataMike Kaganski1-2/+3
It is unclear why the length may be wrong; but at least be safe to avoid buffer overruns. Wrt the validity of sqllen here: see SQLDAMetadata::scatterData in firebird's src/yvalve/why.cpp. Change-Id: Icc24c1cc0db66c20732188ab0621cde53c1ba5c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121458 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2e5dad443a30055d93dbcb3bf9cac906e80b2e25) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121462 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-02Resolves: tdf#143646 move the border from the outer grid to the inner oneCaolán McNamara1-1/+1
which is consistent with the other sidebar panels and gives the expected minimum width expected by the deck Change-Id: Ic9a4629bf6dc675c2a30533310512bf369c7b779 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121453 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-02Resolves: tdf#144209 Handle General containing formats in RoundValueAsShown()Eike Rathke3-7/+37
Calling SvNumberformat::GetThousandDivisorPrecision() for a "AA "General format resulted in 3000 as that was implemented for tdf#106253 without taking into account that ImpSvNumberformatInfo::nThousand may be abused under some conditions, which here is having FLAG_STANDARD_IN_FORMAT = 1000 as nThousand, multiplied by 3 gives 3000. Subtracted from the 0 precision gave -3000 decimals for which of course the new rounding produced 0 where it previously simply ignored the decimals and returned the original value. Change-Id: I66afaf1e2d8b2654d9f7cc8cfb66389357fb742d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121447 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 71b003a12f8afdff42a25786ad0a12ddd6609d59) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121459 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-02tdf#138519 use gtk_adjustment_set_value instead of gtk_spin_button_set_valueCaolán McNamara1-1/+4
for FormattedSpinButton because the latter doesn't change the value if the new value is less than an EPSILON diff of 1e-10 from the old value Change-Id: I410ceec28e1855e53de8c2982e540c612578bf54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121419 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara2-1/+1
surely a lookup of i equal to rTable.size() is bogus ==75288== Conditional jump or move depends on uninitialised value(s) ==75288== at 0x1EC68C45: DelFlyInRange(SwNodeIndex const&, SwNodeIndex const&, SwIndex const*, SwIndex const*) (docedt.cxx:246) ==75288== by 0x1EDE68D4: sw::DocumentContentOperationsManager::DeleteSection(SwNode*) (DocumentContentOperationsManager.cxx:2096) ==75288== by 0x1FC27F2C: SwHTMLParser::DeleteSection(SwStartNode*) (htmltab.cxx:4945) ==75288== by 0x1FC231EF: SwHTMLParser::BuildTable(SvxAdjust, bool, bool, bool) (htmltab.cxx:5219) ==75288== by 0x1FC24B7B: SwHTMLParser::BuildTableCaption(HTMLTable*) (htmltab.cxx:4589) ==75288== by 0x1FC23E34: SwHTMLParser::BuildTableRow(HTMLTable*, bool, SvxAdjust, short) (htmltab.cxx:4020) ==75288== by 0x1FC25B38: SwHTMLParser::BuildTableSection(HTMLTable*, bool, bool) (htmltab.cxx:4189) ==75288== by 0x1FC2237F: SwHTMLParser::BuildTable(SvxAdjust, bool, bool, bool) (htmltab.cxx:5055) ==75288== by 0x1FC24B7B: SwHTMLParser::BuildTableCaption(HTMLTable*) (htmltab.cxx:4589) ==75288== by 0x1FC23E34: SwHTMLParser::BuildTableRow(HTMLTable*, bool, SvxAdjust, short) (htmltab.cxx:4020) ==75288== by 0x1FC25B38: SwHTMLParser::BuildTableSection(HTMLTable*, bool, bool) (htmltab.cxx:4189) ==75288== by 0x1FC2237F: SwHTMLParser::BuildTable(SvxAdjust, bool, bool, bool) (htmltab.cxx:5055) ==75288== by 0x1FC24B7B: SwHTMLParser::BuildTableCaption(HTMLTable*) (htmltab.cxx:4589) ==75288== by 0x1FC23E34: SwHTMLParser::BuildTableRow(HTMLTable*, bool, SvxAdjust, short) (htmltab.cxx:4020) ==75288== by 0x1FC25B38: SwHTMLParser::BuildTableSection(HTMLTable*, bool, bool) (htmltab.cxx:4189) ==75288== by 0x1FC2237F: SwHTMLParser::BuildTable(SvxAdjust, bool, bool, bool) (htmltab.cxx:5055) ==75288== by 0x1FC24B7B: SwHTMLParser::BuildTableCaption(HTMLTable*) (htmltab.cxx:4589) ==75288== by 0x1FC23E34: SwHTMLParser::BuildTableRow(HTMLTable*, bool, SvxAdjust, short) (htmltab.cxx:4020) ==75288== by 0x1FC25BC5: SwHTMLParser::BuildTableSection(HTMLTable*, bool, bool) (htmltab.cxx:4194) ==75288== by 0x1FC2237F: SwHTMLParser::BuildTable(SvxAdjust, bool, bool, bool) (htmltab.cxx:5055) ==75288== by 0x1FC79B2C: SwHTMLParser::NextToken(HtmlTokenId) (swhtml.cxx:1787) ==75288== by 0x22060E6A: HTMLParser::Continue(HtmlTokenId) (parhtml.cxx:295) ==75288== by 0x1FC745AC: SwHTMLParser::Continue(HtmlTokenId) (swhtml.cxx:683) ==75288== by 0x22060CF5: HTMLParser::CallParser() (parhtml.cxx:279) ==75288== by 0x1FC73F7F: SwHTMLParser::CallParser() (swhtml.cxx:607) ==75288== by 0x1FC6FF90: HTMLReader::Read(SwDoc&, rtl::OUString const&, SwPaM&, rtl::OUString const&) (swhtml.cxx:238) Change-Id: I9583e5be41fe76f19c699394961ed2717a990cc3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121351 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6b851810d43e4a9ea8119d97436f658593ff8f1b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121416 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-09-02tdf#137310 ODF import: fix loading of images with multiple slashes in pathMiklos Vajna4-9/+100
Regression from commit 1b02ba03bd62a712e15c15384a3d105d2c088120 (shapes: don't use "GraphicURL" property, always use "Graphic", 2018-02-13), the problem was that now the loading of Models/Fallbacks/duck.png goes via SvXMLGraphicHelper::ImplGetGraphicStream(), which assumed that the directory part of the picture path contains no slashes, so can be handled via ImplGetGraphicStorage(). That functions works with Pictures/something.png, but not with Models/Fallbacks/duck.png. Fix the problem by using openStreamElementByHierarchicalName() to open the picture stream in case we got no stream and the storage name contains a slash. (cherry picked from commit 56f593c9aa00f87fb8780060fece991b91b5c0a7) Change-Id: I0e04fb4286777b04286c4979af31e6df19988873 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121348 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-09-01update creditsXisco Fauli1-2074/+2152
Change-Id: I8fc0e8085dd647f3677554084a0de139a71e4367 (cherry picked from commit 2cfcc8d7c988631333998a78b4b40cb17b025fe7)
2021-09-01tdf#142881 XLSX import: fix shapes rotated exactly 45°,Daniel Arato (NISZ)3-1/+38
135°, 225° and 315° by correcting their cell anchor points, like MSO does. Previously the XLSX export with the bad anchor points messed up the rotation of the shapes, resulting also broken text content in LO and MSO. Thanks to Regina Henschel for analyzing the problem. Co-authored-by: Szabolcs Tóth <toth.szabolcs@nisz.hu> Change-Id: Ica625545a22a74ed027ac0fa2bbf38804611c172 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121307 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121407 Tested-by: Jenkins
2021-09-01ofz#37796 limit to numeric_limits<int>::maxCaolán McNamara1-0/+4
Change-Id: I6e09226fad1e566ba2758d0084042b603b84d221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121230 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 72da4c623baf60eb2b7073697cd36ffb3022847d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121291 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-08-31tdf#125743 sw: fix rendering of graphics bullet with linked imagesMiklos Vajna4-0/+29
Regression from commit d72145f9307c732ced4a546ac1e5093ec7c1a982 (Move BackGraphicURL property & friends to BackGraphic + fixes, 2018-03-01), the problem was that now SvXMLImport::loadGraphicByURL() produces a Graphic that has its type set to GraphicType::Default, but when paintGraphicUsingPrimitivesHelper() consumes this graphic, it expects that the type is either a bitmap or a metafile. Fix the problem by explicitly loading the image when the default-type, origin-url-set case happens: this is rendering, so no problem to load the URL and that will give us the expected graphic type. This is also meant to keep the original problem fixed, since we only load images when painting, not during import. Change-Id: I951bc92d05bb8ec57d2ba6958c47947f8f9b5c78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121082 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121094
2021-08-31tdf#126126 ODT import: improve import of cross-table commented text rangeMiklos Vajna3-2/+37
Regression from commit d4b473dd9ba77427b28d97847067b8877c2033d9 (office:annotation-end import, 2012-07-20), the problem was that XMLAnnotationImportContext::EndElement() assumed that we can always call gotoRange() to go from the annotation start and end points, but this is not true: an annotation may start inside a table and end outside a table, which is not a valid selection, so gotoRange() fails. Fix the regression part by just creating a text range for the anchor of the comment, so the comment is attached to the end of the range, and this way the rest of the comment & the document can be at least opened. [ It seems bookmarks behave similarly: they don't block the whole import, but don't work cross table boundaries, either. ] (cherry picked from commit 4f4452f6a74201e862971a79ba5bdcd06f3ba9ce) Conflicts: xmloff/qa/unit/text.cxx Change-Id: I1b5a2e2e7501ce3054379fc79d2045c3439c52e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121350 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-31tdf#103612 sw: fix confusing inheritance of section hidden flagMichael Stahl6-10/+33
SwSectionData has 3 confusing boolean members for hiding: * m_bHidden corresponds to the Hide checkbox in the UI * m_bCondHiddenFlag stores the result of evaluating the hide condition * m_bHiddenFlag is the final computed result that indicates that this section is hidden Now, the first 2 flags determine m_bHiddenFlag = true, but there's another possibility: m_bHiddenFlag is also true if there is a parent section for which m_bHiddenFlag is true (because of course this hides all section content including nested sections)... the latter situation is apparently handled in SwSectionFormat::UpdateParent(). The code in SwSection::SwSection() checks the parent's m_bHiddenFlag but then sets the child's m_bHidden, which looks very wrong, so remove this. Also adapt 2 other places that look like they should be checking a different flag. Change-Id: I58d9c878b58ad6cd878f450072178006b4c7ebb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121314 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 91b0024965908c692bea40f47c58ea9d1bf8a596) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121283 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-31tdf#142645 PPTX import: convert "ctrTitle" text to slide nameTibor Nagy3-1/+17
(i.e. centered title) similar to <p:ph type="title"/>. See commit 7eb0e52527e729a21973e70d5be8e0a6779ec748 "tdf#142648 PPTX: import long slide names to avoid broken link export", commit 253bee65bc24d999c3629a4d503d0fa01b355cfc "tdf#142646 PPTX import: count repeating slide names" etc. Change-Id: I5f25f04f23981ce2ff64dc792fe8464682d749a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121295 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit e5cfda76aefd6996813f461198816be24cd6ad43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121289 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-08-31tdf#143940: the style index might be -1Xisco Fauli1-5/+7
Similar to 52aebe6986bcec07071adb3f94d6c09fea147044 < tdf#138466 Crash when creating different scenarios > ExportColumns calls GetStyleNameIndex which might return -1 so check the index is different than -1 as it's already done when calling ScFormatRangeStyles::GetStyleNameByIndex Also move fix for tdf#138466 down the stack to be consistent Debug builds will still assert, see coverity#1438402 Since 5e777f23fd0118f6649f0d9e30eb77a72f1099e4 < loplugin:useuniqueptr in ScColumnRowStylesBase > where the nIndex < 0 check in ScColumnRowStylesBase::GetStyleNameByIndex was removed Change-Id: I084bfa04c39f37cb325c3b3df76801b3abdea994 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121128 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 7246759822aff30e4e4e1bca7949eae3b0d960ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121068 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>