#i12587# Inserting/editing arbitrary text objects in chart

15 files changed, 872 insertions, 233 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index cde145046dec..f915701472cb 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -451,8 +451,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
                     // #i12587# support for shapes in chart
                     xLayoutManager->createElement(  C2U( "private:resource/toolbar/drawbar" ) );
                     xLayoutManager->requestElement( C2U( "private:resource/toolbar/drawbar" ) );
-                    //xLayoutManager->createElement(  C2U( "private:resource/toolbar/basicshapes" ) );
-                    //xLayoutManager->requestElement( C2U( "private:resource/toolbar/basicshapes" ) );
 
                     xLayoutManager->requestElement( C2U( "private:resource/statusbar/statusbar" ) );
                     xLayoutManager->unlock();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index af757282a0d8..92ee30cacfd2 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -596,6 +596,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
                 if ( pObj && m_pDrawModelWrapper && pDrawCommandDispatch )
                 {
                     SfxItemSet aSet( m_pDrawModelWrapper->GetItemPool() );
+                    pDrawCommandDispatch->setAttributes( pObj );
                     pDrawCommandDispatch->setLineEnds( aSet );
                     pObj->SetMergedItemSet( aSet );
                 }
@@ -1638,6 +1639,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
                         }
                         break;
                     case OBJ_RECT:
+                    case OBJ_CUSTOMSHAPE:
                         {
                             ePointerStyle = POINTER_DRAW_RECT;
                         }
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index c5555c74405b..39a3d44bbb02 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -145,12 +145,12 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
         // Note, that the chart dispatcher must be queried first, because
         // the chart dispatcher is the default dispatcher for all context
         // sensitive commands.
-        else if ( m_pDrawCommandDispatch && m_pDrawCommandDispatch->isFeatureSupported( rURL ) )
+        else if ( m_pDrawCommandDispatch && m_pDrawCommandDispatch->isFeatureSupported( rURL.Complete ) )
         {
             xResult.set( m_pDrawCommandDispatch );
             m_aCachedDispatches[ rURL.Complete ].set( xResult );
         }
-        else if ( m_pShapeController && m_pShapeController->isFeatureSupported( rURL ) )
+        else if ( m_pShapeController && m_pShapeController->isFeatureSupported( rURL.Complete ) )
         {
             xResult.set( m_pShapeController );
             m_aCachedDispatches[ rURL.Complete ].set( xResult );
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 8118c6c4c137..91a95aa0de82 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -40,12 +40,16 @@
 
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <svtools/itempool.hxx>
+#include <svx/adjitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
+#include <svx/fmmodel.hxx>
+#include <svx/gallery.hxx>
+#include <svx/svdoashp.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svxids.hrc>
 #include <svx/unoapi.hxx>
 #include <svx/xlnedit.hxx>
 #include <svx/xlnedwit.hxx>
@@ -106,6 +110,14 @@ void DrawCommandDispatch::initialize()
     FeatureCommandDispatchBase::initialize();
 }
 
+bool DrawCommandDispatch::isFeatureSupported( const ::rtl::OUString& rCommandURL )
+{
+    sal_uInt16 nFeatureId = 0;
+    ::rtl::OUString aBaseCommand;
+    ::rtl::OUString aCustomShapeType;
+    return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType );
+}
+
 ::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel& rModel )
 {
     ::basegfx::B2DPolyPolygon aReturn;
@@ -127,6 +139,75 @@ void DrawCommandDispatch::initialize()
     return aReturn;
 }
 
