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
This commit is contained in:
Caolán McNamara 2016-08-15 21:13:01 +01:00
parent 7b768dd9a7
commit c5977a89c2

View File

@ -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 // this must be done after merging menus as we won't get the container menu otherwise
xContainerLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() ); 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 // prevent further changes at this LM
// TODO: moggi: why is this necessary? // TODO: moggi: why is this necessary?
// xContainerLM->setVisible( sal_False ); if (!bIsChart)
// xContainerLM->lock(); {
xContainerLM->setVisible( sal_False );
xContainerLM->lock();
}
bUnlock = true; bUnlock = true;
// by unlocking the LM each layout change will now resize the containers window; pending layouts will be processed now // by unlocking the LM each layout change will now resize the containers window; pending layouts will be processed now