[Libreoffice-commits] core.git: sc/source

Mike Kaganski mike.kaganski at collabora.com
Tue Nov 28 09:00:40 UTC 2017


 sc/source/ui/pagedlg/tptable.cxx |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 22e747284c92b69175d3add4d1033a0e7aaacc5e
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Nov 28 10:48:08 2017 +0300

    tdf#113455 follow-up: clear spin buttons when disabled in Reset
    
    otherwise they show "1" in disabled state, unlike after being enabled
    and then disabled again manually (see ToggleHdl)
    
    Change-Id: I4ff4d0ef006b7530bb20d9b830dc5e2f5732530d
    Reviewed-on: https://gerrit.libreoffice.org/45383
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index a6c1954aaabe..0c9c80f8d141 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -221,11 +221,20 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
         else
             nWidth = nHeight = 1;
 
-        m_pEdScalePageWidth->SetValue(nWidth);
+        if (nWidth)
+            m_pEdScalePageWidth->SetValue(nWidth);
+        else
+            m_pEdScalePageWidth->SetText(OUString());
+
         m_pEdScalePageWidth->Enable(nWidth);
-        m_pEdScalePageHeight->SetValue(nHeight);
-        m_pEdScalePageHeight->Enable(nHeight);
         m_pCbScalePageWidth->Check(nWidth);
+
+        if(nHeight)
+            m_pEdScalePageHeight->SetValue(nHeight);
+        else
+            m_pEdScalePageHeight->SetText(OUString());
+
+        m_pEdScalePageHeight->Enable(nHeight);
         m_pCbScalePageHeight->Check(nHeight);
     }
 


More information about the Libreoffice-commits mailing list