diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 16:26:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 16:26:19 +0000 |
| commit | 011c91b804f5478e6e4e38836f7f7e3d66cf8340 (patch) | |
| tree | f802876bf662f736d305b0391382e12ac0be81b1 /sd/source/ui/view/drtxtob1.cxx | |
| parent | 16a9678883317df3181dd3142fee386687ef2502 (diff) | |
INTEGRATION: CWS impressfunctions (1.21.38); FILE MERGED
2005/11/28 18:00:49 cl 1.21.38.2: RESYNC: (1.21-1.22); FILE MERGED
2005/10/28 10:58:25 cl 1.21.38.1: #125341# reworked FuPoor classes to use refcounting
Diffstat (limited to 'sd/source/ui/view/drtxtob1.cxx')
| -rw-r--r-- | sd/source/ui/view/drtxtob1.cxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 98e6a39b704f..a47a1fb57921 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drtxtob1.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2005-11-16 09:21:31 $ + * last change: $Author: rt $ $Date: 2005-12-14 17:26:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -179,24 +179,25 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { SdDrawDocument* pDoc = pView->GetDoc(); OSL_ASSERT (pViewShell->GetViewShell()!=NULL); - FuPoor* pFuActual = new FuTemplate( pViewShell, - static_cast< ::sd::Window*>( - pViewShell->GetViewShell()->GetWindow()), - pView, pDoc, rReq ); + FunctionReference xFunc( FuTemplate::Create( pViewShell, static_cast< ::sd::Window*>( pViewShell->GetViewShell()->GetWindow()), pView, pDoc, rReq ) ); - if (pFuActual) + if(xFunc.is()) { - pFuActual->Activate(); - pFuActual->Deactivate(); - delete pFuActual; + xFunc->Activate(); + xFunc->Deactivate(); if( rReq.GetSlot() == SID_STYLE_APPLY ) - pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_APPLY ); + { + if( pViewShell && pViewShell->GetViewFrame() ) + pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_APPLY ); + } } } else - pViewShell->GetViewFrame()->GetDispatcher()-> - Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON ); + { + if( pViewShell && pViewShell->GetViewFrame() ) + pViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON ); + } rReq.Done(); } |