diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-07-01 16:20:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-03 08:42:15 +0200 |
| commit | 1fe0dc7377300ad961438f5a69bd8bc023cc314d (patch) | |
| tree | 7a7d740747bd5b87d3c5ead7dd96d79d4a470bd2 /sw/source/filter | |
| parent | f5b0cc2a3690ba963b3f150886e1d5ddddee9530 (diff) | |
use sal_Int64 in tools::DateTime
instead of long which has platform-dependent bitlength
Change-Id: I888458d7807027e237772940d4b2cc15c2971243
Reviewed-on: https://gerrit.libreoffice.org/39434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 95c84bba598b..1a1713982625 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -94,7 +94,7 @@ namespace sw /** Convert from DTTM to Writer's DateTime */ - long DateTime2DTTM( const DateTime& rDT ); + sal_uInt32 DateTime2DTTM( const DateTime& rDT ); /** Convert from Word Date/Time field str to Writer's Date Time str diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index ed06ad119548..199e6f88107c 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -723,7 +723,7 @@ namespace sw return nRet; } - long DateTime2DTTM( const DateTime& rDT ) + sal_uInt32 DateTime2DTTM( const DateTime& rDT ) { /* mint short :6 0000003F minutes (0-59) @@ -740,9 +740,9 @@ namespace sw Saturday=6) */ - if ( rDT.GetDate() == 0L ) - return 0L; - long nDT = ( rDT.GetDayOfWeek() + 1 ) % 7; + if ( rDT.GetDate() == 0 ) + return 0; + sal_uInt32 nDT = ( rDT.GetDayOfWeek() + 1 ) % 7; nDT <<= 9; nDT += ( rDT.GetYear() - 1900 ) & 0x1ff; nDT <<= 4; |