diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /tools/source/rc/rc.cxx | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
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 <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'tools/source/rc/rc.cxx')
| -rw-r--r-- | tools/source/rc/rc.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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 ); |