+void DrawCommandDispatch::setAttributes( SdrObject* pObj )
+{
+    if ( m_pChartController )
+    {
+        DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper();
+        DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
+        if ( pDrawModelWrapper && pDrawViewWrapper && pDrawViewWrapper->GetCurrentObjIdentifier() == OBJ_CUSTOMSHAPE )
+        {
+            sal_Bool bAttributesAppliedFromGallery = sal_False;
+            if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
+            {
+                ::std::vector< ::rtl::OUString > aObjList;
+                if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
+                {
+                    for ( sal_uInt16 i = 0; i < aObjList.size(); ++i )
+                    {
+                        if ( aObjList[ i ].equalsIgnoreAsciiCase( m_aCustomShapeType ) )
+                        {
+                            FmFormModel aModel;
+                            SfxItemPool& rPool = aModel.GetItemPool();
+                            rPool.FreezeIdRanges();
+                            if ( GalleryExplorer::GetSdrObj( GALLERY_THEME_POWERPOINT, i, &aModel ) )
+                            {
+                                const SdrObject* pSourceObj = aModel.GetPage( 0 )->GetObj( 0 );
+                                if ( pSourceObj )
+                                {
+                                    const SfxItemSet& rSource = pSourceObj->GetMergedItemSet();
+                                    SfxItemSet aDest( pObj->GetModel()->GetItemPool(),          // ranges from SdrAttrObj
+                                        SDRATTR_START, SDRATTR_SHADOW_LAST,
+                                        SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
+                                        SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
+                                        // Graphic Attributes
+                                        SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST,
+                                        // 3d Properties
+                                        SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
+                                        // CustomShape properties
+                                        SDRATTR_CUSTOMSHAPE_FIRST, SDRATTR_CUSTOMSHAPE_LAST,
+                                        // range from SdrTextObj
+                                        EE_ITEMS_START, EE_ITEMS_END,
+                                        // end
+                                        0, 0);
+                                    aDest.Set( rSource );
+                                    pObj->SetMergedItemSet( aDest );
+                                    sal_Int32 nAngle = pSourceObj->GetRotateAngle();
+                                    if ( nAngle )
+                                    {
+                                        double a = nAngle * F_PI18000;
+                                        pObj->NbcRotate( pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) );
+                                    }
+                                    bAttributesAppliedFromGallery = sal_True;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            if ( !bAttributesAppliedFromGallery )
+            {
+                pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, 0 ) );
+                pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
+                pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
+                pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
+                ( dynamic_cast< SdrObjCustomShape* >( pObj ) )->MergeDefaultAttributes( &m_aCustomShapeType );
+            }
+        }
+    }
+}
+
 void DrawCommandDispatch::setLineEnds( SfxItemSet& rAttr )
 {
     if ( m_nFeatureId == COMMAND_ID_LINE_ARROW_END && m_pChartController )
@@ -181,29 +262,40 @@ FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand )
     FeatureState aReturn;
     aReturn.bEnabled = false;
     aReturn.aState <<= false;
-    sal_uInt16 nFeatureId = m_aSupportedFeatures[ rCommand ].nFeatureId;
 
-    switch ( nFeatureId )
+    sal_uInt16 nFeatureId = 0;
+    ::rtl::OUString aBaseCommand;
+    ::rtl::OUString aCustomShapeType;
+    if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) )
     {
-        case SID_OBJECT_SELECT:
-        case SID_DRAW_LINE:
-        case COMMAND_ID_LINE_ARROW_END:
-        case SID_DRAW_RECT:
-        case SID_DRAW_ELLIPSE:
-        case SID_DRAW_FREELINE_NOFILL:
-        case SID_DRAW_TEXT:
-        case SID_DRAW_CAPTION:
-            {
-                aReturn.bEnabled = true;
-                aReturn.aState <<= false;
-            }
-            break;
-        default:
-            {
-                aReturn.bEnabled = false;
-                aReturn.aState <<= false;
-            }
-            break;
+        switch ( nFeatureId )
+        {
+            case COMMAND_ID_OBJECT_SELECT:
+            case COMMAND_ID_DRAW_LINE:
+            case COMMAND_ID_LINE_ARROW_END:
+            case COMMAND_ID_DRAW_RECT:
+            case COMMAND_ID_DRAW_ELLIPSE:
+            case COMMAND_ID_DRAW_FREELINE_NOFILL:
+            case COMMAND_ID_DRAW_TEXT:
+            case COMMAND_ID_DRAW_CAPTION:
+            case COMMAND_ID_DRAWTBX_CS_BASIC:
+            case COMMAND_ID_DRAWTBX_CS_SYMBOL:
+            case COMMAND_ID_DRAWTBX_CS_ARROW:
+            case COMMAND_ID_DRAWTBX_CS_FLOWCHART:
+            case COMMAND_ID_DRAWTBX_CS_CALLOUT:
+            case COMMAND_ID_DRAWTBX_CS_STAR:
+                {
+                    aReturn.bEnabled = true;
+                    aReturn.aState <<= false;
+                }
+                break;
+            default:
+                {
+                    aReturn.bEnabled = false;
+                    aReturn.aState <<= false;
+                }
+                break;
+        }
     }
 
     return aReturn;
@@ -216,100 +308,118 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
     ChartDrawMode eDrawMode = CHARTDRAW_SELECT;
     SdrObjKind eKind = OBJ_NONE;
     bool bCreate = false;
-    sal_uInt16 nFeatureId = m_aSupportedFeatures[ rCommand ].nFeatureId;
-    m_nFeatureId = nFeatureId;
 
-    switch ( nFeatureId )
+    sal_uInt16 nFeatureId = 0;
+    ::rtl::OUString aBaseCommand;
+    ::rtl::OUString aCustomShapeType;
+    if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) )
     {
-        case SID_OBJECT_SELECT:
-            {
-                eDrawMode = CHARTDRAW_SELECT;
-                eKind = OBJ_NONE;
-            }
-            break;
-        case SID_DRAW_LINE:
-        case COMMAND_ID_LINE_ARROW_END:
-            {
-                eDrawMode = CHARTDRAW_INSERT;
-                eKind = OBJ_LINE;
-            }
-            break;
-        case SID_DRAW_RECT:
-            {
-                eDrawMode = CHARTDRAW_INSERT;
-                eKind = OBJ_RECT;
-            }
-            break;
-        case SID_DRAW_ELLIPSE:
-            {
-                eDrawMode = CHARTDRAW_INSERT;
-                eKind = OBJ_CIRC;
-            }
-            break;
-        case SID_DRAW_FREELINE_NOFILL:
-            {
-                eDrawMode = CHARTDRAW_INSERT;
-                eKind = OBJ_FREELINE;
-            }
-            break;
-        case SID_DRAW_TEXT:
-            {
-                eDrawMode = CHARTDRAW_INSERT;
-                eKind = OBJ_TEXT;
-                bCreate = true;
-            }
-            break;
-        case SID_DRAW_CAPTION:
-            {
-                eDrawMode = CHARTDRAW_INSERT;
-                eKind = OBJ_CAPTION;
-            }
-            break;
-        default:
-            {
-                eDrawMode = CHARTDRAW_SELECT;
-                eKind = OBJ_NONE;
-            }
-            break;
-    }
+        m_nFeatureId = nFeatureId;
+        m_aCustomShapeType = aCustomShapeType;
 
