INTEGRATION: CWS sj05 (1.35.136); FILE MERGED

2004/02/13 13:25:24 sj 1.35.136.2: RESYNC: (1.35-1.36); FILE MERGED
2004/01/23 17:20:27 cl 1.35.136.1: #i20484# adding autoshape ui
This commit is contained in:
Rüdiger Timm 2004-04-02 12:25:54 +00:00
parent fbde3c419f
commit d793e45991

View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviewse.cxx,v $
*
* $Revision: 1.37 $
* $Revision: 1.38 $
*
* last change: $Author: rt $ $Date: 2004-03-30 15:55:07 $
* last change: $Author: rt $ $Date: 2004-04-02 13:25:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -281,6 +281,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView)
void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// Waehrend einer Native-Diashow wird nichts ausgefuehrt!
if (pFuSlideShow && !pFuSlideShow->IsLivePresentation())
return;
@ -561,7 +562,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
rReq.Done();
}
break;
case SID_DRAW_POLYGON:
case SID_DRAW_POLYGON_NOFILL:
case SID_DRAW_XPOLYGON: