[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source

[Michael Stahl]

 cui/source/tabpages/paragrph.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a989b693f6836a17fba4b60b5f06d5117bdb67c4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 20 11:18:55 2014 +0200

    (related: fdo#62176) Revert "reset min/max values in paragraph ...
    
    ... dialog before setting the actual value"
    
    This prevents handling negative first-line indent in Impress, for which
    it is necessary that the values are set before the limits.
    
    This reverts commit 3d7ff1e907713d8ed53a1e193641a2f16de3c38b.
    
    Change-Id: I47807d7d49716acab3657de1da64c6e9a99fc44d
    (cherry picked from commit 35199df7b7af9d9dd3e98eb5f1b24ac1d407345c)
    Reviewed-on: https://gerrit.libreoffice.org/9415
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5854608..f8e7db1 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -429,8 +429,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
         SetFieldUnit( *m_pLineDistAtMetricBox, eFUnit );
     }
 
-    ELRLoseFocusHdl( NULL ); // reset min/max values
-
     sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE );
     SfxItemState eItemState = rSet.GetItemState( _nWhich );
 
@@ -588,6 +586,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
         }
     }
 
+    // this sets the min/max limits; do this _after_ setting the values,
+    // because for Impress the min of first-line indent depends on value of
+    // left-indent!
+    ELRLoseFocusHdl( NULL );
     m_pAutoCB->SaveValue();
     m_pContextualCB->SaveValue();
     m_pLineDist->SaveValue();