*** orig/chart2/source/controller/main/ChartController_Tools.cxx	Thu May 15 16:02:14 2008
--- new/chart2/source/controller/main/ChartController_Tools.cxx	Thu Oct  9 11:45:20 2008
***************
*** 80,85 ****
--- 80,87 ----
  // for SolarMutex
  #include <vcl/svapp.hxx>
  #include <vos/mutex.hxx>
+ // for OutlinerView
+ #include <svx/outliner.hxx>
  
  using namespace ::com::sun::star;
  
***************
*** 406,419 ****
                  OUString aString;
                  if( aDataHelper.GetString( FORMAT_STRING, aString ) && m_pDrawModelWrapper )
                  {
!                     awt::Point aTextPos;
!                     awt::Size aPageSize( ChartModelHelper::getPageSize( m_aModel->getModel()));
!                     aTextPos.X = (aPageSize.Width / 2);
!                     aTextPos.Y = (aPageSize.Height / 2);
!                     lcl_InsertStringAsTextShapeIntoDrawPage(
!                         m_pDrawModelWrapper->getShapeFactory(),
!                         m_pDrawModelWrapper->getMainDrawPage(),
!                         aString, aTextPos );
                  }
              }
          }
--- 408,430 ----
                  OUString aString;
                  if( aDataHelper.GetString( FORMAT_STRING, aString ) && m_pDrawModelWrapper )
                  {
!                     if( m_pDrawViewWrapper )
!                     {
!                         OutlinerView* pOutlinerView = m_pDrawViewWrapper->GetTextEditOutlinerView();
!                         if( pOutlinerView )
!                             pOutlinerView->InsertText( aString );
!                         else
!                         {
!                             awt::Point aTextPos;
!                             awt::Size aPageSize( ChartModelHelper::getPageSize( m_aModel->getModel()));
!                             aTextPos.X = (aPageSize.Width / 2);
!                             aTextPos.Y = (aPageSize.Height / 2);
!                             lcl_InsertStringAsTextShapeIntoDrawPage(
!                                 m_pDrawModelWrapper->getShapeFactory(),
!                                 m_pDrawModelWrapper->getMainDrawPage(),
!                                 aString, aTextPos );
!                         }
!                     }
                  }
              }
          }
*** orig/chart2/source/controller/main/ChartController_Window.cxx	Fri Jun  6 17:10:54 2008
--- new/chart2/source/controller/main/ChartController_Window.cxx	Thu Oct  9 11:48:14 2008
***************
*** 813,821 ****
      }
  
      // pop-up menu
! 	if(rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bIsAction)
! 	{
! 		m_pChartWindow->ReleaseMouse();
  
          if( m_aSelection.isSelectionDifferentFromBeforeMouseDown() )
              impl_notifySelectionChangeListeners();
--- 813,821 ----
      }
  
      // pop-up menu
!     if(rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bIsAction)
!     {
!         m_pChartWindow->ReleaseMouse();
  
          if( m_aSelection.isSelectionDifferentFromBeforeMouseDown() )
              impl_notifySelectionChangeListeners();
***************
*** 865,871 ****
                  aPos = m_pChartWindow->GetPointerState().maPos;
              aContextMenuHelper.completeAndExecute( aPos, xPopupMenu );
          }
! 	}
  }
  
  bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
--- 865,879 ----
                  aPos = m_pChartWindow->GetPointerState().maPos;
              aContextMenuHelper.completeAndExecute( aPos, xPopupMenu );
          }
!     }
!     else if( ( rCEvt.GetCommand() == COMMAND_STARTEXTTEXTINPUT ) ||
!              ( rCEvt.GetCommand() == COMMAND_EXTTEXTINPUT ) ||
!              ( rCEvt.GetCommand() == COMMAND_ENDEXTTEXTINPUT ) ||
!              ( rCEvt.GetCommand() == COMMAND_INPUTCONTEXTCHANGE ) )
!     {
!         if( m_pDrawViewWrapper )
!             m_pDrawViewWrapper->Command( rCEvt, m_pChartWindow );
!     }
  }
  
  bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )