summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-21 12:51:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-21 13:23:02 +0200
commitcd0e227a326f0571f157dde8678a253bcf172204 (patch)
tree7d842dd10e8f2df7cf9143b06e9cc5bc8fba1513 /include
parentf3fab399da4035e910ae701bd1a3e9a6898f13a9 (diff)
rename RECALCMODE_EMASK to ScRecalcMode::EMask
much neater this way Change-Id: I0af38f8bc0d7be4f2f1be9899dd8739493cf66d5
Diffstat (limited to 'include')
-rw-r--r--include/formula/tokenarray.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index cdb4e34e58c1..65b12a940fd4 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -59,13 +59,13 @@ enum class ScRecalcMode : sal_uInt8
ONLOAD_ONCE = 0x08, // exclusive, once after load
FORCED = 0x10, // combined, also if cell isn't visible
ONREFMOVE = 0x20, // combined, if reference was moved
+ EMask = NORMAL | ALWAYS | ONLOAD | ONLOAD_ONCE // mask of exclusive bits
};
// If new bits are to be defined, AddRecalcMode has to be adjusted!
namespace o3tl
{
template<> struct typed_flags<ScRecalcMode> : is_typed_flags<ScRecalcMode, 0x3f> {};
}
-#define RECALCMODE_EMASK (ScRecalcMode(ScRecalcMode::NORMAL | ScRecalcMode::ALWAYS | ScRecalcMode::ONLOAD | ScRecalcMode::ONLOAD_ONCE)) // mask of exclusive bits
namespace formula
{
@@ -173,9 +173,9 @@ protected:
sal_uInt16 RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount );
inline void SetCombinedBitsRecalcMode( ScRecalcMode nBits )
- { nMode |= (nBits & ~RECALCMODE_EMASK); }
+ { nMode |= (nBits & ~ScRecalcMode::EMask); }
inline ScRecalcMode GetCombinedBitsRecalcMode() const
- { return nMode & ~RECALCMODE_EMASK; }
+ { return nMode & ~ScRecalcMode::EMask; }
/** Exclusive bits already set in nMode are
zero'ed, nBits may contain combined bits, but
only one exclusive bit may be set! */