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 /sfx2/source/doc/SfxDocumentMetaData.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 'sfx2/source/doc/SfxDocumentMetaData.cxx')
| -rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 0eb060b5e307..6f08db6a1b1c 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -967,7 +967,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet) OUString("date"))); } else if (type == ::cppu::UnoType<css::util::Time>::get()) { // #i97029#: replaced by Duration - // Time is supported for backward compatibility with OOo 3.x, x<=2 + // tools::Time is supported for backward compatibility with OOo 3.x, x<=2 css::util::Time ut; any >>= ut; css::util::Duration ud; @@ -2274,7 +2274,7 @@ void SfxDocumentMetaData::createUserDefined() types[ 9] = ::cppu::UnoType<sal_Int16>::get(); types[10] = ::cppu::UnoType<sal_Int32>::get(); types[11] = ::cppu::UnoType<sal_Int64>::get(); - // Time is supported for backward compatibility with OOo 3.x, x<=2 + // tools::Time is supported for backward compatibility with OOo 3.x, x<=2 types[12] = ::cppu::UnoType<css::util::Time>::get(); // #i94175#: ODF allows empty user-defined property names! m_xUserDefined.set( |