diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-05 21:39:10 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-05 23:41:46 -0500 |
| commit | b981c089a9194f33b46272e3f4efa117241ea533 (patch) | |
| tree | a6396dae5a16b999a0b1cbeef2211fef8b449d8f /sc/inc | |
| parent | 7122ef19847b26529ed1d5bad40df869e91a8495 (diff) | |
Separate the OpenCL kernel state flag to get it to function correctly.
It's better this way.
Change-Id: I293a51f0d180e21c35b0d310b9a6bda496ad7f45
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/formulacell.hxx | 4 | ||||
| -rw-r--r-- | sc/inc/types.hxx | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index f75895b4af4d..67b0fb68b3e7 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -64,7 +64,9 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable short mnFormatType; bool mbInvariant:1; bool mbSubTotal:1; - sc::GroupCalcState meCalcState; + + sal_uInt8 meCalcState; + sal_uInt8 meKernelState; ScFormulaCellGroup(); ~ScFormulaCellGroup(); diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx index fc0e0e85c07b..b6c4fa64bb78 100644 --- a/sc/inc/types.hxx +++ b/sc/inc/types.hxx @@ -58,11 +58,16 @@ const sal_uInt16 MatrixEdgeOpen = 32; enum GroupCalcState { + GroupCalcDisabled = 0, GroupCalcEnabled, - GroupCalcOpenCLKernelCompilationScheduled, - GroupCalcOpenCLKernelBinaryCreated, GroupCalcRunning, - GroupCalcDisabled +}; + +enum OpenCLKernelState +{ + OpenCLKernelNone = 0, + OpenCLKernelCompilationScheduled, + OpenCLKernelBinaryCreated }; struct RangeMatrix |