diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:56:39 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:56:39 +0000 |
| commit | 1b0024a9bed1f84013934a40c6919c5f84302d0d (patch) | |
| tree | a1a252a3a8af8da51ef35b4ad53d7d4b3375016a /slideshow/source/inc/eventqueue.hxx | |
| parent | 352c397cef48a574e2803423107732e90670d327 (diff) | |
INTEGRATION: CWS presfixes09 (1.6.2); FILE MERGED
2006/09/15 22:17:53 thb 1.6.2.3: RESYNC: (1.6-1.7); FILE MERGED
2006/03/24 18:23:33 thb 1.6.2.2: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/15 15:22:22 thb 1.6.2.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
Diffstat (limited to 'slideshow/source/inc/eventqueue.hxx')
| -rw-r--r-- | slideshow/source/inc/eventqueue.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index 2a1e31de6aa3..3b97ce922aa1 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -4,9 +4,9 @@ * * $RCSfile: eventqueue.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2006-07-26 07:39:44 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:56:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,9 +36,7 @@ #ifndef _SLIDESHOW_EVENTQUEUE_HXX #define _SLIDESHOW_EVENTQUEUE_HXX -#ifndef _CANVAS_ELAPSEDTIME_HXX #include <canvas/elapsedtime.hxx> -#endif #include <queue> #include <vector> @@ -49,7 +47,7 @@ /* Definition of ActivitiesQueue class */ -namespace presentation +namespace slideshow { namespace internal { |