#i12587# Inserting/editing arbitrary text objects in chart

4 files changed, 55 insertions, 8 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b104e232b3b6e..cde145046dec2 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -56,6 +56,7 @@
 #include "AccessibleChartView.hxx"
 #include "DrawCommandDispatch.hxx"
 #include "ShapeController.hxx"
+#include "UndoManager.hxx"
 
 #include <comphelper/InlineContainer.hxx>
 
@@ -1384,6 +1385,20 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ )
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
+IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
+{
+    ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
+    if ( aObjectCID.getLength() == 0 )
+    {
+        UndoManager* pUndoManager = UndoManager::getImplementation( m_xUndoManager );
+        if ( pUndoManager )
+        {
+            pUndoManager->addShapeUndoAction( pUndoAction );
+        }
+    }
+    return 0L;
+}
+
 DrawModelWrapper* ChartController::GetDrawModelWrapper()
 {
     if( !m_pDrawModelWrapper.get() )
@@ -1391,6 +1406,10 @@ DrawModelWrapper* ChartController::GetDrawModelWrapper()
         ExplicitValueProvider* pProvider = ExplicitValueProvider::getExplicitValueProvider( m_xChartView );
         if( pProvider )
             m_pDrawModelWrapper = pProvider->getDrawModelWrapper();
+        if ( m_pDrawModelWrapper.get() )
+        {
+            m_pDrawModelWrapper->getSdrModel().SetNotifyUndoActionHdl( LINK( this, ChartController, NotifyUndoActionHdl ) );
+        }
     }
     return m_pDrawModelWrapper.get();
 }
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index d391975b832b0..99035429f95d5 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -477,6 +477,8 @@ public:
 
     bool isShapeContext() const;
 
+    DECL_LINK( NotifyUndoActionHdl, SdrUndoAction* );
+
 public:
     //-----------------------------------------------------------------
     //-----------------------------------------------------------------
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 41eb44d215ca9..ed041b3d6cc6d 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -166,15 +166,26 @@ bool ChartController::EndTextEdit()
 
             TitleHelper::setCompleteString( aString, uno::Reference<
                 ::com::sun::star::chart2::XTitle >::query( xPropSet ), m_xCC );
-        }
 
-        try
-        {
-            m_xUndoManager->postAction( C2U("Edit Text") );
+            try
+            {
+                m_xUndoManager->postAction( C2U("Edit Text") );
+            }
+            catch( uno::RuntimeException& e)
+            {
+                ASSERT_EXCEPTION( e );
+            }
         }
-        catch( uno::RuntimeException& e)
+        else
         {
-            ASSERT_EXCEPTION( e );
+            try
+            {
+                m_xUndoManager->cancelAction();
+            }
+            catch ( uno::RuntimeException& e )
+            {
+                ASSERT_EXCEPTION( e );
+            }
         }
     }
     return true;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index a19e6dcd807d0..6a991b01ee3cb 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -79,10 +79,13 @@
 // for SolarMutex
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 // for OutlinerView
 #include <svx/outliner.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unopage.hxx>
 
@@ -413,13 +416,14 @@ void ChartController::impl_PasteGraphic(
 void ChartController::impl_PasteShapes( SdrModel* pModel )
 {
     DrawModelWrapper* pDrawModelWrapper( this->GetDrawModelWrapper() );
-    if ( pDrawModelWrapper )
+    if ( pDrawModelWrapper && m_pDrawViewWrapper )
     {
         Reference< drawing::XDrawPage > xDestPage( pDrawModelWrapper->getMainDrawPage() );
         SdrPage* pDestPage = GetSdrPageFromXDrawPage( xDestPage );
         if ( pDestPage )
         {
             Reference< drawing::XShape > xSelShape;
+            m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
             sal_uInt16 nCount = pModel->GetPageCount();
             for ( sal_uInt16 i = 0; i < nCount; ++i )
             {
@@ -442,6 +446,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
                         }
 
                         pDestPage->InsertObject( pNewObj );
+                        m_pDrawViewWrapper->AddUndo( new SdrUndoInsertObj( *pNewObj ) );
                         xSelShape = xShape;
                     }
                 }
@@ -456,6 +461,8 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
             // select last inserted shape
             m_aSelection.setSelection( xSelShape );
             m_aSelection.applySelection( m_pDrawViewWrapper );
+
+            m_pDrawViewWrapper->EndUndo();
         }
     }
 }
@@ -463,7 +470,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
 void ChartController::impl_PasteStringAsTextShape( const OUString& rString, const awt::Point& rPosition )
 {
     DrawModelWrapper* pDrawModelWrapper( this->GetDrawModelWrapper() );
-    if ( pDrawModelWrapper )
+    if ( pDrawModelWrapper && m_pDrawViewWrapper )
     {
         const Reference< lang::XMultiServiceFactory >& xShapeFactory( pDrawModelWrapper->getShapeFactory() );
         const Reference< drawing::XDrawPage >& xDrawPage( pDrawModelWrapper->getMainDrawPage() );
@@ -495,6 +502,14 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
 
                 m_aSelection.setSelection( xTextShape );
                 m_aSelection.applySelection( m_pDrawViewWrapper );
+
+                SdrObject* pObj = DrawViewWrapper::getSdrObject( xTextShape );
+                if ( pObj )
+                {
+                    m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
+                    m_pDrawViewWrapper->AddUndo( new SdrUndoInsertObj( *pObj ) );
+                    m_pDrawViewWrapper->EndUndo();
+                }
             }
             catch ( const uno::Exception& ex )
             {