revert old test idea

8 files changed, 4 insertions, 543 deletions

diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 24ba681c26b1..974df61b1401 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_Library_add_exception_objects,chartview,\
     chart2/source/view/main/Clipping \
     chart2/source/view/main/DataPointSymbolSupplier \
     chart2/source/view/main/DrawModelWrapper \
-    chart2/source/view/main/DumpHelper \
     chart2/source/view/main/LabelPositionHelper \
     chart2/source/view/main/Linear3DTransformation \
     chart2/source/view/main/PlotterBase \
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 2c2e8276522c..bcc24564576d 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -598,9 +598,6 @@ void AreaChart::createShapes()
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
 
-    if(mbDump)
-        maDumpHelper.writeElement("AreaChart-Shapes");
-
     //the text labels should be always on top of the other series shapes
     //for area chart the error bars should be always on top of the other series shapes
 
@@ -1005,9 +1002,6 @@ void AreaChart::createShapes()
     }
     */
 
-    if(mbDump)
-        maDumpHelper.endElement();
-
     //remove and delete series-group-shape if empty
 
     //... todo
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 57d0d08ca026..4f7ee8043ed7 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -158,7 +158,6 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode
         , m_xColorScheme()
         , m_pExplicitCategoriesProvider(0)
         , m_bPointsWereSkipped(false)
-        , mbDump(ENABLE_DUMP)
 {
     OSL_POSTCOND(m_xChartTypeModel.is(),"no XChartType available in view, fallback to default values may be wrong");
 }
@@ -436,14 +435,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
 {
     uno::Reference< drawing::XShape > xTextShape;
 
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("DataLabel");
-        maDumpHelper.writeAttribute("Value", fValue);
-        maDumpHelper.writeAttribute("SumValue", fSumValue);
-        maDumpHelper.writePointElement(rScreenPosition2D);
-    }
-
     try
     {
         awt::Point aScreenPosition2D(rScreenPosition2D);
@@ -2197,19 +2188,10 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries(
         default:
             break;
     };
-
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("LegendSymbolForSeries");
-    }
-
     Reference< drawing::XShape > xShape( VLegendSymbolFactory::createSymbol( rEntryKeyAspectRatio,
         xTarget, eLegendSymbolStyle, xShapeFactory
             , rSeries.getPropertiesOfSeries(), ePropType, aExplicitSymbol ));
 
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -2262,19 +2244,9 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
         }
     }
 
-    if (mbDump)
-    {
-        maDumpHelper.writeElement("LegendSymbolForPoint");
-    }
-
     Reference< drawing::XShape > xShape( VLegendSymbolFactory::createSymbol( rEntryKeyAspectRatio,
         xTarget, eLegendSymbolStyle, xShapeFactory, xPointSet, ePropType, aExplicitSymbol ));
 
-    if (mbDump)
-    {
-        maDumpHelper.endElement();
-    }
-
     return xShape;
 }
 
@@ -2292,11 +2264,6 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
     if( ! ( xShapeFactory.is() && xTarget.is() && xContext.is() ) )
         return aResult;
 
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("LegendEntriesForSeries");
-    }
-
     try
     {
         ViewLegendEntry aEntry;
@@ -2413,10 +2380,6 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
     {
         ASSERT_EXCEPTION( ex );
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return aResult;
 }
 
diff --git a/chart2/source/view/inc/DumpHelper.hxx b/chart2/source/view/inc/DumpHelper.hxx
deleted file mode 100644
index a083d348e6c3..000000000000
--- a/chart2/source/view/inc/DumpHelper.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Markus Mohrhard <markus.mohrhard@googlemail.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#ifndef _CHART2_DUMPHELPER_HXX
-#define _CHART2_DUMPHELPER_HXX
-
-#include <com/sun/star/drawing/Direction3D.hpp>
-#include <com/sun/star/drawing/Position3D.hpp>
-#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/drawing/DoubleSequenceSequence.hpp>
-
-#define ENABLE_DUMP 0
-
-namespace chart
-{
-
-class DumpHelper
-{
-private:
-    //XmlTextWriterPtr pWriter;
-
-public:
-   //void writeStripe(const Stripe& rStripe);
-
-   void writeElement(const char*);
-   void writeAttribute(const char* pAttrName, const char* pAttrValue);
-   void writeAttribute(const char* pAttrName, const com::sun::star::drawing::Position3D& rPosition);
-   void writeAttribute(const char* pAttrName, const rtl::OUString& rName);
-   void writeAttribute(const char* pAttrName, const sal_Int32);
-   void writeAttribute(const char* pAttrName, const com::sun::star::drawing::Direction3D& rPosition);
-   void writeAttribute(const char* pAttrName, const com::sun::star::drawing::PointSequenceSequence& rPoints);
-   void writeAttribute(const char* pAttrName, const com::sun::star::drawing::PolyPolygonShape3D& rPoints);
-   void writeAttribute(const char* pAttrName, const com::sun::star::drawing::PolyPolygonBezierCoords& rCoords);
-   void writePointElement(const com::sun::star::awt::Point& rPoint);
-   void writeDoubleSequence(const char* pName, const com::sun::star::drawing::DoubleSequenceSequence& rSequence);
-   void endElement();
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 9bcaf9b681f3..176f76ac9cd0 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -28,7 +28,6 @@
 #ifndef _CHART2_VIEW_SHAPEFACTORY_HXX
 #define _CHART2_VIEW_SHAPEFACTORY_HXX
 
-#include "DumpHelper.hxx"
 #include "PropertyMapper.hxx"
 #include "VLineProperties.hxx"
 #include "BaseGFXHelper.hxx"
@@ -37,14 +36,12 @@
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
-
 //.............................................................................
 namespace chart
 {
@@ -54,11 +51,8 @@ class Stripe;
 class ShapeFactory
 {
 public:
-    ShapeFactory(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> xFactory):
-        m_xShapeFactory(xFactory),
-        mbDump(ENABLE_DUMP)
-    {
-    }
+    ShapeFactory(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> xFactory)
+        {m_xShapeFactory = xFactory;}
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
         createGroup2D(
@@ -253,9 +247,6 @@ private:
     //member:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>
         m_xShapeFactory;
-
-    bool mbDump;
-    DumpHelper maDumpHelper;
 };
 
 //.............................................................................
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index e82defa6d7d6..8ffa1c862452 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -28,7 +28,6 @@
 #ifndef _CHART2_VSERIESPLOTTER_HXX
 #define _CHART2_VSERIESPLOTTER_HXX
 
-#include "DumpHelper.hxx"
 #include "PlotterBase.hxx"
 #include "VDataSeries.hxx"
 #include "LabelAlignment.hxx"
@@ -444,9 +443,6 @@ protected: //member
     ::com::sun::star::uno::Sequence< sal_Int32 >    m_aCoordinateSystemResolution;
     bool m_bPointsWereSkipped;
 
-    DumpHelper maDumpHelper;
-    bool mbDump;
-
 private: //member
     typedef std::map< sal_Int32 , ExplicitScaleData > tSecondaryValueScales;
     tSecondaryValueScales   m_aSecondaryValueScales;
diff --git a/chart2/source/view/main/DumpHelper.cxx b/chart2/source/view/main/DumpHelper.cxx
deleted file mode 100644
index 2f1b1f8a92a7..000000000000
--- a/chart2/source/view/main/DumpHelper.cxx
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Markus Mohrhard <markus.mohrhard@googlemail.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "DumpHelper.hxx"
-
-#include <iostream>
-#include <rtl/oustringostreaminserter.hxx>
-
-using namespace com::sun::star;
-
-namespace chart
-{
-/*
-void DumpHelper::writeStripe(const Stripe& rStripe)
-{
-    std::cout << "Stripe" << std::endl;
-}*/
-
-void DumpHelper::writeElement(const char* pName)
-{
-    std::cout << pName << std::endl;
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const rtl::OUString& rName)
-{
-    std::cout << pAttrName << " " << rName << std::endl;
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const char* pAttrValue)
-{
-    std::cout << pAttrName << " " << pAttrValue << std::endl;
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const drawing::Position3D& rPos)
-{
-    std::cout << pAttrName << " " << rPos.PositionX << "," << rPos.PositionY << "," << rPos.PositionZ << std::endl;
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const drawing::Direction3D& rDirection)
-{
-    std::cout << pAttrName << " " << rDirection.DirectionX << "," << rDirection.DirectionY << "," << rDirection.DirectionZ << std::endl;
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const sal_Int32 nValue)
-{
-    std::cout << pAttrName << " " << nValue << std::endl;
-}
-
-void DumpHelper::writePointElement(const awt::Point& rPoint)
-{
-    std::cout << "Point" << " " << rPoint.X << "," << rPoint.Y << std::endl;
-}
-
-void DumpHelper::writeDoubleSequence(const char* pName, const drawing::DoubleSequenceSequence& rSequence)
-{
-    writeElement(pName);
-    writeElement("OuterSequence");
-    sal_Int32 nLength1 = rSequence.getLength();
-    for (sal_Int32 i = 0; i < nLength1; ++i)
-    {
-        writeElement("InnerSequence");
-        const uno::Sequence<double>& aInnerSequence = rSequence[i];
-        sal_Int32 nLength2 = aInnerSequence.getLength();
-        for( sal_Int32 j = 0; j < nLength2; ++j)
-        {
-            std::cout << "Value: " << aInnerSequence[j];
-        }
-        endElement();
-    }
-    endElement();
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const drawing::PointSequenceSequence& rSequence)
-{
-    std::cout << pAttrName << " " << std::endl;
-    sal_Int32 nLength1 = rSequence.getLength();
-    writeElement("OuterSequence");
-    for (sal_Int32 i = 0; i < nLength1; ++i)
-    {
-        writeElement("InnerSequence");
-        const uno::Sequence<awt::Point>& aInnerSequence = rSequence[i];
-        sal_Int32 nLength2 = aInnerSequence.getLength();
-        for( sal_Int32 j = 0; j < nLength2; ++j)
-        {
-            writePointElement(aInnerSequence[j]);
-        }
-        endElement();
-    }
-    endElement();
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const drawing::PolyPolygonShape3D& rShape)
-{
-    std::cout << pAttrName << " " << std::endl;
-    writeDoubleSequence("SequenceX", rShape.SequenceX);
-    writeDoubleSequence("SequenceY", rShape.SequenceY);
-    writeDoubleSequence("SequenceZ", rShape.SequenceZ);
-}
-
-void DumpHelper::writeAttribute(const char* pAttrName, const drawing::PolyPolygonBezierCoords& )
-{
-    std::cout << pAttrName << " " << std::endl;
-}
-
-void DumpHelper::endElement()
-{
-    std::cout << "EndElement" << std::endl;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index e62d16554bc5..47da6f6048aa 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <com/sun/star/drawing/PolygonKind.hpp>
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
 #include <com/sun/star/drawing/TextFitToSizeType.hpp>
@@ -59,8 +60,6 @@
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
 #include <algorithm>
-#include <iostream>
-#include <rtl/oustringostreaminserter.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
@@ -462,20 +461,8 @@ uno::Reference<drawing::XShape>
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("Cube");
-    }
-
     uno::Reference<drawing::XShape> xShape = impl_createCube( xTarget, rPosition, rSize, nRotateZAngleHundredthDegree, bRounded );
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-
-    if (mbDump)
-    {
-        maDumpHelper.endElement();
-    }
-
     if( xSourceProp.is())
         PropertyMapper::setMappedProperties( xProp, xSourceProp, rPropertyNameMap );
     return xShape;
@@ -517,9 +504,8 @@ uno::Reference<drawing::XShape>
                 , uno::makeAny( nPercentDiagonal ) );
 
             //Polygon
-            uno::Any aAny = createPolyPolygon_Cube( rSize, double(nPercentDiagonal)/200.0, bRounded);
             xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D )
-                , aAny );
+                , createPolyPolygon_Cube( rSize, double(nPercentDiagonal)/200.0,bRounded) );
 
             //Matrix for position
             {
@@ -533,16 +519,6 @@ uno::Reference<drawing::XShape>
                 xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX )
                     , uno::makeAny(aHM) );
             }
-
-            if(mbDump)
-            {
-                maDumpHelper.writeAttribute("depth",static_cast<sal_Int32>(fDepth));
-                maDumpHelper.writeAttribute("PercentDiagonal",nPercentDiagonal);
-                drawing::PolyPolygonShape3D aPP;
-                aAny >>= aPP;
-                maDumpHelper.writeAttribute("Polygon", aPP);
-                maDumpHelper.writeAttribute("Matrix","");
-            }
         }
         catch( const uno::Exception& e )
         {
@@ -713,23 +689,12 @@ uno::Reference<drawing::XShape>
     aStripe4.SetManualNormal( aNormalsStripe4.getNormal() );
 
     const bool bFlatNormals = false;
-
-    if (mbDump)
-    {
-        maDumpHelper.writeElement("Pyramid");
-    }
-
     ShapeFactory::createStripe( xGroup, aStripe1, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
     ShapeFactory::createStripe( xGroup, aStripe2, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
     ShapeFactory::createStripe( xGroup, aStripe3, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
     ShapeFactory::createStripe( xGroup, aStripe4, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
     ShapeFactory::createStripe( xGroup, aStripeBottom, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
 
-    if (mbDump)
-    {
-        maDumpHelper.endElement();
-    }
-
     return Reference< drawing::XShape >( xGroup, uno::UNO_QUERY );
 }
 
@@ -752,14 +717,6 @@ uno::Reference<drawing::XShape>
     if( !xTarget.is() )
         return 0;
 
-    if(mbDump)
-    {
-        if (bCylinder)
-            maDumpHelper.writeElement("Cylinder");
-        else
-            maDumpHelper.writeElement("Cone");
-    }
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
             m_xShapeFactory->createInstance( C2U(
@@ -812,28 +769,12 @@ uno::Reference<drawing::XShape>
             //Reduced lines
             xProp->setPropertyValue( C2U( UNO_NAME_3D_REDUCED_LINE_GEOMETRY )
                 , uno::makeAny((sal_Bool)sal_True) );
-
-            if(mbDump)
-            {
-                maDumpHelper.writeAttribute("PercentDiagonal", nPercentDiagonal);
-                drawing::PolyPolygonShape3D aPP;
-                aPPolygon >>= aPP;
-                maDumpHelper.writeAttribute("Polygon", aPP);
-                maDumpHelper.writeAttribute("Matrix","");
-                maDumpHelper.writeAttribute("SegmentsHor",CHART_3DOBJECT_SEGMENTCOUNT);
-                maDumpHelper.writeAttribute("SegmentsVert", static_cast<sal_Int32>(nVerticalSegmentCount));
-                maDumpHelper.writeAttribute("ReducedLine","true");
-            }
         }
         catch( const uno::Exception& e )
         {
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if (mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -1032,11 +973,6 @@ uno::Reference< drawing::XShape >
                 C2U("com.sun.star.drawing.ClosedBezierShape") ), uno::UNO_QUERY );
     xTarget->add(xShape); //need to add the shape before setting of properties
 
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("PieSegement2D");
-    }
-
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
     OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
@@ -1055,11 +991,6 @@ uno::Reference< drawing::XShape >
                 , aTransformationFromUnitCircle, fAngleSubdivisionRadian );
 
             xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) );
-
-            if(mbDump)
-            {
-                maDumpHelper.writeAttribute("PolyPolygonBezier", aCoords);
-            }
         }
         catch( const uno::Exception& e )
         {
@@ -1067,11 +998,6 @@ uno::Reference< drawing::XShape >
         }
     }
 
-    if( mbDump )
-    {
-        maDumpHelper.endElement();
-    }
-
     return xShape;
 }
 
@@ -1094,10 +1020,6 @@ uno::Reference< drawing::XShape >
     while(fUnitCircleWidthAngleDegree<0)
         fUnitCircleWidthAngleDegree += 360.0;
 
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("PieSegment");
-    }
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -1153,27 +1075,12 @@ uno::Reference< drawing::XShape >
                 , uno::makeAny( drawing::TextureProjectionMode_PARALLEL ) );
             xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_Y )
                 , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
-
-            if (mbDump)
-            {
-                maDumpHelper.writeAttribute("depth",static_cast<sal_Int32>(fDepth));
-                maDumpHelper.writeAttribute("PercentDiagonal",nPercentDiagonal);
-                maDumpHelper.writeAttribute("Polygon", aPoly);
-                maDumpHelper.writeAttribute("DoubleSided", "true");
-                maDumpHelper.writeAttribute("ReducedLines", "true");
-                maDumpHelper.writeAttribute("TextureProjectionModeY", drawing::TextureProjectionMode_PARALLEL);
-                maDumpHelper.writeAttribute("TextureProjectionModeX", drawing::TextureProjectionMode_OBJECTSPECIFIC);
-            }
         }
         catch( const uno::Exception& e )
         {
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -1193,9 +1100,6 @@ uno::Reference< drawing::XShape >
     if( !xTarget.is() )
         return 0;
 
-    if (mbDump)
-        maDumpHelper.writeElement("Stripe");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
             m_xShapeFactory->createInstance( C2U(
@@ -1233,22 +1137,6 @@ uno::Reference< drawing::XShape >
             xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED )
                 , uno::makeAny(bDoubleSided) );
 
-            if(mbDump)
-            {
-                drawing::PolyPolygonShape3D aPP3;
-                rStripe.getPolyPolygonShape3D() >>= aPP3;
-                maDumpHelper.writeAttribute("Polygon", aPP3);
-                drawing::PolyPolygonShape3D aPP;
-                rStripe.getTexturePolygon(nRotatedTexture) >>= aPP;
-                maDumpHelper.writeAttribute("TexturePolygon", aPP);
-                drawing::PolyPolygonShape3D aPP2;
-                rStripe.getNormalsPolygon() >>= aPP2;
-                maDumpHelper.writeAttribute("NormalsPolygon", aPP2);
-                maDumpHelper.writeAttribute("NormalsKind", drawing::NormalsKind_FLAT);
-                maDumpHelper.writeAttribute("LineOnly", "false");
-                maDumpHelper.writeAttribute("DoubleSided", bDoubleSided);
-            }
-
             if( xSourceProp.is())
                 PropertyMapper::setMappedProperties( xProp, xSourceProp, rPropertyNameMap );
         }
@@ -1257,10 +1145,6 @@ uno::Reference< drawing::XShape >
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -1275,9 +1159,6 @@ uno::Reference< drawing::XShape >
     if( !rPolyPolygon.SequenceX.getLength())
         return 0;
 
-    if(mbDump)
-        maDumpHelper.writeElement("Area3D");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -1322,25 +1203,12 @@ uno::Reference< drawing::XShape >
                 xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX )
                     , uno::makeAny(aHM) );
             }
-
-            if (mbDump)
-            {
-                maDumpHelper.writeAttribute("depth", static_cast<sal_Int32>(fDepth));
-                maDumpHelper.writeAttribute("PercentDiagonal", nPercentDiagonal);
-                maDumpHelper.writeAttribute("Polygon", rPolyPolygon);
-                maDumpHelper.writeAttribute("DoubleSided", "true");
-                maDumpHelper.writeAttribute("Matrix","");
-            }
         }
         catch( const uno::Exception& e )
         {
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -1924,9 +1792,6 @@ uno::Reference< drawing::XShape >
     if( !xTarget.is() )
         return 0;
 
-    if(mbDump)
-        maDumpHelper.writeElement("Symbol2D");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -1954,23 +1819,12 @@ uno::Reference< drawing::XShape >
             //FillColor
             xProp->setPropertyValue( C2U( UNO_NAME_FILLCOLOR )
                 , uno::makeAny( nFillColor ) );
-
-            if(mbDump)
-            {
-                maDumpHelper.writeAttribute("Polygon", aPoints);
-                maDumpHelper.writeAttribute("LineColor", nBorderColor);
-                maDumpHelper.writeAttribute("FillColor", nFillColor);
-            }
         }
         catch( const uno::Exception& e )
         {
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -1987,9 +1841,6 @@ uno::Reference< drawing::XShape >
     // @todo: change this to a rectangle shape with a fill bitmap for
     // performance reasons (ask AW, said CL)
 
-    if(mbDump)
-        maDumpHelper.writeElement("Graphic2D");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -2005,12 +1856,6 @@ uno::Reference< drawing::XShape >
             rPosition.PositionZ );
         xShape->setPosition( Position3DToAWTPoint( aCenterPosition ));
         xShape->setSize( Direction3DToAWTSize( rSize ));
-
-        if(mbDump)
-        {
-            maDumpHelper.writeAttribute("Position", aCenterPosition);
-            maDumpHelper.writeAttribute("Size", rSize);
-        }
     }
     catch( const uno::Exception & e )
     {
@@ -2029,10 +1874,6 @@ uno::Reference< drawing::XShape >
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -2044,13 +1885,6 @@ uno::Reference< drawing::XShapes >
         return 0;
     try
     {
-        if(mbDump)
-        {
-            maDumpHelper.writeElement("Group2D");
-            if(!aName.isEmpty())
-                maDumpHelper.writeAttribute("Name", aName);
-        }
-
         //create and add to target
         uno::Reference< drawing::XShape > xShape(
                     m_xShapeFactory->createInstance( C2U(
@@ -2067,9 +1901,6 @@ uno::Reference< drawing::XShapes >
         }
 
         //return
-        if (mbDump)
-            maDumpHelper.endElement();
-
         uno::Reference< drawing::XShapes > xShapes =
             uno::Reference<drawing::XShapes>( xShape, uno::UNO_QUERY );
         return xShapes;
@@ -2078,10 +1909,6 @@ uno::Reference< drawing::XShapes >
     {
         ASSERT_EXCEPTION( e );
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return 0;
 }
 
@@ -2093,13 +1920,6 @@ uno::Reference< drawing::XShapes >
         return 0;
     try
     {
-        if(mbDump)
-        {
-            maDumpHelper.writeElement("Group3D");
-            if(!aName.isEmpty())
-                maDumpHelper.writeAttribute("Name", aName);
-        }
-
         //create shape
         uno::Reference< drawing::XShape > xShape(
                 m_xShapeFactory->createInstance( C2U(
@@ -2121,9 +1941,6 @@ uno::Reference< drawing::XShapes >
                     ::basegfx::B3DHomMatrix aM;
                     xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX )
                         , uno::makeAny(B3DHomMatrixToHomogenMatrix(aM)) );
-
-                    if(mbDump)
-                        maDumpHelper.writeAttribute("Matrix", "");
                 }
                 catch( const uno::Exception& e )
                 {
@@ -2139,20 +1956,12 @@ uno::Reference< drawing::XShapes >
         //return
         uno::Reference< drawing::XShapes > xShapes =
                 uno::Reference<drawing::XShapes>( xShape, uno::UNO_QUERY );
-
-        if(mbDump)
-            maDumpHelper.endElement();
-
         return xShapes;
     }
     catch( const uno::Exception& e )
     {
         ASSERT_EXCEPTION( e );
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return 0;
 }
 
@@ -2164,9 +1973,6 @@ uno::Reference< drawing::XShape >
     if( !xTarget.is() )
         return 0;
 
-    if(mbDump)
-        maDumpHelper.writeElement("Circle2D");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -2181,12 +1987,6 @@ uno::Reference< drawing::XShape >
             rPosition.PositionZ );
         xShape->setPosition( Position3DToAWTPoint( aCenterPosition ));
         xShape->setSize( Direction3DToAWTSize( rSize ));
-
-        if(mbDump)
-        {
-            maDumpHelper.writeAttribute("Position", aCenterPosition);
-            maDumpHelper.writeAttribute("Size", rSize);
-        }
     }
     catch( const uno::Exception & e )
     {
@@ -2203,19 +2003,12 @@ uno::Reference< drawing::XShape >
             drawing::CircleKind eKind = drawing::CircleKind_FULL;
             xProp->setPropertyValue( C2U( UNO_NAME_CIRCKIND )
                 , uno::makeAny( eKind ) );
-
-            if(mbDump)
-                maDumpHelper.writeAttribute("CircleKind", eKind);
         }
         catch( const uno::Exception& e )
         {
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -2230,9 +2023,6 @@ uno::Reference< drawing::XShape >
     if(!rPoints.SequenceX.getLength())
         return NULL;
 
-    if(mbDump)
-        maDumpHelper.writeElement("Line3D");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -2274,37 +2064,12 @@ uno::Reference< drawing::XShape >
                 xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR )
                     , rLineProperties.Color );
                     //, uno::makeAny( sal_Int32( Color(COL_RED).GetColor()) ) );
-
-            if(mbDump)
-            {
-                sal_Int16 nTransparence = 0;
-                rLineProperties.Transparence >>= nTransparence;
-                maDumpHelper.writeAttribute("Transparency", nTransparence);
-                drawing::LineStyle aLineStyle;
-                rLineProperties.LineStyle >>= aLineStyle;
-                maDumpHelper.writeAttribute("LineStyle", aLineStyle);
-                sal_Int32 nWidth = 0;
-                rLineProperties.Width >>= nWidth;
-                maDumpHelper.writeAttribute("LineWidth", nWidth);
-                sal_Int32 nColor = 0;
-                rLineProperties.Color >>= nColor;
-                maDumpHelper.writeAttribute("LineColor", nColor);
-                rtl::OUString aDashName;
-                rLineProperties.DashName >>= aDashName;
-                maDumpHelper.writeAttribute("LineDashName", aDashName);
-                maDumpHelper.writeAttribute("Polygon", rPoints);
-                maDumpHelper.writeAttribute("LineOnly", "true");
-            }
         }
         catch( const uno::Exception& e )
         {
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -2319,9 +2084,6 @@ uno::Reference< drawing::XShape >
     if(!rPoints.getLength())
         return NULL;
 
-    if(mbDump)
-        maDumpHelper.writeElement("Line2D");
-
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
@@ -2339,9 +2101,6 @@ uno::Reference< drawing::XShape >
             xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON )
                 , uno::makeAny( rPoints ) );
 
