*** orig/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx	Mon Jan 14 21:57:18 2008
--- new/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx	Mon Apr 28 14:40:48 2008
***************
*** 180,185 ****
--- 180,186 ----
              , m_pMarkHandleProvider(NULL)
              , m_apOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, pSdrModel ) )
              , m_bRestoreMapMode( false )
+             , m_bMarkHandlesFromProvider( false )
  {
  	// #114898#
  	SetBufferedOutputAllowed(true);
***************
*** 228,237 ****
  //virtual
  void DrawViewWrapper::SetMarkHandles()
  {
      if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( aHdl ) )
          return;
!     else
          SdrView::SetMarkHandles();
  }
  
  SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
--- 229,245 ----
  //virtual
  void DrawViewWrapper::SetMarkHandles()
  {
+     SdrObject* pObj = this->getSelectedObject();
      if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( aHdl ) )
+     {
+         m_bMarkHandlesFromProvider = true;
          return;
!     }
!     else if( !m_bMarkHandlesFromProvider || !IsObjMarked( pObj ) )
!     {
          SdrView::SetMarkHandles();
+         m_bMarkHandlesFromProvider = false;
+     }
  }
  
  SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
*** orig/chart2/source/controller/inc/DrawViewWrapper.hxx	Mon Jan 14 21:57:44 2008
--- new/chart2/source/controller/inc/DrawViewWrapper.hxx	Mon Apr 28 14:40:41 2008
***************
*** 119,124 ****
--- 119,125 ----
      // #i79965# scroll back view when ending text edit
      bool m_bRestoreMapMode;
      MapMode m_aMapModeToRestore;
+     bool m_bMarkHandlesFromProvider;
  };
  
  //.............................................................................