Kaydet (Commit) 8f941e90 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

there are 3600000 seconds in an hour

regression from...

commit 9830fd36
Date:   Sun Mar 17 08:36:26 2013 +0100

    date/time IDL datatypes incompatible change

Change-Id: I2f4b64a73b5529ba190acc678d907761bb568bbf
Reviewed-on: https://gerrit.libreoffice.org/54010Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 4fd9ba59)
üst 980dee8f
......@@ -16,6 +16,7 @@ $(eval $(call gb_CppunitTest_use_external,tools_test,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \
tools/qa/cppunit/test_bigint \
tools/qa/cppunit/test_date \
tools/qa/cppunit/test_time \
tools/qa/cppunit/test_fract \
tools/qa/cppunit/test_inetmime \
tools/qa/cppunit/test_pathutils \
......
/* -*- 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/.
*/
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <tools/time.hxx>
namespace tools
{
class TimeTest : public CppUnit::TestFixture
{
public:
void testTime();
CPPUNIT_TEST_SUITE(TimeTest);
CPPUNIT_TEST(testTime);
CPPUNIT_TEST_SUITE_END();
};
void TimeTest::testTime()
{
Time aOrigTime(1, 56, 10);
auto nMS = aOrigTime.GetMSFromTime();
Time aNewTime(0);
aNewTime.MakeTimeFromMS(nMS);
CPPUNIT_ASSERT(bool(aOrigTime == aNewTime));
}
CPPUNIT_TEST_SUITE_REGISTRATION(TimeTest);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
......@@ -288,7 +288,7 @@ sal_Int32 tools::Time::GetMSFromTime() const
( nNanoSec/1000000 +
nSec * 1000 +
nMin * 60000 +
nHour * 360000 );
nHour * 3600000 );
}
void tools::Time::MakeTimeFromMS( sal_Int32 nMS )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment