[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

tagezi lera.goncharuk at gmail.com
Wed Dec 20 02:29:11 UTC 2017


 sc/source/ui/condformat/condformatdlg.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit fe31edb29e5e77bb60e3aa73ec6a0380314acc61
Author: tagezi <lera.goncharuk at gmail.com>
Date:   Tue Dec 19 13:32:26 2017 +0200

    tdf#114545 Enabling/Disabling Ok button depending on correct format
    
    Change-Id: Iab3c4363dda0260d16c7167946044c39c21b863a
    Reviewed-on: https://gerrit.libreoffice.org/46790
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 7504af39686171ffb16e70f798d9ecf4ea98f1d3)
    Reviewed-on: https://gerrit.libreoffice.org/46823
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index b7b0c40a73d8..0409efd5dda6 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -772,9 +772,15 @@ IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit&, rEdit, void )
     ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(),
         mpViewData->GetDocument()->GetAddressConvention());
     if(nFlags & ScRefFlags::VALID)
+    {
         rEdit.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor());
+        mpBtnOk->Enable(true);
+    }
     else
+    {
         rEdit.SetControlBackground(COL_LIGHTRED);
+        mpBtnOk->Enable(false);
+    }
 
     updateTitle();
 }


More information about the Libreoffice-commits mailing list