diff options
| author | Dieter Loeschky <dl@openoffice.org> | 2001-05-04 08:07:10 +0000 |
|---|---|---|
| committer | Dieter Loeschky <dl@openoffice.org> | 2001-05-04 08:07:10 +0000 |
| commit | 2b76999a8ff0b30e3c43b9dcc708c8152465bcf6 (patch) | |
| tree | 6a1ac70c1efea8f92c8bccfa09ab667579b1c9f9 | |
| parent | 18fffe80324eddf0a633da8d9afd07a678ee5830 (diff) | |
#85804# GetTextForwarder(): handling of EmptyPresObj
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 494bf389b97e..5d42beccff0f 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshtxt.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dl $ $Date: 2001-04-20 09:41:08 $ + * last change: $Author: dl $ $Date: 2001-05-04 09:07:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,15 +150,22 @@ SvxTextForwarder* SvxTextEditSource::GetTextForwarder() if( pObj && !bDataValid ) { OutlinerParaObject* pOutlinerParaObject = NULL; + BOOL bTextEditActive = FALSE; SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, pObj ); if( pTextObj ) - pOutlinerParaObject = pTextObj->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active
- if( !pOutlinerParaObject ) - pOutlinerParaObject = pObj->GetOutlinerParaObject(); // no text edit active + pOutlinerParaObject = pTextObj->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active - if( pOutlinerParaObject && (!pObj->IsEmptyPresObj() || pObj->GetPage()->IsMasterPage()) ) + if( pOutlinerParaObject ) + bTextEditActive = TRUE; // text edit active + else + pOutlinerParaObject = pObj->GetOutlinerParaObject(); + + if( pOutlinerParaObject && ( bTextEditActive || !pObj->IsEmptyPresObj() || pObj->GetPage()->IsMasterPage() ) ) { pOutliner->SetText( *pOutlinerParaObject ); + + if( pObj->IsEmptyPresObj() ) + pObj->SetEmptyPresObj( FALSE ); } else { |