-    if ( m_pChartController )
-    {
-        DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
-        if ( pDrawViewWrapper )
+        switch ( nFeatureId )
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
-            m_pChartController->setDrawMode( eDrawMode );
-            setInsertObj( sal::static_int_cast< USHORT >( eKind ) );
-            if ( bCreate )
-            {
-                pDrawViewWrapper->SetCreateMode();
-            }
+            case COMMAND_ID_OBJECT_SELECT:
+                {
+                    eDrawMode = CHARTDRAW_SELECT;
+                    eKind = OBJ_NONE;
+                }
+                break;
+            case COMMAND_ID_DRAW_LINE:
+            case COMMAND_ID_LINE_ARROW_END:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_LINE;
+                }
+                break;
+            case COMMAND_ID_DRAW_RECT:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_RECT;
+                }
+                break;
+            case COMMAND_ID_DRAW_ELLIPSE:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_CIRC;
+                }
+                break;
+            case COMMAND_ID_DRAW_FREELINE_NOFILL:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_FREELINE;
+                }
+                break;
+            case COMMAND_ID_DRAW_TEXT:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_TEXT;
+                    bCreate = true;
+                }
+                break;
+            case COMMAND_ID_DRAW_CAPTION:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_CAPTION;
+                }
+                break;
+            case COMMAND_ID_DRAWTBX_CS_BASIC:
+            case COMMAND_ID_DRAWTBX_CS_SYMBOL:
+            case COMMAND_ID_DRAWTBX_CS_ARROW:
+            case COMMAND_ID_DRAWTBX_CS_FLOWCHART:
+            case COMMAND_ID_DRAWTBX_CS_CALLOUT:
+            case COMMAND_ID_DRAWTBX_CS_STAR:
+                {
+                    eDrawMode = CHARTDRAW_INSERT;
+                    eKind = OBJ_CUSTOMSHAPE;
+                }
+                break;
+            default:
+                {
+                    eDrawMode = CHARTDRAW_SELECT;
+                    eKind = OBJ_NONE;
+                }
+                break;
+        }
 
-            const ::rtl::OUString sKeyModifier( C2U( "KeyModifier" ) );
-            const beans::PropertyValue* pIter = rArgs.getConstArray();
-            const beans::PropertyValue* pEnd  = pIter + rArgs.getLength();
-            const beans::PropertyValue* pKeyModifier = ::std::find_if(
-                pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), boost::cref( sKeyModifier ) ) );
-            sal_Int16 nKeyModifier = 0;
-            if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 )
+        if ( m_pChartController )
+        {
+            DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
+            if ( pDrawViewWrapper )
             {
-                if ( eDrawMode == CHARTDRAW_INSERT )
+                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                m_pChartController->setDrawMode( eDrawMode );
+                setInsertObj( sal::static_int_cast< USHORT >( eKind ) );
+                if ( bCreate )
                 {
-                    SdrObject* pObj = createDefaultObject( nFeatureId );
-                    if ( pObj )
+                    pDrawViewWrapper->SetCreateMode();
+                }
+
+                const ::rtl::OUString sKeyModifier( C2U( "KeyModifier" ) );
+                const beans::PropertyValue* pIter = rArgs.getConstArray();
+                const beans::PropertyValue* pEnd  = pIter + rArgs.getLength();
+                const beans::PropertyValue* pKeyModifier = ::std::find_if(
+                    pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), boost::cref( sKeyModifier ) ) );
+                sal_Int16 nKeyModifier = 0;
+                if ( pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 )
+                {
+                    if ( eDrawMode == CHARTDRAW_INSERT )
                     {
-                        SdrPageView* pPageView = pDrawViewWrapper->GetSdrPageView();
-                        pDrawViewWrapper->InsertObjectAtView( pObj, *pPageView );
-                        Reference< drawing::XShape > xShape( pObj->getUnoShape(), uno::UNO_QUERY );
-                        if ( xShape.is() )
-                        {
-                            m_pChartController->m_aSelection.setSelection( xShape );
-                            m_pChartController->m_aSelection.applySelection( pDrawViewWrapper );
-                        }
-                        if ( nFeatureId == SID_DRAW_TEXT )
+                        SdrObject* pObj = createDefaultObject( nFeatureId );
+                        if ( pObj )
                         {
-                            m_pChartController->StartTextEdit();
+                            SdrPageView* pPageView = pDrawViewWrapper->GetSdrPageView();
+                            pDrawViewWrapper->InsertObjectAtView( pObj, *pPageView );
+                            Reference< drawing::XShape > xShape( pObj->getUnoShape(), uno::UNO_QUERY );
+                            if ( xShape.is() )
+                            {
+                                m_pChartController->m_aSelection.setSelection( xShape );
+                                m_pChartController->m_aSelection.applySelection( pDrawViewWrapper );
+                            }
+                            if ( nFeatureId == SID_DRAW_TEXT )
+                            {
+                                m_pChartController->StartTextEdit();
+                            }
                         }
                     }
                 }
