diff options
| -rw-r--r-- | desktop/source/app/opencl.cxx | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index 766ac5011ab9..4cbea032a15c 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -227,7 +227,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop) { // OpenCL device changed - sanity check it and disable if bad. - o3tl::optional<sal_Int32> nOrigMinimumSize = officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get(); + sal_Int32 nOrigMinimumSize = officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get(); { // set the minimum group size to something small for quick testing. std::shared_ptr<comphelper::ConfigurationChanges> xBatch(comphelper::ConfigurationChanges::create()); officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(3 /* small */, xBatch); diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index a7f683a4fec5..8cd789e9a9ad 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1475,7 +1475,7 @@ </info> <value>true</value> </prop> - <prop oor:name="OpenCLMinimumDataSize" oor:type="xs:int"> + <prop oor:name="OpenCLMinimumDataSize" oor:type="xs:int" oor:nillable="false"> <info> <desc>An approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered.</desc> </info> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 12de81d3556b..eb1e35383c61 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3338,7 +3338,7 @@ void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number ) sal_Int32 ScModelObj::getFormulaCellNumberLimit() { - return *officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get(); + return officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get(); } ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) : |