diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-15 21:13:01 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-08 14:00:06 +0000 |
| commit | 3c51f207747150933c6725fa22af1682cf066d8c (patch) | |
| tree | 7f5e12712f853b73f51de1f09a73e511b920aabc | |
| parent | 99d2232e4fb701273d26457817a590f39bbace96 (diff) | |
Resolves: tdf#96451 do magic to enable embedded chart sidebar only for chart
objects, and do the normal thing for other objects, e.g. math
Change-Id: Ifb786a841b843b0317713769cb214a44dceaf546
(cherry picked from commit c5977a89c28b285dfface71ca71e07bb0463ed19)
Reviewed-on: https://gerrit.libreoffice.org/28153
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index e89695e25f5a..c9e931e6866f 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -709,10 +709,17 @@ bool DocumentHolder::ShowUI( const uno::Reference< css::frame::XLayoutManager >& // this must be done after merging menus as we won't get the container menu otherwise xContainerLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() ); + bool bIsChart = false; + uno::Reference< lang::XServiceInfo> xServiceInfo(m_xComponent, uno::UNO_QUERY); + if (xServiceInfo.is() && xServiceInfo->supportsService("com.sun.star.chart2.ChartDocument")) + bIsChart = true; // prevent further changes at this LM // TODO: moggi: why is this necessary? - // xContainerLM->setVisible( sal_False ); - // xContainerLM->lock(); + if (!bIsChart) + { + xContainerLM->setVisible( false ); + xContainerLM->lock(); + } bUnlock = true; // by unlocking the LM each layout change will now resize the containers window; pending layouts will be processed now |