Attachment 216233 Details for Bug 247444 – patch2

[patch] patch2

libreoffice.qt5.patch (text/plain), 2.40 KB, created by Tijl Coosemans on 2020-07-05 19:49:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2020-07-05 19:49:37 UTC

Size: 2.40 KB

patch

obsolete

>Index: editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx
>===================================================================
>--- editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx	(nonexistent)
>+++ editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx	(working copy)
>@@ -0,0 +1,11 @@
>+--- vcl/qt5/Qt5Frame.cxx.orig	2020-05-13 11:19:20 UTC
>++++ vcl/qt5/Qt5Frame.cxx
>+@@ -318,7 +318,7 @@ SalGraphics* Qt5Frame::AcquireGraphics()
>+ 
>+     if (m_bUseCairo)
>+     {
>+-        if (!m_pOurSvpGraphics.get() || m_bGraphicsInvalid)
>++        if (!m_pOurSvpGraphics.get())
>+         {
>+             m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
>+             InitQt5SvpGraphics(m_pOurSvpGraphics.get());
>
>Property changes on: editors/libreoffice/files/patch-vcl_qt5_Qt5Frame.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
>===================================================================
>--- editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx	(nonexistent)
>+++ editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx	(working copy)
>@@ -0,0 +1,17 @@
>+--- vcl/qt5/Qt5Instance.cxx.orig	2020-05-13 11:19:20 UTC
>++++ vcl/qt5/Qt5Instance.cxx
>+@@ -261,7 +261,13 @@ SalFrame* Qt5Instance::CreateChildFrame(SystemParentDa
>+ SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
>+ {
>+     assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
>+-    return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo);
>++    SalFrame* pRet(nullptr);
>++    bool bUseCairo = m_bUseCairo;
>++    RunInMainThread([&pRet, pParent, nStyle, bUseCairo]() {
>++        pRet = new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, bUseCairo);
>++    });
>++    assert(pRet);
>++    return pRet;
>+ }
>+ 
>+ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
>
>Property changes on: editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 247444: 215824 | 215858 | 216046 | 216233