diff options
Diffstat (limited to 'editeng/source/outliner/outlvw.cxx')
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 1f2fe9867304..8d1127e15ba8 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -677,34 +677,34 @@ void OutlinerView::PasteSpecial() void OutlinerView::Paste( bool bUseSpecial ) { - if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) - { - pOwner->UndoActionStart( OLUNDO_INSERT ); - - pOwner->pEditEngine->SetUpdateMode( false ); - pOwner->bPasting = true; + if ( !(!ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this )) ) + return; - if ( bUseSpecial ) - pEditView->PasteSpecial(); - else - pEditView->Paste(); + pOwner->UndoActionStart( OLUNDO_INSERT ); - if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject ) - { - const sal_Int32 nParaCount = pOwner->pEditEngine->GetParagraphCount(); + pOwner->pEditEngine->SetUpdateMode( false ); + pOwner->bPasting = true; - for( sal_Int32 nPara = 0; nPara < nParaCount; nPara++ ) - pOwner->ImplSetLevelDependentStyleSheet( nPara ); - } + if ( bUseSpecial ) + pEditView->PasteSpecial(); + else + pEditView->Paste(); - pEditView->SetEditEngineUpdateMode( true ); - pOwner->UndoActionEnd(); - pEditView->ShowCursor(); + if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject ) + { + const sal_Int32 nParaCount = pOwner->pEditEngine->GetParagraphCount(); - // Chaining handling - // NOTE: We need to do this last because it pEditView may be deleted if a switch of box occurs - aEndCutPasteLink.Call(nullptr); + for( sal_Int32 nPara = 0; nPara < nParaCount; nPara++ ) + pOwner->ImplSetLevelDependentStyleSheet( nPara ); } + + pEditView->SetEditEngineUpdateMode( true ); + pOwner->UndoActionEnd(); + pEditView->ShowCursor(); + + // Chaining handling + // NOTE: We need to do this last because it pEditView may be deleted if a switch of box occurs + aEndCutPasteLink.Call(nullptr); } void OutlinerView::CreateSelectionList (std::vector<Paragraph*> &aSelList) |