summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/doc/docfld.cxx3
-rw-r--r--sw/source/filter/html/htmlfld.cxx5
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 372f3dfb3b27..c630109bb991 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1986,7 +1986,8 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
{
sal_Bool bIsModified = IsModified();
- sal_uLong nDate, nTime;
+ sal_Int32 nDate;
+ sal_Int64 nTime;
if( pNewDateTime )
{
nDate = pNewDateTime->GetDate();
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 00c7a43b153c..57015eeabf66 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -327,7 +327,8 @@ void SwHTMLParser::NewField()
case RES_TIMEFLD:
{
sal_uLong nNumFmt = 0;
- sal_uLong nTime = Time( Time::SYSTEM ).GetTime(), nDate = Date( Date::SYSTEM ).GetDate();
+ sal_Int64 nTime = Time( Time::SYSTEM ).GetTime();
+ sal_Int32 nDate = Date( Date::SYSTEM ).GetDate();
sal_uInt16 nSub = 0;
sal_Bool bValidFmt = sal_False;
HTMLNumFmtTblEntry * pFmtTbl;
@@ -337,7 +338,7 @@ void SwHTMLParser::NewField()
nSub = DATEFLD;
pFmtTbl = aHTMLDateFldFmtTable;
if( !aValue.isEmpty() )
- nDate = (sal_uLong)aValue.toInt32();
+ nDate = aValue.toInt32();
}
else
{