diff options
author | Dieter Loeschky <dl@openoffice.org> | 2001-03-26 13:37:56 +0000 |
---|---|---|
committer | Dieter Loeschky <dl@openoffice.org> | 2001-03-26 13:37:56 +0000 |
commit | 4f19061dd8463f893fa66b48c067bea33f73408e (patch) | |
tree | 2e517e4a380d57faf9fad6c17315fb5e35c7b058 /sd/source/ui/view/sdview.cxx | |
parent | fe352ddc82daede896a8d6fe6c6b0b7e90784a79 (diff) |
#71359# bEmptyPresObj: undo/redo
Diffstat (limited to 'sd/source/ui/view/sdview.cxx')
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index f0e06561d5c1..14f4012c21d9 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ka $ $Date: 2001-03-08 11:24:32 $ + * last change: $Author: dl $ $Date: 2001-03-26 14:34:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -455,36 +455,30 @@ SdrEndTextEditKind SdView::EndTextEdit(BOOL bDontDeleteReally) if ( pFunc && pFunc->ISA(FuText) ) { + SdrTextObj* pTextObj = ( (FuText*) pFunc)->GetTextObj(); BOOL bDefaultTextRestored = ( (FuText*) pFunc)->RestoreDefaultText(); - eKind = FmFormView::EndTextEdit(bDontDeleteReally); - SdrTextObj* pTextObj = ( (FuText*) pFunc)->GetTextObj(); + if( bDefaultTextRestored ) + pTextObj->SetEmptyPresObj( TRUE ); + + pTextObj = ( (FuText*) pFunc)->GetTextObj(); - if (pViewShell && pTextObj) + if ( pTextObj && pViewShell ) { FuSlideShow* pFuSlideShow = pViewShell->GetSlideShow(); - if (pFuSlideShow) - { pFuSlideShow->EndTextEdit(pTextObj); - } } if (eKind == SDRENDTEXTEDIT_CHANGED && !bDefaultTextRestored) - { ( (FuText*) pFunc)->ObjectChanged(); - } } else - { eKind = FmFormView::EndTextEdit(bDontDeleteReally); - } } else - { eKind = FmFormView::EndTextEdit(bDontDeleteReally); - } if (bIsTextEdit) { |