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>

4 files changed, 2 insertions, 57 deletions

diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index e0d52153e525..43d022db4073 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -250,14 +250,6 @@ void ViewObjectContact::triggerLazyInvalidate()
         // reset flag
         mbLazyInvalidate = false;
 
-#if HAVE_FEATURE_DESKTOP
-        // 3D charts need to be notified separately, they are not to be
-        // drawn by the drawinglayer
-        ViewContactOfSdrOle2Obj* pViewContact = dynamic_cast<ViewContactOfSdrOle2Obj*>(&GetViewContact());
-        if (pViewContact && pViewContact->GetOle2Obj().IsReal3DChart())
-            ChartHelper::updateChart(pViewContact->GetOle2Obj().getXModel(), false);
-#endif
-
         // force ObjectRange
         getObjectRange();
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 3c9a1a25ce8d..a2ca6ffe7b05 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -88,8 +88,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrOle2Obj::c
                 }
 
                 SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
-                if(pPageView && ((nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) ||
-                    xObjRef.IsGLChart()))
+                if(pPageView && (nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE))
                 {
                     // connect plugin object
                     pPageView->GetView().DoConnect(const_cast< SdrOle2Obj* >(&rSdrOle2));
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index 4e1d0a698318..a9c18eb4f2ae 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -36,37 +36,6 @@
 
 using namespace ::com::sun::star;
 
-bool ChartHelper::isGL3DDiagram( const css::uno::Reference<css::chart2::XDiagram>& xDiagram )
-{
-    uno::Reference<chart2::XCoordinateSystemContainer> xCooSysContainer(xDiagram, uno::UNO_QUERY);
-
-    if (!xCooSysContainer.is())
-        return false;
-
-    uno::Sequence< uno::Reference<chart2::XCoordinateSystem> > aCooSysList = xCooSysContainer->getCoordinateSystems();
-    for (sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS)
-    {
-        uno::Reference<chart2::XCoordinateSystem> xCooSys = aCooSysList[nCS];
-
-        //iterate through all chart types in the current coordinate system
-        uno::Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCooSys, uno::UNO_QUERY);
-        OSL_ASSERT( xChartTypeContainer.is());
-        if( !xChartTypeContainer.is() )
-            continue;
-
-        uno::Sequence< uno::Reference<chart2::XChartType> > aChartTypeList = xChartTypeContainer->getChartTypes();
-        for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT )
-        {
-            uno::Reference<chart2::XChartType> xChartType = aChartTypeList[nT];
-            OUString aChartType = xChartType->getChartType();
-            if( aChartType == "com.sun.star.chart2.GL3DBarChartType" )
-                return true;
-        }
-    }
-
-    return false;
-}
-
 void ChartHelper::updateChart( const uno::Reference< ::frame::XModel >& rXModel, bool bHardUpdate )
 {
     if (!rXModel.is())
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index b01af63da0ca..c259f1b4bb1e 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -380,8 +380,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
                 uno::Reference< embed::XEmbeddedObject > xObject = pObj->GetObjRef();
                 try
                 {
-                    if ( (xObject->getStatus( pObj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) ||
-                         svt::EmbeddedObjectRef::IsGLChart(xObject) )
+                    if ( xObject->getStatus( pObj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
                         xObject->changeState( embed::EmbedStates::INPLACE_ACTIVE );
                     else
                     {
@@ -1851,20 +1850,6 @@ bool SdrOle2Obj::IsChart() const
     return mpImpl->mbIsChart;
 }
 
-bool SdrOle2Obj::IsReal3DChart() const
-{
-    if (!IsChart())
-        return false;
-
-    uno::Reference<chart2::XChartDocument> xChart2Document(getXModel(), uno::UNO_QUERY);
-    uno::Reference<chart2::XDiagram> xChart2Diagram(xChart2Document->getFirstDiagram(), uno::UNO_QUERY);
-
-    if (!xChart2Diagram.is())
-        return false;
-
-    return ChartHelper::isGL3DDiagram(xChart2Diagram);
-}
-
 void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic )
 {
     mpImpl->mxObjRef.SetGraphic( aGraphic, OUString() );