diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:21:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:21:22 +0000 |
| commit | cc54c739d247a09d28151f8b5e2aefdfae86fab1 (patch) | |
| tree | 50d145fff4f4a995fbea5e449f6197f04e0ffbc9 /sd/source | |
| parent | a3b855e2c35f2711d8563a8c6121afef2c2f50d6 (diff) | |
INTEGRATION: CWS presenterview (1.57.46); FILE MERGED
2008/03/26 10:47:26 cl 1.57.46.5: RESYNC: (1.60-1.62); FILE MERGED
2008/02/26 09:04:05 af 1.57.46.4: RESYNC: (1.59-1.60); FILE MERGED
2007/07/24 12:00:33 af 1.57.46.3: RESYNC: (1.58-1.59); FILE MERGED
2007/07/11 09:13:13 af 1.57.46.2: RESYNC: (1.57-1.58); FILE MERGED
2007/07/10 13:28:22 af 1.57.46.1: #i18486# Converted ViewShellManager, ToolBarManager, and EventMultiplexer of ViewShellBase to shared_ptrs.
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 24caefb9335e..f35300221b4d 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdview.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: rt $ $Date: 2008-03-12 11:59:12 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:21:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -754,7 +754,8 @@ sal_Bool View::SdrBeginTextEdit( SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView, sal_Bool bDontDeleteOutliner, sal_Bool bOnlyOneView, sal_Bool bGrabFocus ) { - GetViewShell()->GetViewShellBase().GetEventMultiplexer().MultiplexEvent( sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, (void*)pObj ); + GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent( + sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, (void*)pObj ); if( pOutl==NULL && pObj ) pOutl = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, pObj->GetModel() ); @@ -852,7 +853,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(BOOL bDontDeleteReally ) pObj->SetEmptyPresObj( FALSE ); } - GetViewShell()->GetViewShellBase().GetEventMultiplexer().MultiplexEvent( sd::tools::EventMultiplexerEvent::EID_END_TEXT_EDIT, (void*)xObj.get() ); + GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(sd::tools::EventMultiplexerEvent::EID_END_TEXT_EDIT, (void*)xObj.get() ); if( xObj.is() ) { |