Tag: cws_src680_dba24a
User: fs      
Date: 2007-07-30 11:27:14+0000
Modified:
   dba/dbaccess/source/core/misc/services.cxx
   dba/dbaccess/source/filter/migration/cfgservices.cxx
   dba/dbaccess/source/filter/xml/xmlColumn.cxx
   dba/dbaccess/source/filter/xml/xmlComponent.cxx
   dba/dbaccess/source/filter/xml/xmlDataSource.cxx
   dba/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
   dba/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
   dba/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
   dba/dbaccess/source/filter/xml/xmlDatabase.cxx
   dba/dbaccess/source/filter/xml/xmlDocuments.cxx
   dba/dbaccess/source/filter/xml/xmlExport.hxx
   dba/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
   dba/dbaccess/source/filter/xml/xmlLogin.cxx
   dba/dbaccess/source/filter/xml/xmlQuery.cxx
   dba/dbaccess/source/filter/xml/xmlStyleImport.cxx
   dba/dbaccess/source/filter/xml/xmlTable.cxx
   dba/dbaccess/source/filter/xml/xmlTableFilterList.cxx
   dba/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
   dba/dbaccess/source/filter/xml/xmlfilter.cxx
   dba/dbaccess/source/filter/xml/xmlfilter.hxx
   dba/dbaccess/source/filter/xml/xmlservices.cxx
   dba/dbaccess/source/shared/registrationhelper.cxx
   dba/dbaccess/source/ui/misc/uiservices.cxx

Log:
 #i80175# no 'using namespace ::rtl'

File Changes:

Directory: /dba/dbaccess/source/core/misc/
==========================================

File [changed]: services.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/services.cxx?r1=1.13&r2=1.13.108.1
Delta lines:  +3 -4
-------------------
--- services.cxx        2006-10-12 13:32:41+0000        1.13
+++ services.cxx        2007-07-30 11:27:09+0000        1.13.108.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: services.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.13.108.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/10/12 13:32:41 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,7 +48,6 @@
 
 
/********************************************************************************************/
 
-using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;

Directory: /dba/dbaccess/source/filter/migration/
=================================================

File [changed]: cfgservices.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/migration/cfgservices.cxx?r1=1.6&r2=1.6.108.1
Delta lines:  +3 -4
-------------------
--- cfgservices.cxx     2006-10-12 13:33:20+0000        1.6
+++ cfgservices.cxx     2007-07-30 11:27:10+0000        1.6.108.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cfgservices.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.108.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/10/12 13:33:20 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -49,7 +49,6 @@
 
 
/********************************************************************************************/
 
-using namespace ::rtl;
 using namespace ::dbacfg;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;

Directory: /dba/dbaccess/source/filter/xml/
===========================================

File [changed]: xmlColumn.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlColumn.cxx?r1=1.7&r2=1.7.120.1
Delta lines:  +5 -6
-------------------
--- xmlColumn.cxx       2006-09-17 06:45:11+0000        1.7
+++ xmlColumn.cxx       2007-07-30 11:27:10+0000        1.7.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlColumn.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:45:11 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -80,7 +80,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::beans;
        using namespace ::com::sun::star::sdbcx;
@@ -90,7 +89,7 @@
 
 OXMLColumn::OXMLColumn( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XAttributeList > & _xAttrList
                                ,const Reference< XNameAccess >& 
_xParentContainer
                                ) :
@@ -108,7 +107,7 @@
     ::rtl::OUString sType;
        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 );

File [changed]: xmlComponent.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlComponent.cxx?r1=1.7&r2=1.7.36.1
Delta lines:  +5 -6
-------------------
--- xmlComponent.cxx    2007-05-10 10:15:06+0000        1.7
+++ xmlComponent.cxx    2007-07-30 11:27:10+0000        1.7.36.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlComponent.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.36.1 $
  *
- *  last change: $Author: kz $ $Date: 2007/05/10 10:15:06 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,7 +71,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::beans;
        using namespace ::com::sun::star::container;
