From ed904af8665f6f7590fedd4ad608018f78c686c1 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sun, 28 Jul 2013 16:08:26 +0200 Subject: fdo#67235 adapt form control code to time nanosecond API change Conflicts: offapi/type_reference/offapi.rdb Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Reviewed-on: https://gerrit.libreoffice.org/5149 Reviewed-by: Lionel Elie Mamane Tested-by: Lionel Elie Mamane --- xmloff/source/forms/handler/vcl_time_handler.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'xmloff/source/forms') diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index c73392f75a14..b50806018661 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -56,7 +56,7 @@ namespace xmloff //------------------------------------------------------------------------------------------------------------------ OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const { - sal_Int32 nVCLTime(0); + sal_Int64 nVCLTime(0); OSL_VERIFY( i_propertyValue >>= nVCLTime ); ::Time aVCLTime( nVCLTime ); @@ -74,7 +74,7 @@ namespace xmloff //------------------------------------------------------------------------------------------------------------------ bool VCLTimeHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { - sal_Int32 nVCLTime(0); + sal_Int64 nVCLTime(0); Duration aDuration; if (::sax::Converter::convertDuration( aDuration, i_attributeValue )) @@ -86,11 +86,13 @@ namespace xmloff else { // compatibility format, before we wrote those values in XML-schema compatible form - if (!::sax::Converter::convertNumber(nVCLTime, i_attributeValue)) + if (!::sax::Converter::convertNumber64(nVCLTime, i_attributeValue)) { OSL_ENSURE( false, "VCLTimeHandler::getPropertyValues: unknown time format (no XML-schema time, no legacy integer)!" ); return false; } + // legacy integer was in centiseconds + nVCLTime *= ::Time::nanoPerCenti; } const Any aPropertyValue( makeAny( nVCLTime ) ); -- cgit 05-testflight'>distro/collabora/co-22.05-testflight LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/shell/Library_gconfbe.mk
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-04-25 15:55:53 +0200
committerAndras Timar <atimar@suse.com>2013-04-25 15:55:53 +0200
commit467748ef3d900ef42ca95df1715879335673341d (patch)
tree5c0faea9060ecf520b57a93d2d80c006db16a94c /shell/Library_gconfbe.mk
parentaf6299687ef968a3731cbfa24c3820f5006b2823 (diff)
Bump for 3.6-20 suse-3.6-20
Change-Id: Id1f02caaae95a43de6638a7c58197da25a57cac2