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

[Serge Krot (via logerrit)]

 embeddedobj/source/commonembedding/embedobj.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b5762d877423579a483fc531597597a3204cc730
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Thu Mar 5 10:59:35 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Mar 11 00:57:33 2020 +0100

    tdf#131146 Linked Calc: changes are lost in last edited cell
    
    Change-Id: I768ccc1d98a0785806986a6ffc70de057991e08a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90009
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit a91e19e30833c2743c1c2ce010a2d0f06aad7706)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90039

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 641253008580..e6e5bec2a316 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -91,6 +91,10 @@ void OCommonEmbeddedObject::Deactivate()
     if ( !xClientSite.is() )
         throw embed::WrongStateException(); //TODO: client site is not set!
 
+    // tdf#131146 close frame before saving of the document
+    // (during CloseFrame() call some changes could be detected not registered in util::XModifiable)
+    m_xDocHolder->CloseFrame();
+
     // store document if it is modified
     if ( xModif.is() && xModif->isModified() )
     {
@@ -110,8 +114,6 @@ void OCommonEmbeddedObject::Deactivate()
         }
     }
 
-    m_xDocHolder->CloseFrame();
-
     xClientSite->visibilityChanged( false );
 }