[Libreoffice-commits] .: sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Dec 10 05:48:45 PST 2012


 sw/source/ui/config/optload.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 5cb4004a443910c6eefb0b58f1fc4ed3e20ba36c
Author: Jack Leigh <leighman at gmx.se>
Date:   Sat Dec 8 21:12:23 2012 +0000

    fdo#38895 fix toggling of numbering separator on Autocaption page
    
    Only enable the Edit box if the overall option is enabled
    
    Change-Id: Ica0f973d22b89a37bd690c285d7cc0ae5204b7a8
    Reviewed-on: https://gerrit.libreoffice.org/1272
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index f3fd604..fbdd800 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -819,9 +819,17 @@ IMPL_LINK_NOARG_INLINE_END(SwCaptionOptPage, SelectHdl)
 IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
 {
     DrawSample();
+
+    SvTreeListEntry* pSelEntry = aCheckLB.FirstSelected();
+    sal_Bool bChecked = sal_False;
+    if (pSelEntry)
+    {
+        bChecked = aCheckLB.IsChecked((sal_uInt16)aCheckLB.GetModel()->GetAbsPos(pSelEntry));
+    }
+
     sal_Int32 nPos = pBox->GetSelectEntryPos();
-    aNumberingSeparatorFT.Enable( nPos == 1 );
-    aNumberingSeparatorED.Enable( nPos == 1 );
+    aNumberingSeparatorFT.Enable( bChecked && nPos == 1 );
+    aNumberingSeparatorED.Enable( bChecked && nPos == 1 );
     return 0;
 }
 


More information about the Libreoffice-commits mailing list