summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-28 15:49:26 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-10-01 07:34:23 +0000
commitfc04f76336fdf8c96e35382cdeb497e2f939705c (patch)
tree70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /svl
parenteb4811590c85895ce531674596bdd6afb3397725 (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 'svl')
-rw-r--r--svl/source/misc/fstathelper.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index a9781b03e94c..ce804988a52c 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::ucb;
using namespace ::rtl;
bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL,
- Date* pDate, Time* pTime )
+ Date* pDate, tools::Time* pTime )
{
bool bRet = false;
try
@@ -48,7 +48,7 @@ bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL,
if( pDate )
*pDate = Date( pDT->Day, pDT->Month, pDT->Year );
if( pTime )
- *pTime = Time( pDT->Hours, pDT->Minutes,
+ *pTime = tools::Time( pDT->Hours, pDT->Minutes,
pDT->Seconds, pDT->NanoSeconds );
}
}