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

[Laurent Godard]

 svx/source/svdraw/svdotext.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fcfba9d67d2f1e3f390e376ba36346e991e03854
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Mon Oct 14 11:53:30 2013 +0200

    revert previous commit : EditMode fails for sd import unit test
    
    Change-Id: Ifcd570f756fc0b9dbd5fe3cd35b59b1be4574b0a

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 69baa31..12f76dd 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1381,8 +1381,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec
 
     SetTextSizeDirty();
 
-    bool bIsEditMode = IsInEditMode(); // Only adjust TextFrame if in Edit Mode - avoid notes import bottleneck
-    if (IsTextFrame() && bIsEditMode && (IsAutoGrowHeight() || IsAutoGrowWidth()))
+    if (IsTextFrame() && (IsAutoGrowHeight() || IsAutoGrowWidth()))
     { // adapt text frame!
         NbcAdjustTextFrameWidthAndHeight();
     }
commit 806d9337398d1e416a680d014e948883695fae5b
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Mon Oct 14 11:41:44 2013 +0200

    Revert "Revert "Only adjust TextFrame if in Edit Mode - avoid notes import bottleneck""
    
    This reverts commit f431ff6456ecaa1b26592e60a49e36a722099c9e.

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();
     }
commit f431ff6456ecaa1b26592e60a49e36a722099c9e
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Mon Oct 14 11:41:26 2013 +0200

    Revert "Only adjust TextFrame if in Edit Mode - avoid notes import bottleneck"
    
    This reverts commit d4e8b7f28eee6854642252c797351978adca4547.

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