sc/source/filter/orcus/interface.cxx | 2 +-
sd/source/filter/eppt/pptx-epptooxml.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f1efc98b45fcf462a74b31790d4075f29cc0f8af
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Apr 19 00:30:10 2013 +0300
WaE: format specifies type 'int' but the argument has type 'sal_uInt32'
Change-Id: I33f603df67db2caaeebec5fc6f5f6ee2341a0b8f
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index da791f3..ba04809 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1314,7 +1314,7 @@ bool PowerPointExport::WriteComments( sal_uInt32 nPageNum
)
sal_Int32 nId = GetAuthorIdAndLastIndex (
xAnnotation->getAuthor(), nLastIndex );
char cDateTime[32];
- snprintf(cDateTime, 31, "%02d-%02d-%02dT%02d:%02d:%02d.%09d",
aDateTime.Year, aDateTime.Month, aDateTime.Day, aDateTime.Hours,
aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds);
+ snprintf(cDateTime, 31, "%02d-%02d-%02dT%02d:%02d:%02d.%09"
SAL_PRIuUINT32, aDateTime.Year, aDateTime.Month, aDateTime.Day,
aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds);
pFS->startElementNS( XML_p, XML_cm,
XML_authorId, I32S( nId ),
commit 824caac79d983ad1aa93a6ec51558d7edb6f2a7d
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Apr 19 00:29:29 2013 +0300
No member named 'Get100Sec' in 'Time' any longer
Change-Id: I6087cd51073529a5c2b636b04f60334a93ac4ecc
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index 55b170a..e67c915 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -231,7 +231,7 @@ void ScOrcusSheet::set_date_time(
long nDateDiff = aDate - aNullDate;
double fTime =
- static_cast<double>(aTime.Get100Sec()) / 100.0 +
+ static_cast<double>(aTime.GetNanoSec()) / 1e9 +
aTime.GetSec() +
aTime.GetMin() * 60.0 +
aTime.GetHour() * 3600.0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
