diff options
Diffstat (limited to 'sc/source/ui/undo/undoutil.cxx')
| -rw-r--r-- | sc/source/ui/undo/undoutil.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 168975cdda3a..7009d2a6e80c 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -43,10 +43,13 @@ #include "globstr.hrc" #include "global.hxx" -void ScUndoUtil::MarkSimpleBlock( ScDocShell* /* pDocShell */, +void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ ) { + if ( pDocShell->IsPaintLocked() ) + return; + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) { @@ -55,7 +58,7 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* /* pDocShell */, pViewShell->SetTabNo( nStartZ ); pViewShell->DoneBlockMode(); - pViewShell->MoveCursorAbs( nStartX, nStartY, SC_FOLLOW_JUMP, FALSE, FALSE ); + pViewShell->MoveCursorAbs( nStartX, nStartY, SC_FOLLOW_JUMP, sal_False, sal_False ); pViewShell->InitOwnBlockMode(); pViewShell->GetViewData()->GetMarkData(). SetMarkArea( ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ) ); @@ -89,24 +92,24 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB if (!pRet) { - BOOL bWasTemp = FALSE; + sal_Bool bWasTemp = sal_False; if ( pUndoData ) { String aName; pUndoData->GetName( aName ); if ( aName == ScGlobal::GetRscString( STR_DB_NONAME ) ) - bWasTemp = TRUE; + bWasTemp = sal_True; } DBG_ASSERT(bWasTemp, "Undo: didn't find database range"); - USHORT nIndex; + sal_uInt16 nIndex; ScDBCollection* pColl = pDoc->GetDBCollection(); if (pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nIndex )) pRet = (*pColl)[nIndex]; else { pRet = new ScDBData( ScGlobal::GetRscString( STR_DB_NONAME ), nTab, - nCol1,nRow1, nCol2,nRow2, TRUE, + nCol1,nRow1, nCol2,nRow2, sal_True, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pColl->Insert( pRet ); } |