From 4fa553e4071a0ba4981a690429903c4e68607864 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 25 Apr 2013 13:56:00 +0200 Subject: fdo#62088: Fix regression introduced by the DateTime incompatible change. It is not good to mess with the stream operators, more so when the size of the data changes ;-) Change-Id: Id02b83224496a28575f4e12196892de198793983 --- svtools/source/misc/templatefoldercache.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index aa2bade43ffd..c0237203d63c 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,9 @@ namespace svt //--------------------------------------------------------------------- SvStream& operator << ( SvStream& _rStorage, const util::DateTime& _rDate ) { - _rStorage << _rDate.NanoSeconds; + sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti ); + _rStorage << hundredthSeconds; + _rStorage << _rDate.Seconds; _rStorage << _rDate.Minutes; _rStorage << _rDate.Hours; @@ -71,7 +74,10 @@ namespace svt //--------------------------------------------------------------------- SvStream& operator >> ( SvStream& _rStorage, util::DateTime& _rDate ) { - _rStorage >> _rDate.NanoSeconds; + sal_uInt16 hundredthSeconds; + _rStorage >> hundredthSeconds; + _rDate.NanoSeconds = static_cast< sal_uInt32 >( hundredthSeconds ) * Time::nanoPerCenti; + _rStorage >> _rDate.Seconds; _rStorage >> _rDate.Minutes; _rStorage >> _rDate.Hours; -- cgit v1.2.3