summaryrefslogtreecommitdiff
path: root/vcl
AgeCommit message (Collapse)AuthorFilesLines
2019-11-13Revert "tdf#122920 Send UNO mouse/key events to parent window listeners as well"Samuel Mehrbrodt1-6/+0
This reverts commit 3b137aaaa1232f0f22730898fcfd1112f68af1bf. Change-Id: If4152d1992baa82cebbabff5b0f4567a7942d350 Reviewed-on: https://gerrit.libreoffice.org/82504 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-10-07vcl: make "Reduce Transparency" parameter tweakableVasily Melenchuk1-2/+14
"Reduce transparency" feature previously was using hardcoded value of 0.25. If current object area to whole printing area ratio exceeds this value, object is being written without any extra transparency layers in order to reduce metafile size. Right now this value can be adjusted in "Expert Configuration". Parameter is called "ReduceTransparencyMinArea". Reviewed-on: https://gerrit.libreoffice.org/75471 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: vcl/source/gdi/print2.cxx Change-Id: I43d5801a1dff6241de214f7b24425626dc06b4fb Reviewed-on: https://gerrit.libreoffice.org/80393 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-10-07Revert series of LogicalFontInstance refactoringsKatarina Behrens36-115/+292
that cripple MM on Windows. They were backported in anticipation of backporting kde5 vclplug to 6.1 but otherwise add ~no value. Those are the reverted changes: e1266add9454 qt5: hold LogicalFontInstance with rtl::Reference ef759d03610b fixup 3eb3f0d9bc7fa94510 dbc1d2fe423b hold LogicalFontInstance with rtl::Reference Change-Id: Ieb0790797630c59ba233145c2ec075cf99725f8c Reviewed-on: https://gerrit.libreoffice.org/80247 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-09-17trac#29600 broadcast up/down of welded native modal dialogs like vcl onesMichael Weghorn1-2/+6
This is basically a partial cherry-pick of upstream commit 9ff8914166d6b26b654b10dbdb9d56b111b99ed4 ("broadcast up/down of welded native modal dialogs like vcl one") for the part that is relevant for trac#29600. Only apply the relevant part from this commit, since further welding etc. that has happened on master makes it hard to find an end of underlying changes that would have to be backported in addition otherwise... Conflicts: vcl/source/app/salvtables.cxx vcl/source/window/dialog.cxx vcl/unx/gtk3/gtk3gtkinst.cxx Change-Id: I642ae1a75a6d225d88ab9568c22438fa9922d03f Reviewed-on: https://gerrit.libreoffice.org/79041 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-17disable 'quit' menu entry when modal dialog waiting responseCaolán McNamara3-4/+15
Traditionally when a modal dialog is active, the quit menu entry of all LibreOffice toplevel frames, not just those which are themselves modal, is get disabled. This has come unstuck because its implemented by dialogs emitting MouseNotifyEvent::[END]EXECUTEDIALOG on its parent, and SfxFrameWindow_Impl listening for that event. But if the dialog parent is the toplevel parent of SfxFrameWindow_Impl then it doesn't get seen by the SfxFrameWindow_Impl child. Reviewed-on: https://gerrit.libreoffice.org/73975 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 252239ae30313142195b3da81aea45a89b2d6674) Conflicts: include/vcl/event.hxx include/vcl/window.hxx sfx2/source/view/frame2.cxx vcl/source/window/dialog.cxx vcl/source/window/window.cxx Change-Id: I0c4a5472d16d9169e68f6b0c230d039f1119489a Reviewed-on: https://gerrit.libreoffice.org/79040 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-17silence bogus -Wmaybe-uninitializedCaolán McNamara1-1/+1
Change-Id: I702b4818f05a606da30a643e13bfcd2c98ba412a Reviewed-on: https://gerrit.libreoffice.org/60215 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b829325fb407250849d9508ed32176b08006dd0a) Reviewed-on: https://gerrit.libreoffice.org/79039 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-17enable hiding gtk dialogs without ending their dialog loopCaolán McNamara1-9/+138
we need this to support reshowing dialog after an intermediate range selection dialog executes Reviewed-on: https://gerrit.libreoffice.org/64100 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 471d6c3653b8b8006db022c5d94af7503adfdc56) Conflicts: vcl/unx/gtk3/gtk3gtkinst.cxx Change-Id: Ib6575e5d852bd1d29cc1a791a5dc2c19949b67a0 Reviewed-on: https://gerrit.libreoffice.org/79038 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-05tdf#122384 Added isPrinter support to WinSalGraphicsImpl::drawPolyLineArmin Le Grand1-0/+15
trac#29436 As already guessed but not been sure (see 'One more hint' in WinSalGraphicsImpl::drawPolyPolygon) the strange WinGDI transform is also needed when printing for WinSalGraphicsImpl:: drawPolyLine. Change-Id: I39f89eac0c17e524949221306723a355c6e94a17 Reviewed-on: https://gerrit.libreoffice.org/66190 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit 6e3c4ae8bca898700cde9caaff43c3a8a61eebc2) Reviewed-on: https://gerrit.libreoffice.org/78623 Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de> Tested-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
2019-08-29tdf#127192 Printing in main threadJuergen Funk1-2/+4
trac29045 the wollmux has change the dialogs form swing to the LO-Dialogs, and when printig with MS-PDF then LO hang on this line. The reason is wollmux run in it own thread, but this thread has no win-message-pump, when the printer-driver would open the FileSave-Dialog then it hangs, because the message-pump is missing in this thread. The swing has made it own win-message-pump for this thread. Reviewed-on: https://gerrit.libreoffice.org/78170 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de> Tested-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de> (cherry picked from commit c16bfef0d51ad903defdb2bacb4550de481d3074) Change-Id: Ia5131464dcc5f166133a3302d29550e945dd1026 Reviewed-on: https://gerrit.libreoffice.org/78248 Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de> Tested-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
2019-06-29try to make the windows tinderboxes happierNoel Grandin1-11/+5
at the moment about 1 in 10 builds fail Reviewed-on: https://gerrit.libreoffice.org/57491 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 180fa02a592bc846e21e3d58c548e6ed7c7039d5) more windows tinderbox fix Reviewed-on: https://gerrit.libreoffice.org/58259 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 415436ad27b4522102d3fbbb6003935871029fc6) test unreliable under windows Reviewed-on: https://gerrit.libreoffice.org/71292 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3e898d3ce8f12c6f4b4f3a8202812fe8871e0a7f) vcl_complextext is still unreliable under windows Reviewed-on: https://gerrit.libreoffice.org/72407 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 536666539ce999cfe97378671a7186e38c32bdfc) Change-Id: Ia6ecd04b81abb751bd7159ca8432c00f97ab5e2d Reviewed-on: https://gerrit.libreoffice.org/74850 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-06-06Revert temp fix of Basic editor crash and fix properlyKatarina Behrens2-5/+1
to do that, backport part of commit 0adbc69c81cc287386b31b25b2dc89780933e2b1 Turns out that this particular VclEventId (WindowChildCreated) is unused i.e. listeners for such event type don't exist and an attempt to find them via GetComponentInterface was causing the crash Change-Id: I57c59bde021cf802f01eaa6fd14e2ce3f6c73a1c Reviewed-on: https://gerrit.libreoffice.org/73623 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-06-04Fix some std::unique_ptr array allocsJan-Marek Glogowski3-4/+4
Found by reviewing the output of and the code around git grep -n "unique_ptr.*new.*\[.*\]" | grep -v "\[\]" The onlineupdater code needs a little bit more attention. Change-Id: I8b70c7da7db60af52bfac12314a21602ede8bfc0 Reviewed-on: https://gerrit.libreoffice.org/60162 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit b18747fcee1ba8744e5cd63791dc9f3eb6848a56) Reviewed-on: https://gerrit.libreoffice.org/73428 Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de> Tested-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
2019-05-24Temporary fix for basic editor crashingSamuel Mehrbrodt1-1/+2
Disable code until we have a fix Change-Id: I0d30aba5d78ac6e0c48952dec43f66f8acf38556 Reviewed-on: https://gerrit.libreoffice.org/72903 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-05-23tdf#122920 Send UNO mouse/key events to parent window listeners as wellSamuel Mehrbrodt1-0/+6
This is a squashed commit consisting of: Wait for async events to be delivered Follow-up fix for 6f43902b12dd36fa2b69401065df198ef9ffdb09 Also remove calling to super class (doesn't work and those methods return void anyway) Reviewed-on: https://gerrit.libreoffice.org/70878 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 0fb575b34d039f7c732820467b6db6f8cebd485d) tdf#125170 Deliver mouse events also when clicking into document content Event listeners are added once VCLXWindow::SetWindow is called. This never happened for the document content window. So we need to call Window::GetComponentInterface which will create an XWindowPeer and then call UnoWrapper::SetWindowInterface which calls VCLXWindow::SetWindow. After that, event listeners are registered so that we can deliver events. Reviewed-on: https://gerrit.libreoffice.org/71948 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit f9905401d8cf2d73576231ebd84cfa5f4f73bcac) More precisely count different event types in xwindow.py Reviewed-on: https://gerrit.libreoffice.org/72426 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 141c75847a0fc470915a16c83e80f8effb7a22b6) Fix comment Reviewed-on: https://gerrit.libreoffice.org/71949 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3d6e2081f0ab71ad4515fed864c3f36566e466c3) Fix typo Reviewed-on: https://gerrit.libreoffice.org/68787 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 3061ca82a323ec922dbdf2f5dcc008ade81f23a8) Make xwindow.py test more robust ...by waiting for all events to be processed before the listeners are removed Reviewed-on: https://gerrit.libreoffice.org/72432 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit edeb858b57d5b45dbc20e04d323085cf9ce95f55) Temporarily disable broken part of xwindow.py test Apparently, at least for many builds there is am additional mouseExited/ mouseEntered event pair (making mouseEnteredEventsIntercepted = 2 and mouseExitedEventsIntercepted = 1) initiated by the xToolkitRobot.mousePress(xMouseEvent2) when the mouse pointer moves from the "Standard" window to the "writer_edit" sub-window. This needs further investigation. Reviewed-on: https://gerrit.libreoffice.org/72433 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit acd4625f2f1bf418452ffdafeac1b83fe1b2acde) Fix expected mouseEntered/Exited values in xwindow.py test (see <https://gerrit.libreoffice.org/#/c/72433/> "Temporarily disable broken part of xwindow.py test") Reviewed-on: https://gerrit.libreoffice.org/72477 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 9976aa7b8420daa9f7a5290ae433e2ab338ca146) Remove some unused variables Reviewed-on: https://gerrit.libreoffice.org/72478 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c5968b68c51503f791cdffac2b9689b7de775054) Move xwindow.py to writer_tests Folder writer_tests5 does not exist on this branch tdf#125370 Fix crash when opening basic editor Reviewed-on: https://gerrit.libreoffice.org/72609 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 08509b747c9077e4753759338a899b76514ba3b7) Related tdf#122920 Treat UNO key events the same as mouse events by sending the notifications to the parent windows as well Reviewed-on: https://gerrit.libreoffice.org/72675 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9e0e97b716ab074d4558c76a62a66bf597f332a5) Change-Id: Ibad84b0b37faccee875f6daad17e3e3680df0557 Reviewed-on: https://gerrit.libreoffice.org/72861 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-05-22tdf#123750 gtk3_kde5: Show removable devices in file dialogMichael Weghorn1-6/+3
Do the same for the gtk3_kde5 VCL plugin as commit 2c69c93fdb871809825fe8b9aff40b7afb093be8 does for the kde5 one. Change-Id: I6fc91d1dbe133bd905c033c9fce7d48c0b6464a0 Reviewed-on: https://gerrit.libreoffice.org/71384 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit c08f23b1470c0f49336c83c711d473584ce5c96f) Reviewed-on: https://gerrit.libreoffice.org/72751 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-05-06disable some more pdfexport testsNoel Grandin1-0/+3
Change-Id: Ifdee7c4bd9ed3306530c7bc4ecf3017008e90c3d Reviewed-on: https://gerrit.libreoffice.org/71215 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 57edcf98dbd2471078d32ceeda9eba502b694496) Reviewed-on: https://gerrit.libreoffice.org/71727 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-05-03Merge branch 'libreoffice-6-1'Thorsten Behrens1-2/+4
into distro/lhm/libreoffice-6-1+backports Change-Id: I6b21f26c55149b5ac59b65d403612a4612ece58b
2019-04-30tdf#120797: Apply transformation also to the extents of damageKatarina Behrens1-13/+7
since 7034311dce663c895577267110baadbec312d491 affine transformation is passed down to drawPolyPolygon and drawPolyLine functions. The transformation was correctly applied to cairo context, but not the extents of damage so those had old, untransformed coordinates and were therefore not redrawn Change-Id: I61ce005ef8770ce5c4560a9d953cd92f440043be Reviewed-on: https://gerrit.libreoffice.org/71383 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> remove comment in light of fix for tdf#120797 Change-Id: I3093f764a26abdbdb651596352ba74b7fa1c3306 Reviewed-on: https://gerrit.libreoffice.org/71399 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/71534 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-29ofz#14469 null derefCaolán McNamara1-1/+3
since... commit af84fc9d906626255aaf136eefc5e55236e0e8a6 Date: Tue Apr 23 15:48:41 2019 +0200 lazy image loading shouldn't read the entire .xls file (tdf#124828) nLength is just an unchecked value in the dff stream, it might not be sane so limit it to the max len of the stream Change-Id: Ia8a2830478952afe1317b5cd795f35059d9b380a Reviewed-on: https://gerrit.libreoffice.org/71414 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-04-26gtk3_kde5: Add missing includeMichael Weghorn1-0/+2
Needed since commit cf879b3e1c473ba37153ae84676154d86d23c504. Change-Id: I69749801d0457a7433b4706c0ca7fa3665e3a026 Reviewed-on: https://gerrit.libreoffice.org/71362 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit e2598de3c028280d432435075475928cfe95943e)
2019-04-25gtk3_kde5: Make folder selection more intuitiveMichael Weghorn1-1/+10
When 'QFileDialog::Directory' is set, the native Plasma QFileDialog does not consider the clicked directory to be selected, but rather the base directory shown in the dialog, s. https://bugs.kde.org/show_bug.cgi?id=406464 . Therefore don't set the option when in a KDE Plasma desktop environment (which the kde5 VCL plugin also doesn't do). This works around the above issue in the Plasma desktop integration. Change-Id: Ib3d0978ab56b6e50ee45f7ad997ec051b35faf54 Reviewed-on: https://gerrit.libreoffice.org/71223 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 9fc0dbcd797f074ddb8ba379c876dd233cb5836e) Reviewed-on: https://gerrit.libreoffice.org/71275 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-04-24lazy image loading shouldn't read the entire .xls file (tdf#124828)Luboš Luňák1-2/+2
b11188835d3b87cd changed msfilter to use GraphicFilter::ImportUnloadedGraphic() to lazy-load images from the document. However, that function in some cases simply reads the entire rest of the passed SvStream, which in this case is the entire .xls file. And the document from tdf#124828 is ~50MiB and contains ~4000 images => 100+ GiB memory required. Reviewed-on: https://gerrit.libreoffice.org/71136 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit af84fc9d906626255aaf136eefc5e55236e0e8a6) Reviewed-on: https://gerrit.libreoffice.org/71221 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: I74926383204ec642eabb28b62e2cf2e1ff8054a9 Reviewed-on: https://gerrit.libreoffice.org/71225 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-17gtk3_kde5: No longer kill fpicker process on timeoutMichael Weghorn1-3/+1
In some observed cases, 100 ms were not enough for the separate 'lo_kde5filepicker' process to terminate properly, in particular on slow or busy hardware. Drop the timeout here and just wait for the process to finish to avoid killing it unnecessarily, which could e.g. lead to file dialog settings/state not properly being saved by the native KDE Plasma QFileDialog (plasma-integration, e.g. in 'KDEPlatformFileDialogHelper::saveSize'), so that the last used mode or size would not be remembered. The assumption is that the separate fpicker process should now properly finish in all cases, in particular since commit 93815c2b04f1905e43c695caf5cc2c594bb897ce. Should that assumption not hold, let's rather fix the underlying issues than increasing the timeout here. Change-Id: I0a58c1425940fbfaecb5012a24fd9a0222cbaccb Reviewed-on: https://gerrit.libreoffice.org/70834 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 4640575bd33c2d1010f3acd4fdf3cce510091716) Reviewed-on: https://gerrit.libreoffice.org/70866 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-10tdf#124652 Guard Gtk3KDE5FolderPicker::execute with SolarMutexGuardMichael Weghorn1-1/+5
S.a. commit 8dbe0af729c9e054135a0f41706165033441f867 which already did the same for Gtk3KDE5FilePicker. Change-Id: I35f837b7b8fdaebc5625ff8ea5e20b3f48a3b4ec Reviewed-on: https://gerrit.libreoffice.org/70519 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 728ee3839ea94e3391c36a847bf6b28c12ad7647) Reviewed-on: https://gerrit.libreoffice.org/70530 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-04-05Merge branch 'libreoffice-6-1'Thorsten Behrens6-6/+77
into distro/lhm/libreoffice-6-1+backports Change-Id: Id362bc8f781d752e6e14032fee8d9c7100e208ad
2019-04-01Resolves: tdf#124440 nospin has no subeditCaolán McNamara1-1/+6
Change-Id: I4e801ec234e86be935a79c9e29f0e5091904f12e Reviewed-on: https://gerrit.libreoffice.org/70055 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-04-01tdf#124413 Crash on undo / redo in Basic IDENoel Grandin1-3/+8
regression from commit 3a9d3f271c445641bebd057c4c91279f9b3cd7d5 Date: Mon Apr 23 09:38:41 2018 +0200 loplugin:useuniqueptr in TextDoc Change-Id: I51ab5de7571e4ec358442e54d590adf88fbeb12d Reviewed-on: https://gerrit.libreoffice.org/70061 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 3ebdb97a305ada182af045ea6438432adfe74e80) Reviewed-on: https://gerrit.libreoffice.org/70072 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-28fix grayscale jpeg writing in pdfexport (tdf#121615)Luboš Luňák3-1/+62
If the bitmap to be written is non-8bit, e.g. in case of using OpenGL (on Linux the test requires "SAL_FORCEGL=1 SAL_USE_VCLPLUGIN=gen", on Windows it's probably the default case), then the bitmap is not in native format for 8bit. This was done correctly by 45e8e0fbee40f that introduced it but somehow it got lost later (I can't even find where). Reviewed-on: https://gerrit.libreoffice.org/69213 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 4b48f5c2fd2d0d6de1e1df4c13ceba47b1da7b5e) Change-Id: Ib1810cb9cf12e373c1cb41da40fa28e96ad7db28 Reviewed-on: https://gerrit.libreoffice.org/69851 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-03-28fix transparency handling in BitmapEx::GetPixelColor()Luboš Luňák1-1/+1
Apparently the Color class uses transparency as the opposite of the normally used meaning of opacity, so transparency 255 means transparent. Change-Id: I3a76c2c93d98ad3c850017d3fd569b04dc6c19c8 Reviewed-on: https://gerrit.libreoffice.org/69211 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/69884 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-19Merge branch 'temp/libreoffice-6-1'Michael Weghorn16-16/+228
into distro/lhm/libreoffice-6-1+backports The merged 'temp/libreoffice-6-1' corresponds to the upstream 'libreoffice-6-1" branch except for the revert of 736a38419f49d4b96bd845f5767a028df59e4cff, for which the corresponding master commit will be cherry-picked after merge instead. Conflicts: sc/qa/unit/subsequent_export-test.cxx Change-Id: I1e79bd2c018d06a945d576a8054350aa459b6762
2019-02-04Resolves: tdf#122930 paper tray is to update on focus-inCaolán McNamara1-5/+48
which adds the problem that GtkComboBox doesn't send a focus-in, but its toggle does, to find and use that instead Change-Id: I18d46511bf2e6997539a8413f574a94b24b4583f Reviewed-on: https://gerrit.libreoffice.org/67136 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-02-01tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only onceMichael Weghorn1-0/+4
Since the event filter is only used to set the custom widget in the KFileWidget, it can and needs to be removed again once this has been done; which also avoids crashes. (s. https://gerrit.libreoffice.org/#/c/67185/ for more infos, where the same thing is done for kde5) Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3 Reviewed-on: https://gerrit.libreoffice.org/67184 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f) Reviewed-on: https://gerrit.libreoffice.org/67204 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-31Resolves: tdf#122958 bmps with weird compression values that work in msoCaolán McNamara2-2/+12
Change-Id: Ie1887288cba7c1d56b807dbc9ddb886b9d20ff33 Reviewed-on: https://gerrit.libreoffice.org/67145 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-30vcl: fix deadlock in VclGtkClipboard::setContents()Michael Stahl1-1/+6
Must not call getTransferDataFlavors with m_Mutex held; 6 TransferableHelper::getTransferDataFlavors() (this=0x567b980) at svtools/source/misc/transfer.cxx:392 7 VclGtkClipboard::setContents(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, com::sun::star::uno::Reference<com::sun::star::datatransfer::clipboard::XClipboardOwner> const&) (this=0x3199550, xTrans=uno::Reference to (SwTransferable *) 0x567b9a8, xClipboardOwner=uno::Reference to (SwTransferable *) 0x567b9b0) at vcl/unx/gtk3_kde5/../gtk3/gtk3gtkinst.cxx:618 8 TransferableHelper::CopyToSelection(vcl::Window*) const (this=0x567b980, pWindow=0x301b0c0) at svtools/source/misc/transfer.cxx:960 CopyToSelection() uses SolarMutexReleaser, then getTransferDataFlavors() has a SolarMutexGuard; this will deadlock against the main thread that holds SolarMutex and calls VclGtkClipboard::setContents() itself, from VclGtkClipboard::OwnerPossiblyChanged(). Change-Id: Ibda0b6bce6f3388c45cee8077dd977abb3dda366 Reviewed-on: https://gerrit.libreoffice.org/67121 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9286cebdff378a19ec146183676c6da96aac77db) Reviewed-on: https://gerrit.libreoffice.org/67154 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-29vcl: unx: apply configuration to "Generic Printer" so it's PDF ...Michael Stahl1-0/+3
... by default, instead of leaving it with m_nPSLevel == 0 && m_nPDFDevice == 0. Change-Id: I44059ac39791442602cbc48582670d98edc578ee Reviewed-on: https://gerrit.libreoffice.org/66802 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit c8dd1c22d7512d4922461350c6cb804cd0864e0b) Reviewed-on: https://gerrit.libreoffice.org/67064 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2019-01-29Resolves: tdf#122662 restore context after changing stateCaolán McNamara1-6/+47
otherwise we may change a context which get reused by gtk for rendering something we don't ourselves draw directly Change-Id: I814140cd63489f7e4fac47a7486a006a4aa1fac5 Reviewed-on: https://gerrit.libreoffice.org/66849 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-23tdf#121129: more custom listboxes in kde5 fpickerKatarina Behrens1-11/+21
the following additional fpicker templates are now fully supported: FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE FILESAVE_AUTOEXTENSION_TEMPLATE FILEOPEN_LINK_PREVIEW_IMAGE_ANCHOR FILEOPEN_READONLY_VERSION Listboxes now also have valid mnemonic labels Change-Id: Ib7f9dd234bf2cbd0eadc1a7675ef51abcea3c532 Reviewed-on: https://gerrit.libreoffice.org/66736 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/66761 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-23tdf#121129: custom listboxes in kde5 fpicker, first stabKatarina Behrens2-1/+94
for FILESAVE_AUTOEXTENSION_TEMPLATE only so far (e.g. menu Insert > Image) Change-Id: I5674025788ce9bab4094f717e2b940e7cd6891e3 Reviewed-on: https://gerrit.libreoffice.org/66705 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2d33c7cb4b4835de77194650124a1cf046920f66) Reviewed-on: https://gerrit.libreoffice.org/66760 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-22Qt5 fix SalGraphics::invertJan-Marek Glogowski2-3/+9
... and also print the invert mode name into the inverted region when running "./bin/run vcldemo --show ellipse". Conflicts: vcl/workben/vcldemo.cxx Reviewed-on: https://gerrit.libreoffice.org/65326 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 6251e4080f4c1ed3bf1a5d615fc3ebdda4c87059) Reviewed-on: https://gerrit.libreoffice.org/65474 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f5d7049f4eb39967625bac819e17170485ea6698) Change-Id: Id461a32756583df1ef778320c29c45c0e7e4fbc8 Reviewed-on: https://gerrit.libreoffice.org/66608 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-19tdf#122459 Qt5 IM underline pre-editJan-Marek Glogowski1-0/+5
This simply always underlines the pre-edit text, so it'S easier to see what text block is currently IM edited. Change-Id: I45145e4faa872c44eb6583ac6f335dd40fe3e53e Reviewed-on: https://gerrit.libreoffice.org/65856 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit f2ee532640fa200ada55ac51fbe47bad260aec7e) Reviewed-on: https://gerrit.libreoffice.org/65858 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 7ca6bd053869a84d18bcce2b3f08a27a6ad785d9) Reviewed-on: https://gerrit.libreoffice.org/66612 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-01-19Qt5+kde4 don't override generic VCL style settingsJan-Marek Glogowski2-12/+0
In commit 3911bf8364da ("tdf#98253 Qt5 rely on VCL for SetDeactiveColor") the named was dropped from the Qt5 styling. This results in SetDeactiveColor now being controlled by LO, but SetActiveColor by the Qt theming. But IMHO both need to be managed together in some way, as the deactive color is normally some variant of active with a lower opacity. Also no other backends except Windows and headless even overide the four general colors Set(De|A)ctive(Text)?Color and Windows is setting them from the window decorations (CAPTION)?! So let's get rid of all these settings for Qt5 and kde4. Change-Id: Id9497dc067e4718d25d24c5795589b6c028a8817 Reviewed-on: https://gerrit.libreoffice.org/65028 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 89c888b48eca24e25ffe8895542cf7ac9b731187) Reviewed-on: https://gerrit.libreoffice.org/65857 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 2b6ba5e47671358cbe44ba68000e13db22bd36db) Reviewed-on: https://gerrit.libreoffice.org/66611 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-01-19tdf#98253 Qt5 rely on VCL for SetDeactiveColorSumit Chauhan1-1/+1
Keep the DeactiveColor from generic vcl style without overriding it with the Qt5 style. Change-Id: I10ffdc79e1b6878d27ae13c6394ad50d7470f073 Reviewed-on: https://gerrit.libreoffice.org/64522 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 3911bf8364dae4c855ad37237c114f9007f70657) Reviewed-on: https://gerrit.libreoffice.org/65560 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 66d3a5b78b7a7665a75047c87ac180eeb03b476f) Reviewed-on: https://gerrit.libreoffice.org/66610 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-01-18Unregister action when menu item is removedAleksei Nikiforov1-1/+9
Change-Id: I9fc5e6630560f285eeb7ef4dbc5e39ccabd5f0df Reviewed-on: https://gerrit.libreoffice.org/66147 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 35b59e56cc01e5ecf97583ab7b7884d301457089) Reviewed-on: https://gerrit.libreoffice.org/66172 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 9ddf669ee1a4490cfbfe0d7166ce7effcc717074) Reviewed-on: https://gerrit.libreoffice.org/66614 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-18tdf#122253 KDE5: Correct parent menu before it's usedAleksei Nikiforov2-6/+9
Also correct action group of menu Change-Id: Ie7eddd3cdc9fa1c36fdeaa1e96eb5d50d7126c09 Reviewed-on: https://gerrit.libreoffice.org/66146 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c278857137ea0e9e25613d5f6bf8ddaf1336fbcc) Reviewed-on: https://gerrit.libreoffice.org/66173 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit b6704c14ce2241e76904e494125a520814ec5021) Reviewed-on: https://gerrit.libreoffice.org/66613 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-18tdf#121161 Qt5 initial IM supportJan-Marek Glogowski3-2/+58
This just implements some minimal solution, since I have no idea, how all this IM handling should actually work. Change-Id: I0d02dfb96680891e275881927ebc17f798dc1f29 Reviewed-on: https://gerrit.libreoffice.org/65553 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit c7ee454a35c392dfd03c9ccf8fd953ec9c98e484) Reviewed-on: https://gerrit.libreoffice.org/65558 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 7da0f71cf15af0cfa74d0eaa0011a6b1db1a4abd) Reviewed-on: https://gerrit.libreoffice.org/66609 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-17Qt5 don't re-register system fontsJan-Marek Glogowski1-1/+6
System fonts are already registered in the QFontDatabase. And addApplicationFont seems to be really expensive especially when registering large fonts like the Noto CJK fonts, which increases load time by 4 seconds per font. This skips all font + style combinations already known in the DB. Since addApplicationFont already relies on fontconfig on Unix/X11 this should be fine. Change-Id: Ief13a613abd99b9fe391d9afe868541035340d1c Reviewed-on: https://gerrit.libreoffice.org/65270 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 5d13f3efe0157559d3625c6b8fe7e9741e601215) Reviewed-on: https://gerrit.libreoffice.org/65290 (cherry picked from commit 6d3faf6a048eedf3fe4a1f43545eeda38adb2763) Reviewed-on: https://gerrit.libreoffice.org/66457 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-17Qt5: fix color bits interpretation for 32bit ARGB image formatsAleksei Nikiforov1-0/+4
Change-Id: Iea8547089a0ce2dc9f6a06b84552f4261fbfa0f1 Reviewed-on: https://gerrit.libreoffice.org/65311 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 7802d99c35f5acfa43203f1dd6d1752af4e7c0b6) Reviewed-on: https://gerrit.libreoffice.org/65332 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-on: https://gerrit.libreoffice.org/66458 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-16Qt5: remove assert leading to crash while executing 'open' dialogAleksei Nikiforov1-1/+0
When Writer is opened using "qt5" VCL plugin, opening menu item "File" -> "Open" leads to a crash due to presence of mentioned assert. Impress crashes same way when same menu item is used. Change-Id: I9d1937344c694d4f4620be1b71d1181eb9645427 Reviewed-on: https://gerrit.libreoffice.org/65344 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit dd2421b148fedc40547ccff8b332285047a0b09e) Reviewed-on: https://gerrit.libreoffice.org/65396 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 77c5d0f4be46071f49957e3e2f7fce24f9e927f3) Reviewed-on: https://gerrit.libreoffice.org/66462 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-16tdf#121247, tdf#121266 KDE5: Add basic support for OpenGLAleksei Nikiforov6-4/+214
Change-Id: Id3a5879f661a6fa51b9f9dc40af73687a8f624df Reviewed-on: https://gerrit.libreoffice.org/65310 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Jenkins (cherry picked from commit 56b19f9a814ae5a39ed760ee542d715493cd0bf3) Reviewed-on: https://gerrit.libreoffice.org/65393 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d51452fc4f15f956dde32cb2cc3e118473f4f23a) Reviewed-on: https://gerrit.libreoffice.org/66461 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-16tdf#122055: catch RuntimeException if a11y context no longer aliveKatarina Behrens1-1/+16
otherwise Desktop::Main will do it and soffice will crash w/ empty error msg Change-Id: I56768909227a6ff158ae353e1eff9b249d6ba9d4 Reviewed-on: https://gerrit.libreoffice.org/65357 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d41bc9bd9359eb83f807fdfa72dbde0831f39be8) Reviewed-on: https://gerrit.libreoffice.org/65384 (cherry picked from commit 20da54d941083a947d8890c2f6b0e8edf3bc9ed5) Reviewed-on: https://gerrit.libreoffice.org/66460 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>