@@ -80,7 +79,7 @@
 
 OXMLComponent::OXMLComponent( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XAttributeList > & _xAttrList
                                ,const Reference< XNameAccess >& 
_xParentContainer
                                ,const ::rtl::OUString& _sComponentServiceName
@@ -98,7 +97,7 @@
        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 );

File [changed]: xmlDataSource.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSource.cxx?r1=1.8&r2=1.8.120.1
Delta lines:  +6 -7
-------------------
--- xmlDataSource.cxx   2006-09-17 06:45:38+0000        1.8
+++ xmlDataSource.cxx   2007-07-30 11:27:10+0000        1.8.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlDataSource.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.8.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:45:38 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -77,13 +77,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 )
 {
@@ -101,7 +100,7 @@
        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 );
@@ -210,7 +209,7 @@
 
 SvXMLImportContext* OXMLDataSource::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlDataSourceInfo.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx?r1=1.7&r2=1.7.120.1
Delta lines:  +5 -6
-------------------
--- xmlDataSourceInfo.cxx       2006-09-17 06:45:52+0000        1.7
+++ xmlDataSourceInfo.cxx       2007-07-30 11:27:10+0000        1.7.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlDataSourceInfo.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:45:52 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -69,14 +69,13 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::xml::sax;
 DBG_NAME(OXMLDataSourceInfo)
 
 OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XAttributeList > & _xAttrList 
                                ,OXMLDataSource& _rParent) :
        SvXMLImportContext( rImport, nPrfx, _sLocalName )
@@ -93,7 +92,7 @@
        sal_Bool bAutoEnabled = sal_False;
        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 );

File [changed]: xmlDataSourceSetting.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx?r1=1.9&r2=1.9.120.1
Delta lines:  +6 -7
-------------------
--- xmlDataSourceSetting.cxx    2006-09-17 06:46:07+0000        1.9
+++ xmlDataSourceSetting.cxx    2007-07-30 11:27:10+0000        1.9.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlDataSourceSetting.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.9.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:46:07 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -68,14 +68,13 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::xml::sax;
 DBG_NAME(OXMLDataSourceSetting)
 
 OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XAttributeList > & _xAttrList 
                                ,OXMLDataSource& _rParent
                                ,OXMLDataSourceSetting* _pContainer) :
@@ -95,7 +94,7 @@
        sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
        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 );
@@ -143,7 +142,7 @@
 // 
-----------------------------------------------------------------------------
 SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlDataSourceSettings.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx?r1=1.7&r2=1.7.120.1
Delta lines:  +5 -6
-------------------
--- xmlDataSourceSettings.cxx   2006-09-17 06:46:21+0000        1.7
+++ xmlDataSourceSettings.cxx   2007-07-30 11:27:10+0000        1.7.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlDataSourceSettings.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:46:21 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -70,14 +70,13 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::xml::sax;
 DBG_NAME(OXMLDataSourceSettings)
 
 OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,OXMLDataSource& _rParent) :
        SvXMLImportContext( rImport, nPrfx, _sLocalName )
        ,m_rParent(_rParent)
@@ -95,7 +94,7 @@
 // 
-----------------------------------------------------------------------------
 SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlDatabase.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDatabase.cxx?r1=1.7&r2=1.7.120.1
Delta lines:  +5 -6
-------------------
--- xmlDatabase.cxx     2006-09-17 06:46:35+0000        1.7
+++ xmlDatabase.cxx     2007-07-30 11:27:10+0000        1.7.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlDatabase.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:46:35 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -77,7 +77,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::sdb;
        using namespace ::com::sun::star::sdbcx;
