diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-26 13:42:29 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-26 13:42:29 +0000 |
commit | 5f780cbab59efbb5b07c62f7c1f70a8fa729863f (patch) | |
tree | 524112d922098501b059b5d2267cc36359a25978 /dbaccess/source/filter/xml/xmlDataSource.cxx | |
parent | fbcc8c7ff0d2439f366ea4a4742d536eda0cde8a (diff) |
INTEGRATION: CWS dba24a (1.8.120); FILE MERGED
2007/08/13 05:27:28 oj 1.8.120.2: RESYNC: (1.8-1.9); FILE MERGED
2007/07/30 11:27:10 fs 1.8.120.1: #i80175# no 'using namespace ::rtl'
Diffstat (limited to 'dbaccess/source/filter/xml/xmlDataSource.cxx')
-rw-r--r-- | dbaccess/source/filter/xml/xmlDataSource.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index b76eecc2691e..1abaa75d4178 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlDataSource.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2007-07-24 12:05:57 $ + * last change: $Author: hr $ $Date: 2007-09-26 14:42:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,13 +80,12 @@ namespace dbaxml { - using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; DBG_NAME(OXMLDataSource) OXMLDataSource::OXMLDataSource( ODBFilter& rImport, - sal_uInt16 nPrfx, const OUString& _sLocalName, + sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName, const Reference< XAttributeList > & _xAttrList ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { @@ -104,7 +103,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + ::rtl::OUString sLocalName; rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); rtl::OUString sValue = _xAttrList->getValueByIndex( i ); @@ -213,7 +212,7 @@ OXMLDataSource::~OXMLDataSource() SvXMLImportContext* OXMLDataSource::CreateChildContext( sal_uInt16 nPrefix, - const OUString& rLocalName, + const ::rtl::OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; |