diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-26 14:35:24 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-06-27 14:12:07 +0200 |
| commit | 8c85d8bb24995a271ec47bfe45756216a095ac0d (patch) | |
| tree | a65716d7cf0408ef42c4d3226306b74a8c210943 /embeddedobj | |
| parent | ab2538cfb69f1c2c955ab3395fa1b8dc6a7fd36f (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 59d93d41537fa806219d705a6d06ed26bf09f2f3)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/commonembedding/visobj.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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 |