Kaydet (Commit) 4ec27ad3 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#91683 Revert avoid activating chart objects...

just to get their mapunit or set visual size.

Will have to try something different here apparently

This reverts commit 757f461e.

(cherry picked from commit f2b3519c)
üst 7aeefc0e
......@@ -54,14 +54,10 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
bool bBackToLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED )
{
//attempt an optimization for chart components
if (!IsChartComponent())
{
changeState( embed::EmbedStates::RUNNING );
changeState( embed::EmbedStates::RUNNING );
// the links should be switched back to loaded state for now to avoid locking problems
bBackToLoaded = m_bIsLink;
}
// the links should be switched back to loaded state for now to avoid locking problems
bBackToLoaded = m_bIsLink;
}
bool bSuccess = m_pDocHolder->SetExtent( nAspect, aSize );
......@@ -137,14 +133,10 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect )
bool bBackToLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED )
{
//attempt an optimization for chart components
if (!IsChartComponent())
{
changeState( embed::EmbedStates::RUNNING );
changeState( embed::EmbedStates::RUNNING );
// the links should be switched back to loaded state for now to avoid locking problems
bBackToLoaded = m_bIsLink;
}
// the links should be switched back to loaded state for now to avoid locking problems
bBackToLoaded = m_bIsLink;
}
sal_Int32 nResult = m_pDocHolder->GetMapUnit( nAspect );
......
......@@ -171,7 +171,6 @@ private:
const OUString& aNewName );
OUString GetDocumentServiceName() const { return m_aDocServiceName; }
bool IsChartComponent() const { return m_aDocServiceName == "com.sun.star.chart2.ChartDocument"; }
OUString GetPresetFilterName() const { return m_aPresetFilterName; }
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment