diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-05 00:34:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-06 11:49:24 +0200 |
| commit | ef809ce9480182ea5c4f77843f72d1d45bd48c35 (patch) | |
| tree | 6c6693039986ff1f60cdee07a3184ee0c5180914 /sc/inc | |
| parent | c78b58e1a1950ea78dc0f9a5d8abe2fc228b08c2 (diff) | |
More work on the new OpenCL options
Now the new options show up in the "Detailed Calculation Settings" dialog and
are saved and restored from the per-user configuration.
The code that manipulates the "Detailed Calculation Settings" dialog is quite
ugly with all its manual hiding and showing of widgets depending on which
detail it is that is being edited. This also means that the dialog cannot be
designed using Glade. But no time now to re-work this.
Change-Id: I03a3a51d902084e73aab5a787b588d22ea7578f2
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 77e944dded6f..3a54efd56a1d 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -12,11 +12,11 @@ #include "scdllapi.h" +#include <ostream> #include <set> #include <formula/grammar.hxx> #include <formula/opcode.hxx> - #include <rtl/ustring.hxx> // have to match the registry values @@ -49,11 +49,13 @@ struct SC_DLLPUBLIC ScCalcConfig bool mbOpenCLSubsetOnly:1; bool mbOpenCLAutoSelect:1; OUString maOpenCLDevice; - int mnOpenCLMinimumFormulaGroupSize; - std::set<OpCodeEnum> maOpenCLSubsetFunctions; + sal_Int32 mnOpenCLMinimumFormulaGroupSize; + std::set<OpCodeEnum> maOpenCLSubsetOpCodes; ScCalcConfig(); + void setOpenCLConfigToDefault(); + void reset(); void MergeDocumentSpecific( const ScCalcConfig& r ); @@ -61,6 +63,12 @@ struct SC_DLLPUBLIC ScCalcConfig bool operator!= (const ScCalcConfig& r) const; }; +std::ostream& SC_DLLPUBLIC operator<<(std::ostream& rStream, const ScCalcConfig& rConfig); + +OUString SC_DLLPUBLIC ScOpCodeSetToNumberString(const std::set<OpCodeEnum>& rOpCodes); +OUString SC_DLLPUBLIC ScOpCodeSetToSymbolicString(const std::set<OpCodeEnum>& rOpCodes); +std::set<OpCodeEnum> SC_DLLPUBLIC ScStringToOpCodeSet(const OUString& rOpCodes); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |