CWS-TOOLING: integrate CWS dr70

2009-06-09 13:52:02 +0200 dr  r272770 : #i101930# SXC import broken
2009-06-05 11:50:16 +0200 dr  r272675 : #i10000# compiler warning
2009-06-05 11:24:39 +0200 dr  r272674 : #i10000# compiler warning
2009-06-05 10:35:22 +0200 dr  r272668 : #i10000# compiler warning
2009-06-04 16:53:32 +0200 dr  r272646 : CWS-TOOLING: rebase CWS dr70 to trunk@272291 (milestone: DEV300:m49)
2009-06-04 14:50:45 +0200 dr  r272633 : #i10000# compiler warning
2009-06-03 18:50:57 +0200 dr  r272603 : #i101930# fix ODS export of uninit'ed notes, do not craete note captions in UpdatePendingRowHeights
2009-05-28 11:11:17 +0200 dr  r272384 : #i101930# note captions must be created before changing row/column size
2009-05-27 15:48:44 +0200 iha  r272356 : #i101925# metafile creation is requested superfluously during inplace editing
2009-05-27 15:46:44 +0200 iha  r272355 : #i101925# metafile creation is requested superfluously during inplace editing
2009-05-27 15:06:58 +0200 iha  r272349 : #i101928# superfluous paint calls while entering and editing charts
2009-05-27 15:01:08 +0200 iha  r272348 : #i101928# superfluous paint calls while entering and editing charts
2009-05-26 14:43:39 +0200 dr  r272303 : #i101930# import performance: invisible cell notes cache caption data
2009-05-22 18:44:19 +0200 dr  r272205 : #i101930# preparations for uninitialized notes (performance), adapted ODF import filter
2009-05-14 19:50:43 +0200 dr  r271918 : #i101930# 'recycle' the shapes already created while loading cell notes
2009-05-06 16:07:45 +0200 dr  r271598 : #i100827# improve performance of HTML query filter, patch by mmeeks, slightly modified
2009-05-06 11:02:38 +0200 dr  r271577 : #i100827# improve performance of HTML query filter, patch by mmeeks
2009-05-06 10:50:13 +0200 dr  r271575 : #i86650# improve performance of HTML query filter
2009-05-05 10:09:44 +0200 nn  r271502 : #i101428# better handling of non-existing view data
2009-04-29 16:42:57 +0200 nn  r271384 : #i101428# after loading, update row heights per sheet on demand

3 files changed, 37 insertions, 2 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8368e76baa82..7728104afc0f 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -468,7 +468,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     {
         //the view has become dirty, we should repaint it if we have a window
         if( m_pChartWindow )
-            m_pChartWindow->Invalidate();
+            m_pChartWindow->ForceInvalidate();
     }
     else if( rEvent.NewMode.equals(C2U("invalid")) )
     {
@@ -478,8 +478,11 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
         if( m_pDrawViewWrapper && m_pDrawViewWrapper->IsTextEdit() )
             this->EndTextEdit();
         if( m_pDrawViewWrapper )
+        {
             m_pDrawViewWrapper->UnmarkAll();
             //m_pDrawViewWrapper->hideMarkHandles(); todo??
+            m_pDrawViewWrapper->HideSdrPage();
+        }
     }
     else
     {
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 5c9e201aebd8..10b999df8f43 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -60,6 +60,7 @@ namespace chart
 ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, WinBits nStyle )
         : Window(pParent, nStyle)
         , m_pWindowController( pWindowController )
+        , m_bInPaint(false)
 {
     this->SetSmartHelpId( SmartId( HID_SCH_WIN_DOCUMENT ) );
     this->SetMapMode( MapMode(MAP_100TH_MM) );
@@ -67,7 +68,7 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent,
     // chart does not depend on exact pixel painting => enable antialiased drawing
     SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | GetAntialiasing() );
     EnableRTL( FALSE );
-    if( pParent )

+    if( pParent )
         pParent->EnableRTL( FALSE );// #i96215# necessary for a correct position of the context menu in rtl mode
 }
 
@@ -92,10 +93,12 @@ void ChartWindow::PrePaint()
 
 void ChartWindow::Paint( const Rectangle& rRect )
 {
+    m_bInPaint = true;
     if( m_pWindowController )
         m_pWindowController->execute_Paint( rRect );
     else
         Window::Paint( rRect );
+    m_bInPaint = false;
 }
 
 void ChartWindow::MouseButtonDown(const MouseEvent& rMEvt)
@@ -243,6 +246,29 @@ void ChartWindow::adjustHighContrastMode()
     SetDrawMode( bUseContrast ? nContrastMode : DRAWMODE_DEFAULT );
 }
 
+void ChartWindow::ForceInvalidate()
+{
+    ::Window::Invalidate();
+}
+void ChartWindow::Invalidate( USHORT nFlags )
+{
+    if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
+        return;
+    ::Window::Invalidate( nFlags );
+}
+void ChartWindow::Invalidate( const Rectangle& rRect, USHORT nFlags )
+{
+    if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
+        return;
+    ::Window::Invalidate( rRect, nFlags );
+}
+void ChartWindow::Invalidate( const Region& rRegion, USHORT nFlags )
+{
+    if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
+        return;
+    ::Window::Invalidate( rRegion, nFlags );
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx
index 41cc7b514a07..543c0b13ffdc 100644
--- a/chart2/source/controller/main/ChartWindow.hxx
+++ b/chart2/source/controller/main/ChartWindow.hxx
@@ -70,10 +70,16 @@ public:
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
     virtual void RequestHelp( const HelpEvent& rHEvt );
 
+    void ForceInvalidate();
+    virtual void Invalidate( USHORT nFlags = 0 );
+    virtual void Invalidate( const Rectangle& rRect, USHORT nFlags = 0 );
+    virtual void Invalidate( const Region& rRegion, USHORT nFlags = 0 );
+
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
 private:
     WindowController*    m_pWindowController;
+    bool m_bInPaint;
 
     void adjustHighContrastMode();
 };