[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - svx/source

[Laurent Godard]

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

New commits:
commit d4e8b7f28eee6854642252c797351978adca4547
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Mon Oct 14 11:08:59 2013 +0200

    Only adjust TextFrame if in Edit Mode - avoid notes import bottleneck
    
    Change-Id: Ib8bedb624351c48b6c53a4d5c01f03105405662e

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index feefd80..69baa31 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1380,7 +1380,9 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec
     }
 
     SetTextSizeDirty();
-    if (IsTextFrame() && (IsAutoGrowHeight() || IsAutoGrowWidth()))
+
+    bool bIsEditMode = IsInEditMode(); // Only adjust TextFrame if in Edit Mode - avoid notes import bottleneck
+    if (IsTextFrame() && bIsEditMode && (IsAutoGrowHeight() || IsAutoGrowWidth()))
     { // adapt text frame!
         NbcAdjustTextFrameWidthAndHeight();
     }