diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 15:54:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 15:54:46 +0000 |
| commit | dcd545d8499449e45b51892bbd97515764ae007d (patch) | |
| tree | 154ae28becfe28e3dc2e84c63e915677bb883db6 | |
| parent | b6ddf11f2d2b7b390765f36a29e389a8c67c3cdd (diff) | |
INTEGRATION: CWS impressfunctions (1.6.40); FILE MERGED
2005/11/28 17:49:17 cl 1.6.40.2: RESYNC: (1.6-1.7); FILE MERGED
2005/10/28 10:57:34 cl 1.6.40.1: #125341# reworked FuPoor classes to use refcounting
| -rw-r--r-- | sd/source/ui/func/fubullet.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 74b8dfdb3945..6f3b16bc6b9d 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fubullet.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2005-11-16 09:20:37 $ + * last change: $Author: rt $ $Date: 2005-12-14 16:54:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -118,7 +118,17 @@ FuBullet::FuBullet ( SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { +} +FunctionReference FuBullet::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) +{ + FunctionReference xFunc( new FuBullet( pViewSh, pWin, pView, pDoc, rReq ) ); + xFunc->DoExecute(rReq); + return xFunc; +} + +void FuBullet::DoExecute( SfxRequest& rReq ) +{ if( rReq.GetSlot() == SID_BULLET ) InsertSpecialCharacter(); else @@ -235,7 +245,7 @@ void FuBullet::InsertSpecialCharacter() ::Outliner* pOL = NULL; // je nach ViewShell Outliner und OutlinerView bestimmen - if (pViewShell->ISA(DrawViewShell)) + if(pViewShell && pViewShell->ISA(DrawViewShell)) { pOV = pView->GetTextEditOutlinerView(); if (pOV) @@ -243,7 +253,7 @@ void FuBullet::InsertSpecialCharacter() pOL = pView->GetTextEditOutliner(); } } - else if (pViewShell->ISA(OutlineViewShell)) + else if(pViewShell && pViewShell->ISA(OutlineViewShell)) { pOL = static_cast<OutlineView*>(pView)->GetOutliner(); pOV = static_cast<OutlineView*>(pView)->GetViewByWindow( |