summaryrefslogtreecommitdiff
path: root/ucbhelper
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-09-08 13:17:27 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-09-08 13:17:27 +0000
commit76c83be55b37a87ca163aef36df87355a230f2e9 (patch)
tree54e439ded33dec82849de928bea3b972706fad01 /ucbhelper
parentf5aee2f2519df4605c391737786202011c28211e (diff)
INTEGRATION: CWS ooo20040704 (1.7.120); FILE MERGED
2004/07/02 08:32:51 cmc 1.7.120.2: #i30891# revert header and namespace change 2004/06/28 14:41:46 cmc 1.7.120.1: #i30801# allow using system stl if possible
Diffstat (limited to 'ucbhelper')
-rw-r--r--ucbhelper/source/provider/contenthelper.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index b02e0ec229d4..b373a5c3dc35 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: contenthelper.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: hr $ $Date: 2001-09-27 09:51:46 $
+ * last change: $Author: rt $ $Date: 2004-09-08 14:17:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,9 +65,7 @@
*************************************************************************/
-#ifndef __HASH_MAP__
#include <hash_map>
-#endif
#ifndef _COM_SUN_STAR_UCB_CONTENTACTION_HPP_
#include <com/sun/star/ucb/ContentAction.hpp>
#endif