diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-23 09:12:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-23 09:13:35 +0100 |
| commit | 4ec27ad35f00fbf5f5bc903cabe0692dc257f1e2 (patch) | |
| tree | 91313218a6db2f0829b3ba5b1c9786421784eb5a | |
| parent | 7aeefc0e7c0c8881c54b987dbac4ee9390a6c869 (diff) | |
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 757f461ef12548af0be470f7c05ff67df3dc1314.
(cherry picked from commit f2b3519c6b2aceacbe2fd9d53eb52dd36a356ecc)
| -rw-r--r-- | embeddedobj/source/commonembedding/visobj.cxx | 20 | ||||
| -rw-r--r-- | embeddedobj/source/inc/commonembobj.hxx | 1 |
2 files changed, 6 insertions, 15 deletions
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index cd16ffb61052..fea7c3a2cf0a 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -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 ); diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index bc89f9a8c853..410850e25099 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -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 > |