[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svx/source

[Petr Mladek]

 svx/source/svdraw/svdedxv.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7cdffe22320808cd80f6126e4437bb7b9b025846
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Apr 27 20:08:22 2011 +0200

    svx-sdrobjeditview-update-edit-area.diff: edit area calcualtion
    
    update before setting output area so that aTextEditArea can be recalculated
    (bnc#305205, bnc#347355)

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index bd6874e..5fccd8d 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -454,8 +454,9 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPa
         pOutlView->SetAnchorMode((EVAnchorMode)(pText->GetOutlinerViewAnchorMode()));
         pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
     }
-    pOutlView->SetOutputArea(aTextEditArea);
+    // do update before setting output area so that aTextEditArea can be recalculated
     pTextEditOutliner->SetUpdateMode(sal_True);
+    pOutlView->SetOutputArea(aTextEditArea);
     ImpInvalidateOutlinerView(*pOutlView);
     return pOutlView;
 }