diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:20:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:20:47 +0000 |
| commit | 263b757f611f6c81a8d2729bfac0e21cc54a9158 (patch) | |
| tree | 55db5d608ef57f38d28408dd62285672b8a74c31 /sd/source/ui/view/outlview.cxx | |
| parent | 3131783a4e07d4a53711c836a8c00d29834df110 (diff) | |
INTEGRATION: CWS presenterview (1.45.54); FILE MERGED
2007/07/11 09:13:05 af 1.45.54.2: RESYNC: (1.45-1.47); FILE MERGED
2007/07/10 13:29:43 af 1.45.54.1: #i18486# Converted ViewShellManager, ToolBarManager, and EventMultiplexer of ViewShellBase to shared_ptrs.
Diffstat (limited to 'sd/source/ui/view/outlview.cxx')
| -rw-r--r-- | sd/source/ui/view/outlview.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index ed99eb859099..2a7c38cfcc5c 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outlview.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:47:47 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:20:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -243,7 +243,8 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh } Link aLink( LINK(this,OutlineView,EventMultiplexerListener) ); - mpOutlineViewShell->GetViewShellBase().GetEventMultiplexer().AddEventListener( aLink, + mpOutlineViewShell->GetViewShellBase().GetEventMultiplexer()->AddEventListener( + aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE | tools::EventMultiplexerEvent::EID_PAGE_ORDER); } @@ -259,7 +260,7 @@ OutlineView::~OutlineView() DBG_ASSERT(maDragAndDropModelGuard.get() == 0, "sd::OutlineView::~OutlineView(), prior drag operation not finished correctly!" ); Link aLink( LINK(this,OutlineView,EventMultiplexerListener) ); - mpOutlineViewShell->GetViewShellBase().GetEventMultiplexer().RemoveEventListener( aLink ); + mpOutlineViewShell->GetViewShellBase().GetEventMultiplexer()->RemoveEventListener( aLink ); DisconnectFromApplication(); if( mpProgress ) |