summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-06-26bump product version to 6.2.5.2.0+libreoffice-6-2-5Christian Lohmaier1-1/+1
Change-Id: If8ec5b645cdf0e5445d81670f6d1729e788917e6
2019-06-26update creditsChristian Lohmaier1-4426/+4472
Change-Id: Ifd72d26db7303ef2e3dbb7ea1212884804889051 (cherry picked from commit f3d00350d52ea75b12fd0283c9f1e3125d575f10) (cherry picked from commit a860fe43880d0607936a16ac5dc1b1df2e9b202b)
2019-06-26Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2-5' - update translations for 6.2.5 rc2 and force-fix errors using pocheck Change-Id: I900cf02ffb00a83388f79c8c6045aacae01bbf32 (cherry picked from commit 8da7a395e1657443f329f8220a7605927068616f)
2019-06-26sw: fix assert on layout of ooo63564-1.odtMichael Stahl1-1/+23
The problem is that some SwTextFrames (1415 in particular) inside the follow-flow-row of a table move backwards, during(!) which the follow-flow-row is deleted; i.e., the SwTextFrame was already moved backwards by the pNewUpper->Calc() in MoveBwd(), then it is Cut and Pasted at the end of pNewUpper, when it is actually already a lower, somewhere in the middle... This triggers the assert in SwFrame::PrepareMake() that was added in commit e14056e6e88d9b8d988b7b88b2776a8fc952031b Prevent this by using the IsDeleteForbidden() check that was introduced in commit 0005b330eaed0b5559042d2597fb45e0c9125d7e; this is similar to how MoveBwd() already locks section frames to prevent such problems. Ultimately a regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50. Change-Id: I893ec3e491b4cbe1569edf97fec31d3dd74548ed Reviewed-on: https://gerrit.libreoffice.org/74298 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 1e6dec4b4313212a3bdc6bb06155fd65e795368b) Reviewed-on: https://gerrit.libreoffice.org/74343 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0d4d982b9cde760f558d5ad51b238951c1753577) Reviewed-on: https://gerrit.libreoffice.org/74461 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-06-26sw: fix SwUiWriterTest::testTdf114306_2Michael Stahl2-6/+6
sw/qa/extras/uiwriter/uiwriter.cxx:5908:SwUiWriterTest::testTdf114306_2 equality assertion failed - Expected: 4 - Actual : 5 Mysteriously this doesn't happen on master when running make sw.check but reproduces with make CppunitTest_sw_uiwriter CPPUNIT_TEST_NAME="testTdf114306_2" The problem is that the early-returns in SwTabFrame::RemoveFollowFlowLine() are too late: the SetFollowFlowLine( false ); was already executed and henceforth the SwTabFrame thinks it doesn't have a follow-flow-line, so it will never be merged again and new follow-flow-line may be created. (test fail is regression from 1e6dec4b4313212a3bdc6bb06155fd65e795368b) Change-Id: Ic5a2ef4219f212c8b4d34fd47d3d67f32de45f8e Reviewed-on: https://gerrit.libreoffice.org/74500 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 98e186a37388d35320b813142b4fc7f0071f5b43) Reviewed-on: https://gerrit.libreoffice.org/74521 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 955add820ecc160647657de308492a0650527221) Reviewed-on: https://gerrit.libreoffice.org/74628 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-06-26tdf#125754 sw_redlinehide: avoid recursive layout in SetHideRedlines()Michael Stahl2-0/+5
During SwLayHelper::CheckInsertPage(), SwRootFrame::CheckViewLayout() is called, which may change the size of the view, which causes a StartAction()/EndAction(), therefore layouting the frames existing at that point, which moves some content onto the newly created frame, but CheckInsertPage() expects to find only SwLayoutFrames on it and crashes. 40 SwLayAction::InternalAction(OutputDevice*) (this=0x7fffd2333f00) at sw/source/core/layout/layact.cxx:551 41 SwLayAction::Action(OutputDevice*) (this=0x7fffd2333f00) at sw/source/core/layout/layact.cxx:348 42 SwViewShell::ImplEndAction(bool) (this=0x56eaff0, bIdleEnd=false) at sw/source/core/view/viewsh.cxx:295 43 SwViewShell::EndAction(bool) (this=0x56eaff0, bIdleEnd=false) at sw/inc/viewsh.hxx:600 44 SwCursorShell::EndAction(bool, bool) (this=0x56eaff0, bIdleEnd=false, DoSetPosX=false) at sw/source/core/crsr/crsrsh.cxx:254 45 SwView::OuterResizePixel(Point const&, Size const&) (this=0x5589850, rOfst=Point = {...}, rSize=Size = {...}) at sw/source/uibase/uiview/viewport.cxx:1125 46 SwView::DocSzChgd(Size const&) (this=0x5589850, rSz=Size = {...}) at sw/source/uibase/uiview/viewport.cxx:203 47 SizeNotify(SwViewShell const*, Size const&) (pVwSh=0x56eaff0, rSize=Size = {...}) at sw/source/uibase/docvw/edtwin3.cxx:67 48 SwViewShell::SizeChgNotify() (this=0x56eaff0) at sw/source/core/view/viewsh.cxx:1077 49 AdjustSizeChgNotify(SwRootFrame*) (pRoot=0x56ea6c0) at sw/source/core/layout/pagechg.cxx:824 50 SwRootFrame::CheckViewLayout(SwViewOption const*, SwRect const*) (this=0x56ea6c0, pViewOpt=0x0, pVisArea=0x0) at sw/source/core/layout/pagechg.cxx:2377 51 SwPageFrame::Paste(SwFrame*, SwFrame*) (this=0x66aa500, pParent=0x56ea6c0, pSibling=0x0) at sw/source/core/layout/pagechg.cxx:941 52 InsertNewPage(SwPageDesc&, SwFrame*, bool, bool, bool, bool, SwFrame*) (rDesc=..., pUpper=0x56ea6c0, bOdd=true, bFirst=false, bInsertEmpty=false, bFootnote=false, pSibling=0x0) at sw/source/core/layout/frmtool.cxx:2853 53 SwLayHelper::CheckInsertPage() (this=0x60a9170) at sw/source/core/layout/laycache.cxx:680 54 SwLayHelper::CheckInsert(unsigned long) (this=0x60a9170, nNodeIndex=1699) at sw/source/core/layout/laycache.cxx:890 55 InsertCnt_(SwLayoutFrame*, SwDoc*, unsigned long, bool, unsigned long, SwFrame*) (pLay=0x6f20f60, pDoc=0x54c86a0, nIndex=1698, bPages=true, nEndIndex=2627, pPrv=0x6ef2d20) at sw/source/core/layout/frmtool.cxx:1503 56 MakeFrames(SwDoc*, SwNodeIndex const&, SwNodeIndex const&) (pDoc=0x54c86a0, rSttIdx=SwNodeIndex (node 1588), rEndIdx=SwNodeIndex (node 2627)) at sw/source/core/layout/frmtool.cxx:1910 57 UnHideRedlines(SwRootFrame&, SwNodes&, SwNode const&, std::__debug::set<unsigned long, std::less<unsigned long>, std::allocator<unsigned long> >*) (rLayout=..., rNodes=..., rEndOfSectionNode=..., pSkipped=0x0) at sw/source/core/layout/wsfrm.cxx:4445 58 SwRootFrame::SetHideRedlines(bool) (this=0x56ea6c0, bHideRedlines=false) at sw/source/core/layout/wsfrm.cxx:4539 59 SwView::Execute(SfxRequest&) (this=0x5589850, rReq=...) at sw/source/uibase/uiview/view2.cxx:658 To avoid that, do StartAction()/EndAction() in the UI caller of SwRootFrame::SetHideRedlines() already; the other callers in Undo/DocumentRedlineManager should already be covered by Actions. Change-Id: I366140415d5714d386af3cf9db30e39b12ade2ce Reviewed-on: https://gerrit.libreoffice.org/74369 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit dd489bc01adc22fc5015ea56b61d66104af184a8) Reviewed-on: https://gerrit.libreoffice.org/74431 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 83263c0428410bd8aa2344aa83e0388fdd3f7342) Reviewed-on: https://gerrit.libreoffice.org/74508 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-06-25tdf#125670 just check gradient clipping on drawingJan-Marek Glogowski1-1/+7
Otherwise the gradient won't be commited to the Metafile, as mbOutputClipped will be true, because the output device will have just one pixel size. Reviewed-on: https://gerrit.libreoffice.org/73423 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 710f3c63af2d8bee7d5e860614145799a3f0e491) tdf#125777 restore old RenderContext before return Related: tdf#125670 avoid possible performance issues for the general case but retain recording of gradient to metafile 6acf23675414983bd07639703f43aa934c0a48ed 5efde15f1c192b15fe647362803442ac947b63de Change-Id: Ia0c6569a28f2aa1a8f0e051b61d429e0ab23ef97 Reviewed-on: https://gerrit.libreoffice.org/74507 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 6047d537b5ea8f13f7e8d4739621c866af1d13fb) Reviewed-on: https://gerrit.libreoffice.org/74515 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 12cf9256fba688df367a2be7db17e0ed3d24c73c) Reviewed-on: https://gerrit.libreoffice.org/74683 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-25tdf#125660 sw_redlinehide: don't create redlines for GrfNode/OLENodeMichael Stahl1-0/+5
This started to assert/crash with commit d258fc29560baa5ecae03ebc2740e11420643e27, but such redlines are really not valid so it's a regression from commit 16916a14a2ce382aa4ff2a25f8e477108aba5a67. Change-Id: I4c03a96a43b62a3c5321535a34c2d09b155b79c0 Reviewed-on: https://gerrit.libreoffice.org/74371 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit edca548f865f4c19f213c1386905ec3591326461) Reviewed-on: https://gerrit.libreoffice.org/74419 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 315a43ec55895648e1c3a2a5cb7d1615099bf04c) Reviewed-on: https://gerrit.libreoffice.org/74509 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-24tdf#125983 CRASH: Updating link to external filesNoel Grandin1-3/+5
Revert "loplugin:useuniqueptr in lcl_UpdateLinksInSect" This reverts commit 9abbe6746cb4d36e3ccb384f96ccafb9e0612cd6. No point in use std::unique_ptr, sometimes pPam points to something we want to delete, sometimes it does not. Change-Id: I37e9871b8d5d836b7e52b5b8a5a7c572d92487f5 Reviewed-on: https://gerrit.libreoffice.org/74449 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 8729c98bbe6843e875be3903c2e5a7783984ae48) Reviewed-on: https://gerrit.libreoffice.org/74485 (cherry picked from commit fa121a50d23cc4154741059a6916d45cdcbc0c59) Reviewed-on: https://gerrit.libreoffice.org/74488 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 5beee8974b0682602ad0bbe12ac1e33f7644958a) Reviewed-on: https://gerrit.libreoffice.org/74534 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-22tdf#126000 Crash deleting templateNoel Grandin1-4/+7
regression from commit 72c191e046112df73c66be8dc8d1bec5a546fa60 Date: Wed Sep 19 12:11:38 2018 +0200 loplugin:useuniqueptr in ThumbnailView Reviewed-on: https://gerrit.libreoffice.org/74362 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 801bb2d4002cf2034315875440a6aee358951eb9) Reviewed-on: https://gerrit.libreoffice.org/74372 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Change-Id: I9bdcec5c2f14b1bd33998041d4b2d8cd2f7be052 Reviewed-on: https://gerrit.libreoffice.org/74428 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 6efe09515c0c028c759f84275a8023f4c188437f) Reviewed-on: https://gerrit.libreoffice.org/74460 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-06-19Resolves: tdf#124251 do not treat internal "URI" as real path URIEike Rathke1-1/+8
Change-Id: I754704b0a979e8449b7ec799cbda58b14ab17098 Reviewed-on: https://gerrit.libreoffice.org/74067 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit ca08ec9292410c28713fd2d92920a7af09883e97) Reviewed-on: https://gerrit.libreoffice.org/74071 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2019-06-17tdf#121486: Correct scale of broken fonts on WindowsKhaled Hosny1-1/+1
Some fonts have negative tmAveCharWidth which makes no sense (fonts can't have negative glyph width, so the average can't be negative) and it would cause our code to apply negative scale to the glyphs of these fonts making them drawn on the flipped horizontally. Fix this by using the absolute value so it is always positive. Change-Id: I731e7aad80dae734847679a1b08c6ac78111e16c Reviewed-on: https://gerrit.libreoffice.org/74109 Tested-by: Jenkins Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> (cherry picked from commit 8fffb56940c6eb81674000cdb718edc79603a6c5) Reviewed-on: https://gerrit.libreoffice.org/74150 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-06-14bump product version to 6.2.5.1.0+Christian Lohmaier1-1/+1
Change-Id: I384004d16aacf315df6a928834fd34f64c210808
2019-06-14Branch libreoffice-6-2-5Christian Lohmaier4-1/+1
This is 'libreoffice-6-2-5' - the stable branch for the 6.2.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.2.x release, please use the 'libreoffice-6-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I2716c2b80a4e288967cf8fabbcbf7802a4675f45
2019-06-14Resolves: tdf#125875 allow keyboard traversal into icon controlCaolán McNamara1-1/+1
Change-Id: I001a5ec63aa998917f30b47f37e7db995bf55f0f Reviewed-on: https://gerrit.libreoffice.org/74041 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-06-14tdf#92079 vcl: fix missing image background on dialog from basicMiklos Vajna1-0/+3
Regression from commit e5bb5c52aeaeb60c8592b004efd88c30242e03a1 (add RenderContext to Window::PushPaintHelper, use Erase correctly, 2015-05-18), the problem was the unconditional ApplySettings() call in the direct painting case. It's not clear what was the intent of that addition, since vcl::Window::ApplySettings() is virtual, and the default implementation is empty. But at least the Dialog subclass sets the background there, leading to the loss of the original bitmap background. Fix the problem by explicitly restoring the old background after ApplySettings() at least in the bitmap case. (Wallpaper is copy-on-write, so no problem to make a copy before ApplySettings() unconditionally.) (cherry picked from commit f4e0cc1ff145287f80738f070a8c46a64b2f76d1) Change-Id: I89768a1331f9dc1ea4508336723484d112156338 Reviewed-on: https://gerrit.libreoffice.org/74023 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 4046b51e6f6bd31b0188d9c00273a1761254a9d6) Reviewed-on: https://gerrit.libreoffice.org/74034 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-06-14Resolves: tdf#125878 correct calculation of H:M:S from timestampEike Rathke1-2/+3
This apparently has been wrong since the beginning in 2009. It's a somewhat odd algorithm anyway, first calculating the time in seconds, minutes and hours, but maybe there's a reason regarding rounding, so not changing that. Change-Id: I855d2c96094b4edb1095d20bcdfebdea6d6d943a Reviewed-on: https://gerrit.libreoffice.org/73893 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 1436d2307d90f5ddbdcb0f129e59544306530342) Reviewed-on: https://gerrit.libreoffice.org/73915 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-06-14Resolves: tdf#113541 handle external reference in Excel syntaxcp-6.2-branch-pointEike Rathke1-3/+6
... not only OOXML. This wasn't only a problem when creating a reference by clicking or travelling to a cell in the external document, but also when editing an external reference in Excel_A1 or Excel_R1C1 reference syntax. Change-Id: Iee3d529ff9834e5013a61c2056238277f33356fe Reviewed-on: https://gerrit.libreoffice.org/73979 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 69903b5c5f9b9015c88931c0eb8a47b52ea3de12) Reviewed-on: https://gerrit.libreoffice.org/73988 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-14tdf#125673 KDE5 implement a KDE5SalVirtualDeviceJan-Marek Glogowski7-6/+71
We just need AcquireGraphics() to return a KDE5Graphics. Otherwise the BufferDevice's SVP will use a SvpSalGraphics instead of the KDE5Graphics, which knows about Qt's theming. Reviewed-on: https://gerrit.libreoffice.org/73673 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 2cb6a591b643a0f65dc58f060f60cc707ad3589c) Reviewed-on: https://gerrit.libreoffice.org/73722 Change-Id: I0ea646df260f2067d61c753f03dee01a003f382a Reviewed-on: https://gerrit.libreoffice.org/73963 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
2019-06-13tdf#125591 DOC import: lazy-load metafiles with explicit sizeMiklos Vajna6-24/+44
Regression from commit 69b62cfcbd364d7f62142149c2f690104b217ca1 (tdf#125281 DOC import: fix size of lazy-loaded metafiles, 2019-05-27), the problem is that setting the preferred size of a Graphic swaps it in. Avoid this by extending ImportUnloadedGraphic(): if a size hint is provided, then that will be used instead of info from the graphic descriptor (which is usually only meaningful for bitmaps). This way we maintain the correct size and we're back to lazy-loading metafiles from binary MSO files as well. (cherry picked from commit acb803b730f2c6bd82e39beab58949ec14f85eb0) and: CppunitTest_sw_ww8import: disable failing assert on Windows It fails only sometimes, it's yet clear why. (cherry picked from commit b5d624c4af1085d4670149e9c1d280da7bc9add0) Change-Id: Ide12d12166110e98ea47b5347dd24fb203b22da3 Reviewed-on: https://gerrit.libreoffice.org/73961 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-06-13tdf#125550 vcl menu bar / floating window: fix text colorMiklos Vajna5-16/+77
Regression from commit e8d5b8beb5958147235ff955ed38c47b51d860ff (tdf#113714 vcl menu bar window: avoid flicker, 2019-05-20), the problem was that a freshly created VirtualDevice doesn't have the default text color, so we need to initialize that explicitly based on the render context text color. Also introduce a BufferDevice to do this initialization, instead of fixing this in MenuBarWindow::Paint(), then copy&pasting the fix to MenuFloatingWindow::Paint(). Change-Id: Ib171cd52e7cabe0bc3c639821f558d8303039fe6 Reviewed-on: https://gerrit.libreoffice.org/73269 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 42bf893a8479f70d7d8f00e03105ce15e8545f8b) Reviewed-on: https://gerrit.libreoffice.org/73314 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-13tdf#125692 SalObject always holds a SystemChildWindowJan-Marek Glogowski3-16/+17
Let's just face reality and store it as a VclPtr. And this is needed, because Qt, like VCL, uses deferred deletion, and has no way to filter events to QObjects out of its event queue easily. This way the qt5 plugin can report focus changes for SalObjects without a crash, which happens when you close a presentation with a video by click. And in addition it reverts the workaround introduced in commit e770bacc85a0 ("Qt5 workaround modal change after show bug"), as it seems this bug is a use-after-free error, introduced by LO. Thanks Michael Weghorn for catching that! Maybe someone should also rename SalObject... Reviewed-on: https://gerrit.libreoffice.org/73567 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 2dc6bdd1d5789ace0500cad90f5d2eb930888bb9) Reviewed-on: https://gerrit.libreoffice.org/73921 Change-Id: I0bc64ea64f95dfc7a838799c4a04de183adfefcf Reviewed-on: https://gerrit.libreoffice.org/73962 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
2019-06-13Resolves tdf#125840: Crash when trying to customize Base Data View toolbarMuhammet Kara1-3/+7
Change-Id: If5b157c1f1362128d22d210286da741ba905e5aa Reviewed-on: https://gerrit.libreoffice.org/73958 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-13Qt5 correctly hide menu bar in tabbed modeJan-Marek Glogowski1-2/+2
Change-Id: I179780c2df5637b8a28c3a77b829319b1a64845b Reviewed-on: https://gerrit.libreoffice.org/73924 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 9758b9b6e52e8e8a8a5cc24b51d62a853a3def82) Reviewed-on: https://gerrit.libreoffice.org/73926 (cherry picked from commit 221f27433900490e2b00bd4ed6957ab36ecadb33) Reviewed-on: https://gerrit.libreoffice.org/73927 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-13tdf#125821 don't crash on missing gstreamer pluginsJan-Marek Glogowski1-8/+16
If GStreamer can't auto-detect an audio sink via "autoaudiosink", it'll return a nullptr. If the volume plugin is missing, then this currently also results in a crash. So check the gst_element_factory_make results before using the objects and change some wrong mpPlaybin checks to the right mpVolumeControl ones. This works for me without any audio and volume plugins. Since we are linked against libgstaudio, I assume the bin is always there. Change-Id: Ide526363d810ea48d0a62539c0a435553783e34a Reviewed-on: https://gerrit.libreoffice.org/73848 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 5e6af47dc87a55fea595c952ea3e59c93d0620db) Reviewed-on: https://gerrit.libreoffice.org/73919 (cherry picked from commit 142696e71e15db3c112796c43630bdfa6c634fa0) Reviewed-on: https://gerrit.libreoffice.org/73922 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-13tdf#125281 DOC import: fix size of lazy-loaded metafilesMiklos Vajna4-29/+23
Metafiles may have an external header, so once graphic data is read, we need to set the size explicitly. Otherwise the width of the EMF image in the bugdoc will be too small. (cherry picked from commit 69b62cfcbd364d7f62142149c2f690104b217ca1) Conflicts: filter/source/msfilter/msdffimp.cxx sw/qa/extras/ww8import/ww8import.cxx Change-Id: I2441eda61278b0f4973db5d9aa14618ccd17c397 Reviewed-on: https://gerrit.libreoffice.org/73180 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-06-13Revert "tdf#120836 KDE5: Clipboard: don't put images to clipboard"Luboš Luňák1-0/+30
My previous commit has disabled setting non-text for selection, so this workaround is no longer needed (and it very much looks like a workaround, I see no good reason for never putting images in the clipboard). This reverts commit c8b0c382c6330865df50ae7cf7360c8a2c08ebe6. Change-Id: I0206211e3ff0adcb89f8ca5410831a428e71fb51 Reviewed-on: https://gerrit.libreoffice.org/72370 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 0d58f51d7672c569c93c6e814dbfffa586eebfb7) Reviewed-on: https://gerrit.libreoffice.org/73929 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-13do not add non-text to PRIMARY selection in VclQt5ClipboardLuboš Luňák1-1/+6
E.g. tdf#80853 repeatedly sets the selection, which results in the entire document getting converted to html. Other VCL backends seem to be even faster, it looks like they convert the data only on-demand, but this at least makes things bearable. Change-Id: Ib08423bd89d7c7065ad0522338979f1ce66701c7 Reviewed-on: https://gerrit.libreoffice.org/72369 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 294d4ed6aab4ae6dbf859626545cf6d75194bacd) Reviewed-on: https://gerrit.libreoffice.org/73928 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-13Qt5 implement SalSurface support for cairoJan-Marek Glogowski11-26/+259
Current qt5+cairo uses the plain VCL canvas. This patch is just a copy of Gtk3Surface (minus comments) with a different update call. This way the Cairo path now uses the Cairo canvas instead. It fixes at least tdf#122668 for me, but other Impress bugs might be fixed this way too. Reviewed-on: https://gerrit.libreoffice.org/72921 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> (cherry picked from commit 86cab846c1a122dd4dd5f5c4ca5750a0fc397c6b) [This also squashes the backport of commit cc237438f6d1c7ee3a391b51402aaa71cd347b6b ("qt5: Make it compile with '-Werror=shadow'") in to the same commit.] Change-Id: Iba511c851001753328293c28e53eaa4acc4315d0 Reviewed-on: https://gerrit.libreoffice.org/73198 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2019-06-13More uses of referer URL with SvxBrushItemStephan Bergmann6-8/+28
Reviewed-on: https://gerrit.libreoffice.org/73643 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d) Conflicts: sw/source/core/text/porfld.cxx sw/source/core/unocore/unosett.cxx Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23 Reviewed-on: https://gerrit.libreoffice.org/73860 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-06-13tdf#125381: Manage URLs beginning with an "~" in cutPrefix (dbaccess/dsntypes)Julien Nabet1-3/+6
On Windows or with other renderings than gtk3, the urls may begin with an ~ In this case, cutPrefix returns only empty string When trying to access Index management for odb files related to dBase indexes don't display because cutPrefix returns empty url in dbaccess/source/ui/dlg/detailpages.cxx line 200 198 ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; 199 if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength()) 200 m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue()); Change-Id: I47360e205ddea7b060a31da697bbe9857ad3f4c0 Reviewed-on: https://gerrit.libreoffice.org/72568 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit d34ed0008f12cfe47dd239672f1941f3c54d97fd) Reviewed-on: https://gerrit.libreoffice.org/73709 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 27bd20cf5333a5df29286794b7384520fbc55012) Reviewed-on: https://gerrit.libreoffice.org/73876
2019-06-12Resolves: rhbz#1719378 wrong signature for GtkGestureLongPress::pressedCaolán McNamara2-9/+6
Change-Id: Ib4c47189d5c9c89433f0c7de194ebb9777dc7bac Reviewed-on: https://gerrit.libreoffice.org/73831 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-12has_default needs can_defaultCaolán McNamara1-0/+1
Change-Id: Id841d214b8d88a986c07d2827b281e5805c3c941 Reviewed-on: https://gerrit.libreoffice.org/73812 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-06-12Resolves: tdf#125808 empty labels in pivot table from registered data sourceCaolán McNamara1-2/+2
since... commit 238cadd315901cbacfd9304bb1205e9f53f13eae Date: Wed Apr 10 04:30:25 2019 +0530 dpcache : use case-insensitive normalization of... Change-Id: I19057bde268ec07561da323bc694536dcad03a95 Reviewed-on: https://gerrit.libreoffice.org/73821 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2019-06-11Fix swapping of vector elementsStephan Bergmann1-2/+1
...which had been broken with edc85fb55f8adc30a1416c6c854c89097060fb21 "clang-tidy performance-unnecessary-copy-init in idl..reportdesign" (and could cause "Tools - Options... - LibreOffice - Advanced - Java Options" to erroneously list a single JRE multiple times, instead of listing different JREs). Change-Id: I6799903be39a5c6aa601131fad6eab3edea8d9e4 Reviewed-on: https://gerrit.libreoffice.org/73679 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b70ab9e9e5630a965c5e6cc40c2480dddf1e2384) Reviewed-on: https://gerrit.libreoffice.org/73802 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-11Resolves: tdf#125761 there is no page called 'labelTP_BACKGROUND'Caolán McNamara1-1/+0
Change-Id: Ia6558039da010b0f6d8385e9791c0abc2ef75eba Reviewed-on: https://gerrit.libreoffice.org/73667 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-06-11tdf#123793 Follow up fix for kb nav of special chars popupJim Raykowski2-3/+3
Static variable use to determine if initializing can focus properties of recent and favorite controls is needed only allows init to ever happen once. This patch changes use to a member variable. This corrects the problem of kb navigation only works the the first time the popup is shown and tab is used to navigate. Change-Id: I2bbb66071b582c9a4282c79d801b4a36c375ed2d Reviewed-on: https://gerrit.libreoffice.org/72264 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit e8a1db012fbd185f52f38806bcac8bb9917c51c3) Reviewed-on: https://gerrit.libreoffice.org/72815 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-06-11Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2' - update translations for 6.2.5 rc1 and force-fix errors using pocheck Change-Id: I47eaf2b9755da1d0126e2999d734dbc25807e542
2019-06-11explictly exclude LibreLogo from XScript usageCaolán McNamara1-0/+13
Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228 Reviewed-on: https://gerrit.libreoffice.org/73708 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-06-10Resolves: tdf#125109 prefer edit format's acceptance patterns and YMD orderEike Rathke1-3/+49
Change-Id: I4036061b9e8f01d99f04f20dfbbd2cf23d3a9b59 Reviewed-on: https://gerrit.libreoffice.org/72632 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 478e051f4ea13b15120fdf74faf94a6c2cfcb50c) Reviewed-on: https://gerrit.libreoffice.org/72848 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-10tdf#117347 sw form controls: fix disappearing FixedText when editing TextFieldMiklos Vajna1-2/+2
This is nominally a regression from commit af11abf3626e12d2b4b7dd9d255c6c71bf84cd4b (SwViewShell::ImplEndAction: still paint directly when non-double-buffering, 2015-09-01), but that just uncovered an already existing problem introduced earlier in commit 2b26c1796d0a05f47cfb01d79ee4f69344efbbb2 (tdf#92577 sw rendercontext: paint transparent from controls conditionally, 2015-07-06). Given that the first commit (as a side-effect) solved the problem the second commit tried to solve, it's safe to just revert this. (Sadly we have no way to test incremental paints with a reasonable amount of effort, so no testcase.) (cherry picked from commit 00dfa6dc890dbbc8140fe613599becb5e4c55486) Change-Id: Ia59efbf45a0cd5af3580914e1dcee74d89068f03 Reviewed-on: https://gerrit.libreoffice.org/73658 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 802e3a960e166b24e18da04a821862620047f37f) Reviewed-on: https://gerrit.libreoffice.org/73751 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-06-10Related: tdf#111522 svx: fix crash with view1 doing textedit and resize/rotateMiklos Vajna3-13/+20
The two actually affected functions are SdrEditView::RotateMarkedObj() and SdrDragObjOwn::EndSdrDrag(), but it looks like the other functions in SdrEditView are safe to be changed the same way. I expect IsUndoEnabled() can't be changed, though: that would mean there would be no undo for the text edit itself, either. If other actions still crash, the pattern is the same: put a breakpoint on the SdrUndoAction constructor and see the backtrace to find the function that calls IsUndoEnabled() without calling CanDoSdrUndo() at the same time. Change-Id: If9324e311ec6e9f68a951559e903e14bb72ea31c Reviewed-on: https://gerrit.libreoffice.org/73669 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 9870ff897f088563426bee9567dd9cb722c2b929) Reviewed-on: https://gerrit.libreoffice.org/73748 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 79cae65f4725d0a8abd5639dc298002d11b2626c) Reviewed-on: https://gerrit.libreoffice.org/73757
2019-06-10tdf#111522 svx: fix crash with view1 doing text edit and view2 doing sdr undoMiklos Vajna7-2/+209
If one view has an active text edit, then current code doesn't handle manipulating the undo text outside the text edit, so avoid problems by simply not adding an undo action to the undo stack for shape creation or move. Other actions might want to do the same in the future: check for CanDoSdrUndo() before calling SdrUndoFactory member functions. [ Found no existing test suite similar to CppunitTest_sw_uiwriter, so added one. ] (cherry picked from commit 3a874f1c80c37e8b35666e1d73161ff762eb7e4c) Change-Id: I3a364bf4fe6f9b0c13aa07283681b1045368cf7a Reviewed-on: https://gerrit.libreoffice.org/73649 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-06-10tdf#125624: this bugdoc overflows sal_uInt16Mike Kaganski2-12/+12
Change-Id: I8ecc08d3ef42b9f7cc501017e0e169bde2196317 Reviewed-on: https://gerrit.libreoffice.org/73654 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2d5821ceacf399ec9267a3704ee0b2cc8a598f04) Reviewed-on: https://gerrit.libreoffice.org/73672 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-06-10Revert "tdf#108687 vcl: always enable tabstop on radio buttons"Justin Luth2-2/+7
This reverts LO 6.2 commit f2cd1c3c7cce2699d1341f726fc90cf30b52612c because it caused regression tdf#125609. There are places where radio-groups are not properly defined, and things are a big mess. So reverting to previous behaviour for 6.2 stable. This can be a fairly serious regression, because the value of the radio buttons can change just by tabbing around. Leaving the commit in place for master/6.3, so that a proper solution to all problems can be developed and tested. Change-Id: I3c71e47934c9d979d1cb22e56535f7ea3b33130c Reviewed-on: https://gerrit.libreoffice.org/73618 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-09Resolves: tdf#120343 show pdf in async pdf export dialog callbackCaolán McNamara1-12/+23
not after dialog async exec begins, but defer to during that response callback Change-Id: I316022c01a87cf251d57b1007ae93fefddada776 Reviewed-on: https://gerrit.libreoffice.org/73717 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-06-08tdf#119109 sw: tweak assertion in PrepareMake()Michael Stahl1-0/+4
Empty section frames cause trouble for the assert added in e14056e6e88d9b8d988b7b88b2776a8fc952031b: * existing ones may be skipped by MoveBwd(), so a SwTextFrame moves to the previous page but the SwSectionFrame that was its mpPrev remains on this page; e.g. ooo110854-1.rtf * a SwSectionFrame moves backward, then some SwTextFrame in it splits and the follow tries to move forward, resulting in *new* SwSectionFrames on this page that are empty (because the follow is eventually joined again); e.g. abi3213-1.rtf So if there's a section frame, assume it's SNAFU and don't assert. Change-Id: Ibdca2aa39fae123583e5edf5173f80e8b70ef335 Reviewed-on: https://gerrit.libreoffice.org/73333 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 1416c5426a757d32f223cab46bf9038bd7f21d48) Reviewed-on: https://gerrit.libreoffice.org/73616 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-08tdf#125062: distort hairline borders only if selection is usedXisco Fauli1-31/+35
Regression from 046df0a876b3d948bb1e14443c00c180bc8cccaa Use the fix for tdf#105998 only when 'selection' option is checked in the save dialog Change-Id: I8c4127c780736408e905ead48e0d3ee6ae149197 Reviewed-on: https://gerrit.libreoffice.org/73391 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 6c31c2b01dd32cc7ba1230f2c4a98b8f7def219b) Reviewed-on: https://gerrit.libreoffice.org/73559 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-07sanitize LibreLogo callsLászló Németh1-1/+50
Change-Id: Ie4d9858e5b4b3e55ab08416fb9338d2df34ee5e1 Reviewed-on: https://gerrit.libreoffice.org/73627 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 1b63fa32bbd4a5b89d2ee3a53b28de4250c8dad3) Reviewed-on: https://gerrit.libreoffice.org/73655 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-07Qt5 make Qt5Widdget's frame a private referenceJan-Marek Glogowski3-43/+43
Kind of a regression from commit 4d382636b0b1 ("qt5: Add basic a11y support"), which made it public for a single call. Change-Id: I631a861a98388223770cfca2704c3ddee6a0a8a0 Reviewed-on: https://gerrit.libreoffice.org/71836 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 8c71d28069acffa2d4590a4acf95a98d1415b563) Reviewed-on: https://gerrit.libreoffice.org/73650 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 12:59:23 +0000