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 /xmlscript | |
| 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 'xmlscript')
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 4 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 3def76d9bd17..a2765da0d5db 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -607,8 +607,8 @@ void ElementDescriptor::readTimeAttr( OUString const & rPropName, OUString const util::Time aUTime; if (a >>= aUTime) { - ::Time aTTime(aUTime); - addAttribute( rAttrName, OUString::number( aTTime.GetTime() / ::Time::nanoPerCenti ) ); + ::tools::Time aTTime(aUTime); + addAttribute( rAttrName, OUString::number( aTTime.GetTime() / ::tools::Time::nanoPerCenti ) ); } else OSL_FAIL( "### internal error" ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index d74786348a54..415047610a90 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1192,7 +1192,7 @@ bool ImportContext::importTimeProperty( _pImport->XMLNS_DIALOGS_UID, rAttrName ) ); if (!aValue.isEmpty()) { - ::Time aTTime(toInt32( aValue ) * ::Time::nanoPerCenti); + ::tools::Time aTTime(toInt32( aValue ) * ::tools::Time::nanoPerCenti); util::Time aUTime(aTTime.GetUNOTime()); _xControlModel->setPropertyValue( rPropName, makeAny( aUTime ) ); return true; |