Undoing pptx filter as a separate lib ( + related changes)

Shared ppt + pptx filter will be merged from cws later

32 files changed, 351 insertions, 2802 deletions

diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 94c92388b8d7..33b823f676ae 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -71,12 +71,9 @@ ChartSpaceConverter::~ChartSpaceConverter()
 
 void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExternalPage, const Point& rChartPos )
 {
-    if( !getChartConverter() )
-        return;
-
     /*  create data provider (virtual function in the ChartConverter class,
         derived converters may create an external data provider) */
-    getChartConverter()->createDataProvider( getChartDocument() );
+    getChartConverter().createDataProvider( getChartDocument() );
 
     // attach number formatter of container document to data receiver
     try
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 7fce093822fe..52bd978cd3b8 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -262,9 +262,9 @@ XmlFilterBase& ConverterRoot::getFilter() const
     return mxData->mrFilter;
 }
 
-ChartConverter* ConverterRoot::getChartConverter() const
+ChartConverter& ConverterRoot::getChartConverter() const
 {
-    return &mxData->mrConverter;
+    return mxData->mrConverter;
 }
 
 Reference< XChartDocument > ConverterRoot::getChartDocument() const
diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx
index 1671c6caceb2..4c76b27b982e 100644
--- a/oox/source/drawingml/chart/datasourceconverter.cxx
+++ b/oox/source/drawingml/chart/datasourceconverter.cxx
@@ -54,15 +54,12 @@ DataSequenceConverter::~DataSequenceConverter()
 Reference< XDataSequence > DataSequenceConverter::createDataSequence( const OUString& rRole )
 {
     // create data sequence from data source model (virtual call at chart converter)
-    Reference< XDataSequence > xDataSeq;
-    if( getChartConverter() )
-    {
-        xDataSeq = getChartConverter()->createDataSequence( getChartDocument()->getDataProvider(), mrModel );
+    Reference< XDataSequence > xDataSeq = getChartConverter().createDataSequence( getChartDocument()->getDataProvider(), mrModel );
+
+    // set sequence role
+    PropertySet aSeqProp( xDataSeq );
+    aSeqProp.setProperty( PROP_Role, rRole );
 
-        // set sequen   ce role
-        PropertySet aSeqProp( xDataSeq );
-        aSeqProp.setProperty( PROP_Role, rRole );
-    }
     return xDataSeq;
 }
 
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index 4aea4fe6e2ba..b7e558266372 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <osl/diagnose.h>
 #include "oox/drawingml/clrscheme.hxx"
 #include "tokens.hxx"
 