@@ -85,7 +84,7 @@
 DBG_NAME(OXMLDatabase)
 
 OXMLDatabase::OXMLDatabase( ODBFilter& rImport,
-                               sal_uInt16 nPrfx, const OUString& rLName ) :
+                               sal_uInt16 nPrfx, const ::rtl::OUString& rLName 
) :
        SvXMLImportContext( rImport, nPrfx, rLName )
 {
     DBG_CTOR(OXMLDatabase,NULL);
@@ -102,7 +101,7 @@
 
 SvXMLImportContext* OXMLDatabase::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlDocuments.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDocuments.cxx?r1=1.6&r2=1.6.36.1
Delta lines:  +6 -7
-------------------
--- xmlDocuments.cxx    2007-05-10 10:15:20+0000        1.6
+++ xmlDocuments.cxx    2007-07-30 11:27:10+0000        1.6.36.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlDocuments.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.36.1 $
  *
- *  last change: $Author: kz $ $Date: 2007/05/10 10:15:20 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,7 +71,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::container;
        using namespace ::com::sun::star::xml::sax;
@@ -79,7 +78,7 @@
 
 OXMLDocuments::OXMLDocuments( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               , const OUString& rLName
+                               , const ::rtl::OUString& rLName
                                ,const Reference< XNameAccess >& _xContainer
                                ,const ::rtl::OUString& _sCollectionServiceName
                                ,const ::rtl::OUString& _sComponentServiceName) 
:
@@ -94,7 +93,7 @@
 // 
-----------------------------------------------------------------------------
 OXMLDocuments::OXMLDocuments( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               , const OUString& rLName
+                               , const ::rtl::OUString& rLName
                                ,const Reference< XNameAccess >& _xContainer
                                ,const ::rtl::OUString& _sCollectionServiceName
                                ) :
@@ -115,7 +114,7 @@
 
 SvXMLImportContext* OXMLDocuments::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlExport.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.hxx?r1=1.7&r2=1.7.128.1
Delta lines:  +3 -4
-------------------
--- xmlExport.hxx       2006-08-15 10:48:21+0000        1.7
+++ xmlExport.hxx       2007-07-30 11:27:10+0000        1.7.128.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlExport.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.128.1 $
  *
- *  last change: $Author: hr $ $Date: 2006/08/15 10:48:21 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -104,7 +104,6 @@
 
 namespace dbaxml
 {
-using namespace ::rtl;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;

File [changed]: xmlHierarchyCollection.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx?r1=1.7&r2=1.7.118.1
Delta lines:  +7 -8
-------------------
--- xmlHierarchyCollection.cxx  2006-09-17 06:47:28+0000        1.7
+++ xmlHierarchyCollection.cxx  2007-07-30 11:27:10+0000        1.7.118.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlHierarchyCollection.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.118.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:47:28 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -78,7 +78,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::beans;
        using namespace ::com::sun::star::container;
@@ -87,7 +86,7 @@
 
 OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XAttributeList > & _xAttrList 
                                ,const Reference< XNameAccess >& 
_xParentContainer
                                ,const ::rtl::OUString& _sCollectionServiceName
@@ -105,7 +104,7 @@
        sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
        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 );
@@ -150,7 +149,7 @@
 // 
-----------------------------------------------------------------------------
 OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XNameAccess >& _xContainer
                        ) :
        SvXMLImportContext( rImport, nPrfx, _sLocalName )
@@ -168,7 +167,7 @@
 // 
-----------------------------------------------------------------------------
 SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlLogin.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlLogin.cxx?r1=1.6&r2=1.6.120.1
Delta lines:  +5 -6
-------------------
--- xmlLogin.cxx        2006-09-17 06:47:42+0000        1.6
+++ xmlLogin.cxx        2007-07-30 11:27:10+0000        1.6.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlLogin.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:47:42 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -65,13 +65,12 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::xml::sax;
 DBG_NAME(OXMLLogin)
 
 OXMLLogin::OXMLLogin( ODBFilter& rImport,
-                               sal_uInt16 nPrfx, const OUString& _sLocalName,
+                               sal_uInt16 nPrfx, const ::rtl::OUString& 
_sLocalName,
                                const Reference< XAttributeList > & _xAttrList 
) :
        SvXMLImportContext( rImport, nPrfx, _sLocalName )
 {
@@ -87,7 +86,7 @@
        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 );

File [changed]: xmlQuery.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlQuery.cxx?r1=1.6&r2=1.6.120.1
Delta lines:  +6 -7
-------------------
--- xmlQuery.cxx        2006-09-17 06:47:55+0000        1.6
+++ xmlQuery.cxx        2007-07-30 11:27:10+0000        1.6.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlQuery.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:47:55 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,7 +71,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::beans;
        using namespace ::com::sun::star::container;
