diff options
Diffstat (limited to 'connectivity/source/drivers/mozab')
50 files changed, 599 insertions, 604 deletions
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index 668a41f76993..06cf96816710 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -50,15 +50,15 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) void OCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; + OUString aName; while(xResult->next()) { aName = xRow->getString(3); diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index 871cbbf22a3a..cad5f7ed77ff 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -82,7 +82,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun:: }; for ( size_t i = 0; i < sizeof( s_pProgrammaticNames ) / sizeof( s_pProgrammaticNames[0] ); ++i ) - m_aAliasMap[ ::rtl::OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i ); + m_aAliasMap[ OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i ); initialize( _rxORB ); } @@ -100,19 +100,19 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su { //............................................................. Reference< XNameAccess > xAliasesNode; - xDriverNode->getPropertyValue( ::rtl::OUString("ColumnAliases") ) >>= xAliasesNode; + xDriverNode->getPropertyValue( OUString("ColumnAliases") ) >>= xAliasesNode; OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" ); // this is a set of string nodes - Sequence< ::rtl::OUString > aProgrammaticNames; + Sequence< OUString > aProgrammaticNames; if ( xAliasesNode.is() ) aProgrammaticNames = xAliasesNode->getElementNames(); //............................................................. // travel through all the set elements - const ::rtl::OUString* pProgrammaticNames = aProgrammaticNames.getConstArray(); - const ::rtl::OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength(); - ::rtl::OUString sAssignedAlias; + const OUString* pProgrammaticNames = aProgrammaticNames.getConstArray(); + const OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength(); + OUString sAssignedAlias; for ( ; pProgrammaticNames < pProgrammaticNamesEnd; ++pProgrammaticNames ) { @@ -123,7 +123,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su if ( sAssignedAlias.isEmpty() ) sAssignedAlias = *pProgrammaticNames; - ::rtl::OString sAsciiProgrammaticName( ::rtl::OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) ); + OString sAsciiProgrammaticName( OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) ); //............................................................. #if OSL_DEBUG_LEVEL > 0 bool bFound = false; @@ -158,21 +158,21 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su } //------------------------------------------------------------------ -::rtl::OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const ::rtl::OUString& _rAlias ) const +OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const { AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias ); if ( pos == m_aAliasMap.end() ) { OSL_FAIL( "OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias: no programmatic name for this alias!" ); - return ::rtl::OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 ); } return pos->second.programmaticAsciiName; } //------------------------------------------------------------------ -bool OColumnAlias::isColumnSearchable( const ::rtl::OUString _alias ) const +bool OColumnAlias::isColumnSearchable( const OUString _alias ) const { - ::rtl::OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); + OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); return ( !sProgrammatic.equals( "HomeCountry" ) && !sProgrammatic.equals( "WorkCountry" ) diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 2dd6c42a1a52..51946b410165 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx @@ -36,7 +36,7 @@ namespace connectivity public: struct AliasEntry { - ::rtl::OString programmaticAsciiName; + OString programmaticAsciiName; size_t columnPosition; AliasEntry() @@ -50,7 +50,7 @@ namespace connectivity { } }; - typedef ::boost::unordered_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap; + typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; private: AliasMap m_aAliasMap; @@ -58,16 +58,16 @@ namespace connectivity public: OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); - inline bool hasAlias( const ::rtl::OUString& _rAlias ) const + inline bool hasAlias( const OUString& _rAlias ) const { return m_aAliasMap.find( _rAlias ) != m_aAliasMap.end(); } - ::rtl::OString getProgrammaticNameOrFallbackToUTF8Alias( const ::rtl::OUString& _rAlias ) const; + OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const; inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); } - bool isColumnSearchable( const ::rtl::OUString _alias ) const; + bool isColumnSearchable( const OUString _alias ) const; private: void initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index 786280cbbe5e..a7c3b96c5758 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.cxx @@ -41,12 +41,12 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, sTableName, _rName); @@ -59,7 +59,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) if(xRow->getString(4) == _rName) { sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); + OUString sTypeName = xRow->getString(6); sal_Int32 nPrec = xRow->getInt(7); OColumn* pRet = new OColumn(_rName, diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx index d0ee122bae83..f841dd45b799 100644 --- a/connectivity/source/drivers/mozab/MColumns.hxx +++ b/connectivity/source/drivers/mozab/MColumns.hxx @@ -34,7 +34,7 @@ namespace connectivity protected: OTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OColumns( OTable* _pTable, diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index d71c6ece474b..2fabd5f97f90 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -46,7 +46,7 @@ namespace connectivity com::sun::star::configuration::theDefaultProvider::get( comphelper::getComponentContext( _rxORB ) ) ); - ::rtl::OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" ); + OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" ); sCompleteNodePath += OConnection::getDriverImplementationName(); //========================================================= @@ -54,14 +54,14 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - ::rtl::OUString("nodepath"), + OUString("nodepath"), 0, makeAny( sCompleteNodePath ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - ::rtl::OUString("depth"), + OUString("depth"), 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE @@ -70,7 +70,7 @@ namespace connectivity //========================================================= // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess" ), + OUString("com.sun.star.configuration.ConfigurationAccess" ), aArguments ); OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" ); @@ -111,10 +111,10 @@ namespace connectivity } //----------------------------------------------------------------- - ::rtl::OUString getDescription(const sal_Char* sNode,const ::rtl::OUString & sDefault) + OUString getDescription(const sal_Char* sNode,const OUString & sDefault) { - ::rtl::OUString sPreferredName; - ::rtl::OUString sDescription; + OUString sPreferredName; + OUString sDescription; Reference< XMultiServiceFactory > xFactory = getMozabServiceFactory(); OSL_ENSURE( xFactory.is(), "getPreferredProfileName: invalid service factory!" ); @@ -125,12 +125,12 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( OUString("ProfileName" ) ) >>= sPreferredName; if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii(sNode) ) >>= sDescription; + xMozPrefsNode->getPropertyValue( OUString::createFromAscii(sNode) ) >>= sDescription; if (sDescription.getLength() == 0) sDescription = sDefault; } @@ -144,9 +144,9 @@ namespace connectivity return sDescription; } //----------------------------------------------------------------- - ::rtl::OUString getPreferredProfileName( ) + OUString getPreferredProfileName( ) { - ::rtl::OUString sPreferredName; + OUString sPreferredName; Reference< XMultiServiceFactory > xFactory = getMozabServiceFactory(); OSL_ENSURE( xFactory.is(), "getPreferredProfileName: invalid service factory!" ); @@ -157,10 +157,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( OUString("ProfileName" ) ) >>= sPreferredName; } catch( const Exception& ) { @@ -178,7 +178,7 @@ namespace connectivity extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) { static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString sUserProfile; + static OUString sUserProfile; if ( !bReadConfig ) { sUserProfile = ::connectivity::mozab::getPreferredProfileName( ); @@ -191,15 +191,15 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usPabDescription; - static ::rtl::OString sPabDescription; + static OUString usPabDescription; + static OString sPabDescription; if ( !bReadConfig ) { usPabDescription = ::connectivity::mozab::getDescription( "PabDescription" , - ::rtl::OUString("Personal Address Book" )); - sPabDescription = ::rtl::OUStringToOString( usPabDescription, + OUString("Personal Address Book" )); + sPabDescription = OUStringToOString( usPabDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; } @@ -211,15 +211,15 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usHisDescription; - static ::rtl::OString sHisDescription; + static OUString usHisDescription; + static OString sHisDescription; if ( !bReadConfig ) { usHisDescription = ::connectivity::mozab::getDescription( "HisDescription" , - ::rtl::OUString("Collected Addresses" )); - sHisDescription = ::rtl::OUStringToOString( usHisDescription, + OUString("Collected Addresses" )); + sHisDescription = OUStringToOString( usHisDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; } diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 05cf2479153e..4345f5cf58f3 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -41,7 +41,7 @@ #include <comphelper/processfactory.hxx> #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -89,9 +89,9 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme ) return NULL; } // ----------------------------------------------------------------------------- -::rtl::OUString OConnection::getDriverImplementationName() +OUString OConnection::getDriverImplementationName() { - return rtl::OUString(MOZAB_DRIVER_IMPL_NAME); + return OUString(MOZAB_DRIVER_IMPL_NAME); } // ----------------------------------------------------------------------------- @@ -139,7 +139,7 @@ void SAL_CALL OConnection::release() throw() } // ----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { OSL_TRACE("IN OConnection::construct()" ); // open file @@ -151,11 +151,11 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV nLen = url.indexOf(':',nLen+1); OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); - ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); + OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme nLen = aAddrbookURI.indexOf(':'); - ::rtl::OUString aAddrbookScheme; - ::rtl::OUString sAdditionalInfo; + OUString aAddrbookScheme; + OUString sAdditionalInfo; if ( nLen == -1 ) { // There isn't any subschema: - but could be just subschema @@ -192,12 +192,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV // * for windows system address book // "sdbc:address:outlookexp:" -> aboutlookdirectory://oe/ // - m_sBindDN = rtl::OUString( ""); - m_sPassword = rtl::OUString( ""); + m_sBindDN = OUString( ""); + m_sPassword = OUString( ""); m_bUseSSL = sal_False; if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_MOZILLA ) ) == 0 ) { - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); m_eSDBCAddressType = SDBCAddress::Mozilla; if(!sAdditionalInfo.isEmpty()) m_sMozillaProfile = sAdditionalInfo; @@ -205,16 +205,16 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_THUNDERBIRD ) ) == 0 ) { //Yes. I am sure it is SCHEME_MOZILLA - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); m_eSDBCAddressType = SDBCAddress::ThunderBird; if(!sAdditionalInfo.isEmpty()) m_sMozillaProfile = sAdditionalInfo; } else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_LDAP ) ) == 0 ) { - rtl::OUString sBaseDN; + OUString sBaseDN; sal_Int32 nPortNumber = -1; - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_LDAP ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_LDAP ) ); m_eSDBCAddressType = SDBCAddress::LDAP; if ( m_sHostName.isEmpty() ) @@ -280,27 +280,27 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV throwSQLException( STR_NO_HOSTNAME, *this ); if ( nPortNumber > 0 ) { - m_sMozillaURI += rtl::OUString( ":" ); - m_sMozillaURI += rtl::OUString::valueOf( nPortNumber ); + m_sMozillaURI += OUString( ":" ); + m_sMozillaURI += OUString::valueOf( nPortNumber ); } if ( !sBaseDN.isEmpty() ) { - m_sMozillaURI += rtl::OUString( "/" ); + m_sMozillaURI += OUString( "/" ); m_sMozillaURI += sBaseDN; } else throwSQLException( STR_NO_BASEDN, *this ); // Addition of a fake query to enable the Mozilla LDAP directory to work correctly. - m_sMozillaURI += ::rtl::OUString( "?(or(DisplayName,=,DontDoThisAtHome)))"); + m_sMozillaURI += OUString( "?(or(DisplayName,=,DontDoThisAtHome)))"); } else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_OUTLOOK_MAPI ) ) == 0 ) { - m_sMozillaURI = ::rtl::OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_MAPI ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_MAPI ) ); m_eSDBCAddressType = SDBCAddress::Outlook; } else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_OUTLOOK_EXPRESS ) ) == 0 ) { - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_EXPRESS ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_EXPRESS ) ); m_eSDBCAddressType = SDBCAddress::OutlookExp; } else @@ -331,8 +331,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV } // Test connection by getting to get the Table Names - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > types; + ::std::vector< OUString > tables; + ::std::vector< OUString > types; if ( !_aDbHelper.getTableStrings( this, tables, types ) ) { throwSQLException( _aDbHelper.getError(), *this ); @@ -356,7 +356,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -373,7 +373,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException) { OSL_UNUSED( _sSql ); ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); @@ -381,7 +381,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -449,15 +449,15 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return sal_False; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { // return your current catalog - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) @@ -555,10 +555,10 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer OSL_ENSURE( ( _rError.getErrorCondition() == 0 ), "OConnection::throwSQLException: unsupported error code combination!" ); - ::rtl::OUString sParameter( _rError.getParameter() ); + OUString sParameter( _rError.getParameter() ); if ( !sParameter.isEmpty() ) { - const ::rtl::OUString sError( getResources().getResourceStringWithSubstitution( + const OUString sError( getResources().getResourceStringWithSubstitution( _rError.getResId(), "$1$", sParameter ) ); @@ -573,7 +573,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer if ( _rError.getErrorCondition() != 0 ) { SQLError aErrorHelper( comphelper::getComponentContext(getDriver()->getMSFactory()) ); - ::rtl::OUString sParameter( _rError.getParameter() ); + OUString sParameter( _rError.getParameter() ); if ( !sParameter.isEmpty() ) aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext, sParameter ); else diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 4bc92c9443f2..b9fe754779ff 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -110,23 +110,23 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; // Start of Additions from the land of mozilla OColumnAlias m_aColumnAlias; - rtl::OUString m_sMozillaURI; - rtl::OUString m_sMozillaProfile; + OUString m_sMozillaURI; + OUString m_sMozillaProfile; sal_Int32 m_nMaxResultRecords; MNameMapper* m_aNameMapper; //LDAP only - rtl::OUString m_sHostName; + OUString m_sHostName; sal_Bool m_bUseSSL; - rtl::OUString m_sBindDN; - rtl::OUString m_sUser; // the user name - rtl::OUString m_sPassword; + OUString m_sBindDN; + OUString m_sUser; // the user name + OUString m_sPassword; SDBCAddress::sdbc_address_type m_eSDBCAddressType; sal_Bool m_bForceLoadTable; public: - virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); OConnection(MozabDriver* _pDriver); virtual ~OConnection(); @@ -141,9 +141,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -152,8 +152,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -172,9 +172,9 @@ namespace connectivity // Additions from the land of mozilla - rtl::OUString getMozURI() const { return m_sMozillaURI; } - rtl::OUString getMozProfile() const { return m_sMozillaProfile; } - void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } + OUString getMozURI() const { return m_sMozillaURI; } + OUString getMozProfile() const { return m_sMozillaProfile; } + void setMozProfile(OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } ::com::sun::star::mozilla::MozillaProductType getProduct() { @@ -184,11 +184,11 @@ namespace connectivity } // Get Ldap BindDN (user name) - rtl::OUString getBindDN() const { return m_sBindDN; } + OUString getBindDN() const { return m_sBindDN; } // Get Ldap Password - rtl::OUString getPassword() const { return m_sPassword; } + OUString getPassword() const { return m_sPassword; } // Get Ldap Host name - rtl::OUString getHost() const { return m_sHostName; } + OUString getHost() const { return m_sHostName; } // Get whether use ssl to connect to ldap sal_Bool getUseSSL() const {return m_bUseSSL;} @@ -203,7 +203,7 @@ namespace connectivity const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } - static ::rtl::OUString getDriverImplementationName(); + static OUString getDriverImplementationName(); MNameMapper* getNameMapper(); void setForceLoadTables(sal_Bool aForce){ m_bForceLoadTable = aForce;} diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 8492941706ca..c9241a6c83bc 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -31,7 +31,7 @@ #include <vector> #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -72,8 +72,8 @@ ODatabaseMetaData::~ODatabaseMetaData() // ------------------------------------------------------------------------- ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException) + const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException) { static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); @@ -81,8 +81,8 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > types; + ::std::vector< OUString > tables; + ::std::vector< OUString > types; if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types) ) { getOwnConnection()->throwSQLException( m_pDbMetaDataHelper->getError(), *this ); } @@ -92,13 +92,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[1] = new ORowSetValueDecorator(OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[2] = new ORowSetValueDecorator(OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); + aRow[6] = new ORowSetValueDecorator(OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -120,7 +120,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); const OColumnAlias& colNames = m_pConnection->getColumnAlias(); @@ -153,9 +153,9 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( return( aRows ); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) @@ -286,21 +286,21 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); + return OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -638,52 +638,52 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)1); + OUString aValue = OUString::valueOf((sal_Int32)1); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)0); + OUString aValue = OUString::valueOf((sal_Int32)0); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -702,36 +702,36 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -851,23 +851,23 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) { // there exists no possibility to get table types so we have to check - static ::rtl::OUString sTableTypes[] = + static OUString sTableTypes[] = { - ::rtl::OUString("TABLE"), - ::rtl::OUString("VIEW") + OUString("TABLE"), + OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString("SYSTEM TABLE"), - // ::rtl::OUString("GLOBAL TEMPORARY"), - // ::rtl::OUString("LOCAL TEMPORARY"), - // ::rtl::OUString("ALIAS"), - // ::rtl::OUString("SYNONYM") + // OUString("SYSTEM TABLE"), + // OUString("GLOBAL TEMPORARY"), + // OUString("LOCAL TEMPORARY"), + // OUString("ALIAS"), + // OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; // here we fill the rows which should be visible when ask for data from the resultset returned here - const sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString); + const sal_Int32 nSize = sizeof(sTableTypes) / sizeof(OUString); ODatabaseMetaDataResultSet::ORows aRows; for(sal_Int32 i=0;i < nSize;++i) { @@ -895,7 +895,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -923,8 +923,8 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -935,8 +935,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -956,14 +956,14 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); Reference< XResultSet > xRef = pResult; - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > types; + ::std::vector< OUString > tables; + ::std::vector< OUString > types; if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types ) ) getOwnConnection()->throwSQLException( m_pDbMetaDataHelper->getError(), *this ); @@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[7] = new ::connectivity::ORowSetValueDecorator(OUString("NO")); // Iterate over all tables @@ -1010,7 +1010,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { return NULL; } diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 4d4cb0935ac1..5d56c82b2242 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -35,7 +35,7 @@ namespace connectivity OConnection* m_pConnection; MDatabaseMetaDataHelper* m_pDbMetaDataHelper; - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); + ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); protected: virtual ~ODatabaseMetaData(); @@ -48,9 +48,9 @@ namespace connectivity private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -66,17 +66,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -87,13 +87,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -119,9 +119,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -170,10 +170,10 @@ namespace connectivity virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -188,7 +188,7 @@ namespace connectivity virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 2aa7fdbc42b0..1e56e719ad12 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -80,34 +80,34 @@ void MozabDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(MOZAB_DRIVER_IMPL_NAME); + return OUString(MOZAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the mozab.xml // Please take care when changing it. } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL MozabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MozabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL MozabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MozabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -115,13 +115,13 @@ sal_Bool SAL_CALL MozabDriver::supportsService( const ::rtl::OUString& _rService } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL MozabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MozabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) return NULL; @@ -134,7 +134,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u { ::osl::MutexGuard aGuard(m_aMutex); //We must make sure we create an com.sun.star.mozilla.MozillaBootstrap brfore call any mozilla codes - Reference<XInterface> xInstance = m_xMSFactory->createInstance(::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap") ); + Reference<XInterface> xInstance = m_xMSFactory->createInstance(OUString( "com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); OConnection* pCon = reinterpret_cast<OConnection*>((*m_pCreationFunc)(this)); @@ -146,9 +146,9 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u else { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_LIB, - "$libname$", ::rtl::OUString( SVLIBRARY( "mozabdrv" ) ) + "$libname$", OUString( SVLIBRARY( "mozabdrv" ) ) ) ); ::dbtools::throwGenericSQLException(sError,*this); @@ -157,7 +157,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL MozabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) @@ -167,7 +167,7 @@ sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) return impl_classifyURL(url) != Unknown; } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) return Sequence< DriverPropertyInfo >(); @@ -179,23 +179,23 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rt ::std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("BaseDN") - ,::rtl::OUString("Base DN.") + OUString("BaseDN") + ,OUString("Base DN.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("MaxRowCount") - ,::rtl::OUString("Records (max.)") + OUString("MaxRowCount") + ,OUString("Records (max.)") ,sal_False - ,::rtl::OUString("100") - ,Sequence< ::rtl::OUString >()) + ,OUString("100") + ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); // if you have something special to say return it here :-) return Sequence< DriverPropertyInfo >(); @@ -211,22 +211,22 @@ sal_Int32 SAL_CALL MozabDriver::getMinorVersion( ) throw(RuntimeException) return 0; // depends on you } // -------------------------------------------------------------------------------- -EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url ) +EDriverType MozabDriver::impl_classifyURL( const OUString& url ) { // Skip 'sdbc:mozab: part of URL // sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); + OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme nLen = aAddrbookURI.indexOf(':'); - ::rtl::OUString aAddrbookScheme; + OUString aAddrbookScheme; if ( nLen == -1 ) { // There isn't any subschema: - but could be just subschema if ( !aAddrbookURI.isEmpty() ) aAddrbookScheme= aAddrbookURI; - else if(url == ::rtl::OUString("sdbc:address:") ) + else if(url == OUString("sdbc:address:") ) return Unknown; // TODO check else return Unknown; @@ -267,12 +267,12 @@ namespace _rFunction = NULL; if ( _rModule ) { - const ::rtl::OUString sSymbolName = ::rtl::OUString::createFromAscii( _pAsciiSymbolName ); + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getFunctionSymbol( _rModule, sSymbolName.pData ) ); if ( !_rFunction ) { // did not find the symbol - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ); aBuf.append( sSymbolName ); OSL_FAIL( aBuf.makeStringAndClear().getStr() ); @@ -293,7 +293,7 @@ bool MozabDriver::ensureInit() OSL_ENSURE(NULL == m_pCreationFunc, "MozabDriver::ensureInit: inconsistence: already have a factory function!"); - const ::rtl::OUString sModuleName(SVLIBRARY( "mozabdrv" )); + const OUString sModuleName(SVLIBRARY( "mozabdrv" )); // load the mozabdrv library m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index 2a1bd71b5431..75899a3e163b 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -74,18 +74,18 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); @@ -93,7 +93,7 @@ namespace connectivity & getMSFactory(void) const { return m_xMSFactory; } private: - EDriverType impl_classifyURL( const ::rtl::OUString& url ); + EDriverType impl_classifyURL( const OUString& url ); }; } diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index 971749d03cc0..346c6bda8ff1 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -33,7 +33,7 @@ #include "diagnose_ex.h" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -53,7 +53,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mozab.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); -OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql) +OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql) :OCommonStatement(_pConnection) ,m_nNumParams(0) ,m_sSqlStatement(sql) @@ -88,7 +88,7 @@ void SAL_CALL OPreparedStatement::disposing() } // ----------------------------------------------------------------------------- -OCommonStatement::StatementType OPreparedStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted ) +OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted ); @@ -189,7 +189,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -316,7 +316,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex* } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } @@ -412,7 +412,7 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere OSL_UNUSED( pMark ); #endif - ::rtl::OUString sParameterName; + OUString sParameterName; // set up Parameter-Column: sal_Int32 eType = DataType::VARCHAR; @@ -433,9 +433,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere } Reference<XPropertySet> xParaColumn = new connectivity::sdbcx::OColumn(sParameterName - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString() + ,OUString() + ,OUString() + ,OUString() ,nNullable ,nPrecision ,nScale @@ -444,9 +444,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere ,sal_False ,sal_False ,m_pSQLIterator->isCaseSensitive() - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString()); + ,OUString() + ,OUString() + ,OUString()); m_xParamColumns->get().push_back(xParaColumn); return nParameter; } @@ -457,7 +457,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) Reference<XPropertySet> xProp; if(SQL_ISRULE(_pNode,column_ref)) { - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; m_pSQLIterator->getColumnRange(_pNode,sColumnName,sTableRange); if(!sColumnName.isEmpty()) { diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 3d3b15ace898..4c6de31cef42 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -61,7 +61,7 @@ namespace connectivity //==================================================================== sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; sal_Bool m_bPrepared; ::rtl::Reference< OResultSet > m_pResultSet; @@ -78,7 +78,7 @@ namespace connectivity // OCommonStatement overridables virtual StatementType - parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); virtual void initializeResultSet( OResultSet* _pResult ); virtual void clearCachedResultSet(); virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ); @@ -96,7 +96,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // A ctor need for returning the object - OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql); + OPreparedStatement( OConnection* _pConnection,const OUString& sql); void lateInit(); //XInterface @@ -113,7 +113,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -121,7 +121,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 06ae1ca0fe1a..6f071dd0f0a1 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -42,7 +42,7 @@ #include "resource/common_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -61,24 +61,24 @@ using namespace com::sun::star::util; //------------------------------------------------------------------------------ // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString("com.sun.star.sdbcx.mozab.ResultSet"); + return OUString("com.sun.star.sdbcx.mozab.ResultSet"); } // ------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + ::com::sun::star::uno::Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -162,12 +162,12 @@ void OResultSet::methodEntry() if ( !m_pTable ) { OSL_FAIL( "OResultSet::methodEntry: looks like we're disposed, but how is this possible?" ); - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -412,7 +412,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -710,17 +710,17 @@ void SAL_CALL OResultSet::release() throw() } // ------------------------------------------------------------------------- -void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString ) +void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ) { OSL_ENSURE(pNode->count() > 0,"Error parsing parameter in Parse Tree"); OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString(""); + rMatchString = OUString(""); - rtl::OUString aParameterName; + OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString("?"); + aParameterName = OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -746,9 +746,9 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat void OResultSet::analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression) { - ::rtl::OUString columnName; + OUString columnName; MQueryOp::cond_type op( MQueryOp::Is ); - ::rtl::OUString matchString; + OUString matchString; if ( parseTree == NULL ) return; @@ -757,7 +757,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT ::rtl::Reference<OSQLColumns> xColumns = m_pSQLIterator->getParameters(); if(xColumns.is()) { - ::rtl::OUString aColName, aParameterValue; + OUString aColName, aParameterValue; OSQLColumns::Vector::iterator aIter = xColumns->get().begin(); sal_Int32 i = 1; for(;aIter != xColumns->get().end();++aIter) @@ -840,7 +840,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL) op = MQueryOp::IsNot; - ::rtl::OUString sTableRange; + OUString sTableRange; if(SQL_ISRULE(parseTree->getChild(0),column_ref)) m_pSQLIterator->getColumnRange(parseTree->getChild(0),columnName,sTableRange); else if(parseTree->getChild(0)->isToken()) @@ -898,7 +898,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT const sal_Unicode ALT_WILDCARD = '*'; const sal_Unicode MATCHCHAR = '_'; - ::rtl::OUString sTableRange; + OUString sTableRange; if(SQL_ISRULE(pColumn,column_ref)) m_pSQLIterator->getColumnRange(pColumn,columnName,sTableRange); @@ -917,12 +917,12 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // Determine where '%' character is... - if ( matchString.equals( ::rtl::OUString::valueOf( WILDCARD ) ) ) + if ( matchString.equals( OUString::valueOf( WILDCARD ) ) ) { // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString(""); + matchString = OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -941,8 +941,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT { // Relatively simple "%string%" - ie, contains... // Cut '%' from front and rear - matchString = matchString.replaceAt( 0, 1, rtl::OUString() ); - matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() ); + matchString = matchString.replaceAt( 0, 1, OUString() ); + matchString = matchString.replaceAt( matchString.getLength() -1 , 1, OUString() ); if (bNot) op = MQueryOp::DoesNotContain; @@ -965,17 +965,17 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT if ( matchString.indexOf ( WILDCARD ) == 0 ) { op = MQueryOp::EndsWith; - matchString = matchString.replaceAt( 0, 1, rtl::OUString()); + matchString = matchString.replaceAt( 0, 1, OUString()); } else if ( matchString.indexOf ( WILDCARD ) == matchString.getLength() -1 ) { op = MQueryOp::BeginsWith; - matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() ); + matchString = matchString.replaceAt( matchString.getLength() -1 , 1, OUString() ); } else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); + matchString = matchString.replaceAt( pos, 1,OUString(".*") ); op = MQueryOp::RegExp; } @@ -986,13 +986,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); + matchString = matchString.replaceAt( pos, 1, OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); + matchString = matchString.replaceAt( pos, 1, OUString(".") ); } op = MQueryOp::RegExp; @@ -1019,7 +1019,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else op = MQueryOp::DoesNotExist; - ::rtl::OUString sTableRange; + OUString sTableRange; m_pSQLIterator->getColumnRange(parseTree->getChild(0),columnName,sTableRange); queryExpression.getExpressions().push_back( new MQueryExpressionString( columnName, op )); @@ -1048,8 +1048,8 @@ void OResultSet::fillRowData() OSL_ENSURE(m_xColumns.is(), "Need the Columns!!"); OSQLColumns::Vector::const_iterator aIter = m_xColumns->get().begin(); - const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - ::rtl::OUString sName; + const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName; m_aAttributeStrings.clear(); m_aAttributeStrings.reserve(m_xColumns->get().size()); for (sal_Int32 i = 1; aIter != m_xColumns->get().end();++aIter, i++) @@ -1087,11 +1087,11 @@ void OResultSet::fillRowData() // For other types we stick to the old behaviour of using // card:nsIAbCard. OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement"); - ::rtl::OUString aStr; + OUString aStr; if (xConnection->isLDAP()) - aStr = ::rtl::OUString("PrimaryEmail"); + aStr = OUString("PrimaryEmail"); else - aStr = ::rtl::OUString("card:nsIAbCard"); + aStr = OUString("card:nsIAbCard"); eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) ); queryExpression.setExpressions( eVector ); @@ -1106,7 +1106,7 @@ void OResultSet::fillRowData() m_aQuery.setExpression( queryExpression ); - rtl::OUString aStr( m_pTable->getName() ); + OUString aStr( m_pTable->getName() ); m_aQuery.setAddressbook( aStr ); sal_Int32 rv = m_aQuery.executeQuery(xConnection); @@ -1350,12 +1350,12 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); Reference<XPropertySet> xTableColumn; - ::rtl::OUString sTableColumnName, sSelectColumnRealName; + OUString sTableColumnName, sSelectColumnRealName; - const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + const OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - ::std::vector< ::rtl::OUString> aColumnNames; + ::std::vector< OUString> aColumnNames; aColumnNames.reserve(_rxColumns->get().size()); OValueVector::Vector::iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column @@ -1371,7 +1371,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, if (xTableColumn.is()) xTableColumn->getPropertyValue(sName) >>= sTableColumnName; else - sTableColumnName = ::rtl::OUString(); + sTableColumnName = OUString(); // look if we have such a select column // TODO: would like to have a O(log n) search here ... @@ -1648,9 +1648,9 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) if ((m_nNewRow && nCurrentRow != m_nNewRow) || ( m_nUpdatedRow && m_nUpdatedRow != nCurrentRow)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COMMIT_ROW, - "$position$", ::rtl::OUString::valueOf(nCurrentRow) + "$position$", OUString::valueOf(nCurrentRow) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -1731,7 +1731,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } @@ -1780,9 +1780,9 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_UPDATEABLE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } // if (!::dbtools::implUpdateObject(this, columnIndex, x)) @@ -1793,9 +1793,9 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_UPDATEABLE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 584cb78f830d..1a56e0c655ec 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -154,7 +154,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -183,7 +183,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XResultSetUpdate virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -201,7 +201,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -230,10 +230,10 @@ protected: ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aColumnNames; + ::com::sun::star::uno::Sequence< OUString> m_aColumnNames; OValueRow m_aRow; OValueRow m_aParameterRow; - ::std::vector< ::rtl::OUString> m_aAttributeStrings; + ::std::vector< OUString> m_aAttributeStrings; sal_Int32 m_nParamIndex; sal_Bool m_bIsAlwaysFalseQuery; ::rtl::Reference<OKeySet> m_pKeySet; @@ -247,7 +247,7 @@ protected: ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; - void parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString ); + void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ); void fillRowData() throw( ::com::sun::star::sdbc::SQLException ); void analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression); diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index cecc0d5dad21..48a888d4316a 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx @@ -71,17 +71,17 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - ::rtl::OUString sColumnName; + OUString sColumnName; try { Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_QUERY_THROW ); @@ -94,30 +94,30 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th return sColumnName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return m_aTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { return getColumnName(column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- @@ -160,7 +160,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) { - ::rtl::OUString sColumnName( getColumnName( column ) ); + OUString sColumnName( getColumnName( column ) ); if ( !m_pTable || !m_pTable->getConnection() ) { diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx index eb9a5f90295d..9b227f5f6319 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx @@ -37,7 +37,7 @@ namespace connectivity class OResultSetMetaData : public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; + OUString m_aTableName; ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; OTable* m_pTable; sal_Bool m_bReadOnly; @@ -48,7 +48,7 @@ namespace connectivity // a constructor that is needed to return the object: // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, - const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly + const OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly ) :m_aTableName(_aTableName) ,m_xColumns(_rxColumns) @@ -70,19 +70,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 725a68197fec..44b8b26f272c 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -26,7 +26,6 @@ #include <tools/solar.h> using namespace connectivity::mozab; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; @@ -84,7 +83,7 @@ struct ProviderRequest typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { - const ::rtl::OUString sModuleName(SVLIBRARY( "mozabdrv" )); + const OUString sModuleName(SVLIBRARY( "mozabdrv" )); // load the dbtools library oslModule s_hModule = osl_loadModuleRelative( @@ -95,7 +94,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString( "OMozillaBootstrap_CreateInstance"); + const OUString sFactoryCreationFunc = OUString( "OMozillaBootstrap_CreateInstance"); // reinterpret_cast<OMozabConnection_CreateInstanceFunction> removed GNU C OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData); @@ -130,8 +129,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory( } else if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); aReq.CREATE_PROVIDER( aImplName, aSNS, diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 9f6b2d5420d6..431844fbe30a 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -48,7 +48,7 @@ #include "resource/common_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -143,22 +143,22 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) { const OSQLTables& xTabs = m_pSQLIterator->getTables(); OSL_ENSURE( !xTabs.empty(), "Need a Table"); - ::rtl::OUString ouTableName=xTabs.begin()->first; + OUString ouTableName=xTabs.begin()->first; xCreateColumn = m_pSQLIterator->getCreateColumns(); OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!"); const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin(); - const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - ::rtl::OUString sName; + const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName; for (sal_Int32 i = 1; aIter != xCreateColumn->get().end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; if ( !aColumnAlias.hasAlias( sName ) ) { - const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", sName ) ); @@ -179,10 +179,10 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); } // ------------------------------------------------------------------------- -OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted) +OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted) throw ( SQLException, RuntimeException ) { - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); @@ -242,7 +242,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo" // So we append ("E-mail" varchar) to the last of it to make it work { - return parseSql(sql + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); + return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); @@ -305,7 +305,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -318,7 +318,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw( } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_ThreadMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -351,7 +351,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this ); return 0; @@ -384,7 +384,7 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc Sequence< Property > aProps(9); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); @@ -529,7 +529,7 @@ void OCommonStatement::analyseSQL() void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { - ::rtl::OUString aColumnName; + OUString aColumnName; if (pColumnRef->count() == 1) aColumnName = pColumnRef->getChild(0)->getTokenValue(); else if (pColumnRef->count() == 3) diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 233873ded588..0e91ac29bec0 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -75,7 +75,7 @@ namespace connectivity // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; OTable* m_pTable; OConnection* m_pConnection; // The owning Connection object @@ -122,7 +122,7 @@ namespace connectivity /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ virtual StatementType - parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); @@ -167,9 +167,9 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index 025cc9d6bf8e..4abecfa5ba64 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, - const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description ) + const OUString& _Name, const OUString& _Type, const OUString& _Description ) :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description ) ,m_pConnection( _pConnection ) { diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index d6211df05bf2..37c7936b243f 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.hxx @@ -37,16 +37,16 @@ namespace connectivity public: OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description ); + const OUString& _Name, + const OUString& _Type, + const OUString& _Description ); OConnection* getConnection() { return m_pConnection;} sal_Bool isReadOnly() const { return sal_False; } - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } // OTableHelper overridables virtual sdbcx::OCollection* createColumns( const TStringVector& _rNames ); diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index dd6f93bfd3a6..be6239457d0b 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -44,14 +44,14 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OTables::createObject(const OUString& _rName) { - ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString("%"); + OUString aName,aSchema; + aSchema = OUString("%"); aName = _rName; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index e2d907a9cd8c..8a3b8e918fa4 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.hxx @@ -30,7 +30,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // OCatalog* m_pParent; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 27d328a113cd..b91bb0e7e433 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -72,7 +72,7 @@ void MozillaBootstrap::Init() (void)aProfileExists; /* avoid warning about unused parameter */ #endif m_ProfileAccess = new ProfileAccess(); - bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString()); + bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString()); } // -------------------------------------------------------------------------------- @@ -84,32 +84,32 @@ void MozillaBootstrap::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException) +OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(MOZAB_MozillaBootstrap_IMPL_NAME); + return OUString(MOZAB_MozillaBootstrap_IMPL_NAME); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -117,7 +117,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rSe } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -128,29 +128,29 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( { return m_ProfileAccess->getProfileCount(product); } -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getProfileList(product,list); } -::rtl::OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getDefaultProfile(product); } -::rtl::OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getProfilePath(product,profileName); } -::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->isProfileLocked(product,profileName); } -::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getProfileExists(product,profileName); } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->bootupProfile(product,profileName); @@ -176,12 +176,12 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( return ::com::sun::star::mozilla::MozillaProductType_Default; #endif } -::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->getCurrentProfile(); #else - return ::rtl::OUString(); + return OUString(); #endif } ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException) @@ -192,14 +192,14 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( return true; #endif } -::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->setCurrentProfile(product,profileName); #else (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ - return ::rtl::OUString(); + return OUString(); #endif } @@ -207,8 +207,8 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER - ::rtl::OUString profileName = aCode->getProfileName(); - ::rtl::OUString currProfileName = getCurrentProfile(); + OUString profileName = aCode->getProfileName(); + OUString currProfileName = getCurrentProfile(); ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct(); //if client provides a profileName, we will use it @@ -246,12 +246,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory if (pServiceManager) { - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString aImplName( OUString::createFromAscii( pImplementationName ) ); Reference< XSingleServiceFactory > xFactory; if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); xFactory = ::cppu::createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pServiceManager), diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index b96838f4280e..05ac65bab150 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -53,31 +53,31 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XMozillaBootstrap // XProfileDiscover virtual ::sal_Int32 SAL_CALL getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); // XProfileManager - virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); // XProxyRunner virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 561b1ce5afab..029d9e39be67 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -42,10 +42,10 @@ using namespace ::com::sun::star::mozilla; namespace { // ------------------------------------------------------------------- - static ::rtl::OUString lcl_getUserDataDirectory() + static OUString lcl_getUserDataDirectory() { ::osl::Security aSecurity; - ::rtl::OUString aConfigPath; + OUString aConfigPath; #if defined(XP_WIN) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); @@ -56,7 +56,7 @@ namespace aSecurity.getHomeDir( aConfigPath ); #endif - return aConfigPath + ::rtl::OUString("/"); + return aConfigPath + OUString("/"); } // ------------------------------------------------------------------- @@ -88,26 +88,26 @@ namespace }; // ------------------------------------------------------------------- - static ::rtl::OUString lcl_guessProfileRoot( MozillaProductType _product ) + static OUString lcl_guessProfileRoot( MozillaProductType _product ) { size_t productIndex = _product - 1; - static ::rtl::OUString s_productDirectories[NB_PRODUCTS]; + static OUString s_productDirectories[NB_PRODUCTS]; if ( s_productDirectories[ productIndex ].isEmpty() ) { - ::rtl::OUString sProductPath; + OUString sProductPath; // check whether we have an anevironment variable which helps us const char* pProfileByEnv = getenv( ProductRootEnvironmentVariable[ productIndex ] ); if ( pProfileByEnv ) { - sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); + sProductPath = OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); // asume that this is fine, no further checks } else { - ::rtl::OUString sProductDirCandidate; + OUString sProductDirCandidate; const char* pProfileRegistry = "profiles.ini"; // check all possible candidates @@ -117,11 +117,11 @@ namespace break; sProductDirCandidate = lcl_getUserDataDirectory() + - ::rtl::OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] ); + OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] ); // check existence ::osl::DirectoryItem aRegistryItem; - ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + ::rtl::OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); + ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); if ( result == ::osl::FileBase::E_None ) { ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate ); @@ -145,10 +145,10 @@ namespace } // ----------------------------------------------------------------------- -::rtl::OUString getRegistryDir(MozillaProductType product) +OUString getRegistryDir(MozillaProductType product) { if (product == MozillaProductType_Default) - return ::rtl::OUString(); + return OUString(); return lcl_guessProfileRoot( product ); } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index 609d0ea24e89..552fc2bc3d01 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -27,7 +27,7 @@ #include <rtl/ustring.hxx> -::rtl::OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); +OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); #endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index e6941bcc5bad..7f078a776e94 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -30,13 +30,10 @@ #include <stdio.h> #endif -using ::rtl::OUString; -using ::rtl::OString; - struct ini_NameValue { - rtl::OUString sName; - rtl::OUString sValue; + OUString sName; + OUString sValue; inline ini_NameValue() SAL_THROW(()) {} @@ -53,10 +50,10 @@ typedef std::list< struct ini_Section { - rtl::OUString sName; + OUString sName; NameValueList lList; }; -typedef std::map<rtl::OUString, +typedef std::map<OUString, ini_Section >IniSectionMap; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 09d665bde55f..f432f33b46f4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -114,9 +114,9 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) { nsCOMPtr<nsILocalFile> binDir; // Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2() - rtl::OUString path1("$BRAND_BASE_DIR/program"); + OUString path1("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(path1); - rtl::OString path2; + OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == osl::FileBase::E_None) && path1.convertToString( diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index cf9bb13b3dd9..9e91043dd41a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::mozilla; -using ::rtl::OUString; // Interfaces Needed @@ -62,7 +61,7 @@ nsProfile::nsProfile() Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); @@ -135,7 +134,7 @@ NS_IMETHODIMP nsProfile::GetProfileList(PRUint32 *length, PRUnichar ***profileNa NS_ENSURE_ARG_POINTER(profileNames); *profileNames = nsnull; - ::com::sun::star::uno::Sequence< ::rtl::OUString > list; + ::com::sun::star::uno::Sequence< OUString > list; *length = xMozillaBootstrap->getProfileList(xMozillaBootstrap->getCurrentProduct(),list); @@ -182,7 +181,7 @@ nsProfile::GetCurrentProfile(PRUnichar **profileName) *profileName = (PRUnichar *)nsMemory::Clone(mCurrentProfileName.get(),(mCurrentProfileName.Length() + 1) * sizeof(PRUnichar )); else { - rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(xMozillaBootstrap->getCurrentProduct()); + OUString profile = xMozillaBootstrap->getDefaultProfile(xMozillaBootstrap->getCurrentProduct()); *profileName = (PRUnichar *)nsMemory::Clone(profile.getStr(),( profile.getLength() + 1) * sizeof(PRUnichar )); SetCurrentProfile(*profileName); } @@ -451,7 +450,7 @@ NS_IMETHODIMP nsProfile::GetProfileDir(const PRUnichar *profileName, nsIFile **p *profileDir = nsnull; // PRUnichar != sal_Unicode in mingw - rtl::OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only<const sal_Unicode *>(profileName)); + OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only<const sal_Unicode *>(profileName)); nsCOMPtr<nsILocalFile> localFile; // PRUnichar != sal_Unicode in mingw diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 8640ba11bd41..6338eff8b4da 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -85,9 +85,9 @@ namespace connectivity { namespace mozab { - ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, + ProfileStruct::ProfileStruct(MozillaProductType aProduct,OUString aProfileName, #ifdef MINIMAL_PROFILEDISCOVER - const ::rtl::OUString& aProfilePath + const OUString& aProfilePath #else nsILocalFile * aProfilePath #endif @@ -97,7 +97,7 @@ namespace connectivity profileName = aProfileName; profilePath = aProfilePath; } - ::rtl::OUString ProfileStruct::getProfilePath() + OUString ProfileStruct::getProfilePath() { #ifdef MINIMAL_PROFILEDISCOVER return profilePath; @@ -106,12 +106,12 @@ namespace connectivity { nsAutoString path; nsresult rv = profilePath->GetPath(path); - NS_ENSURE_SUCCESS(rv, ::rtl::OUString()); + NS_ENSURE_SUCCESS(rv, OUString()); // PRUnichar != sal_Unicode in mingw - return ::rtl::OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(path.get())); + return OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(path.get())); } else - return ::rtl::OUString(); + return OUString(); #endif } @@ -145,9 +145,9 @@ namespace connectivity #ifndef MINIMAL_PROFILEDISCOVER nsresult rv; #endif - ::rtl::OUString regDir = getRegistryDir(product); - ::rtl::OUString profilesIni( regDir ); - profilesIni += ::rtl::OUString("profiles.ini"); + OUString regDir = getRegistryDir(product); + OUString profilesIni( regDir ); + profilesIni += OUString("profiles.ini"); IniParser parser( profilesIni ); IniSectionMap &mAllSection = *(parser.getAllSection()); @@ -156,10 +156,10 @@ namespace connectivity for(;iBegin != iEnd;++iBegin) { ini_Section *aSection = &(*iBegin).second; - ::rtl::OUString profileName; - ::rtl::OUString profilePath; - ::rtl::OUString sIsRelative; - ::rtl::OUString sIsDefault; + OUString profileName; + OUString profilePath; + OUString sIsRelative; + OUString sIsDefault; for(NameValueList::iterator itor=aSection->lList.begin(); itor != aSection->lList.end(); @@ -213,7 +213,7 @@ namespace connectivity } if (NS_FAILED(rv)) continue; #else - rtl::OUString fullProfilePath; + OUString fullProfilePath; if(isRelative) { fullProfilePath = regDir + profilePath; @@ -247,14 +247,14 @@ namespace connectivity return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { //Profile not found - return ::rtl::OUString(); + return OUString(); } else return m_Product.mProfileList[profileName]->getProfilePath(); @@ -266,7 +266,7 @@ namespace connectivity ProductStruct &m_Product = m_ProductProfileList[index]; return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; @@ -284,7 +284,7 @@ namespace connectivity return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; @@ -296,7 +296,7 @@ namespace connectivity if (m_Product.mProfileList.empty()) { //there are not any profiles - return ::rtl::OUString(); + return OUString(); } ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; return aProfile->getProfileName(); @@ -361,14 +361,14 @@ namespace connectivity } #endif - ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifdef MINIMAL_PROFILEDISCOVER (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return sal_True; #else - ::rtl::OUString path = getProfilePath(product,profileName); + OUString path = getProfilePath(product,profileName); if (path.isEmpty()) return sal_True; @@ -395,7 +395,7 @@ namespace connectivity #endif } - ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index ffdb9ecf53d9..7a4afef4dd29 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -43,7 +43,7 @@ namespace connectivity class ProfileStruct; } } -typedef ::std::map < ::rtl::OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; +typedef ::std::map < OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; namespace connectivity { namespace mozab @@ -51,24 +51,24 @@ namespace connectivity class ProfileStruct { public: - ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, + ProfileStruct(MozillaProductType aProduct,OUString aProfileName, #ifdef MINIMAL_PROFILEDISCOVER - const ::rtl::OUString &aProfilePath + const OUString &aProfilePath #else nsILocalFile * aProfilePath #endif ); MozillaProductType getProductType() { return product;} - ::rtl::OUString getProfileName(){ return profileName;} - ::rtl::OUString getProfilePath() ; + OUString getProfileName(){ return profileName;} + OUString getProfilePath() ; #ifndef MINIMAL_PROFILEDISCOVER nsILocalFile *getProfileLocal(){ return profilePath;} #endif protected: MozillaProductType product; - ::rtl::OUString profileName; + OUString profileName; #ifdef MINIMAL_PROFILEDISCOVER - ::rtl::OUString profilePath; + OUString profilePath; #else nsCOMPtr<nsILocalFile> profilePath; #endif @@ -77,9 +77,9 @@ namespace connectivity class ProductStruct { public: - void setCurrentProfile(::rtl::OUString aProfileName){mCurrentProfileName = aProfileName;} + void setCurrentProfile(OUString aProfileName){mCurrentProfileName = aProfileName;} - ::rtl::OUString mCurrentProfileName; + OUString mCurrentProfileName; ProfileList mProfileList; }; @@ -91,12 +91,12 @@ namespace connectivity virtual ~ProfileAccess(); ProfileAccess(); - ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); + OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx index 8615e2edb071..45999d06a4f0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx @@ -41,7 +41,7 @@ namespace connectivity ,aProfile(NULL) { } - ::sal_Int32 ProfileManager::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 ProfileManager::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { if (!aProfile) { @@ -60,22 +60,22 @@ namespace connectivity { return m_CurrentProduct; } - ::rtl::OUString ProfileManager::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileManager::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) { nsresult rv; nsCOMPtr<nsIProfile> theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv)); - if (NS_FAILED(rv)) return ::rtl::OUString(); + if (NS_FAILED(rv)) return OUString(); nsXPIDLString currentProfileStr; //call GetCurrentProfile before call SetCurrentProfile will get the default profile rv = theProfile->GetCurrentProfile(getter_Copies(currentProfileStr)); if (NS_FAILED(rv) || currentProfileStr.get() == nsnull) - return ::rtl::OUString(); + return OUString(); // PRUnichar != sal_Unicode in mingw - return ::rtl::OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(currentProfileStr.get())); + return OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(currentProfileStr.get())); } - ::rtl::OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString currentProfile = getCurrentProfile(); + OUString currentProfile = getCurrentProfile(); //if profileName not given, then skip and return curernt profile if (profileName.isEmpty() && m_CurrentProduct == product) return currentProfile; @@ -88,13 +88,13 @@ namespace connectivity //get profile mozilla profile service nsresult rv; nsCOMPtr<nsIProfile> theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv)); - if (NS_FAILED(rv)) return ::rtl::OUString(); + if (NS_FAILED(rv)) return OUString(); // PRUnichar != sal_Unicode in mingw const PRUnichar* pUsedProfile = reinterpret_cast_mingw_only<const PRUnichar *>(profileName.getStr()); //set current profile rv = theProfile->SetCurrentProfile( pUsedProfile ); - if (NS_FAILED(rv)) return ::rtl::OUString(); + if (NS_FAILED(rv)) return OUString(); return currentProfile; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx index ae752de5f09c..3a93c3b682aa 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx @@ -46,11 +46,11 @@ namespace connectivity virtual ~ProfileManager(); ProfileManager(); - ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; + ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException) ; ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException) ; - ::rtl::OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) ; - ::rtl::OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; + OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) ; + OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; protected: ::com::sun::star::mozilla::MozillaProductType m_CurrentProduct; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 23a721742b63..35e625d53898 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -58,7 +58,7 @@ static ::osl::Mutex m_aMetaMutex; #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0; @@ -200,7 +200,7 @@ static nsresult insertPABDescription() // ------------------------------------------------------------------------- // Case where we get a parent uri, and need to list its children. -static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **aSubs) +static nsresult getSubsFromParent(const OString& aParent, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } @@ -218,7 +218,7 @@ static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **a nsCOMPtr<nsIRDFDataSource> rdfDirectory ; - rtl::OString dir("rdf:addressdirectory"); + OString dir("rdf:addressdirectory"); retCode = rdfService->GetDataSource(dir.getStr(),getter_AddRefs(rdfDirectory)) ; @@ -267,7 +267,7 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array) } // Case where we get a factory uri and need to have it build the directories. -static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator **aSubs) +static nsresult getSubsFromFactory(const OString& aFactory, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } *aSubs = nsnull ; @@ -299,7 +299,7 @@ static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator * } // Case where the uri itself is the directory we're looking for. -static nsresult getSubsFromURI(const rtl::OString& aUri, nsIEnumerator **aSubs) +static nsresult getSubsFromURI(const OString& aUri, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } *aSubs = nsnull ; @@ -370,8 +370,8 @@ namespace } nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap, - ::std::vector< ::rtl::OUString >* _rStrings, - ::std::vector< ::rtl::OUString >* _rTypes, + ::std::vector< OUString >* _rStrings, + ::std::vector< OUString >* _rTypes, sal_Int32* pErrorId ) { if (!sAbURI || !nmap || !_rStrings || !_rTypes || !pErrorId) @@ -408,7 +408,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp PRUnichar *name = nsnull; PRBool bIsMailList = PR_FALSE; - ::rtl::OUString aTableName; + OUString aTableName; nsCOMPtr<nsIRDFService> rdfService(do_GetService(kRDFServiceCID, &rv)) ; NS_ENSURE_SUCCESS(rv, rv) ; @@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp // Insert table into map if ( aTableName.isEmpty() ) - aTableName = rtl::OUString("AddressBook"); + aTableName = OUString("AddressBook"); OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); @@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp //map mailing lists as views _rStrings->push_back( aTableName ); // Table name if (!bIsMailList) { - ::rtl::OUString aTableType(::rtl::OUString("TABLE")); + OUString aTableType(OUString("TABLE")); _rTypes->push_back( aTableType ); // Table type } else { - ::rtl::OUString aTableType(::rtl::OUString("VIEW")); + OUString aTableType(OUString("VIEW")); _rTypes->push_back( aTableType ); // Table type } } @@ -469,12 +469,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp return( NS_OK ); } sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, - ::std::vector< ::rtl::OUString >& _rStrings, - ::std::vector< ::rtl::OUString >& _rTypes) + ::std::vector< OUString >& _rStrings, + ::std::vector< OUString >& _rTypes) { sal_Bool bGivenURI; - ::rtl::OUString sAbURI; - ::rtl::OString sAbURIString; + OUString sAbURI; + OString sAbURIString; OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)", _pCon, _pCon->getForceLoadTables()?"True":"False" ); @@ -495,7 +495,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* if ( sAbURI.isEmpty() ) bGivenURI = sal_False; else { - sAbURIString = ::rtl::OUStringToOString( sAbURI, + sAbURIString = OUStringToOString( sAbURI, RTL_TEXTENCODING_ASCII_US); bGivenURI = sal_True; } @@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* Reference<XMozillaBootstrap> xMozillaBootstrap; Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); m_bProfileExists = sal_False; @@ -609,8 +609,8 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* } sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, - const ::rtl::OUString& tableNamePattern, - const Sequence< ::rtl::OUString >& types, + const OUString& tableNamePattern, + const Sequence< OUString >& types, ODatabaseMetaDataResultSet::ORows& _rRows) { @@ -622,9 +622,9 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well aRows.clear(); - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > tabletypes; - ::rtl::OUString matchAny = rtl::OUString("%"); + ::std::vector< OUString > tables; + ::std::vector< OUString > tabletypes; + OUString matchAny = OUString("%"); if ( !getTableStrings( _pCon, tables,tabletypes ) ) return sal_False; @@ -632,8 +632,8 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, for ( size_t i = 0; i < tables.size(); i++ ) { ODatabaseMetaDataResultSet::ORow aRow(3); - ::rtl::OUString aTableName = tables[i]; - ::rtl::OUString aTableType = tabletypes[i]; + OUString aTableName = tables[i]; + OUString aTableType = tabletypes[i]; OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); @@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, 0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() || 0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) { if ( aTableName.isEmpty() ) { - aTableName = rtl::OUString("AddressBook"); + aTableName = OUString("AddressBook"); } OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) ); @@ -668,9 +668,9 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) const sal_Char* MOZ_SCHEMA = "moz-abldapdirectory://"; const sal_Char* LDAP_SCHEMA = "ldap://"; - rtl::OString sAbURI; - rtl::OUString sAbBindDN; - rtl::OUString sAbPassword; + OString sAbURI; + OUString sAbBindDN; + OUString sAbPassword; sal_Bool useSSL = _pCon->getUseSSL(); nsresult rv(0); @@ -682,13 +682,13 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Int32 pos = sAbURI.indexOf( MOZ_SCHEMA ); if ( pos != -1 ) { - sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) ); + sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), OString(LDAP_SCHEMA) ); } pos = sAbURI.indexOf( QUERY_CHAR ); if ( pos != -1 ) { sal_Int32 len = sAbURI.getLength(); - sAbURI = sAbURI.replaceAt( pos, len - pos, ::rtl::OString("") ); + sAbURI = sAbURI.replaceAt( pos, len - pos, OString("") ); } const sal_Unicode* bindDN=nsnull; if (!sAbBindDN.isEmpty()) @@ -705,7 +705,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) args.arg4 = (void*)&useSSL; MNSMozabProxy xMProxy; - rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() ); + rv = xMProxy.StartProxy( &args, m_ProductType, OUString() ); if ( NS_SUCCEEDED( rv ) ) //Init LDAP,pass OUString() to StarProxy to ignore profile switch { args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; @@ -713,7 +713,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Int32 times=0; while ( times++ < 30 ) { - rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() ); + rv = xMProxy.StartProxy( &args, m_ProductType, OUString() ); if ( NS_SUCCEEDED( rv ) ) // connected successfully break; @@ -730,7 +730,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) return NS_SUCCEEDED( rv ) ? sal_True : sal_False; } -sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName) +sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const OUString & aTableName) { sal_Bool bIsMozillaAB; @@ -759,19 +759,19 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl: } else if (NS_FAILED(rv)) { - m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, ::rtl::OUString::valueOf( sal_Int32(rv), 16 ) ); + m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, OUString::valueOf( sal_Int32(rv), 16 ) ); } OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()" ); return( NS_SUCCEEDED(rv) ? sal_True : sal_False ); } -nsresult NewAddressBook(const ::rtl::OUString * aName) +nsresult NewAddressBook(const OUString * aName) { if (isProfileLocked(NULL)) return NS_ERROR_FILE_IS_LOCKED; nsresult rv; nsCOMPtr<nsIAbDirectoryProperties> aProperties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &rv); NS_ENSURE_ARG_POINTER(aProperties); - const ::rtl::OUString& uName = *aName; + const OUString& uName = *aName; nsString nsName; MTypeConverter::ouStringToNsString(uName,nsName); aProperties->SetDescription(nsName); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 284ee9ab1694..4aa86de5bf92 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx @@ -37,10 +37,10 @@ namespace connectivity { private: sal_Bool m_bProfileExists ; - ::std::vector< ::rtl::OUString > m_aTableNames; - ::std::vector< ::rtl::OUString > m_aTableTypes; + ::std::vector< OUString > m_aTableNames; + ::std::vector< OUString > m_aTableTypes; ::com::sun::star::mozilla::MozillaProductType m_ProductType; - ::rtl::OUString m_ProfileName; + OUString m_ProfileName; ErrorDescriptor m_aError; public: @@ -49,15 +49,15 @@ namespace connectivity // sal_Bool getTableStrings( OConnection* _pCon, - ::std::vector< ::rtl::OUString >& _rStrings, - ::std::vector< ::rtl::OUString >& _rTypes); + ::std::vector< OUString >& _rStrings, + ::std::vector< OUString >& _rTypes); sal_Bool getTables( OConnection* _pCon, - const ::rtl::OUString& tableNamePattern, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types, + const OUString& tableNamePattern, + const ::com::sun::star::uno::Sequence< OUString >& types, ODatabaseMetaDataResultSet::ORows& _rRows); sal_Bool testLDAPConnection( OConnection* _pCon ); - sal_Bool NewAddressBook( OConnection* _pCon,const ::rtl::OUString & aTableName); + sal_Bool NewAddressBook( OConnection* _pCon,const OUString & aTableName); inline const ErrorDescriptor& getError() const { return m_aError; } }; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx index c7739c935c6b..61ec08337514 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx @@ -31,7 +31,7 @@ namespace connectivity private: sal_uInt16 m_nErrorResourceId; sal_Int32 m_nErrorCondition; - ::rtl::OUString m_sParameter; + OUString m_sParameter; public: ErrorDescriptor() @@ -41,7 +41,7 @@ namespace connectivity { } - inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const ::rtl::OUString& _rParam ) + inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const OUString& _rParam ) { m_nErrorResourceId = _nErrorResourceId; m_nErrorCondition = _nErrorCondition; @@ -59,7 +59,7 @@ namespace connectivity inline sal_uInt16 getResId() const { return m_nErrorResourceId; } inline sal_Int32 getErrorCondition() const { return m_nErrorCondition; } - inline const ::rtl::OUString& getParameter() const { return m_sParameter; } + inline const OUString& getParameter() const { return m_sParameter; } inline bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); } }; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index fd5e15c51551..add19e6852ba 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -62,7 +62,7 @@ namespace connectivity { namespace mozab { } }; - typedef ::boost::unordered_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes; + typedef ::boost::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes; #define DEF_CARD_ACCESS( PropertyName ) \ &nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName @@ -122,7 +122,7 @@ namespace connectivity { namespace mozab { const MapEntry* loop = aEntries; while ( loop->pAsciiPropertyName ) { - aMap[ ::rtl::OString( loop->pAsciiPropertyName ) ] = + aMap[ OString( loop->pAsciiPropertyName ) ] = CardPropertyData( loop->pAsciiAttrributeList, loop->PropGetter, loop->PropSetter ); ++loop; } @@ -158,7 +158,7 @@ namespace connectivity { namespace mozab { // ------------------------------------------------------------------- NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval) { - ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); + OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty ); @@ -188,7 +188,7 @@ namespace connectivity { namespace mozab { // ------------------------------------------------------------------- NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval) { - ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); + OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty ); @@ -200,7 +200,7 @@ namespace connectivity { namespace mozab { else { sal_Int32 tokenPos(0); - ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList ); + OString sAttributeList( pos->second.pLDAPAttributeList ); MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval ); } @@ -231,7 +231,7 @@ namespace connectivity { namespace mozab { { const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); - ::rtl::OStringBuffer aAllAttributes; + OStringBuffer aAllAttributes; for ( MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin(); loop != rPropertyMap.end(); ++loop @@ -277,8 +277,8 @@ namespace connectivity { namespace mozab { ) { // split the list of attributes for the current property - ::rtl::OString sAttributeList( prop->second.pLDAPAttributeList ); - ::rtl::OString sAttribute; + OString sAttributeList( prop->second.pLDAPAttributeList ); + OString sAttribute; sal_Int32 tokenPos = 0; while ( tokenPos != -1 ) @@ -352,7 +352,7 @@ namespace connectivity { namespace mozab { { _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown ); - ::rtl::OUString resultValue; + OUString resultValue; const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); for ( MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin(); @@ -395,7 +395,7 @@ namespace connectivity { namespace mozab { void MLdapAttributeMap::fillResultFromCard( MQueryHelperResultEntry& _result, nsIAbCard& _card ) { nsXPIDLString value; - ::rtl::OUString resultValue; + OUString resultValue; const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); for ( MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin(); @@ -422,7 +422,7 @@ namespace connectivity { namespace mozab { { if ( format == pMailFormatType->formatType ) { - resultValue = ::rtl::OUString::createFromAscii( pMailFormatType->description ); + resultValue = OUString::createFromAscii( pMailFormatType->description ); break; } ++pMailFormatType; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 305b0da6ccf3..b086571a2e1b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -53,7 +53,7 @@ using namespace connectivity::mozab; /* Implementation file */ static ::osl::Mutex m_aThreadMutex; -extern nsresult NewAddressBook(const ::rtl::OUString * aName); +extern nsresult NewAddressBook(const OUString * aName); MNSMozabProxy::MNSMozabProxy() @@ -69,7 +69,7 @@ MNSMozabProxy::~MNSMozabProxy() { } -sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile) +sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const OUString &aProfile) { OSL_TRACE( "IN : MNSMozabProxy::StartProxy()" ); ::osl::MutexGuard aGuard(m_aThreadMutex); @@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo { Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY); } @@ -89,15 +89,15 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo } extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap, - ::std::vector< ::rtl::OUString >* _rStrings, - ::std::vector< ::rtl::OUString >* _rTypes, + ::std::vector< OUString >* _rStrings, + ::std::vector< OUString >* _rTypes, sal_Int32* pErrorId ); ::com::sun::star::mozilla::MozillaProductType SAL_CALL MNSMozabProxy::getProductType( ) throw (::com::sun::star::uno::RuntimeException) { return m_Product; } -::rtl::OUString SAL_CALL MNSMozabProxy::getProfileName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MNSMozabProxy::getProfileName( ) throw (::com::sun::star::uno::RuntimeException) { return m_Profile; } @@ -123,8 +123,8 @@ sal_Int32 SAL_CALL MNSMozabProxy::run( ) throw (::com::sun::star::uno::RuntimeE rv = getTableStringsProxied((const sal_Char*)m_Args->arg1, (sal_Int32 *)m_Args->arg2, (MNameMapper *)m_Args->arg3, - (::std::vector< ::rtl::OUString >*)m_Args->arg4, - (::std::vector< ::rtl::OUString >*)m_Args->arg5, + (::std::vector< OUString >*)m_Args->arg4, + (::std::vector< OUString >*)m_Args->arg5, (sal_Int32 *)m_Args->arg6); break; case ProxiedFunc::FUNC_EXECUTE_QUERY: @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL MNSMozabProxy::run( ) throw (::com::sun::star::uno::RuntimeE case ProxiedFunc::FUNC_NEW_ADDRESS_BOOK: if (m_Args->arg1) { - rv = NewAddressBook((const ::rtl::OUString*)m_Args->arg1 ); + rv = NewAddressBook((const OUString*)m_Args->arg1 ); } break; default: diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index 2683b157c852..4e8c0241621c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx @@ -81,10 +81,10 @@ namespace connectivity //XCodeProxy virtual sal_Int32 SAL_CALL run( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getProductType( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProfileName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProfileName( ) throw (::com::sun::star::uno::RuntimeException); public: - sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile); //Call this to start proxy + sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const OUString &aProfile); //Call this to start proxy protected: nsresult testLDAPConnection(); @@ -95,7 +95,7 @@ namespace connectivity RunArgs * m_Args; ::com::sun::star::mozilla::MozillaProductType m_Product; - ::rtl::OUString m_Profile; + OUString m_Profile; #if OSL_DEBUG_LEVEL > 0 oslThreadIdentifier m_oThreadID; #endif diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx index 2a568130606d..f10b41f5c5ca 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx @@ -20,7 +20,7 @@ #include <MNameMapper.hxx> #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -29,7 +29,7 @@ using namespace connectivity::mozab; bool -MNameMapper::ltstr::operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const +MNameMapper::ltstr::operator()( const OUString &s1, const OUString &s2) const { return s1.compareTo(s2) < 0; } @@ -76,7 +76,7 @@ const char * getURI(const nsIAbDirectory* directory) // May modify the name passed in so that it's unique nsresult -MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook ) +MNameMapper::add( OUString& str, nsIAbDirectory* abook ) { MNameMapper::dirMap::iterator iter; @@ -87,18 +87,18 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook ) return NS_ERROR_NULL_POINTER; } - ::rtl::OUString ouUri=::rtl::OUString::createFromAscii(getURI(abook)); + OUString ouUri=OUString::createFromAscii(getURI(abook)); if ( mUriMap->find (ouUri) != mUriMap->end() ) //There's already an entry with same uri { return NS_ERROR_FILE_NOT_FOUND; } mUriMap->insert( MNameMapper::uriMap::value_type( ouUri, abook ) ); - ::rtl::OUString tempStr=str; + OUString tempStr=str; long count =1; while ( mDirMap->find( tempStr ) != mDirMap->end() ) { - tempStr = str + ::rtl::OUString::valueOf(count); + tempStr = str + OUString::valueOf(count); count ++; } str = tempStr; @@ -109,7 +109,7 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook ) } bool -MNameMapper::getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook ) +MNameMapper::getDir( const OUString& str, nsIAbDirectory* *abook ) { MNameMapper::dirMap::iterator iter; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx index 25dd13e911d3..85aefb5f6079 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx @@ -38,12 +38,12 @@ namespace connectivity struct ltstr { - bool operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const; + bool operator()( const OUString &s1, const OUString &s2) const; }; - typedef ::std::multimap< ::rtl::OUString, nsIAbDirectory *, ltstr > dirMap; - typedef ::std::multimap< ::rtl::OUString, nsIAbDirectory *, ltstr > uriMap; + typedef ::std::multimap< OUString, nsIAbDirectory *, ltstr > dirMap; + typedef ::std::multimap< OUString, nsIAbDirectory *, ltstr > uriMap; static MNameMapper *instance; dirMap *mDirMap; @@ -59,13 +59,13 @@ namespace connectivity ~MNameMapper(); // May modify the name passed in so that it's unique - nsresult add( ::rtl::OUString& str, nsIAbDirectory* abook ); + nsresult add( OUString& str, nsIAbDirectory* abook ); //reset dirs void reset(); // Get the directory corresponding to str - bool getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook ); + bool getDir( const OUString& str, nsIAbDirectory* *abook ); }; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 21bed90e07dc..4be34d8f9cba 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -113,7 +113,7 @@ void MQuery::construct() NS_IF_ADDREF( m_aQueryHelper); } // ------------------------------------------------------------------------- -void MQuery::setAddressbook(::rtl::OUString &ab) +void MQuery::setAddressbook(OUString &ab) { OSL_TRACE("IN MQuery::setAddressbook()"); ::osl::MutexGuard aGuard(m_aMutex); @@ -166,7 +166,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, // Set the 'name' property of the boolString. // Check if it's an alias first... - rtl::OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); + OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); boolString->SetName( strdup( attrName.getStr() ) ); OSL_TRACE("Name = %s ;", attrName.getStr() ); // Set the 'matchType' property of the boolString. Check for equal length. @@ -256,9 +256,9 @@ sal_uInt32 MQuery::InsertLoginInfo(OConnection* _pCon) { nsresult rv; // Store return values. - rtl::OUString nameAB = _pCon->getHost().replace('.','_'); - rtl::OUString bindDN = _pCon->getBindDN(); - rtl::OUString password = _pCon->getPassword(); + OUString nameAB = _pCon->getHost().replace('.','_'); + OUString bindDN = _pCon->getBindDN(); + OUString password = _pCon->getPassword(); sal_Bool useSSL = _pCon->getUseSSL(); nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID, &rv); @@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon) ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY); if (_pCon) @@ -620,7 +620,7 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow ) } // ------------------------------------------------------------------------- sal_Bool -MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) const +MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { MQueryHelperResultEntry* xResEntry = m_aQueryHelper->getByIndex( nDBRow ); @@ -645,7 +645,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& // ------------------------------------------------------------------------- sal_Bool -MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) const +MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { MQueryHelperResultEntry* xResEntry = m_aQueryHelper->getByIndex( nDBRow ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index c6d38529f93f..b9de6e148eaf 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -73,15 +73,15 @@ namespace connectivity class MQueryExpressionString : public MQueryExpressionBase { protected: - ::rtl::OUString m_aName; // LHS + OUString m_aName; // LHS MQueryOp::cond_type m_aBooleanCondition; - ::rtl::OUString m_aValue; // RHS + OUString m_aValue; // RHS public: - MQueryExpressionString( ::rtl::OUString& lhs, + MQueryExpressionString( OUString& lhs, MQueryOp::cond_type cond, - ::rtl::OUString rhs ) + OUString rhs ) : MQueryExpressionBase( MQueryExpressionBase::StringExpr ) , m_aName( lhs ) , m_aBooleanCondition( cond ) @@ -89,18 +89,18 @@ namespace connectivity { } - MQueryExpressionString( ::rtl::OUString& lhs, + MQueryExpressionString( OUString& lhs, MQueryOp::cond_type cond ) : MQueryExpressionBase( MQueryExpressionBase::StringExpr ) , m_aName( lhs ) , m_aBooleanCondition( cond ) - , m_aValue( ::rtl::OUString() ) + , m_aValue( OUString() ) { } - const ::rtl::OUString& getName() const { return m_aName; } + const OUString& getName() const { return m_aName; } MQueryOp::cond_type getCond() const { return m_aBooleanCondition; } - const ::rtl::OUString& getValue() const { return m_aValue; } + const OUString& getValue() const { return m_aValue; } }; class MQuery; @@ -192,14 +192,14 @@ namespace connectivity private: MQueryDirectory *m_aQueryDirectory; MQueryHelper *m_aQueryHelper; - ::rtl::OUString m_aAddressbook; + OUString m_aAddressbook; sal_Int32 m_nMaxNrOfReturns; sal_Bool m_bQuerySubDirs; MQueryExpression m_aExpr; const OColumnAlias& m_rColumnAlias; ::com::sun::star::mozilla::MozillaProductType m_Product; - ::rtl::OUString m_Profile; + OUString m_Profile; ErrorDescriptor m_aError; void construct(); @@ -226,7 +226,7 @@ namespace connectivity sal_uInt32 InsertLoginInfo(OConnection* _pCon); - void setAddressbook( ::rtl::OUString&); + void setAddressbook( OUString&); const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; } @@ -241,11 +241,11 @@ namespace connectivity sal_Bool checkRowAvailable( sal_Int32 nDBRow ); sal_Bool getRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, - const rtl::OUString& aDBColumnName, + const OUString& aDBColumnName, sal_Int32 nType ) const; sal_Bool setRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, - const rtl::OUString& aDBColumnName, + const OUString& aDBColumnName, sal_Int32 nType ) const; sal_Int32 getRowStates(sal_Int32 nDBRow); sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 588ec2f5fc06..71ff4f07fb9c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -60,17 +60,17 @@ MQueryHelperResultEntry::getCard() { return m_Card; } -void MQueryHelperResultEntry::insert( const rtl::OString &key, rtl::OUString &value ) +void MQueryHelperResultEntry::insert( const OString &key, OUString &value ) { m_Fields[ key ] = value; } -rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const +OUString MQueryHelperResultEntry::getValue( const OString &key ) const { FieldMap::const_iterator iter = m_Fields.find( key ); if ( iter == m_Fields.end() ) { - return rtl::OUString(); + return OUString(); } else { @@ -78,7 +78,7 @@ rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const } } -void MQueryHelperResultEntry::setValue( const rtl::OString &key, const rtl::OUString & rValue) +void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rValue) { m_Fields[ key ] = rValue; } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 3d8169659a1e..17bb8475aca7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -38,7 +38,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap; + typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap; mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; @@ -49,9 +49,9 @@ namespace connectivity MQueryHelperResultEntry(); ~MQueryHelperResultEntry(); - void insert( const rtl::OString &key, rtl::OUString &value ); - rtl::OUString getValue( const rtl::OString &key ) const; - void setValue( const rtl::OString &key, const rtl::OUString & rValue); + void insert( const OString &key, OUString &value ); + OUString getValue( const OString &key ) const; + void setValue( const OString &key, const OUString & rValue); void setCard(nsIAbCard *card); nsIAbCard *getCard(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 701e403b2d93..813d67b09179 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx @@ -25,10 +25,10 @@ using namespace connectivity::mozab; // ------------------------------------------------------------------------- -void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &nss) +void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss) { - // Convert to ::rtl::OString (utf-8 encoding). - ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8)); + // Convert to OString (utf-8 encoding). + OString os(OUStringToOString(ous, RTL_TEXTENCODING_UTF8)); const char *cs = os.getStr(); PRUint32 csLen = os.getLength(); @@ -38,11 +38,11 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns nss = mozString; // temp. } // ------------------------------------------------------------------------- -::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source ) +OString MTypeConverter::nsACStringToOString( const nsACString& _source ) { const char* buffer = _source.BeginReading(); const char* bufferEnd = _source.EndReading(); - return ::rtl::OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) ); + return OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) ); } // ------------------------------------------------------------------------- void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest ) @@ -51,7 +51,7 @@ void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString _dest.AppendASCII( _asciiString ); } // ------------------------------------------------------------------------- -void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ous) +void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous) { // Get clone of buffer. PRUnichar *uc = ToNewUnicode(nss); @@ -59,24 +59,24 @@ void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ou // TODO check if this is ok. // PRUnichar != sal_Unicode in mingw - ::rtl::OUString _ous(reinterpret_cast_mingw_only<sal_Unicode *>(uc), nssLen); + OUString _ous(reinterpret_cast_mingw_only<sal_Unicode *>(uc), nssLen); ous = _ous; nsMemory::Free(uc); } // ------------------------------------------------------------------------- -void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &ous) +void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous) { // TODO, specify length. // PRUnichar != sal_Unicode in mingw - ::rtl::OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru)); + OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru)); ous = _ous; } // ------------------------------------------------------------------------- -char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous) +char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous) { - // Convert ::rtl::OUString to ::rtl::OString, - ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US)); + // Convert OUString to OString, + OString os(OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US)); return(strdup(os.getStr())); } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx index 7ff358f82436..758983dddfd5 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx @@ -32,18 +32,18 @@ namespace connectivity class MTypeConverter { public: - static void ouStringToNsString(const ::rtl::OUString&, nsString&); - static void nsStringToOUString(const nsString&, ::rtl::OUString&); - static void prUnicharToOUString(const PRUnichar*, ::rtl::OUString&); + static void ouStringToNsString(const OUString&, nsString&); + static void nsStringToOUString(const nsString&, OUString&); + static void prUnicharToOUString(const PRUnichar*, OUString&); // Use free() for the following 3 calls. - static char *ouStringToCCharStringAscii(const ::rtl::OUString&); + static char *ouStringToCCharStringAscii(const OUString&); static char *nsStringToCCharStringAscii(const nsString&); - static char *ouStringToCCharStringUtf8(const ::rtl::OUString&); + static char *ouStringToCCharStringUtf8(const OUString&); // Convert to stl-string. - static ::std::string ouStringToStlString(const ::rtl::OUString&); + static ::std::string ouStringToStlString(const OUString&); static ::std::string nsStringToStlString(const nsString&); - static ::rtl::OString nsACStringToOString( const nsACString& _source ); + static OString nsACStringToOString( const nsACString& _source ); static void asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest ); private: |