diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 12:37:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 12:37:26 +0000 |
| commit | 54cc1f95a3dc7c19f76057827d9e8d8178e6ad5a (patch) | |
| tree | 963d6bbf28af4078346f9e01eeaab495664f6bd0 /svx/source/unodraw | |
| parent | 4d903131cc4c67d65b8b8a3bc0c071f5ea016628 (diff) | |
INTEGRATION: CWS clbetafix01 (1.60.20); FILE MERGED
2008/04/24 10:17:43 cl 1.60.20.1: #i88006# set outliner para object over text shape
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index dfa9e6a202..d4e69d8171 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoshtxt.cxx,v $ - * $Revision: 1.60 $ + * $Revision: 1.61 $ * * This file is part of OpenOffice.org. * @@ -638,7 +638,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() if( mpText && bTextEditActive && mpOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() ) { mpObject->SetEmptyPresObj( FALSE ); - mpText->SetOutlinerParaObject( mpOutlinerParaObject ); + static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( mpOutlinerParaObject, mpText ); } } else @@ -845,25 +845,30 @@ void SvxTextEditSourceImpl::UpdateData() { if( mpOutliner && mpObject && mpText && !mbDestroyed ) { - if( mpOutliner->GetParagraphCount() != 1 || mpOutliner->GetEditEngine().GetTextLen( 0 ) ) + SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mpObject ); + if( pTextObj ) { - if( mpOutliner->GetParagraphCount() > 1 ) + if( mpOutliner->GetParagraphCount() != 1 || mpOutliner->GetEditEngine().GetTextLen( 0 ) ) { - SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); - if( pTextObj && pTextObj->IsTextFrame() && pTextObj->GetTextKind() == OBJ_TITLETEXT ) + if( mpOutliner->GetParagraphCount() > 1 ) { - while( mpOutliner->GetParagraphCount() > 1 ) + if( pTextObj && pTextObj->IsTextFrame() && pTextObj->GetTextKind() == OBJ_TITLETEXT ) { - ESelection aSel( 0,mpOutliner->GetEditEngine().GetTextLen( 0 ), 1,0 ); - mpOutliner->QuickInsertLineBreak( aSel ); + while( mpOutliner->GetParagraphCount() > 1 ) + { + ESelection aSel( 0,mpOutliner->GetEditEngine().GetTextLen( 0 ), 1,0 ); + mpOutliner->QuickInsertLineBreak( aSel ); + } } } + + pTextObj->NbcSetOutlinerParaObjectForText( mpOutliner->CreateParaObject(), mpText ); + } + else + { + pTextObj->NbcSetOutlinerParaObjectForText( NULL,mpText ); } - - mpText->SetOutlinerParaObject( mpOutliner->CreateParaObject() ); } - else - mpText->SetOutlinerParaObject( NULL ); if( mpObject->IsEmptyPresObj() ) mpObject->SetEmptyPresObj(sal_False); |