diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:32:56 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:32:56 +0000 |
commit | d107cc9a6fcd56733d10d111ec72595ce8fa7497 (patch) | |
tree | f427ad139b25b60ec5450cddf954d76364b1c64f /slideshow/source/engine/animationnodes | |
parent | eb1fa9352897443fb4fa6c53931d19c76e833c60 (diff) |
INTEGRATION: CWS presfixes09 (1.6.16); FILE MERGED
2006/10/18 19:55:33 thb 1.6.16.4: RESYNC: (1.8-1.9); FILE MERGED
2006/09/15 22:15:47 thb 1.6.16.3: RESYNC: (1.6-1.8); FILE MERGED
2006/04/24 13:25:29 thb 1.6.16.2: #i53194# Unified include statements (local headers always have double quotes; external headers angle brackets); reverted EventMultiplexer pause events to shared_ptr; removed EventMultiplexer::removeViewHandler(), since the handler is held weakly, anyway.
2006/03/24 18:23:18 thb 1.6.16.1: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
Diffstat (limited to 'slideshow/source/engine/animationnodes')
-rw-r--r-- | slideshow/source/engine/animationnodes/basenode.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index b9baecae2094..48e4d3ecff1f 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -4,9 +4,9 @@ * * $RCSfile: basenode.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-10-12 13:59:27 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:32:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,7 @@ #include "boost/noncopyable.hpp" #include <vector> -namespace presentation { +namespace slideshow { namespace internal { /** Context for every node. @@ -219,7 +219,7 @@ private: typedef ::boost::shared_ptr< BaseNode > BaseNodeSharedPtr; } // namespace internal -} // namespace presentation +} // namespace slideshow #endif /* INCLUDED_SLIDESHOW_BASENODE_HXX */ |