@@ -63,7 +62,6 @@ ClrScheme::~ClrScheme()
 
 sal_Bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const
 {
-    OSL_ASSERT((nSchemeClrToken & sal_Int32(0xFFFF0000))==0);
     switch( nSchemeClrToken )
     {
         case XML_bg1 : nSchemeClrToken = XML_lt1; break;
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 566b83daa467..70f4d54e99ca 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -382,7 +382,6 @@ sal_Int32 Color::getColor( const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr
     {
         for( TransformVec::const_iterator aIt = maTransforms.begin(), aEnd = maTransforms.end(); aIt != aEnd; ++aIt )
         {
-        OSL_ASSERT((aIt->mnToken & sal_Int32(0xFFFF0000))==0);
             switch( aIt->mnToken )
             {
                 case XML_red:       toCrgb(); lclSetValue( mnC1, aIt->mnValue );    break;
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index dacb7f17b298..d1e86de16e9b 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -1172,9 +1172,8 @@ Path2DListContext::Path2DListContext( ContextHandler& rParent, CustomShapeProper
 
 // ---------------------------------------------------------------------
 
-OUString GetShapePresetType( sal_Int32 nType )
+OUString GetShapeType( sal_Int32 nType )
 {
-    OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0);
     OUString sType;
      switch( nType )
     {
@@ -1802,7 +1801,6 @@ OUString GetShapePresetType( sal_Int32 nType )
 
 static OUString GetTextShapeType( sal_Int32 nType )
 {
-    OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0);
     OUString sType;
     switch( nType )
     {
@@ -2033,7 +2031,7 @@ PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler& rParent,
     OUString sShapeType;
     sal_Int32 nShapeType = xAttribs->getOptionalValueToken( XML_prst, FastToken::DONTKNOW );
     if ( nShapeType != FastToken::DONTKNOW )
-        sShapeType = GetShapePresetType( nShapeType );
+        sShapeType = GetShapeType( nShapeType );
     OSL_ENSURE( sShapeType.getLength(), "oox::drawingml::CustomShapeCustomGeometryContext::CustomShapeCustomGeometryContext(), unknown shape type" );
     mrCustomShapeProperties.setShapePresetType( sShapeType );
 }
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx
deleted file mode 100644
index 53519772a00e..000000000000
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile$
- * $Revision$
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "constraintlistcontext.hxx"
-#include "oox/helper/attributelist.hxx"
-#include "oox/core/namespaces.hxx"
-
-using namespace ::oox::core;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
-
-namespace oox { namespace drawingml {
-
-// CT_ConstraintLists
-ConstraintListContext::ConstraintListContext( ContextHandler& rParent,
-                                              const Reference< XFastAttributeList >&,
-                                              const LayoutAtomPtr &pNode )
-    : ContextHandler( rParent )
-    , mpNode( pNode )
-{
-    OSL_ENSURE( pNode, "Node must NOT be NULL" );
-}
-
-
-ConstraintListContext::~ConstraintListContext()
-{
-}
-
-void SAL_CALL ConstraintListContext::endFastElement( ::sal_Int32 )
-    throw (SAXException, RuntimeException)
-{
-}
-
-Reference< XFastContextHandler > SAL_CALL
-ConstraintListContext::createFastChildContext( ::sal_Int32 aElement,
-                                               const Reference< XFastAttributeList >& xAttribs )
-    throw (SAXException, RuntimeException)
-{
-    Reference< XFastContextHandler > xRet;
-
-    OUString aEmptyStr;
-
-    switch( aElement )
-    {
-    case NMSP_DIAGRAM|XML_constr:
-    {
-        ConstraintAtomPtr pNode( new ConstraintAtom() );
-        mpNode->addChild( pNode );
-
-        AttributeList aAttribs( xAttribs );
-        pNode->setFor( aAttribs.getToken( XML_for, XML_none ) );
-        pNode->setForName( aAttribs.getString( XML_forName, aEmptyStr ) );
-        pNode->setPointType( aAttribs.getToken( XML_ptType, XML_none ) );
-        pNode->setType( aAttribs.getToken( XML_type, XML_none ) );
-        pNode->setRefFor( aAttribs.getToken( XML_refFor, XML_none ) );
-        pNode->setRefForName( aAttribs.getString( XML_refForName, aEmptyStr ) );
-        pNode->setRefType( aAttribs.getToken( XML_refType, XML_none ) );
-        pNode->setRefPointType( aAttribs.getToken( XML_refPtType, XML_none ) );
-        pNode->setFactor( aAttribs.getDouble( XML_fact, 1.0 ) );
-        pNode->setValue( aAttribs.getDouble( XML_val, 0.0 ) );
-        pNode->setOperator( aAttribs.getToken( XML_op, XML_none ) );
-        break;
-    }
-    default:
-        break;
-    }
-    if( !xRet.is() )
-        xRet.set(this);
-
-    return xRet;
-}
-
-
-} }
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx
deleted file mode 100644
index ecbb04cf7bb5..000000000000
--- a/oox/source/drawingml/diagram/constraintlistcontext.hxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile$
- * $Revision$
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_DRAWINGML_CONSTRAINTLISTCONTEXT_HXX
-#define OOX_DRAWINGML_CONSTRAINTLISTCONTEXT_HXX
-
-#include "oox/core/contexthandler.hxx"
-#include "diagramlayoutatoms.hxx"
-#include "diagram.hxx"
-
-namespace oox { namespace drawingml {
-
-class ConstraintListContext : public ::oox::core::ContextHandler
-{
-public:
-    ConstraintListContext( ContextHandler& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, const LayoutAtomPtr &pNode );
-    virtual ~ConstraintListContext();
-
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-private:
-    LayoutAtomPtr mpNode;
-};
-
-} }
-
-#endif
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index 26da02281c8a..d7c88b69af89 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "datamodelcontext.hxx"
+#include "oox/drawingml/diagram/datamodelcontext.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/core/namespaces.hxx"
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
@@ -42,46 +42,40 @@ namespace oox { namespace drawingml {
 
 
 
-// CT_CxnList
-class CxnListContext
+// CL_Cxn
+class CxnContext
     : public ContextHandler
 {
 public:
-    CxnListContext( ContextHandler& rParent,
-                    dgm::Connections & aConnections )
+    CxnContext( ContextHandler& rParent,
+                const Reference< XFastAttributeList >& xAttribs,
+                const dgm::ConnectionPtr & pConnection )
         : ContextHandler( rParent )
-        , mrConnections( aConnections )
+        , mpConnection( pConnection )
         {
+            sal_Int32 nType = xAttribs->getOptionalValueToken( XML_type, XML_parOf );
+            pConnection->mnType = nType;
+            pConnection->msModelId = xAttribs->getOptionalValue( XML_modelId );
+            pConnection->msSourceId = xAttribs->getOptionalValue( XML_srcId );
+            pConnection->msDestId  = xAttribs->getOptionalValue( XML_destId );
+            pConnection->msPresId  = xAttribs->getOptionalValue( XML_presId );
+            pConnection->msSibTransId  = xAttribs->getOptionalValue( XML_sibTransId );
+            AttributeList attribs( xAttribs );
+            pConnection->mnSourceOrder = attribs.getInteger( XML_srcOrd, 0 );
+            pConnection->mnDestOrder = attribs.getInteger( XML_destOrd, 0 );
         }
+
     virtual Reference< XFastContextHandler > SAL_CALL
     createFastChildContext( sal_Int32 aElementToken,
-                            const Reference< XFastAttributeList >& xAttribs )
+                            const Reference< XFastAttributeList >& /*xAttribs*/ )
         throw (SAXException, RuntimeException)
         {
             Reference< XFastContextHandler > xRet;
 
             switch( aElementToken )
             {
-            case NMSP_DIAGRAM|XML_cxn:
-            {
-                mrConnections.push_back( dgm::Connection() );
-                dgm::Connection& rConnection=mrConnections.back();
-
-                const sal_Int32 nType = xAttribs->getOptionalValueToken( XML_type, XML_parOf );
-                rConnection.mnType = nType;
-                rConnection.msModelId = xAttribs->getOptionalValue( XML_modelId );
-                rConnection.msSourceId = xAttribs->getOptionalValue( XML_srcId );
-                rConnection.msDestId  = xAttribs->getOptionalValue( XML_destId );
-                rConnection.msPresId  = xAttribs->getOptionalValue( XML_presId );
-                rConnection.msSibTransId  = xAttribs->getOptionalValue( XML_sibTransId );
-                rConnection.msParTransId  = xAttribs->getOptionalValue( XML_parTransId );
-                const AttributeList attribs( xAttribs );
-                rConnection.mnSourceOrder = attribs.getInteger( XML_srcOrd, 0 );
-                rConnection.mnDestOrder = attribs.getInteger( XML_destOrd, 0 );
-
-                // skip CT_extLst
+            case NMSP_DIAGRAM|XML_extLst:
                 return xRet;
-            }
             default:
                 break;
             }
@@ -89,136 +83,37 @@ public:
                 xRet.set( this );
             return xRet;
         }
-
 private:
-    dgm::Connections& mrConnections;
+    dgm::ConnectionPtr mpConnection;
 };
 
 
-// CT_presLayoutVars
-class PresLayoutVarsContext
+// CT_CxnList
+class CxnListContext
     : public ContextHandler
 {
 public:
-    PresLayoutVarsContext( ContextHandler& rParent,
-                           dgm::Point & rPoint ) :
-        ContextHandler( rParent ),
-        mrPoint( rPoint )
-    {
-    }
-    virtual Reference< XFastContextHandler > SAL_CALL
-    createFastChildContext( sal_Int32 aElementToken,
-                            const Reference< XFastAttributeList >& xAttribs )
-        throw (SAXException, RuntimeException)
+    CxnListContext( ContextHandler& rParent,  dgm::Connections & aConnections )
+        : ContextHandler( rParent )
+        , maConnections( aConnections )
         {
-            Reference< XFastContextHandler > xRet;
-            AttributeList aAttribs( xAttribs );
-
-            switch( aElementToken )
-            {
-                // TODO
-            case NMSP_DIAGRAM|XML_animLvl:
-            case NMSP_DIAGRAM|XML_animOne:
-                break;
-            case NMSP_DIAGRAM|XML_bulletEnabled:
-                mrPoint.mbBulletEnabled = aAttribs.getBool( XML_val, false );
-                break;
-            case NMSP_DIAGRAM|XML_chMax:
-                mrPoint.mnMaxChildren = aAttribs.getInteger( XML_val, -1 );
-                break;
-            case NMSP_DIAGRAM|XML_chPref:
-                mrPoint.mnPreferredChildren = aAttribs.getInteger( XML_val, -1 );
-                break;
-            case NMSP_DIAGRAM|XML_dir:
-                mrPoint.mnDirection = aAttribs.getToken( XML_val, XML_norm );
-                break;
-            case NMSP_DIAGRAM|XML_hierBranch:
-                mrPoint.mnHierarchyBranch = aAttribs.getToken( XML_val, XML_std );
-                break;
-            case NMSP_DIAGRAM|XML_orgChart:
-                mrPoint.mbOrgChartEnabled = aAttribs.getBool( XML_val, false );
-                break;
-            case NMSP_DIAGRAM|XML_resizeHandles:
-                mrPoint.mnResizeHandles = aAttribs.getToken( XML_val, XML_rel );
-                break;
-            default:
-                break;
-            }
-            if( !xRet.is() )
-                xRet.set( this );
-            return xRet;
         }
-
-private:
-    dgm::Point& mrPoint;
-};
-
-
-// CT_prSet
-class PropertiesContext
-    : public ContextHandler
-{
-public:
-    PropertiesContext( ContextHandler& rParent,
-                       dgm::Point & rPoint,
-                       const Reference< XFastAttributeList >& xAttribs ) :
-        ContextHandler( rParent ),
-        mrPoint( rPoint )
-    {
-        OUString aEmptyStr;
-        AttributeList aAttribs( xAttribs );
-
-        mrPoint.msColorTransformCategoryId = aAttribs.getString( XML_csCatId, aEmptyStr );
-        mrPoint.msColorTransformTypeId = aAttribs.getString( XML_csTypeId, aEmptyStr );
-        mrPoint.msLayoutCategoryId = aAttribs.getString( XML_loCatId, aEmptyStr );
-        mrPoint.msLayoutTypeId = aAttribs.getString( XML_loTypeId, aEmptyStr );
-        mrPoint.msPlaceholderText = aAttribs.getString( XML_phldrT, aEmptyStr );
-        mrPoint.msPresentationAssociationId = aAttribs.getString( XML_presAssocID, aEmptyStr );
-        mrPoint.msPresentationLayoutName = aAttribs.getString( XML_presName, aEmptyStr );
-        mrPoint.msPresentationLayoutStyleLabel = aAttribs.getString( XML_presStyleLbl, aEmptyStr );
-        mrPoint.msQuickStyleCategoryId = aAttribs.getString( XML_qsCatId, aEmptyStr );
-        mrPoint.msQuickStyleTypeId = aAttribs.getString( XML_qsTypeId, aEmptyStr );
-
-        mrPoint.mnCustomAngle = aAttribs.getInteger( XML_custAng, -1 );
-        mrPoint.mnPercentageNeighbourWidth = aAttribs.getInteger( XML_custLinFactNeighborX, -1 );
-        mrPoint.mnPercentageNeighbourHeight = aAttribs.getInteger( XML_custLinFactNeighborY, -1 );
-        mrPoint.mnPercentageOwnWidth = aAttribs.getInteger( XML_custLinFactX, -1 );
-        mrPoint.mnPercentageOwnHeight = aAttribs.getInteger( XML_custLinFactY, -1 );
-        mrPoint.mnIncludeAngleScale = aAttribs.getInteger( XML_custRadScaleInc, -1 );
-        mrPoint.mnRadiusScale = aAttribs.getInteger( XML_custRadScaleRad, -1 );
-        mrPoint.mnWidthScale = aAttribs.getInteger( XML_custScaleX, -1 );
-        mrPoint.mnHeightScale = aAttribs.getInteger( XML_custScaleY, -1 );
-        mrPoint.mnWidthOverride = aAttribs.getInteger( XML_custSzX, -1 );
-        mrPoint.mnHeightOverride = aAttribs.getInteger( XML_custSzY, -1 );
-        mrPoint.mnLayoutStyleCount = aAttribs.getInteger( XML_presStyleCnt, -1 );
-        mrPoint.mnLayoutStyleIndex = aAttribs.getInteger( XML_presStyleIdx, -1 );
-
-        mrPoint.mbCoherent3DOffset = aAttribs.getBool( XML_coherent3DOff, false );
-        mrPoint.mbCustomHorizontalFlip = aAttribs.getBool( XML_custFlipHor, false );
-        mrPoint.mbCustomVerticalFlip = aAttribs.getBool( XML_custFlipVert, false );
-        mrPoint.mbCustomText = aAttribs.getBool( XML_custT, false );
-        mrPoint.mbIsPlaceholder = aAttribs.getBool( XML_phldr, false );
-    }
     virtual Reference< XFastContextHandler > SAL_CALL
     createFastChildContext( sal_Int32 aElementToken,
-                            const Reference< XFastAttributeList >& )
+                            const Reference< XFastAttributeList >& xAttribs )
         throw (SAXException, RuntimeException)
         {
             Reference< XFastContextHandler > xRet;
 
             switch( aElementToken )
             {
-            case NMSP_DIAGRAM|XML_presLayoutVars:
+            case NMSP_DIAGRAM|XML_cxn:
             {
-                xRet.set( new PresLayoutVarsContext( *this, mrPoint ) );
+                dgm::ConnectionPtr pConnection( new dgm::Connection() );
+                maConnections.push_back( pConnection );
+                xRet.set( new CxnContext( *this, xAttribs, pConnection ) );
                 break;
             }
-            case NMSP_DIAGRAM|XML_style:
-            {
-                // TODO
-                // skip CT_shapeStyle
-                return xRet;
-            }
             default:
                 break;
             }
@@ -228,10 +123,11 @@ public:
         }
 
 private:
-    dgm::Point& mrPoint;
+    dgm::Connections  & maConnections;
 };
 
 
+
 // CL_Pt
 class PtContext
     : public ContextHandler
@@ -239,25 +135,27 @@ class PtContext
 public:
     PtContext( ContextHandler& rParent,
                const Reference< XFastAttributeList >& xAttribs,
-               dgm::Point & rPoint):
-        ContextHandler( rParent ),
-        mrPoint( rPoint )
-    {
-        mrPoint.msModelId = xAttribs->getOptionalValue( XML_modelId );
-
-        // the default type is XML_node
-        const sal_Int32 nType  = xAttribs->getOptionalValueToken( XML_type, XML_node );
-        mrPoint.mnType = nType;
-
-        // ignore the cxnId unless it is this type. See 5.15.3.1.3 in Primer
-        if( ( nType == XML_parTrans ) || ( nType == XML_sibTrans ) )
-            mrPoint.msCnxId = xAttribs->getOptionalValue( XML_cxnId );
-    }
+               const dgm::PointPtr & pPoint)
+        : ContextHandler( rParent )
+        , mpPoint( pPoint )
+        {
+            mpPoint->setModelId( xAttribs->getOptionalValue( XML_modelId ) );
+            //
+            // the default type is XML_node
+            sal_Int32 nType  = xAttribs->getOptionalValueToken( XML_type, XML_node );
+            mpPoint->setType( nType );
+
+            // ignore the cxnId unless it is this type. See 5.15.3.1.3 in Primer
+            if( ( nType == XML_parTrans ) || ( nType == XML_sibTrans ) )
+            {
+                mpPoint->setCnxId( xAttribs->getOptionalValue( XML_cxnId ) );
+            }
+        }
 
 
     virtual Reference< XFastContextHandler > SAL_CALL
     createFastChildContext( sal_Int32 aElementToken,
-                            const Reference< XFastAttributeList >& xAttribs )
+                            const Reference< XFastAttributeList >& /*xAttribs*/ )
         throw (SAXException, RuntimeException)
         {
             Reference< XFastContextHandler > xRet;
@@ -267,22 +165,18 @@ public:
             case NMSP_DIAGRAM|XML_extLst:
                 return xRet;
             case NMSP_DIAGRAM|XML_prSet:
-                OSL_TRACE( "diagram property set for point");
-                xRet = new PropertiesContext( *this, mrPoint, xAttribs );
+                // TODO
+                // CT_ElemPropSet
                 break;
             case NMSP_DIAGRAM|XML_spPr:
                 OSL_TRACE( "shape props for point");
-                if( !mrPoint.mpShape )
-                    mrPoint.mpShape.reset( new Shape() );
-                xRet = new ShapePropertiesContext( *this, *(mrPoint.mpShape) );
+                xRet = new ShapePropertiesContext( *this, *mpPoint->getShape() );
                 break;
             case NMSP_DIAGRAM|XML_t:
             {
                 OSL_TRACE( "shape text body for point");
                 TextBodyPtr xTextBody( new TextBody );
-                if( !mrPoint.mpShape )
-                    mrPoint.mpShape.reset( new Shape() );
-                mrPoint.mpShape->setTextBody( xTextBody );
+                mpPoint->getShape()->setTextBody( xTextBody );
                 xRet = new TextBodyContext( *this, *xTextBody );
                 break;
             }
@@ -295,7 +189,7 @@ public:
         }
 
 private:
-    dgm::Point& mrPoint;
+    dgm::PointPtr mpPoint;
 };
 
 
@@ -305,10 +199,11 @@ class PtListContext
     : public ContextHandler
 {
 public:
-    PtListContext( ContextHandler& rParent,  dgm::Points& rPoints) :
-        ContextHandler( rParent ),
-        mrPoints( rPoints )
-    {}
+    PtListContext( ContextHandler& rParent,  dgm::Points & aPoints)
+        : ContextHandler( rParent )
+        , maPoints( aPoints )
+        {
+        }
     virtual Reference< XFastContextHandler > SAL_CALL
     createFastChildContext( sal_Int32 aElementToken,
                             const Reference< XFastAttributeList >& xAttribs )
@@ -321,8 +216,9 @@ public:
             case NMSP_DIAGRAM|XML_pt:
             {
                 // CT_Pt
-                mrPoints.push_back( dgm::Point() );
-                xRet.set( new PtContext( *this, xAttribs, mrPoints.back() ) );
+                dgm::PointPtr pPoint( new dgm::Point() );
+                maPoints.push_back( pPoint );
+                xRet.set( new PtContext( *this, xAttribs, pPoint ) );
                 break;
             }
             default:
@@ -334,7 +230,7 @@ public:
         }
 
 private:
-    dgm::Points& mrPoints;
+    dgm::Points  & maPoints;
 };
 
 // CT_BackgroundFormatting
diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx
deleted file mode 100644
index be79609a3866..000000000000
--- a/oox/source/drawingml/diagram/datamodelcontext.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: datamodelcontext.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef OOX_DRAWINGML_SHAPECONTEXT_HXX
-#define OOX_DRAWINGML_SHAPECONTEXT_HXX
-
-#include <com/sun/star/drawing/XShapes.hpp>
-
-#include "oox/core/contexthandler.hxx"
-#include "diagram.hxx"
-
-namespace oox { namespace drawingml {
-
-// CT_DataModel
-class DataModelContext : public ::oox::core::ContextHandler
-{
-public:
-    DataModelContext( ::oox::core::ContextHandler& rParent, const DiagramDataPtr & pDataModelPtr );
-    virtual ~DataModelContext();
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-
-protected:
-    DiagramDataPtr mpDataModel;
-};
-
-} }
-
-#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 8a78ddc8d020..2e507d87752b 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -32,22 +32,10 @@
 
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/xml/dom/XDocument.hpp>
-#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
-#include <rtl/ustrbuf.hxx>
-#include "oox/drawingml/textbody.hxx"
-#include "oox/drawingml/textparagraph.hxx"
-#include "oox/drawingml/textrun.hxx"
 #include "oox/drawingml/diagram/diagram.hxx"
 #include "oox/drawingml/fillproperties.hxx"
 #include "oox/core/namespaces.hxx"
 #include "tokens.hxx"
-#include "diagram.hxx"
-#include "diagramlayoutatoms.hxx"
-#include "diagramfragmenthandler.hxx"
-
-#include <iostream>
-#include <fstream>
 
 using rtl::OUString;
 using namespace ::com::sun::star;
@@ -59,26 +47,58 @@ namespace dgm {
 
 void Connection::dump()
 {
-    OSL_TRACE("dgm: cnx modelId %s, srcId %s, dstId %s, parTransId %s, presId %s, sibTransId %s, srcOrd %d, dstOrd %d",
+    OSL_TRACE("dgm: cnx modelId %s, srcId %s, dstId %s",
               OUSTRING_TO_CSTR( msModelId ),
               OUSTRING_TO_CSTR( msSourceId ),
-              OUSTRING_TO_CSTR( msDestId ),
-              OUSTRING_TO_CSTR( msParTransId ),
-              OUSTRING_TO_CSTR( msPresId ),
-              OUSTRING_TO_CSTR( msSibTransId ),
-              mnSourceOrder,
-              mnDestOrder );
+              OUSTRING_TO_CSTR( msDestId ) );
+}
+
+Point::Point()
+    : mpShape( new Shape( "com.sun.star.drawing.GraphicObjectShape" ) )
+    , mnType( 0 )
+{
 }
 
 void Point::dump()
 {
-    OSL_TRACE( "dgm: pt text %x, cnxId %s, modelId %s, type %d",
-               mpShape.get(),
+    OSL_TRACE( "dgm: pt cnxId %s, modelId %s",
                OUSTRING_TO_CSTR( msCnxId ),
-               OUSTRING_TO_CSTR( msModelId ),
-               mnType );
+               OUSTRING_TO_CSTR( msModelId ) );
+}
+
+void Point::setModelId( const ::rtl::OUString & sModelId )
+{
+    msModelId = sModelId;
+    mpShape->setName( msModelId );
+}
+
+
+bool PointsTree::addChild( const PointsTreePtr & pChild )
+{
+    bool added = false;
+
+    OSL_ENSURE( pChild->mpParent.expired(), "can't add, has already a parent" );
+    OSL_ENSURE( mpNode, "has no node" );
+    if( mpNode && pChild->mpParent.expired() )
+    {
+        pChild->mpParent = shared_from_this();
+        maChildrens.push_back( pChild );
+        added = true;
+    }
+
+    return added;
 }
 
+PointsTreePtr PointsTree::getParent() const
+{
+    if( !mpParent.expired() )
+    {
+        return mpParent.lock() ;
+    }
+    return PointsTreePtr();
+}
+
+
 } // dgm namespace
 
 DiagramData::DiagramData()
@@ -96,10 +116,18 @@ void DiagramData::dump()
                   boost::bind( &dgm::Point::dump, _1 ) );
 }
 
-void DiagramLayout::layout( const dgm::Points & /*pTree*/, const awt::Point & /*pt*/ )
+static void setPosition( const dgm::PointPtr & pPoint, const awt::Point & pt )
+{
+    ShapePtr pShape = pPoint->getShape();
+    awt::Size sz;
+    sz.Width = 50;
+    sz.Height = 50;
+    pShape->setPosition( pt );
+    pShape->setSize( sz );
+}
+
+void DiagramLayout::layout( const dgm::PointsTreePtr & pTree, const awt::Point & pt )
 {
-    // TODO
-#if 0
     setPosition( pTree->getPoint(), pt );
     awt::Point nextPt = pt;
     nextPt.Y += 50;
@@ -109,7 +137,6 @@ void DiagramLayout::layout( const dgm::Points & /*pTree*/, const awt::Point & /*
         layout( *iter, nextPt );
         nextPt.X += 50;
     }
-#endif
 }
 
 void Diagram::setData( const DiagramDataPtr & pData)
@@ -123,244 +150,19 @@ void Diagram::setLayout( const DiagramLayoutPtr & pLayout)
     mpLayout = pLayout;
 }
 
-#if OSL_DEBUG_LEVEL > 1
-rtl::OString normalizeDotName( const rtl::OUString& rStr )
+void Diagram::setQStyles( const DiagramQStylesPtr & pStyles)
 {
-    rtl::OUStringBuffer aBuf;
-    aBuf.append((sal_Unicode)'N');
-
-    const sal_Int32 nLen(rStr.getLength());
-    sal_Int32 nCurrIndex(0);
-    while( nCurrIndex < nLen )
-    {
-        const sal_Int32 aChar=rStr.iterateCodePoints(&nCurrIndex);
-        if( aChar != '-' && aChar != '{' && aChar != '}' )
-            aBuf.append((sal_Unicode)aChar);
-    }
-
-    return rtl::OUStringToOString(aBuf.makeStringAndClear(),
-                                  RTL_TEXTENCODING_UTF8);
+    mpQStyles = pStyles;
 }
-#endif
 
-static sal_Int32 calcDepth( const rtl::OUString& rNodeName,
-                            const dgm::Connections& rCnx )
-{
-    // find length of longest path in 'isChild' graph, ending with rNodeName
-    dgm::Connections::const_iterator aCurrCxn( rCnx.begin() );
-    const dgm::Connections::const_iterator aEndCxn( rCnx.end() );
-    while( aCurrCxn != aEndCxn )
-    {
-        if( aCurrCxn->msParTransId.getLength() &&
-            aCurrCxn->msSibTransId.getLength() &&
-            aCurrCxn->msSourceId.getLength() &&
-            aCurrCxn->msDestId.getLength() &&
-            aCurrCxn->mnType != XML_presOf &&
-            aCurrCxn->mnType != XML_presParOf &&
-            rNodeName == aCurrCxn->msDestId )
-        {
-            return calcDepth(aCurrCxn->msSourceId,
-                             rCnx) + 1;
-        }
-        ++aCurrCxn;
-    }
 
-    return 0;
+void Diagram::setColors( const DiagramColorsPtr & pColors)
+{
+    mpColors = pColors;
 }
 
-
 void Diagram::build(  )
 {
-    // build name-object maps
-    // ======================
-
-#if OSL_DEBUG_LEVEL > 1
-    std::ofstream output("/tmp/tree.dot");
-
-    output << "digraph datatree {" << std::endl;
-#endif
-
-    dgm::Points::iterator aCurrPoint( getData()->getPoints( ).begin() );
-    const dgm::Points::iterator aEndPoint( getData()->getPoints( ).end() );
-    while( aCurrPoint != aEndPoint )
-    {
-#if OSL_DEBUG_LEVEL > 1
-        output << "\t"
-               << normalizeDotName(aCurrPoint->msModelId).getStr()
-               << "[";
-
-        if( aCurrPoint->msPresentationLayoutName.getLength() )
-            output << "label=\""
-                   << rtl::OUStringToOString(
-                       aCurrPoint->msPresentationLayoutName,
-                       RTL_TEXTENCODING_UTF8).getStr() << "\", ";
-        else
-            output << "label=\""
-                   << rtl::OUStringToOString(
-                       aCurrPoint->msModelId,
-                       RTL_TEXTENCODING_UTF8).getStr() << "\", ";
-
-        switch( aCurrPoint->mnType )
-        {
-            case XML_doc: output << "style=filled, color=red"; break;
-            case XML_asst: output << "style=filled, color=green"; break;
-            default:
-            case XML_node: output << "style=filled, color=blue"; break;
-            case XML_pres: output << "style=filled, color=yellow"; break;
-            case XML_parTrans: output << "color=grey"; break;
-            case XML_sibTrans: output << " "; break;
-        }
-
-        output << "];" << std::endl;
-
-        // does currpoint have any text set?
-        if( aCurrPoint->mpShape &&
-            aCurrPoint->mpShape->getTextBody() &&
-            !aCurrPoint->mpShape->getTextBody()->getParagraphs().empty() &&
-            !aCurrPoint->mpShape->getTextBody()->getParagraphs().front()->getRuns().empty() )
-        {
-            static sal_Int32 nCount=0;
-
-            output << "\t"
-                   << "textNode" << nCount
-                   << " ["
-                   << "label=\""
-                   << rtl::OUStringToOString(
-                       aCurrPoint->mpShape->getTextBody()->getParagraphs().front()->getRuns().front()->getText(),
-                       RTL_TEXTENCODING_UTF8).getStr()
-                   << "\"" << "];" << std::endl;
-            output << "\t"
-                   << normalizeDotName(aCurrPoint->msModelId).getStr()
-                   << " -> "
-                   << "textNode" << nCount++
-                   << ";" << std::endl;
-        }
-
-
-#if 0
-        // msPresentationAssociationId does not appear to be
-        // valid/used, the relation this imposed for several examples
-        // was ~broken
-        if( aCurrPoint->msPresentationAssociationId.getLength() )
-            output << "\t"
-                   << normalizeDotName(aCurrPoint->msModelId).getStr()
-                   << " -> "
-                   << normalizeDotName(aCurrPoint->msPresentationAssociationId).getStr()
-                   << " [style=dotted, color=red, "
-                   << "label=\"presAssocID\"];" << std::endl;
-#endif
-
-#endif
-
-        const bool bInserted1=getData()->getPointNameMap().insert(
-            std::make_pair(aCurrPoint->msModelId,&(*aCurrPoint))).second;
-        (void)bInserted1;
-
-        OSL_ENSURE(bInserted1,"Diagram::build(): non-unique point model id");
-
-        if( aCurrPoint->msPresentationLayoutName.getLength() )
-        {
-            DiagramData::PointsNameMap::value_type::second_type& rVec=
-                getData()->getPointsPresNameMap()[aCurrPoint->msPresentationLayoutName];
-            rVec.push_back(&(*aCurrPoint));
-        }
-        ++aCurrPoint;
-    }
-
-    dgm::Connections::const_iterator aCurrCxn( getData()->getConnections( ).begin() );
-    const dgm::Connections::const_iterator aEndCxn( getData()->getConnections( ).end() );
-    while( aCurrCxn != aEndCxn )
-    {
-#if OSL_DEBUG_LEVEL > 1
-        if( aCurrCxn->msParTransId.getLength() ||
-            aCurrCxn->msSibTransId.getLength() )
-        {
-            if( aCurrCxn->msSourceId.getLength() ||
-                aCurrCxn->msDestId.getLength() )
-            {
-                output << "\t"
-                       << normalizeDotName(aCurrCxn->msSourceId).getStr()
-                       << " -> "
-                       << normalizeDotName(aCurrCxn->msParTransId).getStr()
-                       << " -> "
-                       << normalizeDotName(aCurrCxn->msSibTransId).getStr()
-                       << " -> "
-                       << normalizeDotName(aCurrCxn->msDestId).getStr()
-                       << " [style=dotted,"
-                       << ((aCurrCxn->mnType == XML_presOf) ? " color=red, " : ((aCurrCxn->mnType == XML_presParOf) ? " color=green, " : " "))
-                       << "label=\""
-                       << rtl::OUStringToOString(aCurrCxn->msModelId,
-                                                 RTL_TEXTENCODING_UTF8 ).getStr()
-                       << "\"];" << std::endl;
-            }
-            else
-            {
-                output << "\t"
-                       << normalizeDotName(aCurrCxn->msParTransId).getStr()
-                       << " -> "
-                       << normalizeDotName(aCurrCxn->msSibTransId).getStr()
-                       << " ["
-                       << ((aCurrCxn->mnType == XML_presOf) ? " color=red, " : ((aCurrCxn->mnType == XML_presParOf) ? " color=green, " : " "))
-                       << "label=\""
-                       << rtl::OUStringToOString(aCurrCxn->msModelId,
-                                                 RTL_TEXTENCODING_UTF8 ).getStr()
-                       << "\"];" << std::endl;
-            }
-        }
-        else if( aCurrCxn->msSourceId.getLength() ||
-                 aCurrCxn->msDestId.getLength() )
-            output << "\t"
-                   << normalizeDotName(aCurrCxn->msSourceId).getStr()
-                   << " -> "
-                   << normalizeDotName(aCurrCxn->msDestId).getStr()
-                   << " [label=\""
-                   << rtl::OUStringToOString(aCurrCxn->msModelId,
-                                             RTL_TEXTENCODING_UTF8 ).getStr()
-                   << ((aCurrCxn->mnType == XML_presOf) ? "\", color=red]" : ((aCurrCxn->mnType == XML_presParOf) ? "\", color=green]" : "\"]"))
-                   << ";" << std::endl;
-#endif
-
-        const bool bInserted1=getData()->getConnectionNameMap().insert(
-            std::make_pair(aCurrCxn->msModelId,&(*aCurrCxn))).second;
-        (void)bInserted1;
-
-        OSL_ENSURE(bInserted1,"Diagram::build(): non-unique connection model id");
-
-        if( aCurrCxn->mnType == XML_presOf )
-        {
-            DiagramData::StringMap::value_type::second_type& rVec=getData()->getPresOfNameMap()[aCurrCxn->msDestId];
-            rVec.push_back(
-                std::make_pair(
-                    aCurrCxn->msSourceId,sal_Int32(0)));
-        }
-
-        ++aCurrCxn;
-    }
-
-    // assign outline levels
-    DiagramData::StringMap::iterator aPresOfIter=getData()->getPresOfNameMap().begin();
-    const DiagramData::StringMap::iterator aPresOfEnd=getData()->getPresOfNameMap().end();
-    while( aPresOfIter != aPresOfEnd )
-    {
-        DiagramData::StringMap::value_type::second_type::iterator aPresOfNodeIterCalcLevel=aPresOfIter->second.begin();
-        const DiagramData::StringMap::value_type::second_type::iterator aPresOfNodeEnd=aPresOfIter->second.end();
-        while(aPresOfNodeIterCalcLevel != aPresOfNodeEnd)
-        {
-            const sal_Int32 nDepth=calcDepth(aPresOfNodeIterCalcLevel->first,
-                                             getData()->getConnections());
-            aPresOfNodeIterCalcLevel->second = nDepth != 0 ? nDepth : -1;
-            ++aPresOfNodeIterCalcLevel;
-        }
-
-        ++aPresOfIter;
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    output << "}" << std::endl;
-#endif
-
-    // TODO
-#if 0
     OSL_TRACE( "building diagram" );
     typedef std::map< OUString, dgm::PointPtr > PointsMap;
     PointsMap aPointsMap;
@@ -436,33 +238,30 @@ void Diagram::build(  )
     }
     // check bounds
     OSL_ENSURE( aRoots.size() == 1, "more than one root" );
-    mpRoot = aRoots.begin()->second;
-    OSL_TRACE( "root is %s", OUSTRING_TO_CSTR( mpRoot->getPoint()->getModelId() ) );
-    for( PointsTreeMap::iterator iter = aTreeMap.begin();
-         iter != aTreeMap.end(); iter++ )
+    // #i92239# roots may be empty
+    if( !aRoots.empty() )
     {
-        if(! iter->second->getParent() )
+        mpRoot = aRoots.begin()->second;
+        OSL_TRACE( "root is %s", OUSTRING_TO_CSTR( mpRoot->getPoint()->getModelId() ) );
+        for( PointsTreeMap::iterator iter = aTreeMap.begin();
+             iter != aTreeMap.end(); iter++ )
         {
-            OSL_TRACE("node without parent %s", OUSTRING_TO_CSTR( iter->first ) );
+            if(! iter->second->getParent() )
+            {
+                OSL_TRACE("node without parent %s", OUSTRING_TO_CSTR( iter->first ) );
+            }
         }
     }
-#endif
 }
 
 
 void Diagram::addTo( const ShapePtr & pParentShape )
 {
-    // collect data, init maps
-    build( );
-
-    // create Shape hierarchy
-    ShapeCreationVisitor aCreationVisitor(pParentShape, *this);
-    mpLayout->getNode()->accept(aCreationVisitor);
-
-#if 0
     dgm::Points & aPoints( mpData->getPoints( ) );
     dgm::Points::iterator aPointsIter;
-    mpLayout->layout( mpRoot, awt::Point( 0, 0 ) );
+    build( );
+    if( mpRoot.get() )
+        mpLayout->layout( mpRoot, awt::Point( 0, 0 ) );
 
     for( aPointsIter = aPoints.begin(); aPointsIter != aPoints.end(); ++aPointsIter )
     {
@@ -485,7 +284,6 @@ void Diagram::addTo( const ShapePtr & pParentShape )
     {
         OSL_TRACE( "Dgm: shape name %s", OUSTRING_TO_CSTR( (*iter)->getName() ) );
     }
-#endif
 }
 
 OUString Diagram::getLayoutId() const
@@ -498,156 +296,6 @@ OUString Diagram::getLayoutId() const
     return sLayoutId;
 }
 
-uno::Reference<xml::dom::XDocument> loadFragment(
-    core::XmlFilterBase& rFilter,
-    const rtl::Reference< core::FragmentHandler >& rxHandler )
-{
-    // load diagramming fragments into DOM representation, that later
-    // gets serialized back to SAX events and parsed
-    return rFilter.importFragment( rxHandler->getFragmentPath() );
-}
-
-void importFragment( core::XmlFilterBase& rFilter,
-                     const uno::Reference<xml::dom::XDocument>& rXDom,
-                     const char* /*pPropName*/,
-                     const ShapePtr& /*pShape*/,
-                     const rtl::Reference< core::FragmentHandler >& rxHandler )
-{
-    uno::Reference<xml::sax::XFastSAXSerializable> xSerializer(
-        rXDom, uno::UNO_QUERY_THROW);
-
-    // now serialize DOM tree into internal data structures
-    rFilter.importFragment( rxHandler, xSerializer );
-
-    // not yet
-#if 0
-    // tack XDocument onto shape
-    pShape->getShapeProperties().setProperty(
-        OUString::createFromAscii(pPropName),
-        rXDom);
-#endif
-}
-
-void loadDiagram( const ShapePtr& pShape,
-                  core::XmlFilterBase& rFilter,
-                  const ::rtl::OUString& rDataModelPath,
-                  const ::rtl::OUString& rLayoutPath,
-                  const ::rtl::OUString& rQStylePath,
-                  const ::rtl::OUString& rColorStylePath )
-{
-    DiagramPtr pDiagram( new Diagram() );
-
-    DiagramDataPtr pData( new DiagramData() );
-    pDiagram->setData( pData );
-
-    DiagramLayoutPtr pLayout( new DiagramLayout() );
-    pDiagram->setLayout( pLayout );
-
-    // data
-    if( rDataModelPath.getLength() > 0 )
-    {
-        rtl::Reference< core::FragmentHandler > xRef(
-            new DiagramDataFragmentHandler( rFilter, rDataModelPath, pData ));
-
-        importFragment(rFilter,
-                       loadFragment(rFilter,xRef),
-                       "DiagramData",
-                       pShape,
-                       xRef);
-    }
-
-    // layout
-    if( rLayoutPath.getLength() > 0 )
-    {
-        rtl::Reference< core::FragmentHandler > xRef(
-            new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
-        importFragment(rFilter,
-                       loadFragment(rFilter,xRef),
-                       "DiagramLayout",
-                       pShape,
-                       xRef);
-    }
-
-    // style
-    if( rQStylePath.getLength() > 0 )
-    {
-        rtl::Reference< core::FragmentHandler > xRef(
-            new DiagramQStylesFragmentHandler( rFilter, rQStylePath, pDiagram->getStyles() ));
-        importFragment(rFilter,
-                       loadFragment(rFilter,xRef),
-                       "DiagramQStyle",
-                       pShape,
-                       xRef);
-    }
-
-    // colors
-    if( rColorStylePath.getLength() > 0 )
-    {
-        rtl::Reference< core::FragmentHandler > xRef(
-            new ColorFragmentHandler( rFilter, rColorStylePath, pDiagram->getColors() ));
-        importFragment(rFilter,
-                       loadFragment(rFilter,xRef),
-                       "DiagramColorStyle",
-                       pShape,
-                       xRef);
-    }
-
-    // diagram loaded. now lump together & attach to shape
-    pDiagram->addTo(pShape);
-}
-
-void loadDiagram( const ShapePtr& pShape,
-                  core::XmlFilterBase& rFilter,
-                  const uno::Reference<xml::dom::XDocument>& rXDataModelDom,
-                  const uno::Reference<xml::dom::XDocument>& rXLayoutDom,
-                  const uno::Reference<xml::dom::XDocument>& rXQStyleDom,
-                  const uno::Reference<xml::dom::XDocument>& rXColorStyleDom )
-{
-    DiagramPtr pDiagram( new Diagram() );
-
-    DiagramDataPtr pData( new DiagramData() );
-    pDiagram->setData( pData );
-
-    DiagramLayoutPtr pLayout( new DiagramLayout() );
-    pDiagram->setLayout( pLayout );
-
-    OUString aEmpty;
-
-    // data
-    if( rXDataModelDom.is() )
-        importFragment(rFilter,
-                       rXDataModelDom,
-                       "DiagramData",
-                       pShape,
-                       new DiagramDataFragmentHandler( rFilter, aEmpty, pData ));
-
-    // layout
-    if( rXLayoutDom.is() )
-        importFragment(rFilter,
-                       rXLayoutDom,
-                       "DiagramLayout",
-                       pShape,
-                       new DiagramLayoutFragmentHandler( rFilter, aEmpty, pLayout ));
-
-    // style
-    if( rXQStyleDom.is() )
-        importFragment(rFilter,
-                       rXQStyleDom,
-                       "DiagramQStyle",
-                       pShape,
-                       new DiagramQStylesFragmentHandler( rFilter, aEmpty, pDiagram->getStyles() ));
-
-    // colors
-    if( rXColorStyleDom.is() )
-        importFragment(rFilter,
-                       rXColorStyleDom,
-                       "DiagramColorStyle",
-                       pShape,
-                       new ColorFragmentHandler( rFilter, aEmpty, pDiagram->getColors() ));
-
-    // diagram loaded. now lump together & attach to shape
-    pDiagram->addTo(pShape);
-}
 
 } }
 
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
deleted file mode 100644
index 6c8075c26b10..000000000000
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ /dev/null
@@ -1,323 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile$
- * $Revision$
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
-#define OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
-
-#include <map>
-#include <vector>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-
-#include <rtl/ustring.hxx>
-
-#include "tokens.hxx"
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace xml { namespace dom { class XDocument; } }
-} } }
-
-namespace oox { namespace drawingml {
-
-namespace dgm {
-
-/** A Connection
- */
-struct Connection
-{
-    Connection() :
-        mnType( 0 ),
-        mnSourceOrder( 0 ),
-        mnDestOrder( 0 )
-    {}
-
-    void dump();
-
-    sal_Int32 mnType;
-    ::rtl::OUString msModelId;
-    ::rtl::OUString msSourceId;
-    ::rtl::OUString msDestId;
-    ::rtl::OUString msParTransId;
-    ::rtl::OUString msPresId;
-    ::rtl::OUString msSibTransId;
-    sal_Int32 mnSourceOrder;
-    sal_Int32 mnDestOrder;
-
-};
-
-typedef std::vector< Connection > Connections;
-
-
-/** A point
- */
-struct Point
-{
-    Point() :
-        mnType(0),
-        mnMaxChildren(-1),
-        mnPreferredChildren(-1),
-        mnDirection(XML_norm),
-        mnHierarchyBranch(XML_std),
-        mnResizeHandles(XML_rel),
-        mnCustomAngle(-1),
-        mnPercentageNeighbourWidth(-1),
-        mnPercentageNeighbourHeight(-1),
-        mnPercentageOwnWidth(-1),
-        mnPercentageOwnHeight(-1),
-        mnIncludeAngleScale(-1),
-        mnRadiusScale(-1),
-        mnWidthScale(-1),
-        mnHeightScale(-1),
-        mnWidthOverride(-1),
-        mnHeightOverride(-1),
-        mnLayoutStyleCount(-1),
-        mnLayoutStyleIndex(-1),
-
-        mbOrgChartEnabled(false),
-        mbBulletEnabled(false),
-        mbCoherent3DOffset(false),
-        mbCustomHorizontalFlip(false),
-        mbCustomVerticalFlip(false),
-        mbCustomText(false),
-        mbIsPlaceholder(false)
-    {}
-    void dump();
-
-    ShapePtr      mpShape;
-
-    rtl::OUString msCnxId;
-    rtl::OUString msModelId;
-    rtl::OUString msColorTransformCategoryId;
-    rtl::OUString msColorTransformTypeId;
-    rtl::OUString msLayoutCategoryId;
-    rtl::OUString msLayoutTypeId;
-    rtl::OUString msPlaceholderText;
-    rtl::OUString msPresentationAssociationId;
-    rtl::OUString msPresentationLayoutName;
-    rtl::OUString msPresentationLayoutStyleLabel;
-    rtl::OUString msQuickStyleCategoryId;
-    rtl::OUString msQuickStyleTypeId;
-
-    sal_Int32     mnType;
-    sal_Int32     mnMaxChildren;
-    sal_Int32     mnPreferredChildren;
-    sal_Int32     mnDirection;
-    sal_Int32     mnHierarchyBranch;
-    sal_Int32     mnResizeHandles;
-    sal_Int32     mnCustomAngle;
-    sal_Int32     mnPercentageNeighbourWidth;
-    sal_Int32     mnPercentageNeighbourHeight;
-    sal_Int32     mnPercentageOwnWidth;
-    sal_Int32     mnPercentageOwnHeight;
-    sal_Int32     mnIncludeAngleScale;
-    sal_Int32     mnRadiusScale;
-    sal_Int32     mnWidthScale;
-    sal_Int32     mnHeightScale;
-    sal_Int32     mnWidthOverride;
-    sal_Int32     mnHeightOverride;
-    sal_Int32     mnLayoutStyleCount;
-    sal_Int32     mnLayoutStyleIndex;
-
-    bool          mbOrgChartEnabled;
-    bool          mbBulletEnabled;
-    bool          mbCoherent3DOffset;
-    bool          mbCustomHorizontalFlip;
-    bool          mbCustomVerticalFlip;
-    bool          mbCustomText;
-    bool          mbIsPlaceholder;
-};
-
-typedef std::vector< Point >        Points;
-
-}
-
-class LayoutNode;
-typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
-
-////////////////////
-
-class DiagramData
-{
-public:
-    typedef std::map< rtl::OUString, dgm::Point* > PointNameMap;
-    typedef std::map< rtl::OUString,
-                      std::vector<dgm::Point*> >   PointsNameMap;
-    typedef std::map< rtl::OUString, const dgm::Connection* > ConnectionNameMap;
-    typedef std::map< rtl::OUString,
-                      std::vector<std::pair<rtl::OUString,sal_Int32> > > StringMap;
-
-    DiagramData();
-    FillPropertiesPtr & getFillProperties()
-        { return mpFillProperties; }
-    dgm::Connections & getConnections()
-        { return maConnections; }
-    dgm::Points & getPoints()
-        { return maPoints; }
-    ConnectionNameMap & getConnectionNameMap()
-        { return maConnectionNameMap; }
-    StringMap & getPresOfNameMap()
-        { return maPresOfNameMap; }
-    PointNameMap & getPointNameMap()
-        { return maPointNameMap; }
-    PointsNameMap & getPointsPresNameMap()
-        { return maPointsPresNameMap; }
-    void dump();
-private:
-    FillPropertiesPtr mpFillProperties;
-    dgm::Connections  maConnections;
-    dgm::Points       maPoints;
-    PointNameMap      maPointNameMap;
-    PointsNameMap     maPointsPresNameMap;
-    ConnectionNameMap maConnectionNameMap;
-    StringMap         maPresOfNameMap;
-};
-
-typedef boost::shared_ptr< DiagramData > DiagramDataPtr;
-
-
-
-////////////////////
-
-class DiagramLayout
-{
-public:
-    void setDefStyle( const ::rtl::OUString & sDefStyle )
-        { msDefStyle = sDefStyle; }
-    void setMinVer( const ::rtl::OUString & sMinVer )
-        { msMinVer = sMinVer; }
-    void setUniqueId( const ::rtl::OUString & sUniqueId )
-        { msUniqueId = sUniqueId; }
-    const ::rtl::OUString & getUniqueId()
-        { return msUniqueId; }
-    void setTitle( const ::rtl::OUString & sTitle )
-        { msTitle = sTitle; }
-    void setDesc( const ::rtl::OUString & sDesc )
-        { msDesc = sDesc; }
-
-    LayoutNodePtr & getNode()
-        { return mpNode; }
-    const LayoutNodePtr & getNode() const
-        { return mpNode; }
-    DiagramDataPtr & getSampData()
-        { return mpSampData; }
-    const DiagramDataPtr & getSampData() const
-        { return mpSampData; }
-    DiagramDataPtr & getStyleData()
-        { return mpStyleData; }
-    const DiagramDataPtr & getStyleData() const
-        { return mpStyleData; }
-
-    void layout( const dgm::Points & pTree, const com::sun::star::awt::Point & pt );
-
-private:
-    ::rtl::OUString msDefStyle;
-    ::rtl::OUString msMinVer;
-    ::rtl::OUString msUniqueId;
-
-    ::rtl::OUString msTitle;
-    ::rtl::OUString msDesc;
-    LayoutNodePtr  mpNode;
-    DiagramDataPtr mpSampData;
-    DiagramDataPtr mpStyleData;
-    // TODO
-    // catLst
-    // clrData
-};
-
-typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr;
-
-///////////////////////
-
-struct DiagramStyle
-{
-    ShapeStyleRef maFillStyle;
-    ShapeStyleRef maLineStyle;
-    ShapeStyleRef maEffectStyle;
-    ShapeStyleRef maTextStyle;
-};
-
-typedef std::map<rtl::OUString,DiagramStyle> DiagramQStyleMap;
-
-struct DiagramColor
-{
-    oox::drawingml::Color maFillColor;
-    oox::drawingml::Color maLineColor;
-    oox::drawingml::Color maEffectColor;
-    oox::drawingml::Color maTextFillColor;
-    oox::drawingml::Color maTextLineColor;
-    oox::drawingml::Color maTextEffectColor;
-};
-
-typedef std::map<rtl::OUString,DiagramColor> DiagramColorMap;
-
-///////////////////////
-
-class Diagram
-{
-public:
-    void setData( const DiagramDataPtr & );
-    DiagramDataPtr getData() const
-        {
-            return mpData;
-        }
-    void setLayout( const DiagramLayoutPtr & );
-    DiagramLayoutPtr getLayout() const
-        {
-            return mpLayout;
-        }
-
-    DiagramQStyleMap& getStyles() { return maStyles; }
-    const DiagramQStyleMap& getStyles() const { return maStyles; }
-    DiagramColorMap& getColors() { return maColors; }
-    const DiagramColorMap& getColors() const { return maColors; }
-
-    void addTo( const ShapePtr & pShape );
-    ::rtl::OUString getLayoutId() const;
-private:
-    void build( );
-    DiagramDataPtr                             mpData;
-    DiagramLayoutPtr                           mpLayout;
-    DiagramQStyleMap                           maStyles;
-    DiagramColorMap                            maColors;
-    std::map< ::rtl::OUString, ShapePtr >      maShapeMap;
-};
-
-
-typedef boost::shared_ptr< Diagram > DiagramPtr;
-
-} }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 65e6c7531018..d14535df509b 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -28,8 +28,9 @@
 
 #include "diagramdefinitioncontext.hxx"
 #include "oox/core/namespaces.hxx"
+#include "oox/helper/helper.hxx"
 #include "layoutnodecontext.hxx"
-#include "datamodelcontext.hxx"
+#include "oox/drawingml/diagram/datamodelcontext.hxx"
 #include "tokens.hxx"
 
 using namespace ::oox::core;
@@ -87,15 +88,9 @@ DiagramDefinitionContext::createFastChildContext( ::sal_Int32 aElement,
         mpLayout->setDesc( xAttribs->getOptionalValue( XML_val ) );
         break;
     case NMSP_DIAGRAM|XML_layoutNode:
-    {
-        LayoutNodePtr pNode( new LayoutNode() );
-        mpLayout->getNode() = pNode;
-        pNode->setChildOrder( xAttribs->getOptionalValueToken( XML_chOrder, XML_b ) );
-        pNode->setMoveWith( xAttribs->getOptionalValue( XML_moveWith ) );
-        pNode->setStyleLabel( xAttribs->getOptionalValue( XML_styleLbl ) );
-        xRet.set( new LayoutNodeContext( *this, xAttribs, pNode ) );
+        mpLayout->getNode().reset( new LayoutNode() );
+        xRet.set( new LayoutNodeContext( *this, xAttribs, mpLayout->getNode() ) );
         break;
-    }
      case NMSP_DIAGRAM|XML_clrData:
         // TODO, does not matter for the UI. skip.
         return xRet;
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
index d5f5db6f3197..99407aed80d3 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
@@ -29,7 +29,7 @@
 #define OOX_DRAWINGML_DIAGRAMDEFINITIONCONTEXT_HXX
 
 #include "oox/core/contexthandler.hxx"
-#include "diagram.hxx"
+#include "oox/drawingml/diagram/diagram.hxx"
 
 namespace oox { namespace drawingml {
 
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index 17091ae2f6ed..a739a0095a5f 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -28,11 +28,11 @@
 
 #include <osl/diagnose.h>
 
+#include "oox/drawingml/diagram/diagramfragmenthandler.hxx"
+#include "oox/drawingml/diagram/datamodelcontext.hxx"
 #include "oox/core/namespaces.hxx"
-#include "oox/drawingml/colorchoicecontext.hxx"
 #include "diagramdefinitioncontext.hxx"
-#include "diagramfragmenthandler.hxx"
-#include "datamodelcontext.hxx"
+#include "tokens.hxx"
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::xml::sax;
@@ -132,145 +132,96 @@ DiagramLayoutFragmentHandler::createFastChildContext( ::sal_Int32 aElement,
 ///////////////////////
 
 DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFilter,
-                                                              const OUString& rFragmentPath,
-                                                              DiagramQStyleMap& rStylesMap ) :
-    FragmentHandler2( rFilter, rFragmentPath ),
-    maStyleName(),
-    maStyleEntry(),
-    mrStylesMap( rStylesMap )
-{}
-
-::oox::core::ContextHandlerRef DiagramQStylesFragmentHandler::createStyleMatrixContext(
-    sal_Int32 nElement,
-    const AttributeList& rAttribs,
-    ShapeStyleRef& o_rStyle )
+                                                        const OUString& rFragmentPath,
+                                                        const DiagramQStylesPtr pDataPtr )
+    throw( )
+    : FragmentHandler( rFilter, rFragmentPath )
+    , mpDataPtr( pDataPtr )
 {
-    o_rStyle.mnThemedIdx = (nElement == (NMSP_DRAWINGML|XML_fontRef)) ?
-        rAttribs.getToken( XML_idx, XML_none ) : rAttribs.getInteger( XML_idx, 0 );
-    return new ColorContext( *this, o_rStyle.maPhClr );
 }
 
-::oox::core::ContextHandlerRef DiagramQStylesFragmentHandler::onCreateContext( sal_Int32 nElement,
-                                                                               const AttributeList& rAttribs )
+DiagramQStylesFragmentHandler::~DiagramQStylesFragmentHandler( ) throw ()
 {
-    // state-table like way of navigating the color fragment. we
-    // currently ignore everything except styleLbl in the colorsDef
-    // element
-    switch( getCurrentElement() )
-    {
-        case XML_ROOT_CONTEXT:
-            return nElement == (NMSP_DIAGRAM|XML_styleDef) ? this : NULL;
-        case NMSP_DIAGRAM|XML_styleDef:
-            return nElement == (NMSP_DIAGRAM|XML_styleLbl) ? this : NULL;
-        case NMSP_DIAGRAM|XML_styleLbl:
-            return nElement == (NMSP_DIAGRAM|XML_style) ? this : NULL;
-        case NMSP_DIAGRAM|XML_style:
-        {
-            switch( nElement )
-            {
-                case NMSP_DRAWINGML|XML_lnRef :     // CT_StyleMatrixReference
-                    return createStyleMatrixContext(nElement,rAttribs,
-                                                    maStyleEntry.maLineStyle);
-                case NMSP_DRAWINGML|XML_fillRef :   // CT_StyleMatrixReference
-                    return createStyleMatrixContext(nElement,rAttribs,
-                                                    maStyleEntry.maFillStyle);
-                case NMSP_DRAWINGML|XML_effectRef : // CT_StyleMatrixReference
-                    return createStyleMatrixContext(nElement,rAttribs,
-                                                    maStyleEntry.maEffectStyle);
-                case NMSP_DRAWINGML|XML_fontRef :   // CT_FontRe    ference
-                    return createStyleMatrixContext(nElement,rAttribs,
-                                                    maStyleEntry.maTextStyle);
-            }
-            return 0;
-        }
-    }
 
-    return 0;
 }
 
-void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttribs )
+void SAL_CALL DiagramQStylesFragmentHandler::endDocument()
+    throw (SAXException, RuntimeException)
+{
+
+}
+
+
+Reference< XFastContextHandler > SAL_CALL
+DiagramQStylesFragmentHandler::createFastChildContext( ::sal_Int32 aElement,
+                                                    const Reference< XFastAttributeList >& )
+    throw ( SAXException, RuntimeException)
 {
-    if( getCurrentElement() == (NMSP_DIAGRAM|XML_styleLbl) )
+    Reference< XFastContextHandler > xRet;
+
+    switch( aElement )
     {
-        maStyleName = rAttribs.getString( XML_name, OUString() );
-        maStyleEntry = mrStylesMap[maStyleName];
+    case NMSP_DIAGRAM|XML_styleDef:
+        // TODO
+        break;
+    default:
+        break;
     }
+
+    if( !xRet.is() )
+        xRet = getFastContextHandler();
+
+    return xRet;
 }
 
-void DiagramQStylesFragmentHandler::onEndElement( const ::rtl::OUString& )
+/////////////////////
+
+DiagramColorsFragmentHandler::DiagramColorsFragmentHandler( XmlFilterBase& rFilter,
+                                                        const OUString& rFragmentPath,
+                                                        const DiagramColorsPtr pDataPtr )
+    throw( )
+    : FragmentHandler( rFilter, rFragmentPath )
+    , mpDataPtr( pDataPtr )
 {
-    if( getCurrentElement() == (NMSP_DIAGRAM|XML_styleLbl) )
-        mrStylesMap[maStyleName] = maStyleEntry;
 }
 
-///////////////////////
+DiagramColorsFragmentHandler::~DiagramColorsFragmentHandler( ) throw ()
+{
 
-ColorFragmentHandler::ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter,
-                                            const ::rtl::OUString& rFragmentPath,
-                                            DiagramColorMap& rColorsMap ) :
-    FragmentHandler2(rFilter,rFragmentPath),
-    maColorName(),
-    maColorEntry(),
-    mrColorsMap(rColorsMap)
-{}
-
-::oox::core::ContextHandlerRef ColorFragmentHandler::onCreateContext( sal_Int32 nElement,
-                                                                      const AttributeList& /*rAttribs*/ )
+}
+
+void SAL_CALL DiagramColorsFragmentHandler::endDocument()
+    throw (SAXException, RuntimeException)
 {
-    // state-table like way of navigating the color fragment. we
-    // currently ignore everything except styleLbl in the colorsDef
-    // element
-    switch( getCurrentElement() )
-    {
-        case XML_ROOT_CONTEXT:
-            return nElement == (NMSP_DIAGRAM|XML_colorsDef) ? this : NULL;;
-        case NMSP_DIAGRAM|XML_colorsDef:
-            return nElement == (NMSP_DIAGRAM|XML_styleLbl) ? this : NULL;;
-        case NMSP_DIAGRAM|XML_styleLbl:
-            return ((nElement == (NMSP_DIAGRAM|XML_fillClrLst)) ||
-                    (nElement == (NMSP_DIAGRAM|XML_linClrLst)) ||
-                    (nElement == (NMSP_DIAGRAM|XML_effectClrLst)) ||
-                    (nElement == (NMSP_DIAGRAM|XML_txLinClrLst)) ||
-                    (nElement == (NMSP_DIAGRAM|XML_txFillClrLst)) ||
-                    (nElement == (NMSP_DIAGRAM|XML_txEffectClrLst))) ? this : NULL;;
-
-        // the actual colors - defer to color fragment handlers.
-
-        // TODO(F1): well, actually, there might be *several* color
-        // definitions in it, after all it's called list. but
-        // apparently colorChoiceContext doesn't handle that anyway...
-        case NMSP_DIAGRAM|XML_fillClrLst:
-            return new ColorContext( *this, maColorEntry.maFillColor );
-        case NMSP_DIAGRAM|XML_linClrLst:
-            return new ColorContext( *this, maColorEntry.maLineColor );
-        case NMSP_DIAGRAM|XML_effectClrLst:
-            return new ColorContext( *this, maColorEntry.maEffectColor );
-        case NMSP_DIAGRAM|XML_txFillClrLst:
-            return new ColorContext( *this, maColorEntry.maTextFillColor );
-        case NMSP_DIAGRAM|XML_txLinClrLst:
-            return new ColorContext( *this, maColorEntry.maTextLineColor );
-        case NMSP_DIAGRAM|XML_txEffectClrLst:
-            return new ColorContext( *this, maColorEntry.maTextEffectColor );
-    }
 
-    return 0;
 }
 
-void ColorFragmentHandler::onStartElement( const AttributeList& rAttribs )
+
+Reference< XFastContextHandler > SAL_CALL
+DiagramColorsFragmentHandler::createFastChildContext( ::sal_Int32 aElement,
+                                                    const Reference< XFastAttributeList >& )
+    throw ( SAXException, RuntimeException)
 {
-    if( getCurrentElement() == (NMSP_DIAGRAM|XML_styleLbl) )
+    Reference< XFastContextHandler > xRet;
+
+    switch( aElement )
     {
-        maColorName = rAttribs.getString( XML_name, OUString() );
-        maColorEntry = mrColorsMap[maColorName];
+    case NMSP_DIAGRAM|XML_colorsDef:
+        // TODO
+        break;
+    default:
+        break;
     }
-}
 
-void ColorFragmentHandler::onEndElement( const ::rtl::OUString& )
-{
-    if( getCurrentElement() == (NMSP_DIAGRAM|XML_styleLbl) )
-        mrColorsMap[maColorName] = maColorEntry;
+    if( !xRet.is() )
+        xRet = getFastContextHandler();
+
+    return xRet;
 }
 
+
+
+
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
deleted file mode 100644
index ab157e7fd349..000000000000
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: diagramfragmenthandler.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef OOX_DRAWINGML_DIAGRAMFRAGMENTHANDLER
-#define OOX_DRAWINGML_DIAGRAMFRAGMENTHANDLER
-
-#include "oox/core/fragmenthandler.hxx"
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
-
-namespace oox { namespace drawingml {
-
-
-class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler
-{
-public:
-    DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, const DiagramDataPtr pDataPtr ) throw();
-    virtual ~DiagramDataFragmentHandler() throw();
-
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-
-private:
-
-    DiagramDataPtr  mpDataPtr;
-};
-
-
-
-class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler
-{
-public:
-    DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, const DiagramLayoutPtr pDataPtr ) throw();
-    virtual ~DiagramLayoutFragmentHandler() throw();
-
-    virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-
-private:
-
-    DiagramLayoutPtr    mpDataPtr;
-};
-
-class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2
-{
-public:
-    DiagramQStylesFragmentHandler(
-        oox::core::XmlFilterBase& rFilter,
-        const ::rtl::OUString& rFragmentPath,
-        DiagramQStyleMap& rStylesMap );
-
-    virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-
-    virtual void onStartElement( const AttributeList& rAttribs );
-    virtual void onEndElement( const ::rtl::OUString& rChars );
-
-private:
-    ::oox::core::ContextHandlerRef createStyleMatrixContext(sal_Int32 nElement,
-                                                            const AttributeList& rAttribs,
-                                                            ShapeStyleRef& o_rStyle);
-
-    ::rtl::OUString   maStyleName;
-    DiagramStyle      maStyleEntry;
-    DiagramQStyleMap& mrStylesMap;
-};
-
-class ColorFragmentHandler : public ::oox::core::FragmentHandler2
-{
-public:
-    ColorFragmentHandler(
-        ::oox::core::XmlFilterBase& rFilter,
-        const ::rtl::OUString& rFragmentPath,
-        DiagramColorMap& rColorMap );
-
-    virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-
-    virtual void onStartElement( const AttributeList& rAttribs );
-    virtual void onEndElement( const ::rtl::OUString& rChars );
-
-private:
-    ::rtl::OUString   maColorName;
-    DiagramColor      maColorEntry;
-    DiagramColorMap&  mrColorsMap;
-};
-
-} }
-
-
-#endif
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index a0c2d6eb1245..dd213fda6c36 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -26,24 +26,14 @@
  *
  ************************************************************************/
 
