diff options
-rw-r--r-- | sd/source/ui/view/drawview.cxx | 7 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 4ac4580cd118..deaa309e5031 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -423,8 +423,13 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // switch to that page when it's not a master page if(SdrHintKind::SwitchToPage == eHintKind) { - const SdrPage* pPage = static_cast<const SdrHint&>(rHint).GetPage(); + // We switch page only in the current view, which triggered this event + // and keep other views ontouched. + SfxViewShell* pViewShell = SfxViewShell::Current(); + if(pViewShell && pViewShell != &mpDrawViewShell->GetViewShellBase()) + return; + const SdrPage* pPage = static_cast<const SdrHint&>(rHint).GetPage(); if(pPage && !pPage->IsMasterPage()) { if(mpDrawViewShell->GetActualPage() != pPage) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 15dac1b614ee..268981f99df0 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1523,7 +1523,6 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) const bool bUndo = IsUndoEnabled(); if (bUndo) { - EndTextEditAllViews(); OUString aObjName(pTEObj->TakeObjNameSingul()); BegUndo(SvxResId(STR_UndoObjSetText), aObjName); } |