diff options
Diffstat (limited to 'dbaccess/source/filter')
35 files changed, 148 insertions, 148 deletions
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 1caaec33fae8..98d4cd8273b7 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -52,7 +52,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( sal_Int32 nNumberFormat = 0; if ( i->maValue >>= nNumberFormat ) { - rtl::OUString sAttrValue = rODBExport.getDataStyleName(nNumberFormat); + OUString sAttrValue = rODBExport.getDataStyleName(nNumberFormat); if ( !sAttrValue.isEmpty() ) { GetExport().AddAttribute( diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index f5939174b184..c99b451751b2 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -44,7 +44,7 @@ DBG_NAME(OXMLColumn) OXMLColumn::OXMLColumn( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer ,const Reference< XPropertySet >& _xTable @@ -61,13 +61,13 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetColumnElemTokenMap(); sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - ::rtl::OUString sType; + OUString sType; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index abe4f956ae7e..95cd7266aa44 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -31,10 +31,10 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sCellStyleName; - ::rtl::OUString m_sHelpMessage; + OUString m_sName; + OUString m_sStyleName; + OUString m_sCellStyleName; + OUString m_sHelpMessage; ::com::sun::star::uno::Any m_aDefaultValue; sal_Bool m_bHidden; @@ -43,7 +43,7 @@ namespace dbaxml OXMLColumn( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index a78561bd5901..e6626ff9d362 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -39,10 +39,10 @@ DBG_NAME(OXMLComponent) OXMLComponent::OXMLComponent( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sComponentServiceName ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bAsTemplate(sal_False) @@ -54,13 +54,13 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetComponentElemTokenMap(); sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 9bbe2815d803..55c69d8178a9 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -28,9 +28,9 @@ namespace dbaxml class ODBFilter; class OXMLComponent : public SvXMLImportContext { - ::rtl::OUString m_sName; - ::rtl::OUString m_sHREF; - ::rtl::OUString m_sComponentServiceName; + OUString m_sName; + OUString m_sHREF; + OUString m_sComponentServiceName; sal_Bool m_bAsTemplate; ODBFilter& GetOwnImport(); @@ -38,10 +38,10 @@ namespace dbaxml OXMLComponent( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sComponentServiceName ); virtual ~OXMLComponent(); }; diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 27b51d0a6cc9..cc8fbdba4791 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -38,7 +38,7 @@ namespace dbaxml DBG_NAME(OXMLConnectionData) OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName) : + sal_uInt16 nPrfx, const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bFoundOne(false) { @@ -56,7 +56,7 @@ OXMLConnectionData::~OXMLConnectionData() SvXMLImportContext* OXMLConnectionData::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 132342cbd1a9..8bd938d43503 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -34,11 +34,11 @@ namespace dbaxml public: OXMLConnectionData( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLConnectionData(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index 710a6e9bb799..b371a3e6d86f 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLConnectionResource( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLConnectionResource(); }; diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index d6a4b8194613..d1a763cbf04a 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -38,13 +38,13 @@ namespace dbaxml }; OXMLDataSource( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const UsedFor _eUsedFor = eDataSource ); virtual ~OXMLDataSource(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index e7be61ffc82a..b7bc57506574 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -30,7 +30,7 @@ namespace dbaxml public: OXMLDataSourceInfo( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const sal_uInt16 _nToken); virtual ~OXMLDataSourceInfo(); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index d5d5ff74e328..b9c779a07d25 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -41,7 +41,7 @@ DBG_NAME(OXMLDataSourceSetting) OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,OXMLDataSourceSetting* _pContainer) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -59,10 +59,10 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -78,7 +78,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); @@ -106,7 +106,7 @@ OXMLDataSourceSetting::~OXMLDataSourceSetting() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -140,19 +140,19 @@ void OXMLDataSourceSetting::EndElement() // if our property is of type string, but was empty, ensure that // we don't add a VOID value if ( !m_bIsList && ( m_aPropType.getTypeClass() == TypeClass_STRING ) && !m_aSetting.Value.hasValue() ) - m_aSetting.Value <<= ::rtl::OUString(); + m_aSetting.Value <<= OUString(); GetOwnImport().addInfo(m_aSetting); } } // ----------------------------------------------------------------------------- -void OXMLDataSourceSetting::Characters( const ::rtl::OUString& rChars ) +void OXMLDataSourceSetting::Characters( const OUString& rChars ) { if ( m_pContainer ) m_pContainer->addValue(rChars); } // ----------------------------------------------------------------------------- -void OXMLDataSourceSetting::addValue(const ::rtl::OUString& _sValue) +void OXMLDataSourceSetting::addValue(const OUString& _sValue) { Any aValue; if( TypeClass_VOID != m_aPropType.getTypeClass() ) @@ -173,7 +173,7 @@ ODBFilter& OXMLDataSourceSetting::GetOwnImport() return static_cast<ODBFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters) +Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters) { Any aReturn; switch (_rExpectedType.getTypeClass()) diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index b8b5a6b8d40d..e0206fe67e51 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -35,29 +35,29 @@ namespace dbaxml sal_Bool m_bIsList; ODBFilter& GetOwnImport(); - ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters); + ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); public: OXMLDataSourceSetting( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,OXMLDataSourceSetting* _pContainer = NULL); virtual ~OXMLDataSourceSetting(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); /** adds value to property @param _sValue The value to add. */ - void addValue(const ::rtl::OUString& _sValue); + void addValue(const OUString& _sValue); }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index 8495264834ca..4b15c4527662 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -38,7 +38,7 @@ DBG_NAME(OXMLDataSourceSettings) OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName) : + ,const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLDataSourceSettings,NULL); @@ -54,7 +54,7 @@ OXMLDataSourceSettings::~OXMLDataSourceSettings() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index 30aa29f15b7c..35e8b45830d3 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -29,11 +29,11 @@ namespace dbaxml ODBFilter& GetOwnImport(); public: - OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const ::rtl::OUString& rLName); + OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const OUString& rLName); virtual ~OXMLDataSourceSettings(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index e848e9e5fdb3..26b727440ff8 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -41,7 +41,7 @@ namespace dbaxml DBG_NAME(OXMLDatabase) OXMLDatabase::OXMLDatabase( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName ) : + sal_uInt16 nPrfx, const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ) { DBG_CTOR(OXMLDatabase,NULL); @@ -58,7 +58,7 @@ OXMLDatabase::~OXMLDatabase() SvXMLImportContext* OXMLDatabase::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -74,7 +74,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"Forms",aValue); aValue >>= sService; if ( sService.isEmpty() ) @@ -89,7 +89,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"Reports",aValue); aValue >>= sService; if ( sService.isEmpty() ) @@ -104,7 +104,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"CommandDefinitions",aValue); aValue >>= sService; if ( sService.isEmpty() ) diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index 2859bc088492..42d170094057 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -30,11 +30,11 @@ namespace dbaxml public: OXMLDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~OXMLDatabase(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 34336c766fe5..ceb3e3c3d2b8 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -37,7 +37,7 @@ namespace dbaxml DBG_NAME(OXMLDatabaseDescription) OXMLDatabaseDescription::OXMLDatabaseDescription( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName) : + sal_uInt16 nPrfx, const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bFoundOne(false) { @@ -54,7 +54,7 @@ OXMLDatabaseDescription::~OXMLDatabaseDescription() SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 28ca38e304cd..a56d90dedb31 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -34,11 +34,11 @@ namespace dbaxml public: OXMLDatabaseDescription( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLDatabaseDescription(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 2b98e8a70e32..ddbae3725845 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -38,10 +38,10 @@ DBG_NAME(OXMLDocuments) OXMLDocuments::OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName) : + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName) : SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xContainer(_xContainer) ,m_sCollectionServiceName(_sCollectionServiceName) @@ -53,9 +53,9 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport // ----------------------------------------------------------------------------- OXMLDocuments::OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName + ,const OUString& _sCollectionServiceName ) : SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xContainer(_xContainer) @@ -74,7 +74,7 @@ OXMLDocuments::~OXMLDocuments() SvXMLImportContext* OXMLDocuments::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 193fccee42af..d1f3617a2002 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -30,8 +30,8 @@ namespace dbaxml { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + OUString m_sCollectionServiceName; + OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: @@ -39,23 +39,23 @@ namespace dbaxml // for forms and reports OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName); + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName); // for queries OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName = ::rtl::OUString() + ,const OUString& _sCollectionServiceName = OUString() ); virtual ~OXMLDocuments(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 67f2dd8db641..5f24a9fb2bef 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -38,7 +38,7 @@ namespace dbaxml DBG_NAME(OXMLFileBasedDatabase) OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName, + sal_uInt16 nPrfx, const OUString& _sLocalName, const Reference< XAttributeList > & _xAttrList) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { @@ -53,15 +53,15 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, PropertyValue aProperty; const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; - ::rtl::OUString sLocation,sMediaType,sFileTypeExtension; + OUString sLocation,sMediaType,sFileTypeExtension; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); - aProperty.Name = ::rtl::OUString(); + aProperty.Name = OUString(); aProperty.Value = Any(); switch( rTokenMap.Get( nPrefix, sLocalName ) ) @@ -69,7 +69,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, case XML_TOK_DB_HREF: { SvtPathOptions aPathOptions; - rtl::OUString sFileName = aPathOptions.SubstituteVariable(sValue); + OUString sFileName = aPathOptions.SubstituteVariable(sValue); if ( sValue == sFileName ) { const sal_Int32 nFileNameLength = sFileName.getLength(); @@ -101,7 +101,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, if ( !(sLocation.isEmpty() || sMediaType.isEmpty()) ) { ::dbaccess::ODsnTypeCollection aTypeCollection(rImport.GetComponentContext()); - ::rtl::OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); + OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try { diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index ebd30ff807c6..0a2626a9988d 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLFileBasedDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLFileBasedDatabase(); }; diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 24668516eea1..7c59d0e57168 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -33,31 +33,31 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + OUString m_sName; + OUString m_sCollectionServiceName; + OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName ); OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable ); virtual ~OXMLHierarchyCollection(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 08164da65962..1059296a442c 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -30,7 +30,7 @@ namespace dbaxml public: OXMLLogin( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual ~OXMLLogin(); diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index cddb57a11aac..e2a64751e99b 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -40,7 +40,7 @@ DBG_NAME(OXMLQuery) OXMLQuery::OXMLQuery( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ) : @@ -56,10 +56,10 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -82,7 +82,7 @@ OXMLQuery::~OXMLQuery() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLQuery::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = OXMLTable::CreateChildContext(nPrefix, rLocalName,xAttrList ); @@ -95,7 +95,7 @@ SvXMLImportContext* OXMLQuery::CreateChildContext( case XML_TOK_UPDATE_TABLE: { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - ::rtl::OUString s1; + OUString s1; fillAttributes(nPrefix, rLocalName,xAttrList,s1,m_sTable,m_sSchema,m_sCatalog); } break; diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index e9c138f3c080..e2aef52021c2 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -28,8 +28,8 @@ namespace dbaxml class ODBFilter; class OXMLQuery : public OXMLTable { - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sTable; + OUString m_sCommand; + OUString m_sTable; sal_Bool m_bEscapeProcessing; protected: virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); @@ -37,14 +37,14 @@ namespace dbaxml OXMLQuery( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ); virtual ~OXMLQuery(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index 22cd0b21df79..84c5272159fe 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLServerDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLServerDatabase(); }; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 46a7f83d64c3..2d13149ff1e3 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -38,9 +38,9 @@ namespace dbaxml class OTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; + OUString m_sDataStyleName; + OUString sPageStyle; + const OUString sNumberFormat; SvXMLStylesContext* pStyles; com::sun::star::uno::Any aConditionalFormat; sal_Int32 m_nNumberFormat; @@ -50,15 +50,15 @@ namespace dbaxml protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False ); @@ -77,9 +77,9 @@ namespace dbaxml class OTableStylesContext : public SvXMLStylesContext { - const ::rtl::OUString sTableStyleServiceName; - const ::rtl::OUString sColumnStyleServiceName; - const ::rtl::OUString sCellStyleServiceName; + const OUString sTableStyleServiceName; + const OUString sColumnStyleServiceName; + const OUString sCellStyleServiceName; sal_Int32 m_nNumberFormatIndex; sal_Int32 nMasterPageNameIndex; sal_Bool bAutoStyles : 1; @@ -96,7 +96,7 @@ namespace dbaxml virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -104,7 +104,7 @@ namespace dbaxml TYPEINFO(); OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bAutoStyles ); virtual ~OTableStylesContext(); @@ -116,7 +116,7 @@ namespace dbaxml virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index bce2ba477fd8..999c216459c3 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -31,13 +31,13 @@ namespace dbaxml protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sFilterStatement; - ::rtl::OUString m_sOrderStatement; - ::rtl::OUString m_sName; - ::rtl::OUString m_sSchema; - ::rtl::OUString m_sCatalog; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sServiceName; + OUString m_sFilterStatement; + OUString m_sOrderStatement; + OUString m_sName; + OUString m_sSchema; + OUString m_sCatalog; + OUString m_sStyleName; + OUString m_sServiceName; sal_Bool m_bApplyFilter; sal_Bool m_bApplyOrder; @@ -45,12 +45,12 @@ namespace dbaxml ODBFilter& GetOwnImport(); void fillAttributes( sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - , ::rtl::OUString& _rsCommand - ,::rtl::OUString& _rsTableName - ,::rtl::OUString& _rsTableSchema - ,::rtl::OUString& _rsTableCatalog + , OUString& _rsCommand + ,OUString& _rsTableName + ,OUString& _rsTableSchema + ,OUString& _rsTableCatalog ); virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); @@ -58,15 +58,15 @@ namespace dbaxml OXMLTable( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sServiceName + ,const OUString& _sServiceName ); virtual ~OXMLTable(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); }; diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 5e48f3742ada..de8e856ba182 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -37,7 +37,7 @@ namespace dbaxml using namespace ::com::sun::star::xml::sax; DBG_NAME(OXMLTableFilterList) -OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName ) +OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& _sLocalName ) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLTableFilterList,NULL); @@ -53,7 +53,7 @@ OXMLTableFilterList::~OXMLTableFilterList() SvXMLImportContext* OXMLTableFilterList::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & /*xAttrList*/ ) { SvXMLImportContext *pContext = 0; @@ -87,9 +87,9 @@ void OXMLTableFilterList::EndElement() if ( xDataSource.is() ) { if ( !m_aPatterns.empty() ) - xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aPatterns.begin()),m_aPatterns.size()))); + xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< OUString>(&(*m_aPatterns.begin()),m_aPatterns.size()))); if ( !m_aTypes.empty() ) - xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aTypes.begin()),m_aTypes.size()))); + xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< OUString>(&(*m_aTypes.begin()),m_aTypes.size()))); } } //---------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index 3f0fddb3995a..ea8e3d826a46 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -27,19 +27,19 @@ namespace dbaxml class ODBFilter; class OXMLTableFilterList : public SvXMLImportContext { - ::std::vector< ::rtl::OUString> m_aPatterns; - ::std::vector< ::rtl::OUString> m_aTypes; + ::std::vector< OUString> m_aPatterns; + ::std::vector< OUString> m_aTypes; ODBFilter& GetOwnImport(); public: OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLTableFilterList(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -48,7 +48,7 @@ namespace dbaxml @param _sTableFilterPattern The new filter pattern. */ - inline void pushTableFilterPattern(const ::rtl::OUString& _sTableFilterPattern) + inline void pushTableFilterPattern(const OUString& _sTableFilterPattern) { m_aPatterns.push_back(_sTableFilterPattern); } @@ -57,7 +57,7 @@ namespace dbaxml @param _sTypeFilter The new type filter. */ - inline void pushTableTypeFilter(const ::rtl::OUString& _sTypeFilter) + inline void pushTableTypeFilter(const OUString& _sTypeFilter) { m_aTypes.push_back(_sTypeFilter); } diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index c18528b27e65..2c8c0f6af2eb 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -29,7 +29,7 @@ DBG_NAME(OXMLTableFilterPattern) OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport, sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,sal_Bool _bNameFilter ,OXMLTableFilterList& _rParent) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -47,7 +47,7 @@ OXMLTableFilterPattern::~OXMLTableFilterPattern() DBG_DTOR(OXMLTableFilterPattern,NULL); } // ----------------------------------------------------------------------------- -void OXMLTableFilterPattern::Characters( const ::rtl::OUString& rChars ) +void OXMLTableFilterPattern::Characters( const OUString& rChars ) { if ( m_bNameFilter ) m_rParent.pushTableFilterPattern(rChars); diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index c6ee32db2d4b..8402cc846a1e 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -31,13 +31,13 @@ namespace dbaxml public: OXMLTableFilterPattern( SvXMLImport& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,sal_Bool _bNameFilter ,OXMLTableFilterList& _rParent); virtual ~OXMLTableFilterPattern(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 1b9e65595ab2..d8c29c57fc44 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -99,14 +99,14 @@ private: */ void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); - SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); - SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName ); + SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); protected: // SvXMLImport virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ODBFilter() throw(); diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 1dc576bf2723..613c9c9990a9 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -67,7 +67,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbaxml::OModuleRegistration::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } |