[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                    |    1 -
 patches/dev300/svx-sdrobjeditview-update-edit-area.diff |   13 -------------
 2 files changed, 14 deletions(-)

New commits:
commit d5b438fc8dbedbe40813ff3ba99d59eedc78fe0b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 20:11:52 2011 +0200

    pushed svx-sdrobjeditview-update-edit-area.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a6f808a..4471109 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1072,7 +1072,6 @@ palette-enhanced-hatch.diff
 icu-arm.diff, doko
 
 [ Fixes ]
-svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 
 [ OxygenOfficeDefaultSettings ]
diff --git a/patches/dev300/svx-sdrobjeditview-update-edit-area.diff b/patches/dev300/svx-sdrobjeditview-update-edit-area.diff
deleted file mode 100644
index 010ee67..0000000
--- a/patches/dev300/svx-sdrobjeditview-update-edit-area.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- svx/source/svdraw/svdedxv.cxx
-+++ svx/source/svdraw/svdedxv.cxx
-@@ -455,8 +455,9 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*
-         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;
- }