diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-10 11:20:10 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-10 11:20:10 -0400 |
| commit | 47ce01c9e5a9db3f86beb711aa4e0318aa901695 (patch) | |
| tree | e7b0d1cbf3823aca8a6953afddea65fca1b23906 /sc | |
| parent | de1b819b7e5fe7dfcb9a84b8fe380c60f981dcaf (diff) | |
Fixed an infinite loop when the paste destination has only one sheet.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/document.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index ec5cd5241b5a..ff6dd1f8b488 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2277,7 +2277,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, { if (maTabs[i] && rMark.GetTableSelect(i) ) { - while (!ppClipTab[nClipTab]) nClipTab = (nClipTab+1) % (static_cast<SCTAB>(maTabs.size())); + while (!ppClipTab[nClipTab]) nClipTab = (nClipTab+1) % (static_cast<SCTAB>(ppClipTab.size())); maTabs[i]->CopyFromClip( nCol1, nRow1, nCol2, nRow2, nDx, nDy, pCBFCP->nInsFlag, pCBFCP->bAsLink, pCBFCP->bSkipAttrForEmpty, ppClipTab[nClipTab] ); @@ -2303,7 +2303,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, } } - nClipTab = (nClipTab+1) % (static_cast<SCTAB>(maTabs.size())); + nClipTab = (nClipTab+1) % (static_cast<SCTAB>(ppClipTab.size())); } } if ( pCBFCP->nInsFlag & IDF_CONTENTS ) @@ -2313,7 +2313,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, { if (maTabs[i] && rMark.GetTableSelect(i) ) { - while (!ppClipTab[nClipTab]) nClipTab = (nClipTab+1) % (static_cast<SCTAB>(maTabs.size())); + while (!ppClipTab[nClipTab]) nClipTab = (nClipTab+1) % (static_cast<SCTAB>(ppClipTab.size())); SCsTAB nDz = ((SCsTAB)i) - nClipTab; // ranges of consecutive selected tables (in clipboard and dest. doc) @@ -2339,7 +2339,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, nCol1, nRow1, i, nCol2, nRow2, i+nFollow, nDx, nDy, nDz, pCBFCP->pRefUndoDoc, false ); - nClipTab = (nClipTab+nFollow+1) % (static_cast<SCTAB>(maTabs.size())); + nClipTab = (nClipTab+nFollow+1) % (static_cast<SCTAB>(ppClipTab.size())); i = sal::static_int_cast<SCTAB>( i + nFollow ); } } |