-            if(mbDump)
-                maDumpHelper.writeAttribute("Polygon", rPoints);
-
             if(pLineProperties)
             {
                 //Transparency
@@ -2368,25 +2127,6 @@ uno::Reference< drawing::XShape >
                 if(pLineProperties->DashName.hasValue())
                     xProp->setPropertyValue( C2U( "LineDashName" )
                         , pLineProperties->DashName );
-
-                if(mbDump)
-                {
-                    sal_Int16 nTransparence = 0;
-                    pLineProperties->Transparence >>= nTransparence;
-                    maDumpHelper.writeAttribute("Transparency", nTransparence);
-                    drawing::LineStyle aLineStyle;
-                    pLineProperties->LineStyle >>= aLineStyle;
-                    maDumpHelper.writeAttribute("LineStyle", aLineStyle);
-                    sal_Int32 nWidth = 0;
-                    pLineProperties->Width >>= nWidth;
-                    maDumpHelper.writeAttribute("LineWidth", nWidth);
-                    sal_Int32 nColor = 0;
-                    pLineProperties->Color >>= nColor;
-                    maDumpHelper.writeAttribute("LineColor", nColor);
-                    rtl::OUString aDashName;
-                    pLineProperties->DashName >>= aDashName;
-                    maDumpHelper.writeAttribute("LineDashName", aDashName);
-                }
             }
         }
         catch( const uno::Exception& e )
@@ -2394,10 +2134,6 @@ uno::Reference< drawing::XShape >
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }
 
@@ -2470,12 +2206,6 @@ uno::Reference< drawing::XShape >
     if(rText.isEmpty())
         return 0;
 
-    if(mbDump)
-    {
-        maDumpHelper.writeElement("Text");
-        maDumpHelper.writeAttribute("TextValue", rText);
-    }
-
     //create shape and add to page
     uno::Reference< drawing::XShape > xShape(
             m_xShapeFactory->createInstance( C2U(
@@ -2504,10 +2234,6 @@ uno::Reference< drawing::XShape >
             ASSERT_EXCEPTION( e );
         }
     }
-
-    if(mbDump)
-        maDumpHelper.endElement();
-
     return xShape;
 }