diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-19 02:24:00 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-19 21:20:46 +0200 |
| commit | 1fe24bb1e2fbe44a4bf2c03297e259b3a18b1235 (patch) | |
| tree | e237d906174ec0646fef5051e5f6940da31e28cf /include/oox | |
| parent | 2a6450cbe8b57cae240d8cfea02e508cfac78dbe (diff) | |
Further cleanup of FastSerializerHelper's startElement/singleElement[NS]
Drop FSEND_t: C-style varargs code was replaced since version 6.0 in commit
d43fc40718217d89cc95cc3c0bc0b8e7926abcc0, so it's time to remove the last bits.
Drop int-to-string macros that are simple wrappers over OString::number.
Avoid unnecessary string type conversions.
Change-Id: I86478577b8e469f99b5a90619e5f78a61f4f23fb
Reviewed-on: https://gerrit.libreoffice.org/70964
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/export/utils.hxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx index fa758089136e..357597e7a5d4 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -24,21 +24,13 @@ #include <rtl/textenc.h> #include <sal/types.h> -inline OString I32S_(sal_Int32 x) { return OString::number(x); } -inline OString I32SHEX_(sal_Int32 x) +inline OString I32SHEX(sal_Int32 x) { OString aStr = OString::number(x, 16); while (aStr.getLength() < 6) aStr = OString("0") + aStr; - return aStr.getStr(); + return aStr; } -inline OString I64S_(sal_Int64 x) { return OString::number(x); } -inline OString DS_(double x) { return OString::number(x); } -#define I32S(x) I32S_(x).getStr() -#define I32SHEX(x) I32SHEX_(x).getStr() -#define I64S(x) I64S_(x).getStr() -#define IS(x) OString::number( x ).getStr() -#define DS(x) DS_(x).getStr() /** * @return const char* literal "true" for true value, or literal "false" |