@@ -81,7 +80,7 @@
 
 OXMLQuery::OXMLQuery( ODBFilter& rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const Reference< XAttributeList > & _xAttrList 
                                ,const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& _xParentContainer
                                ) :
@@ -97,7 +96,7 @@
        sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
        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 );
@@ -123,7 +122,7 @@
 // 
-----------------------------------------------------------------------------
 SvXMLImportContext* OXMLQuery::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext* pContext = OXMLTable::CreateChildContext(nPrefix, 
rLocalName,xAttrList );

File [changed]: xmlStyleImport.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlStyleImport.cxx?r1=1.6&r2=1.6.120.1
Delta lines:  +9 -10
--------------------
--- xmlStyleImport.cxx  2006-09-17 06:48:09+0000        1.6
+++ xmlStyleImport.cxx  2007-07-30 11:27:10+0000        1.6.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlStyleImport.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:48:09 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -98,7 +98,6 @@
 namespace dbaxml
 {
 
-using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
@@ -114,7 +113,7 @@
 DBG_NAME(OTableStyleContext)
 
 OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
-               sal_uInt16 nPrfx, const OUString& rLName,
+               sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                const Reference< XAttributeList > & xAttrList,
                SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool 
bDefaultStyle )
     :XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, 
bDefaultStyle )
@@ -194,8 +193,8 @@
 }
 // 
-----------------------------------------------------------------------------
 void OTableStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
-                                                                               
const OUString& rLocalName,
-                                                                               
const OUString& rValue )
+                                                                               
const ::rtl::OUString& rLocalName,
+                                                                               
const ::rtl::OUString& rValue )
 {
        // TODO: use a map here
        if( IsXMLToken(rLocalName, XML_DATA_STYLE_NAME ) )
@@ -215,7 +214,7 @@
 
 OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
                sal_uInt16 nPrfx ,
-               const OUString& rLName ,
+               const ::rtl::OUString& rLName ,
                const Reference< XAttributeList > & xAttrList,
                const sal_Bool bTempAutoStyles ) :
        SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
