summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-12-13 14:54:44 +0000
committerKurt Zenker <kz@openoffice.org>2006-12-13 14:54:44 +0000
commit1008da8c04d949765bdd15cdc2ed610afa18d47b (patch)
tree43404ada5ab197dc95a1759b6e9c5ec3e4dd041c /slideshow
parent9ccb27fd89acf8d0a456a5a44669f7abeb41a4ca (diff)
INTEGRATION: CWS presfixes09 (1.5.16); FILE MERGED
2006/03/24 18:23:32 thb 1.5.16.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.5.16.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/inc/doctreenode.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx
index b2fa81e4929f..b14d0844e02a 100644
--- a/slideshow/source/inc/doctreenode.hxx
+++ b/slideshow/source/inc/doctreenode.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: doctreenode.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: obo $ $Date: 2005-10-11 08:49:23 $
+ * last change: $Author: kz $ $Date: 2006-12-13 15:54:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,16 +36,14 @@
#ifndef _SLIDESHOW_DOCTREENODE_HXX
#define _SLIDESHOW_DOCTREENODE_HXX
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
#include <vector>
/* Definition of DocTreeNode class */
-namespace presentation
+namespace slideshow
{
namespace internal
{