update ooo310-m15
[ooovba.git] / applied_patches / 0725-svx-sdrobjeditview-update-edit-area.diff
blob3d2ce075b036639c9b8ec155a1279079ef283998
1 --- svx-orig/source/svdraw/svdedxv.cxx 2007-11-08 14:03:57.000000000 +0100
2 +++ svx/source/svdraw/svdedxv.cxx 2007-11-08 14:07:29.000000000 +0100
3 @@ -540,8 +540,9 @@ OutlinerView* SdrObjEditView::ImpMakeOut
4 pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode()));
5 pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
7 - pOutlView->SetOutputArea(aTextEditArea);
8 + // do update before setting output area so that aTextEditArea can be recalculated
9 pTextEditOutliner->SetUpdateMode(TRUE);
10 + pOutlView->SetOutputArea(aTextEditArea);
11 ImpInvalidateOutlinerView(*pOutlView);
12 return pOutlView;
14 --- svx/source/editeng-orig/impedit.cxx 2008-01-30 11:46:56.000000000 +0100
15 +++ svx/source/editeng/impedit.cxx 2008-01-31 13:27:15.000000000 +0100
16 @@ -710,6 +710,10 @@
18 USHORT nTextPortionStart = 0;
19 USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
21 + if( nPara == USHRT_MAX )
22 + return;
24 ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
26 nShowCursorFlags |= nExtraCursorFlags;