From fc04f76336fdf8c96e35382cdeb497e2f939705c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 28 Sep 2014 15:49:26 +0200 Subject: fdo#82577: Handle Time Put the TOOLS Time class in the tools namespace. Avoids clash with the X11 Time typedef. Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866 Reviewed-on: https://gerrit.libreoffice.org/11684 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- tools/source/rc/rc.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools/source/rc') diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 5700f151ee46..a4bd8f269e18 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -39,6 +39,8 @@ void Resource::GetRes( const ResId& rResId ) IncrementRes( sizeof( RSHEADER_TYPE ) ); } +namespace tools { + Time::Time( const ResId& rResId ) { nTime = 0; @@ -59,9 +61,11 @@ Time::Time( const ResId& rResId ) // TODO: when we change the place that writes this binary resource format to match: // SetNanoSec( pResMgr->ReadLong() ); // In the meantime: - SetNanoSec( pResMgr->ReadShort() * ::Time::nanoPerCenti ); + SetNanoSec( pResMgr->ReadShort() * ::tools::Time::nanoPerCenti ); } +} /* namespace tools */ + Date::Date( const ResId& rResId ) : nDate(0) { rResId.SetRT( RSC_DATE ); -- cgit