diff options
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 25fe724d2832..4c583a43895a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1344,12 +1344,12 @@ </info> <value>true</value> </prop> - <prop oor:name="OpenCLAutoDevice" oor:type="xs:string" oor:nillable="false"> + <prop oor:name="OpenCLDevice" oor:type="xs:string" oor:nillable="false"> <!-- UIHints: Tools - Options Spreadsheet Formula --> <info> <desc>The Device ID of the OpenCL device selected if OpenCLAutoSelect is false</desc> </info> - <value></value> + <value/> </prop> </group> <group oor:name="Syntax"> diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index f6499272ef64..1ce5e0994541 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -216,7 +216,7 @@ Sequence<OUString> ScFormulaCfg::GetPropertyNames() "Load/ODFRecalcMode", // SCFORMULAOPT_ODF_RECALC "Calculation/OpenCL", // SCFORMULAOPT_OPENCL_ENABLED "Calculation/OpenCLAutoSelect", // SCFORMULAOPT_OPENCL_AUTOSELECT - "Calculation/OpenCLAutoDevice" // SCFORMULAOPT_OPENCL_DEVICE + "Calculation/OpenCLDevice" // SCFORMULAOPT_OPENCL_DEVICE }; Sequence<OUString> aNames(SCFORMULAOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -428,6 +428,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames ) pValues[nProp] >>= aOpenCLDevice; GetCalcConfig().maOpenCLDevice = aOpenCLDevice; } + break; default: ; } @@ -540,6 +541,8 @@ void ScFormulaCfg::Commit() { sal_Bool bVal = GetCalcConfig().mbOpenCLAutoSelect; pValues[nProp] <<= bVal; + sc::FormulaGroupInterpreter::switchOpenCLDevice( + GetCalcConfig().maOpenCLDevice, bVal); } break; case SCFORMULAOPT_OPENCL_DEVICE: |