[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source

Markus Mohrhard markus.mohrhard at googlemail.com
Thu Sep 12 22:16:45 PDT 2013


 sc/source/ui/optdlg/calcoptionsdlg.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b7160172cdf26b90e2bc4ae7b5172b02f172ceba
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 13 07:05:53 2013 +0200

    use the correct description for the opencl option
    
    Change-Id: Ie4b8e2f99bb8a32dae31555561c86a448201f792

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 6639f35..dd6003c 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -250,9 +250,15 @@ void ScCalcOptionsDialog::SelectionChanged()
 
             bool bValue = false;
             if ( nSelectedPos == CALC_OPTION_EMPTY_AS_ZERO )
+            {
                 bValue = maConfig.mbEmptyStringAsZero;
+                mpFtAnnotation->SetText(maDescEmptyStringAsZero);
+            }
             else
+            {
                 bValue = maConfig.mbOpenCLEnabled;
+                mpFtAnnotation->SetText(maDescOpenCLEnabled);
+            }
 
             if ( bValue )
             {
@@ -264,7 +270,6 @@ void ScCalcOptionsDialog::SelectionChanged()
                 mpBtnTrue->Check(false);
                 mpBtnFalse->Check(true);
             }
-            mpFtAnnotation->SetText(maDescEmptyStringAsZero);
         }
         break;
         default:


More information about the Libreoffice-commits mailing list