[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/source

[Libreoffice Gerrit user]

 helpcontent2                     |    2 +-
 sc/source/ui/drawfunc/futext.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 97930797d2346ceaded866fd7c1dd4c3c9916015
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Wed Sep 12 08:12:23 2018 +0200
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Wed Sep 12 08:48:54 2018 +0200

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      - Fix typo
    
        Change-Id: Ideca97ded830b58d314c40dfa417ae5327325bca
        Reviewed-on: https://gerrit.libreoffice.org/60367
        Tested-by: Jenkins
        Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/helpcontent2 b/helpcontent2
index 0cfa25cb0494..69d729bd8e60 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0cfa25cb0494fee382aaa33f8dd0354f8a35b881
+Subproject commit 69d729bd8e60ebfa06cf33b52a22da3f35d039fe
commit 4926b0f348dd1ddf170fe41df0cde4d426ab3b5f
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Sep 11 13:18:09 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Sep 12 08:48:48 2018 +0200

    tdf#119793 Crash on redo of rectangle movement and text
    
    regression from
       commit be48eb2e82a3d8891ee84145567e2b89884f1fd6
       return std::unique_ptr from SdrMakeOutliner
    
    Change-Id: Iec4421558ed29121973c87b9363da0303f71e203
    Reviewed-on: https://gerrit.libreoffice.org/60317
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 7c86db1ab53e..0b9ba8048149 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -197,11 +197,11 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                 pO->SetVertical( bVertical );
 
                 //!?? the default values are not correct when result is without outliner ???!?
-                auto pUndoManager = &pO->GetUndoManager();
+                auto pOTemp = pO.get();
                 if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO.release()) )
                 {
                     // subscribe EditEngine-UndoManager
-                    rViewShell.SetDrawTextUndo( pUndoManager );
+                    rViewShell.SetDrawTextUndo( &pOTemp->GetUndoManager() );
 
                     OutlinerView* pOLV = pView->GetTextEditOutlinerView();
                     if ( pOLV->MouseButtonDown(rMEvt) )
@@ -592,7 +592,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
                 pO->SetVertical( bVertical );
 
                 //!??  without returned Outliner the defaults are not correct ???!?
-                auto pUndoManager = &pO->GetUndoManager();
+                auto pOTemp = pO.get();
                 if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO.release()) )
                 {
                     //  Toggle out of paste mode if we are in it, otherwise
@@ -602,7 +602,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
                     rViewShell.UpdateCopySourceOverlay();
 
                     //  EditEngine-UndoManager anmelden
-                    rViewShell.SetDrawTextUndo( pUndoManager );
+                    rViewShell.SetDrawTextUndo( &pOTemp->GetUndoManager() );
 
                     pView->SetEditMode();