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 /filter/source/msfilter | |
| 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 'filter/source/msfilter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/util.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0d99c9d57418..a098b94fe6b6 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2661,7 +2661,7 @@ void ImportComment10( SvxMSDffManager& rMan, SvStream& rStCtrl, SdrPage* pPage, .ReadInt32( nPosX ) .ReadInt32( nPosY ); - aDateTime.NanoSeconds *= ::Time::nanoPerMilli; + aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli; } break; } @@ -6299,7 +6299,7 @@ void PPTFieldEntry::SetDateTime( sal_uInt32 nVal ) pField1 = new SvxFieldItem( SvxDateField( Date( Date::SYSTEM ), SVXDATETYPE_VAR, eDateFormat ), EE_FEATURE_FIELD ); if ( eTimeFormat != SVXTIMEFORMAT_APPDEFAULT ) { - SvxFieldItem* pFieldItem = new SvxFieldItem( SvxExtTimeField( Time( Time::SYSTEM ), SVXTIMETYPE_VAR, eTimeFormat ), EE_FEATURE_FIELD ); + SvxFieldItem* pFieldItem = new SvxFieldItem( SvxExtTimeField( tools::Time( tools::Time::SYSTEM ), SVXTIMETYPE_VAR, eTimeFormat ), EE_FEATURE_FIELD ); if ( pField1 ) pField2 = pFieldItem; else diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 9f3a640155d1..8350a1a94da6 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -64,7 +64,7 @@ DateTime DTTM2DateTime( long lDTTM ) Friday=5 Saturday=6) */ - DateTime aDateTime(Date( 0 ), Time( 0 )); + DateTime aDateTime(Date( 0 ), ::tools::Time( 0 )); if( lDTTM ) { sal_uInt16 lMin = (sal_uInt16)(lDTTM & 0x0000003F); @@ -76,7 +76,7 @@ DateTime DTTM2DateTime( long lDTTM ) sal_uInt16 lMon = (sal_uInt16)(lDTTM & 0x0000000F); lDTTM >>= 4; sal_uInt16 lYear= (sal_uInt16)(lDTTM & 0x000001FF) + 1900; - aDateTime = DateTime(Date(lDay, lMon, lYear), Time(lHour, lMin)); + aDateTime = DateTime(Date(lDay, lMon, lYear), tools::Time(lHour, lMin)); } return aDateTime; } |