strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sw8u10bf02 (1.21.96); FILE MERGED

Browse source 
2007/11/30 14:13:27 ama 1.21.96.1: Fix #i84117#: Double use of namespace
This commit is contained in:
Jens-Heiner Rechtien 2008-01-04 12:15:03 +00:00
parent 94ed655741
commit 7fcc6014a3
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xmloff/source/core/nmspmap.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: nmspmap.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: hr $ $Date: 2007-06-27 14:56:21 $
* last change: $Author: hr $ $Date: 2008-01-04 13:15:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -161,9 +161,12 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString& rPrefix, const OUStrin
if( XML_NAMESPACE_NONE == nKey )
return XML_NAMESPACE_UNKNOWN;
if( XML_NAMESPACE_UNKNOWN != nKey &&
aNameHash.find ( rPrefix ) == aNameHash.end() )
nKey = _Add( rPrefix, rName, nKey );
if( XML_NAMESPACE_UNKNOWN != nKey )
{
NameSpaceHash::const_iterator aIter = aNameHash.find( rPrefix );
if( aIter == aNameHash.end() || (*aIter).second->sName != rName )
nKey = _Add( rPrefix, rName, nKey );
}
return nKey;
}