diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-21 15:30:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-22 08:08:05 +0200 |
| commit | e25fd7782ad04dc363b4265e1bd08d6e092b50c5 (patch) | |
| tree | 1dd202549adbc1ed7dbe17e5a81abbe408086e85 /hwpfilter | |
| parent | 180dd91c189de0bf03d5062e33c20da94c5d35d9 (diff) | |
long->tools::Long in hwpfilter..oox
Change-Id: I9ab8876aac7b2f8b488db6dfa9c6fd0cecd2238b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104626
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/hwpread.cxx | 3 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/mzstring.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/mzstring.h | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index 98fba3016bc5..36fb77996c56 100644 --- a/hwpfilter/source/hwpread.cxx +++ b/hwpfilter/source/hwpread.cxx @@ -21,6 +21,7 @@ #include <comphelper/newarray.hxx> #include <unotools/configmgr.hxx> +#include <tools/long.hxx> #include <assert.h> @@ -117,7 +118,7 @@ bool FieldCode::Read(HWPFile & hwpf) // book mark(6) bool Bookmark::Read(HWPFile & hwpf) { - long len; + tools::Long len; hwpf.Read4b(&len, 1); if (!hwpf.Read2b(dummy)) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 45574c8ed344..4cf69e28603f 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -2046,7 +2046,7 @@ void HwpReader::makeDrawStyle( HWPDrawingObject * hdo, FBoxStyle * fstyle) padd("style:wrap", sXML_CDATA, "dynamic"); break; } - long color; + tools::Long color; // invisible line if( hdo->property.line_color > 0xffffff ) { diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx index 1ffba2d6558d..462ed91ad3fc 100644 --- a/hwpfilter/source/mzstring.cxx +++ b/hwpfilter/source/mzstring.cxx @@ -190,7 +190,7 @@ MzString &MzString::operator << (int i) } -MzString &MzString::operator << (long l) +MzString &MzString::operator << (tools::Long l) { char str[80]; diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h index 0726d5bb55e0..475ab31e283b 100644 --- a/hwpfilter/source/mzstring.h +++ b/hwpfilter/source/mzstring.h @@ -23,6 +23,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <tools/long.hxx> /** @name MzString class @@ -98,7 +99,7 @@ class MzString MzString &operator << (char); MzString &operator << (unsigned char c) { return *this<<static_cast<char>(c); } MzString &operator << (int); - MzString &operator << (long); + MzString &operator << (tools::Long); MzString &operator << (short i) { return *this<<static_cast<int>(i); } MzString &operator << (MzString const &); /* MzString &operator << (MzString *s) { return *this<<*s; } |