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

[Szymon Kłos]

 embeddedobj/source/general/docholder.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54a605fdef2ca12ac47c35e527950a980f7945fe
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Fri Jul 14 16:11:40 2017 +0200

    Embedded obj: don't change new window size
    
    Change-Id: Idc5e1e26fa1a98c6f96a1f0f15b6e5c3c9398402
    Reviewed-on: https://gerrit.libreoffice.org/39957
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit f9d5877f41b54882a7f364f33b314cbaeb3b44c0)
    Reviewed-on: https://gerrit.libreoffice.org/39985
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index a67091ff3f5d..0a490153e8d5 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -878,7 +878,6 @@ uno::Reference< frame::XFrame > const & DocumentHolder::GetDocFrame()
 
         // TODO/LATER: get it for the real aspect
         awt::Size aSize;
-        GetExtent( embed::Aspects::MSOLE_CONTENT, &aSize );
         LoadDocToFrame(false);
 
         if ( xOwnLM.is() )
@@ -887,6 +886,7 @@ uno::Reference< frame::XFrame > const & DocumentHolder::GetDocFrame()
             xOwnLM->lock();
         }
 
+        GetExtent( embed::Aspects::MSOLE_CONTENT, &aSize );
         SetExtent( embed::Aspects::MSOLE_CONTENT, aSize );
 
         if ( xOwnLM.is() )