diff options
Diffstat (limited to 'sc/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/ftools.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 9e0c461ed058..d420fef5acc1 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -36,6 +36,7 @@ #include <tools/string.hxx> #include <tools/list.hxx> #include <tools/debug.hxx> +#include <sal/macros.h> #include <oox/helper/helper.hxx> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> @@ -44,10 +45,8 @@ // Common macros ============================================================== -/** Expands to the size of a STATIC data array. */ -#define STATIC_TABLE_SIZE( array ) (sizeof(array)/sizeof(*(array))) /** Expands to a pointer behind the last element of a STATIC data array (like STL end()). */ -#define STATIC_TABLE_END( array ) ((array)+STATIC_TABLE_SIZE(array)) +#define STATIC_TABLE_END( array ) ((array)+SAL_N_ELEMENTS(array)) /** Expands to a temporary String, created from an ASCII character array. */ #define CREATE_STRING( ascii ) String( RTL_CONSTASCII_USTRINGPARAM( ascii ) ) |