[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - vcl/source xmloff/source

[Noel Grandin (via logerrit)]

 vcl/source/window/mouse.cxx                         |    2 +-
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 13449131ba1b041875e4d84af008196aacf574e0
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat May 29 08:34:28 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Thu Aug 19 10:53:34 2021 +0200

    IsDisposed->isDisposed in vcl/../window
    
    Cherry-picked piece of code as this solves a crash in wollmux.
    
    Change-Id: Ic1c8bb6bb9a45d4e91c997b752e23aed35767f42
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116364
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120318
    Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index a3a06ecf1f31..d3f61a551876 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -343,7 +343,7 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags )
     }
 
     // call Get- and LoseFocus
-    if ( pOldFocusWindow && ! pOldFocusWindow->IsDisposed() )
+    if ( pOldFocusWindow && ! pOldFocusWindow->isDisposed() )
     {
         NotifyEvent aNEvt( MouseNotifyEvent::LOSEFOCUS, pOldFocusWindow );
         if ( !ImplCallPreNotify( aNEvt ) )
commit d77d0a91ce6a2f863b78426d67856f557fc56411
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Tue Aug 17 16:49:21 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Thu Aug 19 10:51:53 2021 +0200

    tdf#143736 Fix loading hyperlink from various shapes
    
    Change-Id: I86de90ee605fab8f11e7c01892fbbff6acf790a6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120609
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
    (cherry picked from commit 7bd26828933a682b7bca86e4fb26f4cf99fa33e0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120696
    Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index c475543bafec..278d6d953205 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -119,7 +119,8 @@ SvXMLImportContextRef XMLTextFrameHyperlinkContext::CreateChildContext(
             pTextFrameContext = new XMLTextFrameContext( GetImport(), nPrefix,
                                                 rLocalName, xAttrList,
                                                 eDefaultAnchorType );
-        else if( IsXMLToken( rLocalName, XML_CUSTOM_SHAPE ) )
+        else if (IsXMLToken(rLocalName, XML_CUSTOM_SHAPE) || IsXMLToken(rLocalName, XML_PATH)
+                 || IsXMLToken(rLocalName, XML_ELLIPSE) || IsXMLToken(rLocalName, XML_LINE))
         {
             Reference<XShapes> xShapes;
             SvXMLShapeContext* pShapeContext