diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-10 16:59:27 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-11 11:02:55 +0200 |
commit | b1a74e52606cac591c8721fd76b458fafde394a9 (patch) | |
tree | 57ecafefda0daccad8f5924f6f1d05ad40b09331 /app-office/libreoffice/files | |
parent | app-office/libreoffice: 6.2.3.2 version bump (no keywords) (diff) | |
download | gentoo-b1a74e52606cac591c8721fd76b458fafde394a9.tar.gz gentoo-b1a74e52606cac591c8721fd76b458fafde394a9.tar.bz2 gentoo-b1a74e52606cac591c8721fd76b458fafde394a9.zip |
app-office/libreoffice: Drop 6.2.3.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch deleted file mode 100644 index 17843e007e08..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch +++ /dev/null @@ -1,113 +0,0 @@ -From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001 -From: Aleksei Nikiforov <darktemplar@basealt.ru> -Date: Wed, 6 Mar 2019 16:10:17 +0300 -Subject: tdf#123406 KDE5: Update delayed frame destruction - -Move deleteLater() call to the different event loop. -This fixes issue with frames not being disposed of -deterministically, and previously opened window -not reactivating. - -Also hide modal dialog window before unsetting modal mode. -Unsetting modal mode may require to toggle window visibility. -Window will be hidden soon anyway, -and additional generated events might make finding correct -focused window harder. - -Change-Id: Id7839f817075785287b09f6ac79eb3fb211726aa -Reviewed-on: https://gerrit.libreoffice.org/68852 -Tested-by: Jenkins -Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> -Reviewed-on: https://gerrit.libreoffice.org/70078 -Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> ---- - vcl/inc/qt5/Qt5Instance.hxx | 2 ++ - vcl/qt5/Qt5Instance.cxx | 12 ++++++++++-- - vcl/source/window/dialog.cxx | 4 ++-- - 3 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx -index 91682bd..cece484 100644 ---- a/vcl/inc/qt5/Qt5Instance.hxx -+++ b/vcl/inc/qt5/Qt5Instance.hxx -@@ -50,10 +50,12 @@ public: - - private Q_SLOTS: - bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); -+ static void deleteObjectLater(QObject* pObject); - - Q_SIGNALS: - bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents); - std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*); -+ void deleteObjectLaterSignal(QObject* pObject); - - public: - explicit Qt5Instance(bool bUseCairo = false); -diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx -index 8de9fc7..58f93fe 100644 ---- a/vcl/qt5/Qt5Instance.cxx -+++ b/vcl/qt5/Qt5Instance.cxx -@@ -67,6 +67,12 @@ Qt5Instance::Qt5Instance(bool bUseCairo) - Qt::BlockingQueuedConnection); - connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu, - Qt::BlockingQueuedConnection); -+ -+ // this one needs to be queued non-blocking -+ // in order to have this event arriving to correct event processing loop -+ connect(this, &Qt5Instance::deleteObjectLaterSignal, this, -+ [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); }, -+ Qt::QueuedConnection); - } - - Qt5Instance::~Qt5Instance() -@@ -78,6 +84,8 @@ Qt5Instance::~Qt5Instance() - free(m_pFakeArgvFreeable[i]); - } - -+void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); } -+ - SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) - { - return new Qt5Frame(nullptr, nStyle, m_bUseCairo); -@@ -94,7 +102,7 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame) - if (pFrame) - { - assert(dynamic_cast<Qt5Frame*>(pFrame)); -- static_cast<Qt5Frame*>(pFrame)->deleteLater(); -+ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Frame*>(pFrame)); - } - } - -@@ -109,7 +117,7 @@ void Qt5Instance::DestroyObject(SalObject* pObject) - if (pObject) - { - assert(dynamic_cast<Qt5Object*>(pObject)); -- static_cast<Qt5Object*>(pObject)->deleteLater(); -+ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Object*>(pObject)); - } - } - -diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx -index 0c75f85..1688163 100644 ---- a/vcl/source/window/dialog.cxx -+++ b/vcl/source/window/dialog.cxx -@@ -1097,6 +1097,8 @@ void Dialog::EndDialog( long nResult ) - - const bool bModal = GetType() != WindowType::MODELESSDIALOG; - -+ Hide(); -+ - if (bModal) - { - SetModalInputMode(false); -@@ -1121,8 +1123,6 @@ void Dialog::EndDialog( long nResult ) - } - } - -- Hide(); -- - if (bModal && GetParent()) - { - NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this ); --- -cgit v1.1 |