diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:32:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:32:16 +0000 |
| commit | 4397add88587271fca090a571bdc330d6cafd7bd (patch) | |
| tree | 8978d9fe6cabab9cc07d8fe56070c5cd7401e930 /slideshow/source | |
| parent | 8d7d3294482b811583c3eda530dfd29c20f42538 (diff) | |
INTEGRATION: CWS presfixes09 (1.5.16); FILE MERGED
2006/10/18 19:55:17 thb 1.5.16.5: RESYNC: (1.6-1.7); FILE MERGED
2006/09/15 22:15:30 thb 1.5.16.4: RESYNC: (1.5-1.6); FILE MERGED
2006/04/24 13:25:29 thb 1.5.16.3: #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/04/12 20:40:07 thb 1.5.16.2: #i37778# Replaced all shared_ptr.get() != NULL places with the more elegant automatic-conversion-to-bool version (at least where the compiler tolerated that)
2006/03/24 18:23:18 thb 1.5.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')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basecontainernode.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 6af1b0758ce7..cbed8edbdce3 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: basecontainernode.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-17 08:35:24 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:32:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,7 @@ using namespace com::sun::star; -namespace presentation { +namespace slideshow { namespace internal { BaseContainerNode::BaseContainerNode( @@ -179,5 +179,5 @@ void BaseContainerNode::showState() const #endif } // namespace internal -} // namespace presentation +} // namespace slideshow |