diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/tabview.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview3.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview4.cxx | 7 |
5 files changed, 8 insertions, 21 deletions
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index a5d739289099..891af9e82567 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -204,12 +204,6 @@ private: void PaintRangeFinderEntry (ScRangeFindData* pData, SCTAB nTab); - /** - * Check the visible grid area to see if the visible range has changed. If - * so, update the stored visible range, and re-paint the grid area. - */ - void UpdateGrid(); - protected: void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, const SCROW* pPosY = NULL ); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index fa697ee5fbdd..a60fb82812f7 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -390,6 +390,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod OSL_ENSURE( ValidCol(nX2) && ValidRow(nY2), "GridWin Draw Bereich zu gross" ); + UpdateVisibleRange(); + if (nX2 < maVisibleRange.mnCol1 || nY2 < maVisibleRange.mnRow1) return; // unsichtbar diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index aafd1144d333..02b99b94f6bc 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1198,8 +1198,6 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars ) if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff ); if (bUpdBars) UpdateScrollBars(); - else - UpdateGrid(); } if (nDeltaX==1 || nDeltaX==-1) @@ -1285,8 +1283,6 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars ) if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff ); if (bUpdBars) UpdateScrollBars(); - else - UpdateGrid(); } if (nDeltaY==1 || nDeltaY==-1) diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 7053037e60a3..50066ba15be2 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -2089,16 +2089,6 @@ void ScTabView::PaintRangeFinderEntry (ScRangeFindData* pData, const SCTAB nTab) } } -void ScTabView::UpdateGrid() -{ - if (!UpdateVisibleRange()) - // Visible range hasn't changed. No need to re-paint. - return; - - SC_MOD()->AnythingChanged(); // if visible area has changed - PaintGrid(); -} - void ScTabView::PaintRangeFinder( long nNumber ) { ScInputHandler* pHdl = SC_MOD()->GetInputHdl( aViewData.GetViewShell() ); diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 2f72a20a53be..85284311e604 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -421,7 +421,12 @@ void ScTabView::UpdateScrollBars() } // set visible area for online spelling - UpdateGrid(); + + if ( aViewData.IsActive() ) + { + if (UpdateVisibleRange()) + SC_MOD()->AnythingChanged(); // if visible area has changed + } } #ifndef HDR_SLIDERSIZE |