diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-07-16 22:58:53 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-07-17 02:59:19 +0200 |
| commit | 026e2623f7f498432e6dc970fb06145dfc77dc45 (patch) | |
| tree | 22229b7aab2fff3c4f4f12f856e55494dc7fb565 /sfx2/source/view | |
| parent | 13660d4b311501d80b3e1a9541fb7db80cc42f87 (diff) | |
remove the GL based 3D charts
Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9
Reviewed-on: https://gerrit.libreoffice.org/57533
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 047a4b1acbd0..a02377b05428 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -1045,8 +1045,7 @@ void SfxInPlaceClient::DeactivateObject() m_pViewSh->GetViewFrame()->GetFrame().LockResize_Impl(true); - if ( (m_xImp->m_xObject->getStatus( m_xImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) || - svt::EmbeddedObjectRef::IsGLChart(m_xImp->m_xObject) ) + if ( m_xImp->m_xObject->getStatus( m_xImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) { m_xImp->m_xObject->changeState( embed::EmbedStates::INPLACE_ACTIVE ); if (bHasFocus) @@ -1079,8 +1078,7 @@ void SfxInPlaceClient::ResetObject() try { m_xImp->m_bUIActive = false; - if ( (m_xImp->m_xObject->getStatus( m_xImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) || - svt::EmbeddedObjectRef::IsGLChart(m_xImp->m_xObject) ) + if ( m_xImp->m_xObject->getStatus( m_xImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) m_xImp->m_xObject->changeState( embed::EmbedStates::INPLACE_ACTIVE ); else { diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index d5ec553855d8..fe494ae1c522 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1649,8 +1649,7 @@ void SfxViewShell::CheckIPClient_Impl( bool bAlwaysActive = ( ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY ) != 0 ); bool bActiveWhenVisible = - ( (( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0 ) || - svt::EmbeddedObjectRef::IsGLChart(pIPClient->GetObject())); + ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0; // this method is called when a client is created if (!pIPClient->IsObjectInPlaceActive()) |