7e5f69aa33
This ctor is meant to set the value of nTime directly; and that value is not nanoseconds, but an encoded value, using SEC_/MIN_/HOUR_MASK. But in some places, this ctor was misused for setting of nanoseconds, which would only accidentally work for values less than one second. All places that initialized tools::Time with 0, now use EMPTY. This makes the ctor private; and for the very few cases where really the encoded value of nTime is stored / restored, fromEncodedTime is introduced. Change-Id: I1f1994bd9aab1b51a41b1de637619049fe820da4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175283 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
97 lines
3.3 KiB
C++
97 lines
3.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include "vcl_time_handler.hxx"
|
|
|
|
#include <rtl/ustrbuf.hxx>
|
|
|
|
#include <com/sun/star/util/Duration.hpp>
|
|
#include <com/sun/star/util/Time.hpp>
|
|
|
|
#include <sax/tools/converter.hxx>
|
|
|
|
#include <osl/diagnose.h>
|
|
#include <tools/time.hxx>
|
|
|
|
namespace xmloff
|
|
{
|
|
|
|
using ::com::sun::star::uno::Any;
|
|
using ::com::sun::star::util::Duration;
|
|
using ::com::sun::star::util::Time;
|
|
|
|
//= VCLTimeHandler
|
|
VCLTimeHandler::VCLTimeHandler()
|
|
{
|
|
}
|
|
|
|
OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const
|
|
{
|
|
css::util::Time aTime;
|
|
OSL_VERIFY( i_propertyValue >>= aTime );
|
|
|
|
Duration aDuration; // default-inited to 0
|
|
aDuration.Hours = aTime.Hours;
|
|
aDuration.Minutes = aTime.Minutes;
|
|
aDuration.Seconds = aTime.Seconds;
|
|
aDuration.NanoSeconds = aTime.NanoSeconds;
|
|
|
|
OUStringBuffer aBuffer;
|
|
::sax::Converter::convertDuration( aBuffer, aDuration );
|
|
return aBuffer.makeStringAndClear();
|
|
}
|
|
|
|
bool VCLTimeHandler::getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const
|
|
{
|
|
Duration aDuration;
|
|
css::util::Time aTime;
|
|
if (::sax::Converter::convertDuration( aDuration, i_attributeValue ))
|
|
{
|
|
aTime = Time(aDuration.NanoSeconds, aDuration.Seconds,
|
|
aDuration.Minutes, aDuration.Hours,
|
|
false);
|
|
}
|
|
else
|
|
{
|
|
// compatibility format, before we wrote those values in XML-schema compatible form
|
|
sal_Int64 nVCLTime(0);
|
|
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 *= ::tools::Time::nanoPerCenti;
|
|
aTime = tools::Time::fromEncodedTime(nVCLTime).GetUNOTime();
|
|
}
|
|
|
|
const Any aPropertyValue( aTime );
|
|
|
|
OSL_ENSURE( o_propertyValues.size() == 1, "VCLTimeHandler::getPropertyValues: time strings represent exactly one property - not more, not less!" );
|
|
for ( auto& prop : o_propertyValues )
|
|
{
|
|
prop.second = aPropertyValue;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace xmloff
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|