diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-26 14:35:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-06-26 17:15:40 +0200 |
| commit | 59d93d41537fa806219d705a6d06ed26bf09f2f3 (patch) | |
| tree | 34fa81b39b14e6a1eb650244c005fd7f728b5df8 /embeddedobj | |
| parent | 1ace4ed5c7152e7ac81f07e86d794e83b1cebc2c (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>
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 de4d61700f05..7ed1bdcc029e 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -165,7 +165,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 |