diff options
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 12 | ||||
-rw-r--r-- | editeng/source/uno/unoviwou.cxx | 2 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/shells/annotsh.cxx | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index b51cbbbbfb40..f86f707c4c35 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -669,12 +669,12 @@ void OutlinerView::Cut() } } -void OutlinerView::Paste() +void OutlinerView::PasteSpecial() { - PasteSpecial(); // HACK(SD does not call PasteSpecial) + Paste( true ); } -void OutlinerView::PasteSpecial() +void OutlinerView::Paste( bool bUseSpecial ) { if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) { @@ -682,7 +682,11 @@ void OutlinerView::PasteSpecial() pOwner->pEditEngine->SetUpdateMode( false ); pOwner->bPasting = true; - pEditView->PasteSpecial(); + + if ( bUseSpecial ) + pEditView->PasteSpecial(); + else + pEditView->Paste(); if ( pOwner->ImplGetOutlinerMode() == OutlinerMode::OutlineObject ) { diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx index ca404db7b0b1..4da65606f8fe 100644 --- a/editeng/source/uno/unoviwou.cxx +++ b/editeng/source/uno/unoviwou.cxx @@ -150,7 +150,7 @@ bool SvxDrawOutlinerViewForwarder::Cut() bool SvxDrawOutlinerViewForwarder::Paste() { - mrOutlinerView.Paste(); + mrOutlinerView.PasteSpecial(); return true; } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index e4258582af2a..b6308599cfe3 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -274,7 +274,7 @@ public: void Cut(); void Copy(); - void Paste(); + void Paste( bool bUseSpecial = false ); void PasteSpecial(); const SfxStyleSheet* GetStyleSheet() const; diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 021d23f62971..19a513387e3f 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -904,7 +904,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest const &rReq) break; case SID_PASTE: if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED) - pOLV->Paste(); + pOLV->PasteSpecial(); break; case SID_PASTE_SPECIAL: { |