diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 13:10:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 13:10:44 +0000 |
| commit | 4dfc76ac1229789e3dfb1a2ed420ac72e09c5243 (patch) | |
| tree | 52e6114d40d8c03f14c614710251e23c40aa4ca3 | |
| parent | 0bf5c819bd4883398a655edfb6e73913b057f474 (diff) | |
INTEGRATION: CWS ooo20040704 (1.2.58); FILE MERGED
2004/07/02 10:21:15 cmc 1.2.58.2: #i30891# revert header and namespace change
2004/06/28 12:23:41 cmc 1.2.58.1: #i30801 allow using system stl if possible
| -rw-r--r-- | framework/inc/xml/eventsdocumenthandler.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx index cbecbe5a6c20..6616fa909186 100644 --- a/framework/inc/xml/eventsdocumenthandler.hxx +++ b/framework/inc/xml/eventsdocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: eventsdocumenthandler.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-02-25 17:39:36 $ + * last change: $Author: rt $ $Date: 2004-09-08 14:10:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,9 +90,7 @@ #include <cppuhelper/weak.hxx> #endif -#ifndef __SGI_STL_HASH_MAP #include <hash_map> -#endif #ifndef __FRAMEWORK_STDTYPES_H_ #include <stdtypes.h> diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index ea7ff949c084..e8bd55430a94 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: imagesdocumenthandler.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-02-25 17:39:56 $ + * last change: $Author: rt $ $Date: 2004-09-08 14:10:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,9 +90,7 @@ #include <cppuhelper/weak.hxx> #endif -#ifndef __SGI_STL_HASH_MAP #include <hash_map> -#endif #ifndef __FRAMEWORK_STDTYPES_H_ #include <stdtypes.h> diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 788b96d895a9..21cb10755e7e 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: statusbardocumenthandler.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-02-25 17:40:55 $ + * last change: $Author: rt $ $Date: 2004-09-08 14:10:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,9 +90,7 @@ #include <cppuhelper/weak.hxx> #endif -#ifndef __SGI_STL_HASH_MAP #include <hash_map> -#endif #ifndef __FRAMEWORK_STDTYPES_H_ #include <stdtypes.h> |