sc/source/core/tool/formulagroup.cxx | 2 +-
sc/source/ui/optdlg/calcoptionsdlg.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1adf99bf2320a29694fe300749f685d3893ad179
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Thu Jun 27 17:29:16 2013 -0400
Revert "These should be ifdef, per compiler warnings."
This reverts commit fcf4a2ea98c59c4d9d95c4c3b437aa02f414acd3.
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 4cccc36..f9d251b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -111,7 +111,7 @@ FormulaGroupInterpreter
*FormulaGroupInterpreter::getStatic()
if ( !msInstance )
{
-#ifdef HAVE_FEATURE_OPENCL
+#if HAVE_FEATURE_OPENCL
if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
msInstance = sc::opencl::createFormulaGroupInterpreter();
#endif
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 26434bf..11ec4cb 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -199,7 +199,7 @@ void ScCalcOptionsDialog::FillOptionsList()
}
pModel->Insert(createBoolItem(maCaptionEmptyStringAsZero,maConfig.mbEmptyStringAsZero));
-#ifdef HAVE_FEATURE_OPENCL
+#if HAVE_FEATURE_OPENCL
pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