@@ -277,7 +276,7 @@
 }
 // ----------------------------------------------------------------------------
 SvXMLStyleContext *OTableStylesContext::CreateStyleStyleChildContext(
-               sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& 
rLocalName,
+               sal_uInt16 nFamily, sal_uInt16 nPrefix, const ::rtl::OUString& 
rLocalName,
                const Reference< xml::sax::XAttributeList > & xAttrList )
 {
        SvXMLStyleContext *pStyle = 
SvXMLStylesContext::CreateStyleStyleChildContext( nFamily, nPrefix,
@@ -306,7 +305,7 @@
 }
 // 
-----------------------------------------------------------------------------
 
-OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
+::rtl::OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
 {
        rtl::OUString sServiceName = 
SvXMLStylesContext::GetServiceName(nFamily);
        if (!sServiceName.getLength())

File [changed]: xmlTable.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlTable.cxx?r1=1.7&r2=1.7.22.1
Delta lines:  +8 -9
-------------------
--- xmlTable.cxx        2007-06-05 14:40:45+0000        1.7
+++ xmlTable.cxx        2007-07-30 11:27:10+0000        1.7.22.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlTable.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.22.1 $
  *
- *  last change: $Author: ihi $ $Date: 2007/06/05 14:40:45 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -80,7 +80,6 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
     using namespace ::com::sun::star;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::sdbcx;
@@ -89,7 +88,7 @@
 
 OXMLTable::OXMLTable( ODBFilter& _rImport
                                ,sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,const uno::Reference< XAttributeList > & 
_xAttrList 
                                ,const uno::Reference< 
::com::sun::star::container::XNameAccess >& _xParentContainer
                                ,const ::rtl::OUString& _sServiceName
@@ -109,7 +108,7 @@
        sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
        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 );
@@ -158,7 +157,7 @@
 // 
-----------------------------------------------------------------------------
 SvXMLImportContext* OXMLTable::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const uno::Reference< XAttributeList > & xAttrList )
 {
        SvXMLImportContext *pContext = 0;
@@ -277,7 +276,7 @@
        sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
        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 );

File [changed]: xmlTableFilterList.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlTableFilterList.cxx?r1=1.8&r2=1.8.120.1
Delta lines:  +5 -6
-------------------
--- xmlTableFilterList.cxx      2006-09-17 06:48:36+0000        1.8
+++ xmlTableFilterList.cxx      2007-07-30 11:27:10+0000        1.8.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlTableFilterList.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.8.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:48:36 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -74,14 +74,13 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::xmloff::token;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::beans;
        using namespace ::com::sun::star::xml::sax;
 DBG_NAME(OXMLTableFilterList)
 
-OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 
nPrfx, const OUString& _sLocalName )
+OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 
nPrfx, const ::rtl::OUString& _sLocalName )
     :SvXMLImportContext( rImport, nPrfx, _sLocalName )
 {
     DBG_CTOR(OXMLTableFilterList,NULL);
@@ -97,7 +96,7 @@
 
 SvXMLImportContext* OXMLTableFilterList::CreateChildContext(
                sal_uInt16 nPrefix,
-               const OUString& rLocalName,
+               const ::rtl::OUString& rLocalName,
                const Reference< XAttributeList > & /*xAttrList*/ )
 {
        SvXMLImportContext *pContext = 0;

File [changed]: xmlTableFilterPattern.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx?r1=1.6&r2=1.6.120.1
Delta lines:  +4 -5
-------------------
--- xmlTableFilterPattern.cxx   2006-09-17 06:48:50+0000        1.6
+++ xmlTableFilterPattern.cxx   2007-07-30 11:27:11+0000        1.6.120.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlTableFilterPattern.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.120.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:48:50 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,14 +47,13 @@
 
 namespace dbaxml
 {
-       using namespace ::rtl;
        using namespace ::com::sun::star::uno;
        using namespace ::com::sun::star::xml::sax;
 DBG_NAME(OXMLTableFilterPattern)
 
 OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport,
                                sal_uInt16 nPrfx
-                               ,const OUString& _sLocalName
+                               ,const ::rtl::OUString& _sLocalName
                                ,sal_Bool _bNameFilter
                                ,OXMLTableFilterList& _rParent)
     :SvXMLImportContext( rImport, nPrfx, _sLocalName )

File [changed]: xmlfilter.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.15&r2=1.15.22.1
Delta lines:  +10 -10
---------------------
--- xmlfilter.cxx       2007-06-05 14:40:57+0000        1.15
+++ xmlfilter.cxx       2007-07-30 11:27:11+0000        1.15.22.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlfilter.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.15.22.1 $
  *
- *  last change: $Author: ihi $ $Date: 2007/06/05 14:40:57 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -163,7 +163,7 @@
        // get parser
        uno::Reference< XParser > xParser(
                rFactory->createInstance(
-                       
OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+               ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") 
),
                UNO_QUERY );
        DBG_ASSERT( xParser.is(), "Can't create parser" );
        if( !xParser.is() )
@@ -253,7 +253,7 @@
                try
                {
                        // open stream (and set parser input)
-                       OUString sStreamName = 
OUString::createFromAscii(pStreamName);
+               ::rtl::OUString sStreamName = 
::rtl::OUString::createFromAscii(pStreamName);
                        if ( !xStorage->hasByName( sStreamName ) || 
!xStorage->isStreamElement( sStreamName ) )
                        {
                                // stream name not found! Then try the 
compatibility name.
@@ -264,7 +264,7 @@
                                        return 0;
 
                                // if so, does the stream exist?
-                               sStreamName = 
OUString::createFromAscii(pCompatibilityStreamName);
+                               sStreamName = 
::rtl::OUString::createFromAscii(pCompatibilityStreamName);
                                if ( !xStorage->hasByName( sStreamName ) || 
!xStorage->isStreamElement( sStreamName ) )
                                        return 0;
                        }
@@ -273,7 +273,7 @@
                        xDocStream = xStorage->openStreamElement( sStreamName, 
embed::ElementModes::READ );
 
                        uno::Reference< beans::XPropertySet > xProps( 
xDocStream, uno::UNO_QUERY_THROW );
-               uno::Any aAny = xProps->getPropertyValue( OUString( 
RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) );
+               uno::Any aAny = xProps->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) );
                aAny >>= bEncrypted;
                }
                catch( packages::WrongPasswordException& )
@@ -309,11 +309,11 @@
 
        GetMM100UnitConverter().setCoreMeasureUnit(MAP_10TH_MM);
     GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM);
-       GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( 
sXML_np__db) ),
+       GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( 
sXML_np__db) ),
                                                GetXMLToken(XML_N_DB),
                                                XML_NAMESPACE_DB );
 
-       GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( 
sXML_np___db) ),
+       GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( 
sXML_np___db) ),
                                                GetXMLToken(XML_N_DB_OASIS),
                                                XML_NAMESPACE_DB );
 }
@@ -359,7 +359,7 @@
 sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
        throw (RuntimeException)
 {
-       OUString                                                        
sFileName;
+::rtl::OUString                                                        
sFileName;
        
        const PropertyValue* pIter = rDescriptor.getConstArray();
        const PropertyValue* pEnd       = pIter + rDescriptor.getLength();

File [changed]: xmlfilter.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.hxx?r1=1.4&r2=1.4.298.1
Delta lines:  +3 -4
-------------------
--- xmlfilter.hxx       2005-09-08 14:11:36+0000        1.4
+++ xmlfilter.hxx       2007-07-30 11:27:11+0000        1.4.298.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlfilter.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.4.298.1 $
  *
- *  last change: $Author: rt $ $Date: 2005/09/08 14:11:36 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -98,7 +98,6 @@
 
 namespace dbaxml
 {
-using namespace ::rtl;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;

File [changed]: xmlservices.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlservices.cxx?r1=1.6&r2=1.6.108.1
Delta lines:  +3 -4
-------------------
--- xmlservices.cxx     2006-10-12 13:33:48+0000        1.6
+++ xmlservices.cxx     2007-07-30 11:27:11+0000        1.6.108.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: xmlservices.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.108.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/10/12 13:33:48 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,7 +48,6 @@
 
 
/********************************************************************************************/
 
-using namespace ::rtl;
 using namespace ::dbaxml;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;

Directory: /dba/dbaccess/source/shared/
=======================================

File [changed]: registrationhelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/shared/registrationhelper.cxx?r1=1.12&r2=1.12.22.1
Delta lines:  +18 -19
---------------------
--- registrationhelper.cxx      2007-06-05 14:41:09+0000        1.12
+++ registrationhelper.cxx      2007-07-30 11:27:11+0000        1.12.22.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: registrationhelper.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.12.22.1 $
  *
- *  last change: $Author: ihi $ $Date: 2007/06/05 14:41:09 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,19 +41,18 @@
 #endif
 
 using namespace ::com::sun::star;
-using namespace ::rtl;
 using namespace ::comphelper;
 using namespace ::cppu;
 
-uno::Sequence< OUString >*                                 
OModuleRegistration::s_pImplementationNames = NULL;
-uno::Sequence< uno::Sequence< OUString > >*    
OModuleRegistration::s_pSupportedServices = NULL;
+uno::Sequence< ::rtl::OUString >*                                  
OModuleRegistration::s_pImplementationNames = NULL;
+uno::Sequence< uno::Sequence< ::rtl::OUString > >*     
OModuleRegistration::s_pSupportedServices = NULL;
 uno::Sequence< sal_Int64 >*                        
OModuleRegistration::s_pCreationFunctionPointers = NULL;
 uno::Sequence< sal_Int64 >*                                
OModuleRegistration::s_pFactoryFunctionPointers = NULL;
 
 //--------------------------------------------------------------------------
 void OModuleRegistration::registerComponent(
-       const OUString& _rImplementationName,
-       const uno::Sequence< OUString >& _rServiceNames,
+       const ::rtl::OUString& _rImplementationName,
+       const uno::Sequence< ::rtl::OUString >& _rServiceNames,
        ComponentInstantiation _pCreateFunction,
        FactoryInstantiation _pFactoryFunction)
 {
@@ -61,8 +60,8 @@
        {
                OSL_ENSURE(!s_pSupportedServices && 
!s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
                        "OModuleRegistration::registerComponent : inconsistent 
state (the pointers (1)) !");
-               s_pImplementationNames = new uno::Sequence< OUString >;
-               s_pSupportedServices = new uno::Sequence< uno::Sequence< 
OUString > >;
+               s_pImplementationNames = new uno::Sequence< ::rtl::OUString >;
+               s_pSupportedServices = new uno::Sequence< uno::Sequence< 
::rtl::OUString > >;
                s_pCreationFunctionPointers = new uno::Sequence< sal_Int64 >;
                s_pFactoryFunctionPointers = new uno::Sequence< sal_Int64 >;
        }
@@ -102,7 +101,7 @@
                "OModuleRegistration::revokeComponent : inconsistent state !");
 
        sal_Int32 nLen = s_pImplementationNames->getLength();
-       const OUString* pImplNames = s_pImplementationNames->getConstArray();
+       const ::rtl::OUString* pImplNames = 
s_pImplementationNames->getConstArray();
        for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames)
        {
                if (pImplNames->equals(_rImplementationName))
@@ -144,21 +143,21 @@
                "OModuleRegistration::writeComponentInfos : inconsistent state 
!");
 
        sal_Int32 nLen = s_pImplementationNames->getLength();
-       const OUString* pImplName = s_pImplementationNames->getConstArray();
-       const uno::Sequence< OUString >* pServices = 
s_pSupportedServices->getConstArray();
+       const ::rtl::OUString* pImplName = 
s_pImplementationNames->getConstArray();
+       const uno::Sequence< ::rtl::OUString >* pServices = 
s_pSupportedServices->getConstArray();
 
-       OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
+       ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
        for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices)
        {
-               OUString aMainKeyName(sRootKey);
+               ::rtl::OUString aMainKeyName(sRootKey);
                aMainKeyName += *pImplName;
-               aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+               aMainKeyName += 
::rtl::OUString::createFromAscii("/UNO/SERVICES");
 
                try
                {
                        uno::Reference< registry::XRegistryKey >  xNewKey( 
_rxRootKey->createKey(aMainKeyName) );
 
-                       const OUString* pService = pServices->getConstArray();
+                       const ::rtl::OUString* pService = 
pServices->getConstArray();
                        for (sal_Int32 j=0; j<pServices->getLength(); ++j, 
++pService)
                                xNewKey->createKey(*pService);
                }
@@ -197,8 +196,8 @@
 
 
        sal_Int32 nLen = s_pImplementationNames->getLength();
-       const OUString* pImplName = s_pImplementationNames->getConstArray();
-       const uno::Sequence< OUString >* pServices = 
s_pSupportedServices->getConstArray();
+       const ::rtl::OUString* pImplName = 
s_pImplementationNames->getConstArray();
+       const uno::Sequence< ::rtl::OUString >* pServices = 
s_pSupportedServices->getConstArray();
        const sal_Int64* pComponentFunction = 
s_pCreationFunctionPointers->getConstArray();
        const sal_Int64* pFactoryFunction = 
s_pFactoryFunctionPointers->getConstArray();
 

Directory: /dba/dbaccess/source/ui/misc/
========================================

File [changed]: uiservices.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/uiservices.cxx?r1=1.24&r2=1.24.18.1
Delta lines:  +3 -4
-------------------
--- uiservices.cxx      2007-07-06 08:38:21+0000        1.24
+++ uiservices.cxx      2007-07-30 11:27:11+0000        1.24.18.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: uiservices.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.24.18.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/07/06 08:38:21 $
+ *  last change: $Author: fs $ $Date: 2007/07/30 11:27:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,7 +51,6 @@
 
 
/********************************************************************************************/
 
-using namespace ::rtl;
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to