diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-07 15:08:07 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-07 18:44:28 +0200 |
| commit | 0485355e05da36f4023b4c594ecb80b342608f5a (patch) | |
| tree | 41ec42c8f9379b2ac9d35b14ededaaba6061c1cd /sc/inc/calcconfig.hxx | |
| parent | 03b4aa438b4a72431044f9fc137804329e5bdf43 (diff) | |
Make it possible to actually edit existing white/black list entries
Still not possible to add new ones or delete existing ones, though. And the UI
for this is not finished at all. Work in progress.
Also some refactoring. To increase readability, introduce typedefs in
ScCalcConfig. Not sure whether nested types inside the class is a good idea or
not.
Change-Id: I8e1695bb0594e2cd5f8b5ce0ece075842b77762a
Diffstat (limited to 'sc/inc/calcconfig.hxx')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 1a4c62c6683b..4b72dc876847 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -101,10 +101,15 @@ struct SC_DLLPUBLIC ScCalcConfig bool mbOpenCLAutoSelect:1; OUString maOpenCLDevice; sal_Int32 mnOpenCLMinimumFormulaGroupSize; - std::set<OpCodeEnum> maOpenCLSubsetOpCodes; - std::set<OpenCLImpl> maOpenCLWhiteList; - std::set<OpenCLImpl> maOpenCLBlackList; + typedef std::set<OpCodeEnum> OpCodeSet; + + OpCodeSet maOpenCLSubsetOpCodes; + + typedef std::set<OpenCLImpl> OpenCLImplSet; + + OpenCLImplSet maOpenCLWhiteList; + OpenCLImplSet maOpenCLBlackList; ScCalcConfig(); @@ -117,11 +122,13 @@ struct SC_DLLPUBLIC ScCalcConfig bool operator!= (const ScCalcConfig& r) const; }; +SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig::OpenCLImpl& rImpl); +SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig::OpenCLImplSet& rSet); SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig); -SC_DLLPUBLIC OUString ScOpCodeSetToNumberString(const std::set<OpCodeEnum>& rOpCodes); -SC_DLLPUBLIC OUString ScOpCodeSetToSymbolicString(const std::set<OpCodeEnum>& rOpCodes); -SC_DLLPUBLIC std::set<OpCodeEnum> ScStringToOpCodeSet(const OUString& rOpCodes); +SC_DLLPUBLIC OUString ScOpCodeSetToNumberString(const ScCalcConfig::OpCodeSet& rOpCodes); +SC_DLLPUBLIC OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes); +SC_DLLPUBLIC ScCalcConfig::OpCodeSet ScStringToOpCodeSet(const OUString& rOpCodes); #endif |