@@ -320,20 +430,24 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
 
 void DrawCommandDispatch::describeSupportedFeatures()
 {
-    implDescribeSupportedFeature( ".uno:SelectObject",      SID_OBJECT_SELECT,          CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:Line",              SID_DRAW_LINE,              CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:LineArrowEnd",      COMMAND_ID_LINE_ARROW_END,  CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:Rect",              SID_DRAW_RECT,              CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:Ellipse",           SID_DRAW_ELLIPSE,           CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:Freeline_Unfilled", SID_DRAW_FREELINE_NOFILL,   CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:DrawText",          SID_DRAW_TEXT,              CommandGroup::INSERT );
-    implDescribeSupportedFeature( ".uno:DrawCaption",       SID_DRAW_CAPTION,           CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:SelectObject",      COMMAND_ID_OBJECT_SELECT,           CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:Line",              COMMAND_ID_DRAW_LINE,               CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:LineArrowEnd",      COMMAND_ID_LINE_ARROW_END,          CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:Rect",              COMMAND_ID_DRAW_RECT,               CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:Ellipse",           COMMAND_ID_DRAW_ELLIPSE,            CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:Freeline_Unfilled", COMMAND_ID_DRAW_FREELINE_NOFILL,    CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:DrawText",          COMMAND_ID_DRAW_TEXT,               CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:DrawCaption",       COMMAND_ID_DRAW_CAPTION,            CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:BasicShapes",       COMMAND_ID_DRAWTBX_CS_BASIC,        CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:SymbolShapes",      COMMAND_ID_DRAWTBX_CS_SYMBOL,       CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:ArrowShapes",       COMMAND_ID_DRAWTBX_CS_ARROW,        CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:FlowChartShapes",   COMMAND_ID_DRAWTBX_CS_FLOWCHART,    CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:CalloutShapes",     COMMAND_ID_DRAWTBX_CS_CALLOUT,      CommandGroup::INSERT );
+    implDescribeSupportedFeature( ".uno:StarShapes",        COMMAND_ID_DRAWTBX_CS_STAR,         CommandGroup::INSERT );
 }
 
-void DrawCommandDispatch::setInsertObj( USHORT eObj, const ::rtl::OUString& rShapeType )
+void DrawCommandDispatch::setInsertObj( USHORT eObj )
 {
-    (void)rShapeType;
-
     DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ? m_pChartController->GetDrawViewWrapper() : NULL );
     if ( pDrawViewWrapper )
     {
@@ -369,7 +483,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
 
                 switch ( nID )
                 {
-                    case SID_DRAW_LINE:
+                    case COMMAND_ID_DRAW_LINE:
                     case COMMAND_ID_LINE_ARROW_END:
                         {
                             if ( pObj->ISA( SdrPathObj ) )
@@ -387,7 +501,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                             }
                         }
                         break;
-                    case SID_DRAW_FREELINE_NOFILL:
+                    case COMMAND_ID_DRAW_FREELINE_NOFILL:
                         {
                             if ( pObj->ISA( SdrPathObj ) )
                             {
@@ -407,8 +521,8 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                             }
                         }
                         break;
-                    case SID_DRAW_TEXT:
-                    case SID_DRAW_TEXT_VERTICAL:
+                    case COMMAND_ID_DRAW_TEXT:
+                    case COMMAND_ID_DRAW_TEXT_VERTICAL:
                         {
                             if ( pObj->ISA( SdrTextObj ) )
                             {
@@ -431,8 +545,8 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                             }
                         }
                         break;
-                    case SID_DRAW_CAPTION:
-                    case SID_DRAW_CAPTION_VERTICAL:
+                    case COMMAND_ID_DRAW_CAPTION:
+                    case COMMAND_ID_DRAW_CAPTION_VERTICAL:
                         {
                             if ( pObj->ISA( SdrCaptionObj ) )
                             {
@@ -463,6 +577,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                         {
                             pObj->SetLogicRect( aRect );
                             SfxItemSet aSet( pDrawModelWrapper->GetItemPool() );
+                            setAttributes( pObj );
                             pObj->SetMergedItemSet( aSet );
                         }
                         break;
@@ -474,6 +589,89 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
     return pObj;
 }
 
+bool DrawCommandDispatch::parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId,
+    ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType )
+{
+    bool bFound = true;
+    sal_uInt16 nFeatureId = 0;
+    ::rtl::OUString aBaseCommand;
+    ::rtl::OUString aType;
+
+    sal_Int32 nIndex = 1;
+    ::rtl::OUString aToken = rCommandURL.getToken( 0, '.', nIndex );
+    if ( nIndex == -1 || !aToken.getLength() )
+    {
+        aBaseCommand = rCommandURL;
+        SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( aBaseCommand );
+        if ( aIter != m_aSupportedFeatures.end() )
+        {
+            nFeatureId = aIter->second.nFeatureId;
+
+            switch ( nFeatureId )
+            {
+                case COMMAND_ID_DRAWTBX_CS_BASIC:
+                    {
+                        aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "diamond" ) );
+                    }
+                    break;
+                case COMMAND_ID_DRAWTBX_CS_SYMBOL:
+                    {
+                        aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "smiley" ) );
+                    }
+                    break;
+                case COMMAND_ID_DRAWTBX_CS_ARROW:
+                    {
+                        aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "left-right-arrow" ) );
+                    }
+                    break;
+                case COMMAND_ID_DRAWTBX_CS_FLOWCHART:
+                    {
+                        aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flowchart-internal-storage" ) );
+                    }
+                    break;
+                case COMMAND_ID_DRAWTBX_CS_CALLOUT:
+                    {
+                        aType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "round-rectangular-callout" ) );
+                    }
+                    break;
+                case COMMAND_ID_DRAWTBX_CS_STAR:
+                    {
+                        aType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "star5" ) );
+                    }
+                    break;
+                default:
+                    {
+                    }
+                    break;
+            }
+        }
+        else
+        {
+            bFound = false;
+        }
+    }
+    else
+    {
+        aBaseCommand = rCommandURL.copy( 0, nIndex - 1 );
+        SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( aBaseCommand );
+        if ( aIter != m_aSupportedFeatures.end() )
+        {
+            nFeatureId = aIter->second.nFeatureId;
+            aType = rCommandURL.getToken( 0, '.', nIndex );
+        }
+        else
+        {
+            bFound = false;
+        }
+    }
+
+    *pnFeatureId = nFeatureId;
+    *pBaseCommand = aBaseCommand;
+    *pCustomShapeType = aType;
+
+    return bFound;
+}
+
 //.............................................................................
 } //  namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc
index 73cfc8f2db4a..4fe14b8bd087 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hrc
+++ b/chart2/source/controller/main/DrawCommandDispatch.hrc
@@ -32,7 +32,22 @@
 
 //-----------------------------------------------------------------------------
 //Command Ids:
-#define COMMAND_ID_LINE_ARROW_END               1
+#define COMMAND_ID_OBJECT_SELECT                1
+#define COMMAND_ID_DRAW_LINE                    2
+#define COMMAND_ID_LINE_ARROW_END               3
+#define COMMAND_ID_DRAW_RECT                    4
+#define COMMAND_ID_DRAW_ELLIPSE                 5
+#define COMMAND_ID_DRAW_FREELINE_NOFILL         6
+#define COMMAND_ID_DRAW_TEXT                    7
+#define COMMAND_ID_DRAW_TEXT_VERTICAL           8
+#define COMMAND_ID_DRAW_CAPTION                 9
+#define COMMAND_ID_DRAW_CAPTION_VERTICAL       10
+#define COMMAND_ID_DRAWTBX_CS_BASIC            11
+#define COMMAND_ID_DRAWTBX_CS_SYMBOL           12
+#define COMMAND_ID_DRAWTBX_CS_ARROW            13
+#define COMMAND_ID_DRAWTBX_CS_FLOWCHART        14
+#define COMMAND_ID_DRAWTBX_CS_CALLOUT          15
+#define COMMAND_ID_DRAWTBX_CS_STAR             16
 
 // CHART_DRAWCOMMANDDISPATCH_HRC
 #endif
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index c4ac62caa7e1..4a4316622c6e 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -56,6 +56,9 @@ public:
     // late initialisation, especially for adding as listener
     virtual void initialize();
 
+    virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL );
+
+    void setAttributes( SdrObject* pObj );
     void setLineEnds( SfxItemSet& rAttr );
 
 protected:
@@ -76,10 +79,13 @@ protected:
     virtual void describeSupportedFeatures();
 
 private:
-    void setInsertObj( USHORT eObj, const ::rtl::OUString& rShapeType = ::rtl::OUString() );
+    void setInsertObj( USHORT eObj );
     SdrObject* createDefaultObject( const sal_uInt16 nID );
 
+    bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType );
+
     ChartController* m_pChartController;
+    ::rtl::OUString m_aCustomShapeType;
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 4aa452d9dd67..185d457b84af 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -57,9 +57,9 @@ void FeatureCommandDispatchBase::initialize()
     fillSupportedFeatures();
 }
 
-bool FeatureCommandDispatchBase::isFeatureSupported( const util::URL& rURL ) const
+bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCommandURL )
 {
-    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rURL.Complete );
+    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommandURL );
     if ( aIter != m_aSupportedFeatures.end() )
     {
         return true;
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index f75fc4084890..0528e8137ffb 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -68,7 +68,7 @@ public:
     // late initialisation, especially for adding as listener
     virtual void initialize();
 
-    virtual bool isFeatureSupported( const ::com::sun::star::util::URL& rURL ) const;
+    virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL );
 
 protected:
     // XDispatch
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 8a2e0e92e3e6..001003cccb12 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -54,7 +54,6 @@
 #include <svx/orphitem.hxx>
 #include <svx/spltitem.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/svxids.hrc>
 #include <svx/widwitem.hxx>
 
 #include <boost/scoped_ptr.hpp>
@@ -113,49 +112,52 @@ FeatureState ShapeController::getState( const ::rtl::OUString& rCommand )
         }
     }
 
-    sal_uInt16 nFeatureId = m_aSupportedFeatures[ rCommand ].nFeatureId;
-
-    switch ( nFeatureId )
+    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommand );
+    if ( aIter != m_aSupportedFeatures.end() )
     {
-        case COMMAND_ID_FORMAT_LINE:
-        case COMMAND_ID_FORMAT_AREA:
-        case COMMAND_ID_TEXT_ATTRIBUTES:
-        case COMMAND_ID_TRANSFORM_DIALOG:
-        case COMMAND_ID_OBJECT_TITLE_DESCRIPTION:
-        case COMMAND_ID_RENAME_OBJECT:
-            {
-                aReturn.bEnabled = bWritable;
-                aReturn.aState <<= false;
-            }
-            break;
-        case COMMAND_ID_BRING_TO_FRONT:
-        case COMMAND_ID_FORWARD:
-            {
-                aReturn.bEnabled = ( bWritable && isForwardPossible() );
-                aReturn.aState <<= false;
-            }
-            break;
-        case COMMAND_ID_BACKWARD:
-        case COMMAND_ID_SEND_TO_BACK:
-            {
+        sal_uInt16 nFeatureId = aIter->second.nFeatureId;
+        switch ( nFeatureId )
+        {
+            case COMMAND_ID_FORMAT_LINE:
+            case COMMAND_ID_FORMAT_AREA:
+            case COMMAND_ID_TEXT_ATTRIBUTES:
+            case COMMAND_ID_TRANSFORM_DIALOG:
+            case COMMAND_ID_OBJECT_TITLE_DESCRIPTION:
+            case COMMAND_ID_RENAME_OBJECT:
+                {
+                    aReturn.bEnabled = bWritable;
+                    aReturn.aState <<= false;
+                }
+                break;
+            case COMMAND_ID_BRING_TO_FRONT:
+            case COMMAND_ID_FORWARD:
+                {
+                    aReturn.bEnabled = ( bWritable && isForwardPossible() );
+                    aReturn.aState <<= false;
+                }
+                break;
+            case COMMAND_ID_BACKWARD:
+            case COMMAND_ID_SEND_TO_BACK:
+                {
 
-                aReturn.bEnabled = ( bWritable && isBackwardPossible() );
-                aReturn.aState <<= false;
-            }
-            break;
-        case COMMAND_ID_FONT_DIALOG:
-        case COMMAND_ID_PARAGRAPH_DIALOG:
-            {
-                aReturn.bEnabled = bWritable;
-                aReturn.aState <<= false;
-            }
-            break;
-        default:
-            {
-                aReturn.bEnabled = false;
-                aReturn.aState <<= false;
-            }
-            break;
+                    aReturn.bEnabled = ( bWritable && isBackwardPossible() );
+                    aReturn.aState <<= false;
+                }
+                break;
+            case COMMAND_ID_FONT_DIALOG:
+            case COMMAND_ID_PARAGRAPH_DIALOG:
+                {
+                    aReturn.bEnabled = bWritable;
+                    aReturn.aState <<= false;
+                }
+                break;
+            default:
+                {
+                    aReturn.bEnabled = false;
+                    aReturn.aState <<= false;
+                }
+                break;
+        }
     }
 
     return aReturn;
