[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 1 08:37:24 UTC 2020


 sd/source/ui/view/drtxtob1.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8daf9336b0991d756c8fe2eeea6543bfeb8ce245
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Mar 25 23:28:47 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Apr 1 10:36:52 2020 +0200

    tdf#131571: fix crash when clicking the "Text direction from top to bottom"
    
    See bt here:
    https://bugs.documentfoundation.org/attachment.cgi?id=159006
    
    cause of invalidation of pOLV here:
    https://bugs.documentfoundation.org/show_bug.cgi?id=131571#c4
    
    Change-Id: Ibf79e1fa4ebe94470afb2042cdc007bc05010b28
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91078
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 83ae778d2e7350a15db2f8fbfde7521ab905d0aa)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91115
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 3d0367e6b2b9..3d2c68960752 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -416,6 +416,9 @@ void TextObjectBar::Execute( SfxRequest &rReq )
         case SID_TEXTDIRECTION_TOP_TO_BOTTOM:
         {
             mpView->SdrEndTextEdit();
+            // tdf#131571: SdrEndTextEdit invalidates pTextEditOutlinerView, the pointer retrieved for pOLV
+            // so reinitialize pOLV
+            pOLV=mpView->GetTextEditOutlinerView();
             SfxItemSet aAttr( mpView->GetDoc().GetPool(), svl::Items<SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION>{} );
             aAttr.Put( SvxWritingModeItem(
                 nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ?


More information about the Libreoffice-commits mailing list