From fc04f76336fdf8c96e35382cdeb497e2f939705c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Sun, 28 Sep 2014 15:49:26 +0200
Subject: 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>
---
 extensions/source/propctrlr/standardcontrol.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extensions/source/propctrlr/standardcontrol.cxx')

diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index cd9815167d8d..2e22d16c9b0b 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -87,7 +87,7 @@ namespace pcr
         }
         else
         {
-            ::Time aTime( aUNOTime.Hours, aUNOTime.Minutes, aUNOTime.Seconds, aUNOTime.NanoSeconds );
+            ::tools::Time aTime( aUNOTime.Hours, aUNOTime.Minutes, aUNOTime.Seconds, aUNOTime.NanoSeconds );
             getTypedControlWindow()->SetTime( aTime );
         }
     }
-- 
cgit