diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 12:59:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 12:59:23 +0000 |
| commit | c19a0a1b1a49a4ec46e944cff4277ea13b2a9843 (patch) | |
| tree | 8119bb7feaac586f71057a1358a554b37200fb56 /psprint | |
| parent | 76121adac75d0ef4aced19d17b29e47b9d01526b (diff) | |
INTEGRATION: CWS ooo20040704 (1.17.12); FILE MERGED
2004/07/19 07:53:56 svesik 1.17.12.4: RESYNC: (1.18-1.19); FILE MERGED
2004/07/02 09:02:55 cmc 1.17.12.3: #i30891# revert header and namespace change
2004/06/29 01:39:12 svesik 1.17.12.2: RESYNC: (1.17-1.18); FILE MERGED
2004/06/28 12:57:35 cmc 1.17.12.1: #i30801# allow using system stl if possible
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/inc/psprint/fontmanager.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/psprint/inc/psprint/fontmanager.hxx b/psprint/inc/psprint/fontmanager.hxx index 12cfc51e85c1..65e302150f31 100644 --- a/psprint/inc/psprint/fontmanager.hxx +++ b/psprint/inc/psprint/fontmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fontmanager.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2004-07-05 09:22:12 $ + * last change: $Author: rt $ $Date: 2004-09-08 13:59:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,9 +62,7 @@ #ifndef _PSPRINT_FONTMANAGER_HXX_ #define _PSPRINT_FONTMANAGER_HXX_ -#ifndef __SGI_STL_HASH_MAP #include <hash_map> -#endif #ifndef __SGI_STL_MAP #include <map> #endif |