diff options
| author | Dieter Loeschky <dl@openoffice.org> | 2001-04-20 08:41:42 +0000 |
|---|---|---|
| committer | Dieter Loeschky <dl@openoffice.org> | 2001-04-20 08:41:42 +0000 |
| commit | a959e2c680b4cd59300c926a49d6c0b8418c7adf (patch) | |
| tree | ccbf4048287bccf5777af3457c0b21f395b7ff70 /svx/source/unodraw | |
| parent | 158debd5532628b3e379d12630c5367c18669e63 (diff) | |
#85804# GetEditOutlinerParaObject() now public
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 74d658fc9d21..494bf389b97e 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshtxt.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cl $ $Date: 2001-02-13 15:13:37 $ + * last change: $Author: dl $ $Date: 2001-04-20 09:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,7 +149,13 @@ SvxTextForwarder* SvxTextEditSource::GetTextForwarder() if( pObj && !bDataValid ) { - OutlinerParaObject* pOutlinerParaObject = pObj->GetOutlinerParaObject(); + OutlinerParaObject* pOutlinerParaObject = NULL; + 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 + if( pOutlinerParaObject && (!pObj->IsEmptyPresObj() || pObj->GetPage()->IsMasterPage()) ) { pOutliner->SetText( *pOutlinerParaObject ); |