diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-05-02 12:19:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-05-02 12:19:29 +0000 |
| commit | 7f283fcaea380c4f37a7afc34868f7758debe9c9 (patch) | |
| tree | ee7afbe3e42c452565721084e1e2f4bb3c23b628 /sd/source/ui | |
| parent | 6e8e5f1838f879a2c09c203cd87347ba15ee4e94 (diff) | |
INTEGRATION: CWS impress52 (1.68.16); FILE MERGED
2005/04/28 10:37:30 cl 1.68.16.1: #i48314# guard outliner callbacks from page change events
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index a65111f68580..236ccddf1a52 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outlnvsh.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: obo $ $Date: 2005-04-18 11:17:28 $ + * last change: $Author: obo $ $Date: 2005-05-02 13:19:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -732,13 +732,13 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) OutlinerView* pOutlView = pOlView->GetViewByWindow(GetActiveWindow()); if (pOutlView) { - pOlView->IgnoreCurrentPageChanges(true); + OutlineViewPageChangesGuard aGuard(pOlView); + KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode ); pOutlView->PostKeyEvent(aKEvt); if (pFuActual!=NULL && pFuActual->ISA(FuOutlineText)) static_cast<FuOutlineText*>(pFuActual)->UpdateForKeyPress (aKEvt); - pOlView->IgnoreCurrentPageChanges(false); } } rReq.Done(); @@ -1628,7 +1628,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { BOOL bReturn = FALSE; - pOlView->IgnoreCurrentPageChanges(true); + OutlineViewPageChangesGuard aGuard(pOlView); if (pWin == NULL && pFuActual) { @@ -1656,7 +1656,6 @@ BOOL OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { Invalidate( SID_PREVIEW_STATE ); } - pOlView->IgnoreCurrentPageChanges(false); return(bReturn); } @@ -2048,9 +2047,8 @@ void OutlineViewShell::UpdatePreview( SdPage* pPage, BOOL bInit ) } if (bNewPage) { - pOlView->IgnoreCurrentPageChanges(true); + OutlineViewPageChangesGuard aGuard(pOlView); SetCurrentPage (pPage); - pOlView->IgnoreCurrentPageChanges(false); } } |