summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-05-20 11:18:55 +0200
committerMichael Stahl <mstahl@redhat.com>2014-05-20 16:44:29 +0200
commit35199df7b7af9d9dd3e98eb5f1b24ac1d407345c (patch)
tree8a1c19c92831bdbfe923ac626a01d8f49a567c5c
parent43cd2f79da7a639d09fe43e6194f7568cbc78970 (diff)
(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
-rw-r--r--cui/source/tabpages/paragrph.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 6dba191153fc..0e71f68c8d16 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -431,8 +431,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 );
@@ -590,6 +588,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();