-#include "diagramlayoutatoms.hxx"
+#include "oox/drawingml/diagram/diagramlayoutatoms.hxx"
 
 #include <functional>
 #include <boost/bind.hpp>
 
-#include <basegfx/numeric/ftools.hxx>
-
 #include "oox/helper/attributelist.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/lineproperties.hxx"
-#include "oox/drawingml/textbody.hxx"
-#include "oox/drawingml/textparagraph.hxx"
-#include "oox/drawingml/textrun.hxx"
-#include "oox/drawingml/customshapeproperties.hxx"
-#include "diagramlayoutatoms.hxx"
 #include "layoutnodecontext.hxx"
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::oox::core;
@@ -53,7 +43,7 @@ namespace oox { namespace drawingml {
 
 IteratorAttr::IteratorAttr( )
     : mnAxis( 0 )
-    , mnCnt( -1 )
+    , mnCnt( 0 )
     , mbHideLastTrans( false )
     , mnPtType( 0 )
     , mnSt( 0 )
@@ -65,7 +55,7 @@ void IteratorAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr )
 {
     AttributeList attr( xAttr );
     mnAxis = xAttr->getOptionalValueToken( XML_axis, 0 );
-    mnCnt = attr.getInteger( XML_cnt, -1 );
+    mnCnt = attr.getInteger( XML_cnt, 0 );
     mbHideLastTrans = attr.getBool( XML_hideLastTrans, false );
     mnPtType = xAttr->getOptionalValueToken( XML_ptType, 0 );
     mnSt = attr.getInteger( XML_st, 0 );
@@ -98,675 +88,56 @@ void LayoutAtom::dump(int level)
     OSL_TRACE( "level = %d - %s of type %s", level,
                OUSTRING_TO_CSTR( msName ),
                typeid(*this).name() );
-    const std::vector<LayoutAtomPtr>& pChildren=getChildren();
-    std::for_each( pChildren.begin(), pChildren.end(),
-                   boost::bind( &LayoutAtom::dump, _1, level + 1 ) );
-}
-
-
-ForEachAtom::ForEachAtom(const Reference< XFastAttributeList >& xAttributes)
-{
-    maIter.loadFromXAttr(xAttributes);
-}
-
-void ForEachAtom::accept( LayoutAtomVisitor& rVisitor )
-{
-    rVisitor.visit(*this);
-}
-
-void ChooseAtom::accept( LayoutAtomVisitor& rVisitor )
-{
-    rVisitor.visit(*this);
-}
-
-ConditionAtom::ConditionAtom(const Reference< XFastAttributeList >& xAttributes) :
-    mbElse( false )
-{
-    maIter.loadFromXAttr( xAttributes );
-    maCond.loadFromXAttr( xAttributes );
-}
-
-const std::vector<LayoutAtomPtr>& ConditionAtom::getChildren() const
-{
-    bool bDecisionVar=true;
-    // HACK
-    if( maCond.mnFunc==XML_var && maCond.mnArg==XML_dir &&
-        maCond.mnOp==XML_equ && !maCond.msVal.equalsAscii("norm") )
-        bDecisionVar=false;
-
-    if( bDecisionVar )
-        return mpChildNodes;
-    else
-        return mpElseChildNodes;
-}
-
-void ConditionAtom::accept( LayoutAtomVisitor& rVisitor )
-{
-    rVisitor.visit(*this);
-}
-
-void ConditionAtom::addChild( const LayoutAtomPtr & pNode )
-{
-    if( mbElse )
-        mpElseChildNodes.push_back( pNode );
-    else
-        mpChildNodes.push_back( pNode );
-}
-
-void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor )
-{
-    rVisitor.visit(*this);
-}
-
-void AlgAtom::accept( LayoutAtomVisitor& rVisitor )
-{
-    rVisitor.visit(*this);
+    std::for_each( mpChildNodes.begin(), mpChildNodes.end(),
+                  boost::bind( &LayoutAtom::dump, _1, level + 1 ) );
 }
 
-void AlgAtom::layoutShape( const ShapePtr& rShape,
-                           const Diagram&  /*rDgm*/,
-                           const rtl::OUString& rName ) const
-{
-    switch(mnType)
-    {
-        case XML_composite:
-        {
-            if( rShape->getChildren().empty() )
-            {
-                rShape->setSize(awt::Size(50,50));
-                break;
-            }
-
-            // just put stuff below each other
-            const sal_Int32 nIncX=0;
-            const sal_Int32 nIncY=1;
-
-            std::vector<ShapePtr>::const_iterator aCurrShape=rShape->getChildren().begin();
-            const std::vector<ShapePtr>::const_iterator aLastShape=rShape->getChildren().end();
-
-            // find biggest shape
-            awt::Size aMaxSize;
-            while( aCurrShape != aLastShape )
-            {
-                const awt::Size& sz=(*aCurrShape)->getSize();
-
-                aMaxSize.Width = std::max(
-                    aMaxSize.Width,
-                    sz.Width);
-                aMaxSize.Height = std::max(
-                    aMaxSize.Height,
-                    sz.Height);
-
-                ++aCurrShape;
-            }
-
-            aCurrShape=rShape->getChildren().begin();
-            const awt::Point aStartPos=(*aCurrShape)->getPosition();
-            awt::Point aCurrPos=aStartPos;
-            awt::Size  aTotalSize;
-            aTotalSize.Width = aMaxSize.Width;
-            while( aCurrShape != aLastShape )
-            {
-                const awt::Size& sz=(*aCurrShape)->getSize();
-                (*aCurrShape)->setPosition(aCurrPos);
-                (*aCurrShape)->setSize(
-                    awt::Size(aMaxSize.Width,
-                              sz.Height));
-
-                aTotalSize.Height = std::max(
-                    aTotalSize.Height,
-                    aCurrPos.Y + sz.Height);
-
-                aCurrPos.X += nIncX*sz.Width;
-                aCurrPos.Y += nIncY*sz.Height;
-
-                ++aCurrShape;
-            }
-
-            rShape->setSize(aTotalSize);
-            break;
-        }
-
-        case XML_conn:
-            break;
-
-        case XML_cycle:
-        {
-            if( rShape->getChildren().empty() )
-            {
-                rShape->setSize(awt::Size(50,50));
-                break;
-            }
-
-            const sal_Int32 nStartAngle=maMap.count(XML_stAng) ? maMap.find(XML_stAng)->second : 0;
-            const sal_Int32 nSpanAngle=maMap.count(XML_spanAng) ? maMap.find(XML_spanAng)->second : 360;
-
-            std::vector<ShapePtr>::const_iterator aCurrShape=rShape->getChildren().begin();
-            const std::vector<ShapePtr>::const_iterator aLastShape=rShape->getChildren().end();
-            const sal_Int32 nShapes=aLastShape-aCurrShape;
-
-            // find biggest shape
-            awt::Size aMaxSize;
-            while( aCurrShape != aLastShape )
-            {
-                const awt::Size& sz=(*aCurrShape)->getSize();
-
-                aMaxSize.Width = std::max(
-                    aMaxSize.Width,
-                    sz.Width);
-                aMaxSize.Height = std::max(
-                    aMaxSize.Height,
-                    sz.Height);
-
-                ++aCurrShape;
-            }
-
-            // layout shapes
-            const sal_Int32 nMaxDim=std::max(aMaxSize.Width,aMaxSize.Height);
-            awt::Size aTotalSize;
-            aCurrShape=rShape->getChildren().begin();
-            for( sal_Int32 i=0; i<nShapes; ++i, ++aCurrShape )
-            {
-                const awt::Size& sz=(*aCurrShape)->getSize();
-
-                const double r=nShapes*nMaxDim/F_2PI * 360.0/nSpanAngle;
-                const awt::Point aCurrPos(
-                    r + r*sin( (double(i)*nSpanAngle/nShapes + nStartAngle)*F_PI180 ),
-                    r - r*cos( (double(i)*nSpanAngle/nShapes + nStartAngle)*F_PI180 ) );
-                (*aCurrShape)->setPosition(aCurrPos);
-
-                aTotalSize.Width = std::max(
-                    aTotalSize.Width,
-                    aCurrPos.X + sz.Width);
-                aTotalSize.Height = std::max(
-                    aTotalSize.Height,
-                    aCurrPos.Y + sz.Height);
-            }
-
-            rShape->setSize(aTotalSize);
-            break;
-        }
-
-        case XML_hierChild:
-        case XML_hierRoot:
-            break;
-
-        case XML_lin:
-        {
-            if( rShape->getChildren().empty() )
-            {
-                rShape->setSize(awt::Size(50,50));
-                break;
-            }
-
-            const sal_Int32 nDir=maMap.count(XML_linDir) ? maMap.find(XML_linDir)->second : XML_fromL;
-            const sal_Int32 nIncX=nDir==XML_fromL ? 1 : (nDir==XML_fromR ? -1 : 0);
-            const sal_Int32 nIncY=nDir==XML_fromT ? 1 : (nDir==XML_fromB ? -1 : 0);
-
-            std::vector<ShapePtr>::const_iterator aCurrShape=rShape->getChildren().begin();
-            const std::vector<ShapePtr>::const_iterator aLastShape=rShape->getChildren().end();
-            const awt::Point aStartPos=(*aCurrShape)->getPosition();
-            awt::Point aCurrPos=aStartPos;
-            awt::Size  aTotalSize;
-            while( aCurrShape != aLastShape )
-            {
-                const awt::Size& sz=(*aCurrShape)->getSize();
-                (*aCurrShape)->setPosition(aCurrPos);
-
-                aTotalSize.Width = std::max(
-                    aTotalSize.Width,
-                    aCurrPos.X + sz.Width);
-                aTotalSize.Height = std::max(
-                    aTotalSize.Height,
-                    aCurrPos.Y + sz.Height);
-
-                // HACK: the spacing is arbitrary
-                aCurrPos.X += nIncX*(sz.Width+5);
-                aCurrPos.Y += nIncY*(sz.Height+5);
-
-                ++aCurrShape;
-            }
-
-            rShape->setSize(aTotalSize);
-            break;
-        }
-
-        case XML_pyra:
-        case XML_snake:
-            break;
-
-        case XML_sp:
-            // HACK. Handled one level higher. Or rather, planned to
-            break;
 
-        case XML_tx:
-        {
-            TextBodyPtr pTextBody=rShape->getTextBody();
-            if( !pTextBody ||
-                pTextBody->getParagraphs().empty() ||
-                pTextBody->getParagraphs().front()->getRuns().empty() )
-            {
-                rShape->setSize(awt::Size(5,5));
-                break;
-            }
-
-            // HACK - count chars & paragraphs to come up with *some*
-            // notion of necessary size
-            const sal_Int32 nHackyFontHeight=50;
-            const sal_Int32 nHackyFontWidth=20;
-            awt::Size aTotalSize;
-            for( sal_uInt32 nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara )
-            {
-                aTotalSize.Height += nHackyFontHeight;
-
-                sal_Int32 nLocalWidth=0;
-                for( sal_uInt32 nRun=0; nRun<pTextBody->getParagraphs().at(nPara)->getRuns().size(); ++nRun )
-                    nLocalWidth +=
-                        pTextBody->getParagraphs().at(nPara)->getRuns().at(nRun)->getText().getLength()
-                        * nHackyFontWidth;
-
-                aTotalSize.Width = std::max(
-                    aTotalSize.Width,
-                    nLocalWidth);
-            }
-
-            rShape->setSize(aTotalSize);
-        }
-
-        default:
-            break;
-    }
-
-    OSL_TRACE("Layouting shape %s: (%d,%d,%d,%d)",
-              OUSTRING_TO_CSTR( rName ),
-              rShape->getPosition().X,
-              rShape->getPosition().Y,
-              rShape->getSize().Width,
-              rShape->getSize().Height);
-}
-
-void LayoutNode::accept( LayoutAtomVisitor& rVisitor )
+void ForEachAtom::processAtom()
 {
-    rVisitor.visit(*this);
+    // TODO there is likely some conditions
+    std::for_each( mpChildNodes.begin(), mpChildNodes.end(),
+                   boost::bind( &LayoutAtom::processAtom, _1 ) );
 }
 
-bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uInt32 nIdx ) const
+/** call ConditionAtom::test() if pAtom is one
+ * if it is not a ConditionAtom, then return false.
+ */
+static bool _test_atom( const LayoutAtomPtr & pAtom)
 {
-    // find the data node to grab text from
-    DiagramData::PointsNameMap::const_iterator aDataNode=rDgm.getData()->getPointsPresNameMap().find(msName);
-    if( aDataNode->second.size() > nIdx &&
-        aDataNode != rDgm.getData()->getPointsPresNameMap().end() )
-    {
-        OSL_TRACE( "Filling content from %d th layout node named \"%s\", modelId \"%s\"",
-                   nIdx,
-                   OUSTRING_TO_CSTR( msName ),
-                   OUSTRING_TO_CSTR( aDataNode->second.at(nIdx)->msModelId ) );
-
-        // got the presentation node - now, need the actual data node:
-        const DiagramData::StringMap::const_iterator aNodeName=rDgm.getData()->getPresOfNameMap().find(
-            aDataNode->second.at(nIdx)->msModelId);
-        if( aNodeName != rDgm.getData()->getPresOfNameMap().end() )
-        {
-            DiagramData::StringMap::value_type::second_type::const_iterator aVecIter=aNodeName->second.begin();
-            const DiagramData::StringMap::value_type::second_type::const_iterator aVecEnd=aNodeName->second.end();
-            while( aVecIter != aVecEnd )
-            {
-                DiagramData::PointNameMap::const_iterator aDataNode2=rDgm.getData()->getPointNameMap().find(aVecIter->first);
-                if( aVecIter->second == 0 )
-                {
-                    // grab shape attr from topmost element(s)
-                    rShape->getShapeProperties() = aDataNode2->second->mpShape->getShapeProperties();
-                    rShape->getLineProperties() = aDataNode2->second->mpShape->getLineProperties();
-                    rShape->getFillProperties() = aDataNode2->second->mpShape->getFillProperties();
-                    rShape->getCustomShapeProperties() = aDataNode2->second->mpShape->getCustomShapeProperties();
-                    rShape->setMasterTextListStyle( aDataNode2->second->mpShape->getMasterTextListStyle() );
-
-                    OSL_TRACE( "Custom shape with preset type %s added for layout node named \"%s\"",
-                               OUSTRING_TO_CSTR(
-                                   rShape->getCustomShapeProperties()->getShapePresetType()),
-                               OUSTRING_TO_CSTR( msName ) );
-                }
-
-                // append text with right outline level
-                if( aDataNode2->second->mpShape->getTextBody() &&
-                    !aDataNode2->second->mpShape->getTextBody()->getParagraphs().empty() &&
-                    !aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getRuns().empty() )
-                {
-                    TextBodyPtr pTextBody=rShape->getTextBody();
-                    if( !pTextBody )
-                    {
-                        pTextBody.reset( new TextBody() );
-
-                        // also copy text attrs
-                        pTextBody->getTextListStyle() =
-                            aDataNode2->second->mpShape->getTextBody()->getTextListStyle();
-                        pTextBody->getTextProperties() =
-                            aDataNode2->second->mpShape->getTextBody()->getTextProperties();
-
-                        rShape->setTextBody(pTextBody);
-                    }
-
-                    TextParagraph& rPara=pTextBody->addParagraph();
-                    if( aVecIter->second != -1 )
-                        rPara.getProperties().setLevel(aVecIter->second);
-
-                    rPara.addRun(
-                        aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getRuns().front());
-                    rPara.getProperties().apply(
-                        aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getProperties());
-                }
-
-                ++aVecIter;
-            }
-        }
-        else
-        {
-            OSL_TRACE("ShapeCreationVisitor::visit: no data node name found while processing shape type %s for layout node named \"%s\"",
-                      OUSTRING_TO_CSTR(
-                          rShape->getCustomShapeProperties()->getShapePresetType()),
-                      OUSTRING_TO_CSTR( msName ) );
-        }
-
-        // TODO(Q1): apply styling & coloring - taking
-        // layout node's styleLbl for both style & color
-        // now, but docs are a bit unclear on this
-        if( msStyleLabel.getLength() )
+    try {
+        bool bResult = false;
+        const ConditionAtomPtr pCond = boost::dynamic_pointer_cast< ConditionAtom >(pAtom);
+        if( pCond )
         {
-            OSL_TRACE("setting style with label %s",
-                      OUSTRING_TO_CSTR( msStyleLabel ) );
-
-            const DiagramQStyleMap::const_iterator aStyle=rDgm.getStyles().find(msStyleLabel);
-            if( aStyle != rDgm.getStyles().end() )
-            {
-                rShape->getShapeStyleRefs()[XML_fillRef] = aStyle->second.maFillStyle;
-                OSL_TRACE("added fill style with id %d", aStyle->second.maFillStyle.mnThemedIdx);
-                rShape->getShapeStyleRefs()[XML_lnRef] = aStyle->second.maLineStyle;
-                OSL_TRACE("added line style with id %d", aStyle->second.maLineStyle.mnThemedIdx);
-                rShape->getShapeStyleRefs()[XML_effectRef] = aStyle->second.maEffectStyle;
-                OSL_TRACE("added effect style with id %d", aStyle->second.maEffectStyle.mnThemedIdx);
-                rShape->getShapeStyleRefs()[XML_fontRef] = aStyle->second.maTextStyle;
-                OSL_TRACE("added fontref style with id %d", aStyle->second.maTextStyle.mnThemedIdx);
-                Color aColor=aStyle->second.maTextStyle.maPhClr;
-                OSL_TRACE("added fontref color with alpha %d", aColor.getTransparence() );
-            }
-
-            const DiagramColorMap::const_iterator aColor=rDgm.getColors().find(msStyleLabel);
-            if( aColor != rDgm.getColors().end() )
-            {
-                const DiagramColor& rColor=aColor->second;
-                if( rColor.maFillColor.isUsed() )
-                    rShape->getShapeStyleRefs()[XML_fillRef].maPhClr = rColor.maFillColor;
-                if( rColor.maLineColor.isUsed() )
-                    rShape->getShapeStyleRefs()[XML_lnRef].maPhClr = rColor.maLineColor;
-                if( rColor.maEffectColor.isUsed() )
-                    rShape->getShapeStyleRefs()[XML_effectRef].maPhClr = rColor.maEffectColor;
-                if( rColor.maTextFillColor.isUsed() )
-                    rShape->getShapeStyleRefs()[XML_fontRef].maPhClr = rColor.maTextFillColor;
-            }
+            bResult = pCond->test();
         }
-
-        // even if no data node found, successful anyway. it's
-        // contained at the layoutnode
-        return true;
+        return bResult;
     }
-    else
+    catch(...)
     {
-        OSL_TRACE("ShapeCreationVisitor::visit: no text found while processing shape type %s for layout node named \"%s\"",
-                  OUSTRING_TO_CSTR(
-                      rShape->getCustomShapeProperties()->getShapePresetType()),
-                  OUSTRING_TO_CSTR( msName ) );
     }
-
     return false;
 }
 
-///////////////////////////////////////////////////////////////////////
-//
-// Visitation
-//
-
-class ShapeLayoutingVisitor : public LayoutAtomVisitor
-{
-    ShapePtr mpParentShape;
-    const Diagram& mrDgm;
-    rtl::OUString maName;
-
-    virtual void visit(ConstraintAtom& rAtom);
-    virtual void visit(AlgAtom& rAtom);
-    virtual void visit(ForEachAtom& rAtom);
-    virtual void visit(ConditionAtom& rAtom);
-    virtual void visit(ChooseAtom& rAtom);
-    virtual void visit(LayoutNode& rAtom);
-
-public:
-    ShapeLayoutingVisitor(const ShapePtr& rParentShape,
-                          const Diagram& rDgm,
-                          const rtl::OUString& rName) :
-        mpParentShape(rParentShape),
-        mrDgm(rDgm),
-        maName(rName)
-    {}
-
-    void defaultVisit(LayoutAtom& rAtom);
-};
-
-class ShallowPresNameVisitor : public LayoutAtomVisitor
-{
-    const Diagram& mrDgm;
-    size_t mnCnt;
-
-    void defaultVisit(LayoutAtom& rAtom);
-    virtual void visit(ConstraintAtom& rAtom);
-    virtual void visit(AlgAtom& rAtom);
-    virtual void visit(ForEachAtom& rAtom);
-    virtual void visit(ConditionAtom& rAtom);
-    virtual void visit(ChooseAtom& rAtom);
-    virtual void visit(LayoutNode& rAtom);
-
-public:
-    ShallowPresNameVisitor(const Diagram& rDgm) :
-        mrDgm(rDgm),
-        mnCnt(0)
-    {}
-
-    size_t getCount() const
-        { return mnCnt; }
-};
-
-void ShapeCreationVisitor::defaultVisit(LayoutAtom& rAtom)
-{
-    const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren();
-    std::for_each( pChildren.begin(), pChildren.end(),
-                   boost::bind( &LayoutAtom::accept,
-                                _1,
-                                boost::ref(*this)) );
-}
-
-void ShapeCreationVisitor::visit(ConstraintAtom& /*rAtom*/)
-{
-    // TODO: eval the constraints
-}
-
-void ShapeCreationVisitor::visit(AlgAtom& rAtom)
+void ChooseAtom::processAtom()
 {
-    defaultVisit(rAtom);
-}
-
-void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
-{
-    const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren();
-
-    sal_Int32 nChildren=1;
-    if( rAtom.iterator().mnPtType == XML_node )
-    {
-        // cound child data nodes - check all child Atoms for "name"
-        // attribute that is contained in diagram's
-        // getPointsPresNameMap()
-        ShallowPresNameVisitor aVisitor(mrDgm);
-        std::for_each( pChildren.begin(), pChildren.end(),
-                       boost::bind( &LayoutAtom::accept,
-                                    _1,
-                                    boost::ref(aVisitor)) );
-        nChildren = aVisitor.getCount();
-    }
-
-    const sal_Int32 nCnt = std::min(
-        nChildren,
-        rAtom.iterator().mnCnt==-1 ? nChildren : rAtom.iterator().mnCnt);
-
-    const sal_Int32 nOldIdx=mnCurrIdx;
-    const sal_Int32 nStep=rAtom.iterator().mnStep;
-    for( mnCurrIdx=0; mnCurrIdx<nCnt && nStep>0; mnCurrIdx+=nStep )
-    {
-        // TODO there is likely some conditions
-        std::for_each( pChildren.begin(), pChildren.end(),
-                       boost::bind( &LayoutAtom::accept,
-                                    _1,
-                                    boost::ref(*this)) );
-    }
-
-    // and restore idx
-    mnCurrIdx = nOldIdx;
-}
-
-void ShapeCreationVisitor::visit(ConditionAtom& rAtom)
-{
-    defaultVisit(rAtom);
-}
-
-void ShapeCreationVisitor::visit(ChooseAtom& rAtom)
-{
-    defaultVisit(rAtom);
-}
-
-void ShapeCreationVisitor::visit(LayoutNode& rAtom)
-{
-    ShapePtr pCurrParent(mpParentShape);
-    ShapePtr pCurrShape(rAtom.getShape());
-    if( pCurrShape )
-    {
-        OSL_TRACE("ShapeCreationVisitor::visit: processing shape type %s",
-                  OUSTRING_TO_CSTR(
-                      pCurrShape->getCustomShapeProperties()->getShapePresetType()) );
-
-        // TODO(F3): cloned shape shares all properties by reference,
-        // don't change them!
-        ShapePtr pClonedShape(
-            new Shape( pCurrShape ));
-
-        if( rAtom.setupShape(pClonedShape, mrDgm, mnCurrIdx) )
-        {
-            pCurrParent->addChild(pClonedShape);
-            pCurrParent = pClonedShape;
-        }
-    }
-    else
+    std::vector< LayoutAtomPtr >::iterator
+        iter = std::find_if( mpChildNodes.begin(), mpChildNodes.end(),
+                             boost::bind( &_test_atom, _1 ) );
+    if( iter != mpChildNodes.end() )
     {
-        OSL_TRACE("ShapeCreationVisitor::visit: no shape set while processing layoutnode named %s",
-                  OUSTRING_TO_CSTR( rAtom.getName() ) );
+        // TODO do something
+        (*iter)->processAtom();
     }
-
-    // set new parent for children
-    ShapePtr pPreviousParent(mpParentShape);
-    mpParentShape=pCurrParent;
-
-    // process children
-    defaultVisit(rAtom);
-
-    // restore parent
-    mpParentShape=pPreviousParent;
-
-    // layout shapes - now all child shapes are created
-    ShapeLayoutingVisitor aLayoutingVisitor(pCurrParent,
-                                            mrDgm,
-                                            rAtom.getName());
-    aLayoutingVisitor.defaultVisit(rAtom);
-}
-
-void ShapeLayoutingVisitor::defaultVisit(LayoutAtom& rAtom)
-{
-    // visit all children, one of them need to be the layout algoritm
-    const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren();
-    std::for_each( pChildren.begin(), pChildren.end(),
-                   boost::bind( &LayoutAtom::accept,
-                                _1,
-                                boost::ref(*this)) );
-}
-
-void ShapeLayoutingVisitor::visit(ConstraintAtom& /*rAtom*/)
-{
-    // stop processing
-}
-
-void ShapeLayoutingVisitor::visit(AlgAtom& rAtom)
-{
-    rAtom.layoutShape(mpParentShape,mrDgm,maName);
-}
-
-void ShapeLayoutingVisitor::visit(ForEachAtom& /*rAtom*/)
-{
-    // stop processing
-}
-
-void ShapeLayoutingVisitor::visit(ConditionAtom& rAtom)
-{
-    defaultVisit(rAtom);
-}
-
-void ShapeLayoutingVisitor::visit(ChooseAtom& rAtom)
-{
-    defaultVisit(rAtom);
-}
-
-void ShapeLayoutingVisitor::visit(LayoutNode& /*rAtom*/)
-{
-    // stop processing - only traverse Condition/Choose atoms
-}
-
-void ShallowPresNameVisitor::defaultVisit(LayoutAtom& rAtom)
-{
-    // visit all children, at least one of them needs to have proper
-    // name set
-    const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren();
-    std::for_each( pChildren.begin(), pChildren.end(),
-                   boost::bind( &LayoutAtom::accept,
-                                _1,
-                                boost::ref(*this)) );
-}
-
-void ShallowPresNameVisitor::visit(ConstraintAtom& /*rAtom*/)
-{
-    // stop processing
 }
 
-void ShallowPresNameVisitor::visit(AlgAtom& /*rAtom*/)
+bool ConditionAtom::test()
 {
-    // stop processing
-}
-
-void ShallowPresNameVisitor::visit(ForEachAtom& rAtom)
-{
-    defaultVisit(rAtom);
-}
-
-void ShallowPresNameVisitor::visit(ConditionAtom& rAtom)
-{
-    defaultVisit(rAtom);
-}
-
-void ShallowPresNameVisitor::visit(ChooseAtom& rAtom)
-{
-    defaultVisit(rAtom);
+    // TODO
+    return false;
 }
 
-void ShallowPresNameVisitor::visit(LayoutNode& rAtom)
-{
-    DiagramData::PointsNameMap::const_iterator aDataNode=
-        mrDgm.getData()->getPointsPresNameMap().find(rAtom.getName());
-    if( aDataNode != mrDgm.getData()->getPointsPresNameMap().end() )
-        mnCnt = std::max(mnCnt,
-                         aDataNode->second.size());
-}
 
 } }
 
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
deleted file mode 100644
index 5f7ab297435e..000000000000
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ /dev/null
@@ -1,318 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: diagramlayoutatoms.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_DRAWINGML_DIAGRAMLAYOUTATOMS_HXX
-#define OOX_DRAWINGML_DIAGRAMLAYOUTATOMS_HXX
-
-#include <map>
-#include <string>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/array.hpp>
-
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-
-#include "oox/drawingml/shape.hxx"
-#include "diagram.hxx"
-
-
-namespace oox { namespace drawingml {
-
-class DiagramLayout;
-typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr;
-
-// AG_IteratorAttributes
-struct IteratorAttr
-{
-    IteratorAttr();
-
-    // not sure this belong here, but wth
-    void loadFromXAttr( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
-
-    sal_Int32 mnAxis;
-    sal_Int32 mnCnt;
-    sal_Bool  mbHideLastTrans;
-    sal_Int32 mnPtType;
-    sal_Int32 mnSt;
-    sal_Int32 mnStep;
-};
-
-struct ConditionAttr
-{
-    ConditionAttr();
-
-    // not sure this belong here, but wth
-    void loadFromXAttr( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
-
-    sal_Int32 mnFunc;
-    sal_Int32 mnArg;
-    sal_Int32 mnOp;
-    ::rtl::OUString msVal;
-};
-
-struct LayoutAtomVisitor;
-class LayoutAtom;
-
-typedef boost::shared_ptr< LayoutAtom > LayoutAtomPtr;
-
-/** abstract Atom for the layout */
-class LayoutAtom
-{
-public:
-    /** visitor acceptance
-     */
-    virtual void accept( LayoutAtomVisitor& ) = 0;
-
-    void setName( const ::rtl::OUString& sName )
-        { msName = sName; }
-    const ::rtl::OUString& getName() const
-        { return msName; }
-
-    virtual void addChild( const LayoutAtomPtr & pNode )
-        { mpChildNodes.push_back( pNode ); }
-    virtual const std::vector<LayoutAtomPtr>& getChildren() const
-        { return mpChildNodes; }
-
-    // dump for debug
-    void dump(int level = 0);
-protected:
-    std::vector< LayoutAtomPtr > mpChildNodes;
-    ::rtl::OUString              msName;
-};
-
-class ConstraintAtom
-    : public LayoutAtom
-{
-public:
-    ConstraintAtom() :
-        mnFor(-1), msForName(), mnPointType(-1), mnType(-1), mnRefFor(-1), msRefForName(),
-        mnRefType(-1), mnRefPointType(-1), mfFactor(1.0), mfValue(0.0), mnOperator(0)
-    {}
-
-    virtual void accept( LayoutAtomVisitor& );
-
-    void setFor( sal_Int32 nToken )
-        { mnFor = nToken; }
-    void setForName( const ::rtl::OUString & sName )
-        { msForName = sName; }
-    void setPointType( sal_Int32 nToken )
-        { mnPointType = nToken; }
-    void setType( sal_Int32 nToken )
-        { mnType = nToken; }
-    void setRefFor( sal_Int32 nToken )
-        { mnRefFor = nToken; }
-    void setRefForName( const ::rtl::OUString & sName )
-        { msRefForName = sName; }
-    void setRefType( sal_Int32 nToken )
-        { mnRefType = nToken; }
-    void setRefPointType( sal_Int32 nToken )
-        { mnRefPointType = nToken; }
-    void setFactor( const double& fVal )
-        { mfFactor = fVal; }
-    void setValue( const double& fVal )
-        { mfValue = fVal; }
-    void setOperator( sal_Int32 nToken )
-        { mnOperator = nToken; }
-private:
-    sal_Int32 mnFor;
-    ::rtl::OUString msForName;
-    sal_Int32 mnPointType;
-    sal_Int32 mnType;
-    sal_Int32 mnRefFor;
-    ::rtl::OUString msRefForName;
-    sal_Int32 mnRefType;
-    sal_Int32 mnRefPointType;
-    double mfFactor;
-    double mfValue;
-    sal_Int32 mnOperator;
-};
-
-typedef boost::shared_ptr< ConstraintAtom > ConstraintAtomPtr;
-
-class AlgAtom
-    : public LayoutAtom
-{
-public:
-    AlgAtom() : mnType(0), maMap() {}
-
-    typedef std::map<sal_Int32,sal_Int32> ParamMap;
-
-    virtual void accept( LayoutAtomVisitor& );
-
-    void setType( sal_Int32 nToken )
-        { mnType = nToken; }
-    void addParam( sal_Int32 nType, sal_Int32 nVal )
-        { maMap[nType]=nVal; }
-    void layoutShape( const ShapePtr& rShape,
-                      const Diagram& rDgm,
-                      const rtl::OUString& rName ) const;
-private:
-    sal_Int32 mnType;
-    ParamMap  maMap;
-};
-
-typedef boost::shared_ptr< AlgAtom > AlgAtomPtr;
-
-class ForEachAtom
-    : public LayoutAtom
-{
-public:
-    explicit ForEachAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
-
-    IteratorAttr & iterator()
-        { return maIter; }
-    virtual void accept( LayoutAtomVisitor& );
-
-private:
-    IteratorAttr maIter;
-};
-
-typedef boost::shared_ptr< ForEachAtom > ForEachAtomPtr;
-
-
-class ConditionAtom
-    : public LayoutAtom
-{
-public:
-    explicit ConditionAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
-    bool test();
-    virtual void accept( LayoutAtomVisitor& );
-    IteratorAttr & iterator()
-        { return maIter; }
-    ConditionAttr & cond()
-        { return maCond; }
-    void readElseBranch()
-        { mbElse=true; }
-    virtual void addChild( const LayoutAtomPtr & pNode );
-    virtual const std::vector<LayoutAtomPtr>& getChildren() const;
-private:
-    bool          mbElse;
-    IteratorAttr  maIter;
-    ConditionAttr maCond;
-    std::vector< LayoutAtomPtr > mpElseChildNodes;
-};
-
-typedef boost::shared_ptr< ConditionAtom > ConditionAtomPtr;
-
-
-/** "choose" statements. Atoms will be tested in order. */
-class ChooseAtom
-    : public LayoutAtom
-{
-public:
-    virtual void accept( LayoutAtomVisitor& );
-};
-
-class LayoutNode
-    : public LayoutAtom
-{
-public:
-    enum {
-        VAR_animLvl = 0,
-        VAR_animOne,
-        VAR_bulletEnabled,
-        VAR_chMax,
-        VAR_chPref,
-        VAR_dir,
-        VAR_hierBranch,
-        VAR_orgChart,
-        VAR_resizeHandles
-    };
-    // we know that the array is of fixed size
-    // the use of Any allow having empty values
-    typedef boost::array< ::com::sun::star::uno::Any, 9 > VarMap;
-
-    LayoutNode() : mnChildOrder(0) {}
-    virtual void accept( LayoutAtomVisitor& );
-    VarMap & variables()
-        { return mVariables; }
-    void setMoveWith( const ::rtl::OUString & sName )
-        { msMoveWith = sName; }
-    void setStyleLabel( const ::rtl::OUString & sLabel )
-        { msStyleLabel = sLabel; }
-    void setChildOrder( sal_Int32 nOrder )
-        { mnChildOrder = nOrder; }
-    void setShape( const ShapePtr& pShape )
-        { mpShape = pShape; }
-    const ShapePtr& getShape() const
-        { return mpShape; }
-
-    bool setupShape( const ShapePtr& rShape,
-                     const Diagram& rDgm,
-                     sal_uInt32 nIdx ) const;
-
-private:
-    VarMap                       mVariables;
-    ::rtl::OUString              msMoveWith;
-    ::rtl::OUString              msStyleLabel;
-    ShapePtr                     mpShape;
-    sal_Int32                    mnChildOrder;
-};
-
-typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
-
-struct LayoutAtomVisitor
-{
-    virtual ~LayoutAtomVisitor() {}
-    virtual void visit(ConstraintAtom& rAtom) = 0;
-    virtual void visit(AlgAtom& rAtom) = 0;
-    virtual void visit(ForEachAtom& rAtom) = 0;
-    virtual void visit(ConditionAtom& rAtom) = 0;
-    virtual void visit(ChooseAtom& rAtom) = 0;
-    virtual void visit(LayoutNode& rAtom) = 0;
-};
-
-class ShapeCreationVisitor : public LayoutAtomVisitor
-{
-    ShapePtr mpParentShape;
-    const Diagram& mrDgm;
-    sal_Int32 mnCurrIdx;
-
-    void defaultVisit(LayoutAtom& rAtom);
-    virtual void visit(ConstraintAtom& rAtom);
-    virtual void visit(AlgAtom& rAtom);
-    virtual void visit(ForEachAtom& rAtom);
-    virtual void visit(ConditionAtom& rAtom);
-    virtual void visit(ChooseAtom& rAtom);
-    virtual void visit(LayoutNode& rAtom);
-
-public:
-    ShapeCreationVisitor(const ShapePtr& rParentShape,
-                         const Diagram& rDgm) :
-        mpParentShape(rParentShape),
-        mrDgm(rDgm),
-        mnCurrIdx(0)
-    {}
-};
-
-} }
-
-#endif
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index ad7e4ae3a289..61213b5afa4c 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -32,9 +32,7 @@
 #include "oox/core/namespaces.hxx"
 #include "oox/drawingml/diagram/diagram.hxx"
 #include "oox/drawingml/shapecontext.hxx"
-#include "oox/drawingml/customshapeproperties.hxx"
 #include "diagramdefinitioncontext.hxx"
-#include "constraintlistcontext.hxx"
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
@@ -49,9 +47,15 @@ class IfContext
 public:
     IfContext( ContextHandler& rParent,
                const Reference< XFastAttributeList >& xAttribs,
-               const ConditionAtomPtr& pAtom )
-        : LayoutNodeContext( rParent, xAttribs, pAtom )
-    {}
+               const LayoutAtomPtr & pNode )
+        : LayoutNodeContext( rParent, xAttribs, pNode )
+        {
+            ConditionAtomPtr pAtom( boost::dynamic_pointer_cast< ConditionAtom >(pNode) );
+            OSL_ENSURE( pAtom, "Must pass a ConditionAtom" );
+
+            pAtom->iterator().loadFromXAttr( xAttribs );
+            pAtom->cond().loadFromXAttr( xAttribs );
+        }
 };
 
 
