diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:02:50 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:02:50 +0000 |
commit | 26f32a6b6a51028234c92151caf96d44ce42e2a2 (patch) | |
tree | 9ef770180760446d26d49f5b65a32a070044ea85 /stoc | |
parent | 0436b0349e7bcc8392a07dcbf928940df9387c48 (diff) |
INTEGRATION: CWS ooo20040704 (1.3.150); FILE MERGED
2004/07/02 09:59:48 cmc 1.3.150.2: #i30891# revert header and namespace change
2004/06/28 14:05:27 cmc 1.3.150.1: #i30801# allow using system stl if possible
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/security/file_policy.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 6a87696768b4..abe141c2c3c6 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: file_policy.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dbo $ $Date: 2002-04-11 11:55:57 $ + * last change: $Author: rt $ $Date: 2004-09-08 16:02:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,6 @@ #define IMPL_NAME "com.sun.star.security.comp.stoc.FilePolicy" -using namespace ::std; using namespace ::osl; using namespace ::rtl; using namespace ::cppu; @@ -131,7 +130,7 @@ class FilePolicy AccessControl m_ac; Sequence< Any > m_defaultPermissions; - typedef hash_map< OUString, Sequence< Any >, OUStringHash > t_permissions; + typedef std::hash_map< OUString, Sequence< Any >, OUStringHash > t_permissions; t_permissions m_userPermissions; bool m_init; @@ -197,7 +196,7 @@ Sequence< Any > FilePolicy::getPermissions( } MutexGuard guard( m_mutex ); - t_permissions::const_iterator const iFind( m_userPermissions.find( userId ) ); + t_permissions::iterator iFind( m_userPermissions.find( userId ) ); if (m_userPermissions.end() == iFind) { return Sequence< Any >(); |