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

[Caolán McNamara]

 embeddedobj/source/commonembedding/visobj.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8c85d8bb24995a271ec47bfe45756216a095ac0d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 26 14:35:24 2017 +0100

    Resolves: tdf#108643 don't restore orig size on first chart activate
    
    Change-Id: Ibe51eb81ea1b0874fc1a9018871f07c9af38e8d2
    Reviewed-on: https://gerrit.libreoffice.org/39268
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 59d93d41537fa806219d705a6d06ed26bf09f2f3)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 87a7f3933af3..5321bf1f455e 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -178,7 +178,9 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
         // themselves to a default size OLESIZE
         awt::Size aOrigSize = getVisualAreaSize(nAspect);
         changeState(embed::EmbedStates::RUNNING);
-        if (aOrigSize != getVisualAreaSize(nAspect))
+        const bool bIsChart = GetDocumentServiceName() == "com.sun.star.chart2.ChartDocument";
+        // tdf#108643 unless its a chart, cause those are weird (#i103460#)
+        if (!bIsChart && aOrigSize != getVisualAreaSize(nAspect))
             setVisualAreaSize(nAspect, aOrigSize);
 
         // the links should be switched back to loaded state for now to avoid locking problems