@@ -60,47 +64,21 @@ class AlgorithmContext
     : public ContextHandler
 {
 public:
-    AlgorithmContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, const AlgAtomPtr & pNode )
+    AlgorithmContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, const LayoutAtomPtr & pNode )
         : ContextHandler( rParent )
         , mnRevision( 0 )
+        , mnType( 0 )
         , mpNode( pNode )
         {
             AttributeList aAttribs( xAttribs );
             mnRevision = aAttribs.getInteger( XML_rev, 0 );
-            pNode->setType(xAttribs->getOptionalValueToken(XML_type, 0));
-        }
-
-    virtual Reference< XFastContextHandler > SAL_CALL
-    createFastChildContext( ::sal_Int32 aElement,
-                            const Reference< XFastAttributeList >& xAttribs )
-        throw (SAXException, RuntimeException)
-        {
-            Reference< XFastContextHandler > xRet;
-
-            switch( getToken(aElement) )
-            {
-                case XML_param:
-                {
-                    AttributeList aAttribs( xAttribs );
-                    const sal_Int32 nValTok=aAttribs.getToken( XML_val, 0 );
-                    mpNode->addParam(
-                        aAttribs.getToken( XML_type, 0 ),
-                        nValTok>0 ? nValTok : aAttribs.getInteger( XML_val, 0 ) );
-                    break;
-                }
-                default:
-                    break;
-            }
-
-            if( !xRet.is() )
-                xRet.set(this);
-
-            return xRet;
+            mnType = xAttribs->getOptionalValueToken( XML_type, 0 );
         }
 
 private:
-    sal_Int32  mnRevision;
-    AlgAtomPtr mpNode;
+    sal_Int32     mnRevision;
+    sal_Int32     mnType;
+    LayoutAtomPtr mpNode;
 };
 
 
@@ -110,6 +88,7 @@ class ChooseContext
 public:
     ChooseContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, const LayoutAtomPtr & pNode )
         : ContextHandler( rParent )
+        , mbHasElse( false )
         , mpNode( pNode )
         {
             msName = xAttribs->getOptionalValue( XML_name );
@@ -122,23 +101,24 @@ public:
         {
             Reference< XFastContextHandler > xRet;
 
-            switch( getToken(aElement) )
+            switch( aElement )
             {
             case XML_if:
             {
                 // CT_When
-                mpConditionNode.reset( new ConditionAtom(xAttribs) );
-                mpNode->addChild( mpConditionNode );
-                xRet.set( new IfContext( *this, xAttribs, mpConditionNode ) );
+                LayoutAtomPtr pAtom( new ConditionAtom( false ) );
+                mpNode->addChild( pAtom );
+                xRet.set( new IfContext( *this, xAttribs, pAtom ) );
                 break;
             }
             case XML_else:
                 // CT_Otherwise
-                if( mpConditionNode )
+                if( !mbHasElse )
                 {
-                    mpConditionNode->readElseBranch();
-                    xRet.set( new IfContext( *this, xAttribs, mpConditionNode ) );
-                    mpConditionNode.reset();
+                    LayoutAtomPtr pAtom( new ConditionAtom( true ) );
+                    mpNode->addChild( pAtom );
+                    xRet.set( new IfContext( *this, xAttribs, pAtom ) );
+                    mbHasElse = true;
                 }
                 else
                 {
@@ -155,9 +135,9 @@ public:
             return xRet;
         }
 private:
+    bool     mbHasElse;
     OUString msName;
     LayoutAtomPtr mpNode;
-    ConditionAtomPtr mpConditionNode;
 };
 
 
@@ -167,10 +147,13 @@ class ForEachContext
     : public LayoutNodeContext
 {
 public:
-    ForEachContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, const ForEachAtomPtr& pAtom )
-        : LayoutNodeContext( rParent, xAttribs, pAtom )
+    ForEachContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, const LayoutAtomPtr & pNode )
+        : LayoutNodeContext( rParent, xAttribs, pNode )
         {
+            ForEachAtomPtr pAtom( boost::dynamic_pointer_cast< ForEachAtom >(pNode) );
+            OSL_ENSURE( pAtom, "Must pass a ForEachAtom" );
             xAttribs->getOptionalValue( XML_ref );
+
             pAtom->iterator().loadFromXAttr( xAttribs );
         }
 };
@@ -214,12 +197,17 @@ private:
 // CT_LayoutNode
 LayoutNodeContext::LayoutNodeContext( ContextHandler& rParent,
                                       const Reference< XFastAttributeList >& xAttribs,
-                                      const LayoutAtomPtr& pAtom )
+                                      const LayoutAtomPtr &pNode )
     : ContextHandler( rParent )
-    , mpNode( pAtom )
+    , mpNode( pNode )
 {
-    OSL_ENSURE( pAtom, "Node must NOT be NULL" );
+    OSL_ENSURE( pNode, "Node must NOT be NULL" );
     mpNode->setName( xAttribs->getOptionalValue( XML_name ) );
+    // TODO shall we even bother?
+    // b or t
+//  sal_Int32 nChOrder = xAttributes->getOptionalValueToken( XML_chOrder, XML_b );
+//  OUString sMoveWith = xAttributes->getOptionalValue( XML_moveWith );
+//  OUString sStyleLbl = xAttributes->getOptionalValue( XML_styleLbl );
 }
 
 
