diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 16:35:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 16:35:46 +0000 |
| commit | 1978c2d31ea37e637c834045bd5f66aaba3f04e3 (patch) | |
| tree | 1f7bbd564e1f61e611ea3fbd18f7acf244b7912c /sd | |
| parent | 9481870b4697db67b54fd94b064d04afb6dd8323 (diff) | |
INTEGRATION: CWS impress35 (1.37.14); FILE MERGED
2005/02/18 15:42:31 cl 1.37.14.1: #i42847# always reset the empty pres obj state when it is true but the shape has text
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 521e04ae443d..a02657d0c3f1 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.38 $ + * $Revision: 1.39 $ * - * last change: $Author: vg $ $Date: 2005-02-16 17:03:36 $ + * last change: $Author: kz $ $Date: 2005-03-01 17:35:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -773,11 +773,20 @@ SdrEndTextEditKind View::EndTextEdit(BOOL bDontDeleteReally, FuPoor* pFunc) BOOL bDefaultTextRestored = ( (FuText*) pFunc)->RestoreDefaultText(); eKind = FmFormView::EndTextEdit(bDontDeleteReally); - if( bDefaultTextRestored ) - pTextObj->SetEmptyPresObj( TRUE ); - pTextObj = ( (FuText*) pFunc)->GetTextObj(); + if( pTextObj ) + { + if( bDefaultTextRestored ) + { + pTextObj->SetEmptyPresObj( TRUE ); + } + else if( pTextObj->IsEmptyPresObj() && (pTextObj->GetEditOutlinerParaObject() == 0) ) + { + pTextObj->SetEmptyPresObj( FALSE ); + } + } + if (eKind == SDRENDTEXTEDIT_CHANGED && !bDefaultTextRestored) ( (FuText*) pFunc)->ObjectChanged(); |