[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source

[Tomaž Vajngerl (via logerrit)]

 svx/source/table/tablecontroller.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7f3d35ecd63b503fb2fb9685b5475cef63fcbea
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Oct 2 12:02:42 2020 +0200
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Oct 8 16:28:29 2020 +0200

    rearrange to not use pUndoObject after std::move
    
    pGeoUndo is always nullptr in this case because of std::move, so
    the SetSkipChangeLayout is never set.
    
    Issue since: https://gerrit.libreoffice.org/c/core/+/78201
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103827
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit e31474d71235bccee8568c4a952a8319bddf39e0)
    
    Change-Id: I4f1dcb3a25adeb0737e03aa9e9dfb193969250b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103894
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index d6541073be6e..232ed782414a 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1529,11 +1529,11 @@ void SvxTableController::changeTableEdge(const SfxRequest& rReq)
             {
                 auto pUndoObject = rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj);
                 rModel.BegUndo(pUndoObject->GetComment());
-                rModel.AddUndo(std::move(pUndoObject));
 
                 auto* pGeoUndo = static_cast<SdrUndoGeoObj*>(pUndoObject.get());
                 if (pGeoUndo)
                     pGeoUndo->SetSkipChangeLayout(true);
+                rModel.AddUndo(std::move(pUndoObject));
             }
             tools::Rectangle aBoundRect;
             if (rTableObj.GetUserCall())