@@ -240,33 +228,33 @@ void SAL_CALL LayoutNodeContext::endFastElement( ::sal_Int32 )
 sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag )
 {
     sal_Int32 nIdx = -1;
-    switch( aTag & ~NMSP_DIAGRAM )
+    switch( aTag )
     {
-    case XML_animLvl:
+    case NMSP_DIAGRAM|XML_animLvl:
         nIdx = LayoutNode::VAR_animLvl;
         break;
-    case XML_animOne:
+    case NMSP_DIAGRAM|XML_animOne:
         nIdx = LayoutNode::VAR_animOne;
         break;
-    case XML_bulletEnabled:
+    case NMSP_DIAGRAM|XML_bulletEnabled:
         nIdx = LayoutNode::VAR_bulletEnabled;
         break;
-    case XML_chMax:
+    case NMSP_DIAGRAM|XML_chMax:
         nIdx = LayoutNode::VAR_chMax;
         break;
-    case XML_chPref:
+    case NMSP_DIAGRAM|XML_chPref:
         nIdx = LayoutNode::VAR_chPref;
         break;
-    case XML_dir:
+    case NMSP_DIAGRAM|XML_dir:
         nIdx = LayoutNode::VAR_dir;
         break;
-    case XML_hierBranch:
+    case NMSP_DIAGRAM|XML_hierBranch:
         nIdx = LayoutNode::VAR_hierBranch;
         break;
-    case XML_orgChart:
+    case NMSP_DIAGRAM|XML_orgChart:
         nIdx = LayoutNode::VAR_orgChart;
         break;
-    case XML_resizeHandles:
+    case NMSP_DIAGRAM|XML_resizeHandles:
         nIdx = LayoutNode::VAR_resizeHandles;
         break;
     default:
@@ -289,39 +277,13 @@ LayoutNodeContext::createFastChildContext( ::sal_Int32 aElement,
     {
         LayoutNodePtr pNode( new LayoutNode() );
         mpNode->addChild( pNode );
-        pNode->setChildOrder( xAttribs->getOptionalValueToken( XML_chOrder, XML_b ) );
-        pNode->setMoveWith( xAttribs->getOptionalValue( XML_moveWith ) );
-        pNode->setStyleLabel( xAttribs->getOptionalValue( XML_styleLbl ) );
         xRet.set( new LayoutNodeContext( *this, xAttribs, pNode ) );
         break;
     }
     case NMSP_DIAGRAM|XML_shape:
     {
-        LayoutNodePtr pNode( boost::dynamic_pointer_cast< LayoutNode >( mpNode ) );
-        if( pNode )
-        {
-            ShapePtr pShape;
-
-            if( xAttribs->hasAttribute( XML_type ) )
-            {
-                pShape.reset( new Shape("com.sun.star.drawing.CustomShape") );
-                const sal_Int32 nType(xAttribs->getOptionalValueToken( XML_type, XML_obj ));
-                pShape->setSubType( nType );
-                pShape->getCustomShapeProperties()->setShapePresetType(
-                    GetShapePresetType( nType ) );
-            }
-            else
-            {
-                pShape.reset( new Shape("com.sun.star.drawing.GroupShape") );
-            }
-
-            pNode->setShape( pShape );
-            xRet.set( new ShapeContext( *this, ShapePtr(), pShape ) );
-        }
-        else
-        {
-            OSL_TRACE( "OOX: encountered a shape in a non layoutNode context" );
-        }
+        ShapePtr pShape( new Shape() );
+        xRet.set( new ShapeContext( *this, ShapePtr(), pShape ) );
         break;
     }
     case NMSP_DIAGRAM|XML_extLst:
@@ -329,7 +291,7 @@ LayoutNodeContext::createFastChildContext( ::sal_Int32 aElement,
     case NMSP_DIAGRAM|XML_alg:
     {
         // CT_Algorithm
-        AlgAtomPtr pAtom( new AlgAtom );
+        LayoutAtomPtr pAtom( new AlgAtom );
         mpNode->addChild( pAtom );
         xRet.set( new AlgorithmContext( *this, xAttribs, pAtom ) );
         break;
@@ -345,14 +307,14 @@ LayoutNodeContext::createFastChildContext( ::sal_Int32 aElement,
     case NMSP_DIAGRAM|XML_forEach:
     {
         // CT_ForEach
-        ForEachAtomPtr pAtom( new ForEachAtom(xAttribs) );
+        LayoutAtomPtr pAtom( new ForEachAtom );
         mpNode->addChild( pAtom );
         xRet.set( new ForEachContext( *this, xAttribs, pAtom ) );
         break;
     }
     case NMSP_DIAGRAM|XML_constrLst:
         // CT_Constraints
-        xRet.set( new ConstraintListContext( *this, xAttribs, mpNode ) );
+        // TODO
         break;
     case NMSP_DIAGRAM|XML_presOf:
     {
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index c9c0c6e1d7e2..19cb19aa602d 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -29,8 +29,7 @@
 #define OOX_DRAWINGML_LAYOUTNODECONTEXT_HXX
 
 #include "oox/core/contexthandler.hxx"
-#include "diagramlayoutatoms.hxx"
-#include "diagram.hxx"
+#include "oox/drawingml/diagram/diagram.hxx"
 
 namespace oox { namespace drawingml {
 
diff --git a/oox/source/drawingml/diagram/makefile.mk b/oox/source/drawingml/diagram/makefile.mk
index 1d438c21fbae..9d526ed3d3fb 100644
--- a/oox/source/drawingml/diagram/makefile.mk
+++ b/oox/source/drawingml/diagram/makefile.mk
@@ -41,7 +41,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES = \
-    $(SLO)$/constraintlistcontext.obj \
     $(SLO)$/diagram.obj \
     $(SLO)$/diagramfragmenthandler.obj \
     $(SLO)$/diagramdefinitioncontext.obj \
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index 3e2582ffcdf4..2b0eeae3273f 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -160,7 +160,6 @@ float GetFontHeight( sal_Int32 nHeight )
 
 sal_Int16 GetFontUnderline( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_none:              return FontUnderline::NONE;
@@ -187,7 +186,6 @@ sal_Int16 GetFontUnderline( sal_Int32 nToken )
 
 sal_Int16 GetFontStrikeout( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_dblStrike: return FontStrikeout::DOUBLE;
@@ -210,7 +208,6 @@ sal_Int16 GetCaseMap( sal_Int32 nToken )
 /** converts a paragraph align to a ParaAdjust */
 sal_Int16 GetParaAdjust( sal_Int32 nAlign )
 {
-    OSL_ASSERT((nAlign & sal_Int32(0xFFFF0000))==0);
     sal_Int16 nEnum;
     switch( nAlign )
     {
@@ -239,7 +236,6 @@ sal_Int16 GetParaAdjust( sal_Int32 nAlign )
 
 TabAlign GetTabAlign( sal_Int32 aToken )
 {
-    OSL_ASSERT((aToken & sal_Int32(0xFFFF0000))==0);
     TabAlign nEnum;
     switch( aToken )
     {
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index dd1bf960166f..e7351424d924 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -79,7 +79,6 @@ static const sal_Int32 spnDefaultFillIds[ FillId_END ] =
 
 BitmapMode lclGetBitmapMode( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_tile:      return BitmapMode_REPEAT;
@@ -90,7 +89,6 @@ BitmapMode lclGetBitmapMode( sal_Int32 nToken )
 
 RectanglePoint lclGetRectanglePoint( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_tl:    return RectanglePoint_LEFT_TOP;
@@ -225,7 +223,6 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, ModelObjectHelper& rM
     if( moFillType.has() )
     {
         FillStyle eFillStyle = FillStyle_NONE;
-        OSL_ASSERT((moFillType.get() & sal_Int32(0xFFFF0000))==0);
         switch( moFillType.get() )
         {
             case XML_noFill:
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 45ef18e57741..1631920c6452 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -32,7 +32,7 @@
 
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
 #include "oox/drawingml/customshapeproperties.hxx"
-#include "oox/drawingml/diagram/diagram.hxx"
+#include "oox/drawingml/diagram/diagramfragmenthandler.hxx"
 #include "oox/drawingml/table/tablecontext.hxx"
 #include "oox/core/namespaces.hxx"
 #include "oox/core/xmlfilterbase.hxx"
@@ -94,7 +94,7 @@ Reference< XFastContextHandler > GraphicShapeContext::createFastChildContext( sa
             (mpShapePtr->getCustomShapeProperties());
 
         sal_uInt32 nType = aElementToken & (~ NMSP_MASK);
-        OUString sType(GetShapePresetType(nType));
+        OUString sType(GetShapeType(nType));
 
         if (sType.getLength() > 0)
             pCstmShpProps->setShapePresetType(sType);
@@ -119,7 +119,6 @@ Reference< XFastContextHandler > GraphicalObjectFrameContext::createFastChildCon
 {
     Reference< XFastContextHandler > xRet;
 
-    OSL_ASSERT(((aElementToken &(~NMSP_MASK)) & sal_Int32(0xFFFF0000))==0);
     switch( aElementToken &(~NMSP_MASK) )
     {
     // CT_ShapeProperties
@@ -278,6 +277,48 @@ DiagramGraphicDataContext::~DiagramGraphicDataContext()
 {
 }
 
+DiagramPtr DiagramGraphicDataContext::loadDiagram()
+{
+    DiagramPtr pDiagram( new Diagram() );
+    XmlFilterBase& rFilter = getFilter();
+
+    // data
+    OUString sDmPath = getFragmentPathFromRelId( msDm );
+    if( sDmPath.getLength() > 0 )
+    {
+        DiagramDataPtr pData( new DiagramData() );
+        pDiagram->setData( pData );
+        rFilter.importFragment( new DiagramDataFragmentHandler( rFilter, sDmPath, pData ) );
+    }
+    // layout
+    OUString sLoPath = getFragmentPathFromRelId( msLo );
+    if( sLoPath.getLength() > 0 )
+    {
+        DiagramLayoutPtr pLayout( new DiagramLayout() );
+        pDiagram->setLayout( pLayout );
+        rFilter.importFragment( new DiagramLayoutFragmentHandler( rFilter, sLoPath, pLayout ) );
+    }
+    // style
+    OUString sQsPath = getFragmentPathFromRelId( msQs );
+    if( sQsPath.getLength() > 0 )
+    {
+        DiagramQStylesPtr pStyles( new DiagramQStyles() );
+        pDiagram->setQStyles( pStyles );
+        rFilter.importFragment( new DiagramQStylesFragmentHandler( rFilter, sQsPath, pStyles ) );
+    }
+    // colors
+    OUString sCsPath = getFragmentPathFromRelId( msCs );
+    if( sCsPath.getLength() > 0 )
+    {
+        DiagramColorsPtr pColors( new DiagramColors() );
+        pDiagram->setColors( pColors );
+        rFilter.importFragment( new DiagramColorsFragmentHandler( rFilter, sCsPath, pColors ) ) ;
+    }
+
+    return pDiagram;
+}
+
+
 Reference< XFastContextHandler > DiagramGraphicDataContext::createFastChildContext( ::sal_Int32 aElementToken, const Reference< XFastAttributeList >& xAttribs )
     throw (SAXException, RuntimeException)
 {
@@ -291,12 +332,8 @@ Reference< XFastContextHandler > DiagramGraphicDataContext::createFastChildConte
         msLo = xAttribs->getOptionalValue( NMSP_RELATIONSHIPS|XML_lo );
         msQs = xAttribs->getOptionalValue( NMSP_RELATIONSHIPS|XML_qs );
         msCs = xAttribs->getOptionalValue( NMSP_RELATIONSHIPS|XML_cs );
-        loadDiagram(mpShapePtr,
-                    getFilter(),
-                    getFragmentPathFromRelId( msDm ),
-                    getFragmentPathFromRelId( msLo ),
-                    getFragmentPathFromRelId( msQs ),
-                    getFragmentPathFromRelId( msCs ));
+        DiagramPtr pDiagram = loadDiagram();
+        pDiagram->addTo( mpShapePtr );
         OSL_TRACE("diagram added shape %s of type %s", OUSTRING_TO_CSTR( mpShapePtr->getName() ),
                   OUSTRING_TO_CSTR( mpShapePtr->getServiceName() ) );
         break;
@@ -355,8 +392,7 @@ void CreateChartCallback::onXShapeCreated( const Reference< drawing::XShape >& r
         Reference< drawing::XShapes > xExternalPage;
         if( !mbEmbedShapes )
             xExternalPage = rxShapes;
-        if( mrFilter.getChartConverter() )
-            mrFilter.getChartConverter()->convertFromModel( mrFilter, aModel, xChartDoc, xExternalPage, rxShape->getPosition(), rxShape->getSize() );
+        mrFilter.getChartConverter().convertFromModel( mrFilter, aModel, xChartDoc, xExternalPage, rxShape->getPosition(), rxShape->getSize() );
     }
     catch( Exception& )
     {
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 17266e4efe3f..7bc60f026665 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -160,7 +160,6 @@ void lclConvertCustomDash( LineDash& orLineDash, const LineProperties::DashStopV
 
 DashStyle lclGetDashStyle( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_rnd:   return DashStyle_ROUNDRELATIVE;
@@ -172,7 +171,6 @@ DashStyle lclGetDashStyle( sal_Int32 nToken )
 
 LineJoint lclGetLineJoint( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_round: return LineJoint_ROUND;
@@ -188,7 +186,6 @@ const sal_Int32 OOX_ARROWSIZE_LARGE     = 2;
 
 sal_Int32 lclGetArrowSize( sal_Int32 nToken )
 {
-    OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
     switch( nToken )
     {
         case XML_sm:    return OOX_ARROWSIZE_SMALL;
@@ -210,7 +207,6 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties&
 
     OUStringBuffer aBuffer;
     sal_Int32 nArrowType = rArrowProps.moArrowType.get( XML_none );
-    OSL_ASSERT((nArrowType & sal_Int32(0xFFFF0000))==0);
     switch( nArrowType )
     {
         case XML_triangle:
@@ -267,7 +263,6 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties&
 #define OOX_ARROW_POINT( x, y ) Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) )
 
             ::std::vector< Point > aPoints;
-            OSL_ASSERT((rArrowProps.moArrowType.get() & sal_Int32(0xFFFF0000))==0);
             switch( rArrowProps.moArrowType.get() )
             {
                 case XML_triangle:
diff --git a/oox/source/drawingml/makefile.mk b/oox/source/drawingml/makefile.mk
index 5079b02c1da1..e2d4ea6b8f3d 100644
--- a/oox/source/drawingml/makefile.mk
+++ b/oox/source/drawingml/makefile.mk
@@ -59,7 +59,6 @@ SLOFILES =	\
         $(SLO)$/linepropertiescontext.obj\
         $(SLO)$/objectdefaultcontext.obj\
         $(SLO)$/shape.obj\
-        $(SLO)$/shape3dproperties.obj\
         $(SLO)$/shapecontext.obj\
         $(SLO)$/shapegroupcontext.obj\
         $(SLO)$/shapepropertiescontext.obj\
diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx
deleted file mode 100644
index 4f629d8466a1..000000000000
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ /dev/null
@@ -1,189 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fillpropertiesgroupcontext.cxx,v $
- * $Revision: 1.8.6.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "oox/drawingml/scene3dcontext.hxx"
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <cppuhelper/exc_hlp.hxx>
-#include <comphelper/anytostring.hxx>
-#include "oox/drawingml/colorchoicecontext.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/core/namespaces.hxx"
-#include "oox/core/xmlfilterbase.hxx"
-#include "oox/helper/attributelist.hxx"
-
-using ::rtl::OUString;
-using ::oox::core::ContextHandler;
-using ::oox::core::XmlFilterBase;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-
-namespace oox { namespace drawingml {
-
-Scene3DContext::Scene3DContext( ContextHandler& rParent, Shape3DProperties& r3DProperties ) throw()
-: ContextHandler( rParent )
-, mr3DProperties( r3DProperties )
-{
-}
-
-Reference< XFastContextHandler > Scene3DContext::createFastChildContext( sal_Int32 aElementToken, const Reference< XFastAttributeList >& xAttribs )
-    throw ( SAXException, RuntimeException )
-{
-    AttributeList aAttribs( xAttribs );
-    Reference< XFastContextHandler > xRet;
-
-    switch( aElementToken )
-    {
-    case NMSP_DRAWINGML|XML_camera:
-        mr3DProperties.mfFieldOfVision = aAttribs.getInteger( XML_fov, 0 ) / 36000000.0;
-        mr3DProperties.mfZoom = aAttribs.getInteger( XML_zoom, 100000 ) / 100000.0;
-        mr3DProperties.mnPreset = aAttribs.getToken( XML_prst, XML_none );
-
-legacyObliqueTopLeft
-legacyObliqueTop
-legacyObliqueTopRight
-legacyObliqueLeft
-legacyObliqueFront
-legacyObliqueRight
-legacyObliqueBottomLeft
-legacyObliqueBottom
-legacyObliqueBottomRight
-legacyPerspectiveTopLeft
-legacyPerspectiveTop
-legacyPerspectiveTopRight
-legacyPerspectiveLeft
-legacyPerspectiveFront
-legacyPerspectiveRight
-legacyPerspectiveBottomLeft
-legacyPerspectiveBottom
-legacyPerspectiveBottomRight
-orthographicFront
-isometricTopUp
-isometricTopDown
-isometricBottomUp
-isometricBottomDown
-isometricLeftUp
-isometricLeftDown
-isometricRightUp
-isometricRightDown
-isometricOffAxis1Left
-isometricOffAxis1Right
-isometricOffAxis1Top
-isometricOffAxis2Left
-isometricOffAxis2Right
-isometricOffAxis2Top
-isometricOffAxis3Left
-isometricOffAxis3Right
-isometricOffAxis3Bottom
-isometricOffAxis4Left
-isometricOffAxis4Right
-isometricOffAxis4Bottom
-obliqueTopLeft
-obliqueTop
-obliqueTopRight
-obliqueLeft
-obliqueRight
-obliqueBottomLeft
-obliqueBottom
-obliqueBottomRight
-perspectiveFront
-perspectiveLeft
-perspectiveRight
-perspectiveAbove
-perspectiveBelow
-perspectiveAboveLeftFacing
-perspectiveAboveRightFacing
-perspectiveContrastingLeftFacing
-perspectiveContrastingRightFacing
-perspectiveHeroicLeftFacing
-perspectiveHeroicRightFacing
-perspectiveHeroicExtremeLeftFacing
-perspectiveHeroicExtremeRightFacing
-perspectiveRelaxed
-perspectiveRelaxedModerately
-
-
-        // TODO: nested element XML_rot
-        break;
-    case NMSP_DRAWINGML|XML_lightRig:
-        mr3DProperties.mnLightRigDirection = aAttribs.getToken( XML_dir, XML_none );
-
-XML_tl
-XML_t
-XML_tr
-XML_l
-XML_r
-XML_bl
-XML_b
-XML_br
-
-
-        mr3DProperties.mnLightRigType = aAttribs.getToken( XML_rig, XML_none );
-
-XML_legacyFlat1
-XML_legacyFlat2
-XML_legacyFlat3
-XML_legacyFlat4
-XML_legacyNormal1
-XML_legacyNormal2
-XML_legacyNormal3
-XML_legacyNormal4
-XML_legacyHarsh1
-XML_legacyHarsh2
-XML_legacyHarsh3
-XML_legacyHarsh4
-XML_threePt
-XML_balanced
-XML_soft
-XML_harsh
-XML_flood
-XML_contrasting
-XML_morning
-XML_sunrise
-XML_sunset
-XML_chilly
-XML_freezing
-XML_flat
-XML_twoPt
-XML_glow
-XML_brightRoom
-
-        // TODO: nested element XML_rot
-        break;
-    case NMSP_DRAWINGML|XML_backdrop:
-    case NMSP_DRAWINGML|XML_extLst:
-        return xRet; // TODO: later (backdrop is not supported by core anyway)
-    }
-    return xRet;
-}
-
-} }
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 8483e730a2c0..d7b2bc7b1bb2 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -42,10 +42,8 @@
 #include <tools/solar.h>        // for the F_PI180 define
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/xml/AttributeData.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -108,34 +106,6 @@ Shape::Shape( const sal_Char* pServiceName )
         msServiceName = OUString::createFromAscii( pServiceName );
     setDefaults();
 }
-
-Shape::Shape( const ShapePtr& pSourceShape )
-: maChildren()
-, mbIsChild( pSourceShape->mbIsChild )
-, mpTextBody(pSourceShape->mpTextBody)
-, mpLinePropertiesPtr( pSourceShape->mpLinePropertiesPtr )
-, mpFillPropertiesPtr( pSourceShape->mpFillPropertiesPtr )
-, mpGraphicPropertiesPtr( pSourceShape->mpGraphicPropertiesPtr )
-, mpCustomShapePropertiesPtr( pSourceShape->mpCustomShapePropertiesPtr )
-, mpTablePropertiesPtr( pSourceShape->mpTablePropertiesPtr )
-, mp3DPropertiesPtr( pSourceShape->mp3DPropertiesPtr )
-, maShapeProperties( pSourceShape->maShapeProperties )
-, mpMasterTextListStyle( pSourceShape->mpMasterTextListStyle )
-, mxShape()
-, msServiceName( pSourceShape->msServiceName )
-, msName( pSourceShape->msName )
-, msId( pSourceShape->msId )
-, mnSubType( pSourceShape->mnSubType )
-, mnSubTypeIndex( pSourceShape->mnSubTypeIndex )
-, maShapeStyleRefs( pSourceShape->maShapeStyleRefs )
-, maSize( pSourceShape->maSize )
-, maPosition( pSourceShape->maPosition )
-, mxCreateCallback( pSourceShape->mxCreateCallback )
-, mnRotation( pSourceShape->mnRotation )
-, mbFlipH( pSourceShape->mbFlipH )
-, mbFlipV( pSourceShape->mbFlipV )
-{}
-
 Shape::~Shape()
 {
 }
@@ -208,7 +178,6 @@ void Shape::addShape(
 
 void Shape::applyShapeReference( const Shape& rReferencedShape )
 {
-    if( rReferencedShape.mpTextBody.get() )
     mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
     maShapeProperties = rReferencedShape.maShapeProperties;
     mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties( *rReferencedShape.mpLinePropertiesPtr.get() ) );
@@ -225,19 +194,6 @@ void Shape::applyShapeReference( const Shape& rReferencedShape )
     mbHidden = rReferencedShape.mbHidden;
 }
 
-void Shape::addChildren( const ::oox::core::XmlFilterBase& rFilterBase,
-                         const Theme* pTheme,
-                         const Reference< XShapes >& rxShapes,
-                         const awt::Rectangle* pShapeRect,
-                         ShapeIdMap* pShapeMap )
-{
-    addChildren(rFilterBase, *this, pTheme, rxShapes,
-                pShapeRect ?
-                 *pShapeRect :
-                 awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ),
-                pShapeMap);
-}
-
 // for group shapes, the following method is also adding each child
 void Shape::addChildren(
         const ::oox::core::XmlFilterBase& rFilterBase,
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
deleted file mode 100644
index ea1e4f4bc7a4..000000000000
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fillproperties.cxx,v $
- * $Revision: 1.7.6.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "oox/drawingml/shape3dproperties.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/drawing/BitmapMode.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/RectanglePoint.hpp>
-#include <com/sun/star/graphic/XGraphicTransformer.hpp>
-#include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
-#include "tokens.hxx"
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::graphic;
-
-using ::rtl::OUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::oox::core::XmlFilterBase;
-
-namespace oox {
-namespace drawingml {
-
-// ============================================================================
-
-// ============================================================================
-
-} // namespace drawingml
-} // namespace oox
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index 4fa8acb8451b..470433af0556 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/container/XNamed.hpp>
 
 #include "oox/core/namespaces.hxx"
-#include "oox/drawingml/scene3dcontext.hxx"
 #include "oox/drawingml/linepropertiescontext.hxx"
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
 #include "oox/drawingml/transform2dcontext.hxx"
@@ -107,11 +106,8 @@ Reference< XFastContextHandler > ShapePropertiesContext::createFastChildContext(
     case NMSP_DRAWINGML|XML_effectDag:  // CT_EffectContainer
         break;
 
-    case NMSP_DRAWINGML|XML_scene3d:    // CT_Scene3D
-//        xRet.set( new Scene3DContext( *this, xAttribs, *(mrShape.get3DShapeProperties()) ) );
-        break;
-
     // todo
+    case NMSP_DRAWINGML|XML_scene3d:    // CT_Scene3D
     case NMSP_DRAWINGML|XML_sp3d:       // CT_Shape3D
         break;
     }
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index d31e911e4996..feda8f2ac00d 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -63,9 +63,6 @@ void TextParagraph::insertAt(
         Reference< XTextRange > xStart( xAt, UNO_QUERY );
 
         sal_Int16 nLevel = maProperties.getLevel();
-
-        OSL_TRACE("TextParagraph::insertAt() - level %d", nLevel);
-
         const TextParagraphPropertiesVector& rListStyle = rTextListStyle.getListStyle();
         if ( nLevel >= static_cast< sal_Int16 >( rListStyle.size() ) )
             nLevel = 0;
@@ -117,12 +114,6 @@ void TextParagraph::insertAt(
             const OUString sNumberingLevel( CREATE_OUSTRING( "NumberingLevel" ) );
             xProps->setPropertyValue( sNumberingLevel, Any( static_cast< sal_Int16 >( -1 ) ) );
         }
-        else if ( nLevel > 1 )
-        {
-            // Even more UGLY HACK
-            const OUString sNumberingLevel( CREATE_OUSTRING( "NumberingLevel" ) );
-            xProps->setPropertyValue( sNumberingLevel, Any( static_cast< sal_Int16 >( nLevel-1 ) ) );
-        }
 
 // FIXME this is causing a lot of dispruption (ie does not work). I wonder what to do -- Hub
 //          Reference< XTextRange > xEnd( xAt, UNO_QUERY );
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index f818a5defca6..68aad1f3cf26 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -114,7 +114,6 @@ void BulletList::setSuffixMinusRight()
 
 void BulletList::setType( sal_Int32 nType )
 {
-    OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0);
 //  OSL_TRACE( "OOX: set list numbering type %d", nType);
     switch( nType )
     {