@@ -165,62 +167,65 @@ void ShapeController::execute( const ::rtl::OUString& rCommand, const Sequence<
 {
     (void)rArgs;
 
-    sal_uInt16 nFeatureId = m_aSupportedFeatures[ rCommand ].nFeatureId;
-
-    switch ( nFeatureId )
+    SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommand );
+    if ( aIter != m_aSupportedFeatures.end() )
     {
-        case COMMAND_ID_FORMAT_LINE:
-            {
-                executeDispatch_FormatLine();
-            }
-            break;
-        case COMMAND_ID_FORMAT_AREA:
-            {
-                executeDispatch_FormatArea();
-            }
-            break;
-        case COMMAND_ID_TEXT_ATTRIBUTES:
-            {
-                executeDispatch_TextAttributes();
-            }
-            break;
-        case COMMAND_ID_TRANSFORM_DIALOG:
-            {
-                executeDispatch_TransformDialog();
-            }
-            break;
-        case COMMAND_ID_OBJECT_TITLE_DESCRIPTION:
-            {
-                executeDispatch_ObjectTitleDescription();
-            }
-            break;
-        case COMMAND_ID_RENAME_OBJECT:
-            {
-                executeDispatch_RenameObject();
-            }
-            break;
-        case COMMAND_ID_BRING_TO_FRONT:
-        case COMMAND_ID_FORWARD:
-        case COMMAND_ID_BACKWARD:
-        case COMMAND_ID_SEND_TO_BACK:
-            {
-                executeDispatch_ChangeZOrder( nFeatureId );
-            }
-            break;
-        case COMMAND_ID_FONT_DIALOG:
-            {
-                executeDispatch_FontDialog();
-            }
-            break;
-        case COMMAND_ID_PARAGRAPH_DIALOG:
-            {
-                executeDispatch_ParagraphDialog();
-            }
-            break;
-        default:
-            {
-            }
-            break;
+        sal_uInt16 nFeatureId = aIter->second.nFeatureId;
+        switch ( nFeatureId )
+        {
+            case COMMAND_ID_FORMAT_LINE:
+                {
+                    executeDispatch_FormatLine();
+                }
+                break;
+            case COMMAND_ID_FORMAT_AREA:
+                {
+                    executeDispatch_FormatArea();
+                }
+                break;
+            case COMMAND_ID_TEXT_ATTRIBUTES:
+                {
+                    executeDispatch_TextAttributes();
+                }
+                break;
+            case COMMAND_ID_TRANSFORM_DIALOG:
+                {
+                    executeDispatch_TransformDialog();
+                }
+                break;
+            case COMMAND_ID_OBJECT_TITLE_DESCRIPTION:
+                {
+                    executeDispatch_ObjectTitleDescription();
+                }
+                break;
+            case COMMAND_ID_RENAME_OBJECT:
+                {
+                    executeDispatch_RenameObject();
+                }
+                break;
+            case COMMAND_ID_BRING_TO_FRONT:
+            case COMMAND_ID_FORWARD:
+            case COMMAND_ID_BACKWARD:
+            case COMMAND_ID_SEND_TO_BACK:
+                {
+                    executeDispatch_ChangeZOrder( nFeatureId );
+                }
+                break;
+            case COMMAND_ID_FONT_DIALOG:
+                {
+                    executeDispatch_FontDialog();
+                }
+                break;
+            case COMMAND_ID_PARAGRAPH_DIALOG:
+                {
+                    executeDispatch_ParagraphDialog();
+                }
+                break;
+            default:
+                {
+                }
+                break;
+        }
     }
 }
 
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
new file mode 100644
index 000000000000..17d41b492161
--- /dev/null
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -0,0 +1,302 @@
+/*************************************************************************
+ *
+ * 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: ShapeToolbarController.cxx,v $
+ * $Revision: 1.0 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+
+#include "ShapeToolbarController.hxx"
+
+#include <vos/mutex.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <svx/svxids.hrc>
+#include <svx/tbxcustomshapes.hxx>
+
+
+using namespace com::sun::star;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+::rtl::OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException)
+{
+    return getImplementationName_Static();
+}
+
+::rtl::OUString ShapeToolbarController::getImplementationName_Static() throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.comp.ShapeToolbarController" ) );
+}
+
+Sequence< ::rtl::OUString > ShapeToolbarController::getSupportedServiceNames_Static() throw (uno::RuntimeException)
+{
+    Sequence< ::rtl::OUString > aSupported(1);
+    aSupported.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ShapeToolbarController" ) );
+    return aSupported;
+}
+
+::sal_Bool ShapeToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+{
+    return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() );
+}
+
+Sequence< ::rtl::OUString> ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException)
+{
+    return getSupportedServiceNames_Static();
+}
+
+Reference< uno::XInterface > ShapeToolbarController::create( const Reference< uno::XComponentContext >& xContext )
+{
+    return *( new ShapeToolbarController( Reference< lang::XMultiServiceFactory >( xContext->getServiceManager(), uno::UNO_QUERY ) ) );
+}
+
+ShapeToolbarController::ShapeToolbarController( const Reference< lang::XMultiServiceFactory >& rxFact )
+    :m_pToolbarController( NULL )
+    ,m_nToolBoxId( 1 )
+    ,m_nSlotId( 0 )
+{
+    osl_incrementInterlockedCount( &m_refCount );
+    m_xServiceManager = rxFact;
+    osl_decrementInterlockedCount( &m_refCount );
+}
+
+ShapeToolbarController::~ShapeToolbarController()
+{
+}
+
+// ::com::sun::star::uno::XInterface
+uno::Any ShapeToolbarController::queryInterface( const uno::Type& rType ) throw (uno::RuntimeException)
+{
+    uno::Any aReturn = ToolboxController::queryInterface( rType );
+    if ( !aReturn.hasValue() )
+    {
+        aReturn = ShapeToolbarController_Base::queryInterface( rType );
+    }
+    return aReturn;
+}
+
+void ShapeToolbarController::acquire() throw ()
+{
+    ToolboxController::acquire();
+}
+
+void ShapeToolbarController::release() throw ()
+{
+    ToolboxController::release();
+}
+
+// ::com::sun::star::lang::XInitialization
+void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException)
+{
+    ToolboxController::initialize( rArguments );
+    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
+    if ( pToolBox )
+    {
+        const USHORT nCount = pToolBox->GetItemCount();
+        for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+        {
+            const USHORT nItemId = pToolBox->GetItemId( nPos );
+            if ( pToolBox->GetItemCommand( nItemId ) == String( m_aCommandURL ) )
+            {
+                m_nToolBoxId = nItemId;
+                break;
+            }
+        }
+        if ( m_aCommandURL.equalsAscii( ".uno:BasicShapes" ) )
+        {
+            m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes" ) ), sal_True ) );
+            m_nSlotId = SID_DRAWTBX_CS_BASIC;
+            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+        }
+        else if ( m_aCommandURL.equalsAscii( ".uno:SymbolShapes" ) )
+        {
+            m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes" ) ), sal_True ) );
+            m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
+            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+        }
+        else if ( m_aCommandURL.equalsAscii( ".uno:ArrowShapes" ) )
+        {
+            m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes" ) ), sal_True ) );
+            m_nSlotId = SID_DRAWTBX_CS_ARROW;
+            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
+        }
+        else if ( m_aCommandURL.equalsAscii( ".uno:FlowChartShapes" ) )
+        {
+            m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes" ) ), sal_True ) );
+            m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
+            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+        }
+        else if ( m_aCommandURL.equalsAscii( ".uno:CalloutShapes" ) )
+        {
+            m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes" ) ), sal_True ) );
+            m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
+            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+        }
+        else if ( m_aCommandURL.equalsAscii( ".uno:StarShapes" ) )
+        {
+            m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes" ) ), sal_True ) );
+            m_nSlotId = SID_DRAWTBX_CS_STAR;
+            m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
+        }
+
+        for ( TCommandState::iterator aIter( m_aStates.begin() ); aIter != m_aStates.end(); ++aIter )
+        {
+            addStatusListener( aIter->first );
+        }
+
+        if ( m_pToolbarController.is() )
+        {
+            m_pToolbarController->initialize( rArguments );
+        }
+
+        // check if paste special is allowed, when not don't add DROPDOWN
+        pToolBox->SetItemBits( m_nToolBoxId, pToolBox->GetItemBits( m_nToolBoxId ) | TIB_DROPDOWN );
+    }
+}
+
+// ::com::sun::star::frame::XStatusListener
+void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete );
+    if ( aFind != m_aStates.end() )
+    {
+        aFind->second = Event.IsEnabled;
+        if ( m_pToolbarController.is() )
+        {
+            sal_Bool bSetCheckmark = sal_False;
+            sal_Bool bCheckmark = sal_False;
+            ToolBox& rTb = m_pToolbarController->GetToolBox();
+
+            for ( USHORT i = 0; i < rTb.GetItemCount(); ++i )
+            {
+                USHORT nId = rTb.GetItemId( i );
+                if ( nId == 0 )
+                {
+                    continue;
+                }
+                ::rtl::OUString aCmd = rTb.GetItemCommand( nId );
+                if ( aCmd == Event.FeatureURL.Complete )
+                {
+                    rTb.EnableItem( nId, Event.IsEnabled );
+                    if ( Event.State >>= bCheckmark )
+                    {
+                        rTb.CheckItem( nId, bCheckmark );
+                    }
+                    else
+                    {
+                        ::rtl::OUString aItemText;
+                        if ( Event.State >>= aItemText )
+                        {
+                            rTb.SetItemText( nId, aItemText );
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// ::com::sun::star::frame::XToolbarController
+Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException)
+{
+    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    Reference< awt::XWindow > xRet;
+    if ( m_pToolbarController.is() )
+    {
+        xRet = m_pToolbarController.getRef()->createPopupWindow();
+    }
+
+    return xRet;
+}
+
+// ::com::sun::star::frame::XSubToolbarController
+::sal_Bool ShapeToolbarController::opensSubToolbar() throw (uno::RuntimeException)
+{
+    return ( m_nSlotId == SID_DRAWTBX_CS_BASIC ||
+             m_nSlotId == SID_DRAWTBX_CS_SYMBOL ||
+             m_nSlotId == SID_DRAWTBX_CS_ARROW ||
+             m_nSlotId == SID_DRAWTBX_CS_FLOWCHART ||
+             m_nSlotId == SID_DRAWTBX_CS_CALLOUT ||
+             m_nSlotId == SID_DRAWTBX_CS_STAR );
+}
+
+::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException)
+{
+    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard(m_aMutex);
+    uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
+    if ( xSub.is() )
+    {
+        return xSub->getSubToolbarName();
+    }
+    return ::rtl::OUString();
+}
+
+void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException)
+{
+    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
+    if ( xSub.is() )
+    {
+        m_aCommandURL = rCommand;
+        xSub->functionSelected( rCommand );
+    }
+}
+
+void ShapeToolbarController::updateImage() throw (uno::RuntimeException)
+{
+    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
+    if ( xSub.is() )
+    {
+        xSub->updateImage();
+    }
+}
+
+//.............................................................................
+} //  namespace chart
+//.............................................................................
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
new file mode 100644
index 000000000000..2ad89f0f40b0
--- /dev/null
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * 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: ShapeToolbarController.hxx,v $
+ * $Revision: 1.0 $
+ *
+ * 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 CHART2_SHAPETOOLBARCONTROLLER_HXX
+#define CHART2_SHAPETOOLBARCONTROLLER_HXX
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/frame/XSubToolbarController.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+#include <comphelper/implementationreference.hxx>
+#include <comphelper/stl_types.hxx>
+#include <svtools/toolboxcontroller.hxx>
+
+class SfxToolBoxControl;
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo,
+                              ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base;
+
+typedef ::comphelper::ImplementationReference< SfxToolBoxControl, ::com::sun::star::frame::XToolbarController > TToolbarHelper;
+
+class ShapeToolbarController : public ::svt::ToolboxController
+                              ,public ShapeToolbarController_Base
+{
+    DECLARE_STL_USTRINGACCESS_MAP( sal_Bool, TCommandState );
+    TCommandState   m_aStates;
+    TToolbarHelper  m_pToolbarController;
+    sal_uInt16      m_nToolBoxId;
+    sal_uInt16      m_nSlotId;
+    ShapeToolbarController( const ShapeToolbarController& );
+    void operator =( const ShapeToolbarController& );
+
+public:
+    ShapeToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFact );
+    virtual ~ShapeToolbarController();
+
+    // ::com::sun::star::uno::XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // ::com::sun::star::lang::XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+
+    // needed by registration
+    static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+        create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::lang::XInitialization
+    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::frame::XStatusListener
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::frame::XToolbarController
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::frame::XSubToolbarController
+    virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException);
+};
+
+//.............................................................................
+} //  namespace chart
+//.............................................................................
+
+#endif //CHART2_SHAPETOOLBARCONTROLLER_HXX
+
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx
index 922096ab5b5f..eb8df08a7e13 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -36,6 +36,7 @@
 #include "dlg_ChartType_UNO.hxx"
 #include "ChartDocumentWrapper.hxx"
 #include "AccessibleChartView.hxx"
+#include "ShapeToolbarController.hxx"
 #include <cppuhelper/implementationentry.hxx>
 
 static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
@@ -80,6 +81,14 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
         , 0
         , 0
     }
+    ,{
+          ::chart::ShapeToolbarController::create
+        , ::chart::ShapeToolbarController::getImplementationName_Static
+        , ::chart::ShapeToolbarController::getSupportedServiceNames_Static
+        , ::cppu::createSingleComponentFactory
+        , 0
+        , 0
+    }
     ,{ 0, 0, 0, 0, 0, 0 }
 };
 
diff --git a/chart2/source/controller/main/makefile.mk b/chart2/source/controller/main/makefile.mk
index cd14adebcd74..d1a5b37688d5 100644
--- a/chart2/source/controller/main/makefile.mk
+++ b/chart2/source/controller/main/makefile.mk
@@ -74,6 +74,7 @@ SLOFILES =  \
             $(SLO)$/FeatureCommandDispatchBase.obj \
             $(SLO)$/DrawCommandDispatch.obj \
             $(SLO)$/ShapeController.obj \
+            $(SLO)$/ShapeToolbarController.obj \
             $(SLO)$/ImplUndoManager.obj \
             $(SLO)$/UndoManager.obj \
             $(SLO)$/UndoGuard.obj
diff --git a/chart2/source/controller/menus/ShapeContextMenu.src b/chart2/source/controller/menus/ShapeContextMenu.src
index 4aa0c381bd26..4ffea413c735 100644
--- a/chart2/source/controller/menus/ShapeContextMenu.src
+++ b/chart2/source/controller/menus/ShapeContextMenu.src
@@ -30,8 +30,6 @@
 #include "MenuResIds.hrc"
 #include "ShapeController.hrc"
 
-#include <svx/svxids.hrc>
-
 
 Menu RID_CONTEXTMENU_SHAPE
 {
diff --git a/chart2/source/controller/menus/ShapeEditContextMenu.src b/chart2/source/controller/menus/ShapeEditContextMenu.src
index c23e977bfa09..1ce19844945f 100644
--- a/chart2/source/controller/menus/ShapeEditContextMenu.src
+++ b/chart2/source/controller/menus/ShapeEditContextMenu.src
@@ -30,7 +30,6 @@
 #include "MenuResIds.hrc"
 #include "ShapeController.hrc"
 
-#include <svx/svxids.hrc>
 
 Menu RID_CONTEXTMENU_SHAPEEDIT
 {