[Libreoffice-commits] core.git: dbaccess/source svl/inc svl/source
Gergő Mocsi
gmocsi91 at gmail.com
Fri Feb 22 01:49:10 PST 2013
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 12
dbaccess/source/core/dataaccess/databasecontext.cxx | 79 +++---
dbaccess/source/core/dataaccess/databasecontext.hxx | 44 +--
dbaccess/source/core/misc/dsntypes.cxx | 179 +++++++-------
dbaccess/source/filter/xml/xmlExport.cxx | 180 +++++++-------
dbaccess/source/filter/xml/xmlExport.hxx | 26 +-
dbaccess/source/inc/dsntypes.hxx | 48 +--
dbaccess/source/ui/app/AppController.cxx | 205 ++++++++---------
dbaccess/source/ui/app/AppController.hxx | 48 +--
dbaccess/source/ui/dlg/ConnectionPage.cxx | 46 +--
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 28 +-
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 153 ++++++------
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 14 -
dbaccess/source/ui/dlg/detailpages.cxx | 8
dbaccess/source/ui/dlg/detailpages.hxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 51 ++--
dbaccess/source/ui/dlg/generalpage.hxx | 18 -
svl/inc/svl/custritm.hxx | 10
svl/source/items/custritm.cxx | 2
20 files changed, 574 insertions(+), 581 deletions(-)
New commits:
commit 1da3af5f1eb6a32fd0ab10da7cf2f8ddb298a3a1
Author: Gergő Mocsi <gmocsi91 at gmail.com>
Date: Wed Feb 20 04:33:49 2013 +0100
fdo#38838, ::rtl::OUString, String to OUString
I have cleared out String and ::rtl::OUString calls in module dbaccess/source/core/misc.
It was mainly file dbaccess/source/core/misc/dnstypes.cxx , and it's usages. There are
still some calls in dbaccess for this class(ODnsTypeCollection), that needs refactoring
(eg. in file DbAdminImpl.cxx, method "String ODbDataSourceAdministrationHelper::getConnectionURL() const").
Remaining calls will be my next task (in module dbaccess). I also clear out deprecated macro
RTL_CONSTASCII_USTRINGPARAM every time I find one. The class I've mentioned above
(ODnsTypeCollector) is OK.
Change-Id: Ia0f3bb8cc649d1ecf8decc093f8a1a20ee23c33c
Reviewed-on: https://gerrit.libreoffice.org/2289
Reviewed-by: Andras Timar <atimar at suse.com>
Tested-by: Andras Timar <atimar at suse.com>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 546352b..f10af65 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -258,7 +258,7 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
{
Any aValue;
Reference<XInterface> xDs = dbaccess::getDataSource(_xConnection);
- if ( dbtools::getDataSourceSetting(xDs,static_cast <rtl::OUString> (PROPERTY_BOOLEANCOMPARISONMODE),aValue) )
+ if ( dbtools::getDataSourceSetting(xDs,static_cast <OUString> (PROPERTY_BOOLEANCOMPARISONMODE),aValue) )
{
OSL_VERIFY( aValue >>= m_nBoolCompareMode );
}
@@ -380,9 +380,8 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sa
}
else
{
- String sMessage( DBACORE_RESSTRING( RID_STR_TABLE_DOES_NOT_EXIST ) );
- sMessage.SearchAndReplaceAscii( "$table$", Command );
- throwGenericSQLException(sMessage,*this);
+ OUString sMessage( DBACORE_RESSTRING( RID_STR_TABLE_DOES_NOT_EXIST ) );
+ throwGenericSQLException(sMessage.replaceAll( "$table$", Command ),*this);
}
break;
case CommandType::QUERY:
@@ -468,9 +467,8 @@ OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< X
|| !column->getPropertySetInfo()->hasPropertyByName(PROPERTY_NAME)
)
{
- String sError(DBACORE_RESSTRING(RID_STR_COLUMN_UNKNOWN_PROP));
- sError.SearchAndReplaceAscii("%value", OUString(PROPERTY_NAME));
- SQLException aErr(sError,*this,SQLSTATE_GENERAL,1000,Any() );
+ OUString sError(DBACORE_RESSTRING(RID_STR_COLUMN_UNKNOWN_PROP));
+ SQLException aErr(sError.replaceAll("%value", OUString(PROPERTY_NAME)),*this,SQLSTATE_GENERAL,1000,Any() );
throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,makeAny(aErr) );
}
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 8144f82..321de72 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -214,25 +214,25 @@ Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentCont
return *( new ODatabaseContext( _rxContext ) );
}
-Sequence< rtl::OUString > ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException )
+Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException )
{
- Sequence< ::rtl::OUString > aSNS( 1 );
+ Sequence< OUString > aSNS( 1 );
aSNS[0] = "com.sun.star.sdb.DatabaseContext";
return aSNS;
}
// XServiceInfo
-rtl::OUString ODatabaseContext::getImplementationName( ) throw(RuntimeException)
+OUString ODatabaseContext::getImplementationName( ) throw(RuntimeException)
{
return getImplementationName_static();
}
-sal_Bool ODatabaseContext::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+sal_Bool ODatabaseContext::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
{
return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
}
-Sequence< ::rtl::OUString > ODatabaseContext::getSupportedServiceNames( ) throw (RuntimeException)
+Sequence< OUString > ODatabaseContext::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_static();
}
@@ -255,7 +255,7 @@ Reference< XInterface > SAL_CALL ODatabaseContext::createInstance( ) throw (Exc
Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
{
::comphelper::NamedValueCollection aArgs( _rArguments );
- ::rtl::OUString sURL = aArgs.getOrDefault( (::rtl::OUString)INFO_POOLURL, ::rtl::OUString() );
+ OUString sURL = aArgs.getOrDefault( (OUString)INFO_POOLURL, OUString() );
Reference< XInterface > xDataSource;
if ( !sURL.isEmpty() )
@@ -292,12 +292,12 @@ void ODatabaseContext::disposing()
}
// XNamingService
-Reference< XInterface > ODatabaseContext::getRegisteredObject(const rtl::OUString& _rName) throw( Exception, RuntimeException )
+Reference< XInterface > ODatabaseContext::getRegisteredObject(const OUString& _rName) throw( Exception, RuntimeException )
{
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
- ::rtl::OUString sURL( getDatabaseLocation( _rName ) );
+ OUString sURL( getDatabaseLocation( _rName ) );
if ( sURL.isEmpty() )
// there is a registration for this name, but no URL
@@ -311,7 +311,7 @@ Reference< XInterface > ODatabaseContext::getRegisteredObject(const rtl::OUStri
return loadObjectFromURL( _rName, sURL );
}
-Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUString& _rName,const ::rtl::OUString& _sURL)
+Reference< XInterface > ODatabaseContext::loadObjectFromURL(const OUString& _rName,const OUString& _sURL)
{
INetURLObject aURL( _sURL );
if ( aURL.GetProtocol() == INET_PROT_NOT_VALID )
@@ -333,12 +333,11 @@ Reference< XInterface > ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin
)
{
// #i40463# #i39187#
- String sErrorMessage( DBACORE_RESSTRING( RID_STR_FILE_DOES_NOT_EXIST ) );
+ OUString sErrorMessage( DBACORE_RESSTRING( RID_STR_FILE_DOES_NOT_EXIST ) );
::svt::OFileNotation aTransformer( _sURL );
- sErrorMessage.SearchAndReplaceAscii( "$file$", aTransformer.get( ::svt::OFileNotation::N_SYSTEM ) );
SQLException aError;
- aError.Message = sErrorMessage;
+ aError.Message = sErrorMessage.replaceAll( "$file$", aTransformer.get( ::svt::OFileNotation::N_SYSTEM ) );
throw WrappedTargetException( _sURL, *this, makeAny( aError ) );
}
@@ -386,13 +385,13 @@ void ODatabaseContext::removeFromTerminateListener(const ODatabaseModelImpl& _rD
m_pDatabaseDocumentLoader->remove(_rDataSourceModel);
}
-void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel )
+void ODatabaseContext::setTransientProperties(const OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel )
{
if ( m_aDatasourceProperties.end() == m_aDatasourceProperties.find(_sURL) )
return;
try
{
- ::rtl::OUString sAuthFailedPassword;
+ OUString sAuthFailedPassword;
Reference< XPropertySet > xDSProps( _rDataSourceModel.getOrCreateDataSource(), UNO_QUERY_THROW );
const Sequence< PropertyValue >& rSessionPersistentProps = m_aDatasourceProperties[_sURL];
const PropertyValue* pProp = rSessionPersistentProps.getConstArray();
@@ -417,20 +416,20 @@ void ODatabaseContext::setTransientProperties(const ::rtl::OUString& _sURL, ODat
}
}
-void ODatabaseContext::registerObject(const rtl::OUString& _rName, const Reference< XInterface > & _rxObject) throw( Exception, RuntimeException )
+void ODatabaseContext::registerObject(const OUString& _rName, const Reference< XInterface > & _rxObject) throw( Exception, RuntimeException )
{
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
if ( _rName.isEmpty() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
Reference< XDocumentDataSource > xDocDataSource( _rxObject, UNO_QUERY );
Reference< XModel > xModel( xDocDataSource.is() ? xDocDataSource->getDatabaseDocument() : Reference< XOfficeDatabaseDocument >(), UNO_QUERY );
if ( !xModel.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 2 );
+ throw IllegalArgumentException( OUString(), *this, 2 );
- ::rtl::OUString sURL = xModel->getURL();
+ OUString sURL = xModel->getURL();
if ( sURL.isEmpty() )
throw IllegalArgumentException( DBACORE_RESSTRING( RID_STR_DATASOURCE_NOT_STORED ), *this, 2 );
@@ -482,7 +481,7 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl
// #i86178#
aRememberProps.put( "AuthFailedPassword", _rModelImpl.m_sFailedPassword );
- ::rtl::OUString sDocumentURL( _rModelImpl.getURL() );
+ OUString sDocumentURL( _rModelImpl.getURL() );
if ( m_aDatabaseObjects.find( sDocumentURL ) != m_aDatabaseObjects.end() )
{
m_aDatasourceProperties[ sDocumentURL ] = aRememberProps.getPropertyValues();
@@ -510,12 +509,12 @@ void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XConta
m_aContainerListeners.removeInterface(_rxListener);
}
-void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exception, RuntimeException )
+void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, RuntimeException )
{
ClearableMutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
- ::rtl::OUString sURL = getDatabaseLocation( _rName );
+ OUString sURL = getDatabaseLocation( _rName );
revokeDatabaseLocation( _rName );
// will throw if something goes wrong
@@ -536,37 +535,37 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
}
-::sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
+::sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
{
return m_xDatabaseRegistrations->hasRegisteredDatabase( _Name );
}
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException)
+Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException)
{
return m_xDatabaseRegistrations->getRegistrationNames();
}
-::rtl::OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
+OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
{
return m_xDatabaseRegistrations->getDatabaseLocation( _Name );
}
-void SAL_CALL ODatabaseContext::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
+void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
{
m_xDatabaseRegistrations->registerDatabaseLocation( _Name, _Location );
}
-void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
+void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
{
m_xDatabaseRegistrations->revokeDatabaseLocation( _Name );
}
-void SAL_CALL ODatabaseContext::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
+void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
{
m_xDatabaseRegistrations->changeDatabaseLocation( _Name, _NewLocation );
}
-::sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
+::sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
{
return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( _Name );
}
@@ -603,7 +602,7 @@ Reference< ::com::sun::star::container::XEnumeration > ODatabaseContext::create
}
// ::com::sun::star::container::XNameAccess
-Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElementException,
+Any ODatabaseContext::getByName(const OUString& _rName) throw( NoSuchElementException,
WrappedTargetException, RuntimeException )
{
MutexGuard aGuard(m_aMutex);
@@ -618,7 +617,7 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen
return makeAny( xExistent );
// see whether this is an registered name
- ::rtl::OUString sURL;
+ OUString sURL;
if ( hasRegisteredDatabase( _rName ) )
{
sURL = getDatabaseLocation( _rName );
@@ -653,7 +652,7 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen
}
}
-Sequence< rtl::OUString > ODatabaseContext::getElementNames(void) throw( RuntimeException )
+Sequence< OUString > ODatabaseContext::getElementNames(void) throw( RuntimeException )
{
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -661,7 +660,7 @@ Sequence< rtl::OUString > ODatabaseContext::getElementNames(void) throw( Runtime
return getRegistrationNames();
}
-sal_Bool ODatabaseContext::hasByName(const rtl::OUString& _rName) throw( RuntimeException )
+sal_Bool ODatabaseContext::hasByName(const OUString& _rName) throw( RuntimeException )
{
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -669,7 +668,7 @@ sal_Bool ODatabaseContext::hasByName(const rtl::OUString& _rName) throw( Runtime
return hasRegisteredDatabase( _rName );
}
-Reference< XInterface > ODatabaseContext::getObject( const ::rtl::OUString& _rURL )
+Reference< XInterface > ODatabaseContext::getObject( const OUString& _rURL )
{
ObjectCacheIterator aFind = m_aDatabaseObjects.find( _rURL );
Reference< XInterface > xExistent;
@@ -680,9 +679,9 @@ Reference< XInterface > ODatabaseContext::getObject( const ::rtl::OUString& _rUR
void ODatabaseContext::registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl )
{
- ::rtl::OUString sURL( _rModelImpl.getURL() );
+ OUString sURL( _rModelImpl.getURL() );
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "DatabaseContext: registering %s", ::rtl::OUStringToOString( sURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE( "DatabaseContext: registering %s", OUStringToOString( sURL, RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
if ( m_aDatabaseObjects.find( sURL ) == m_aDatabaseObjects.end() )
{
@@ -695,19 +694,19 @@ void ODatabaseContext::registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl
void ODatabaseContext::revokeDatabaseDocument( const ODatabaseModelImpl& _rModelImpl )
{
- ::rtl::OUString sURL( _rModelImpl.getURL() );
+ OUString sURL( _rModelImpl.getURL() );
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "DatabaseContext: deregistering %s", ::rtl::OUStringToOString( sURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE( "DatabaseContext: deregistering %s", OUStringToOString( sURL, RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
m_aDatabaseObjects.erase( sURL );
}
-void ODatabaseContext::databaseDocumentURLChange( const ::rtl::OUString& _rOldURL, const ::rtl::OUString& _rNewURL )
+void ODatabaseContext::databaseDocumentURLChange( const OUString& _rOldURL, const OUString& _rNewURL )
{
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE( "DatabaseContext: changing registration from %s to %s",
- ::rtl::OUStringToOString( _rOldURL, RTL_TEXTENCODING_UTF8 ).getStr(),
- ::rtl::OUStringToOString( _rNewURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( _rOldURL, RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( _rNewURL, RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
ObjectCache::iterator oldPos = m_aDatabaseObjects.find( _rOldURL );
ENSURE_OR_THROW( oldPos != m_aDatabaseObjects.end(), "illegal old database document URL" );
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 6e43425..7f99ea7 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -78,14 +78,14 @@ private:
@throws WrappedTargetException
if an error occurs accessing the URL via the UCB
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > loadObjectFromURL(const ::rtl::OUString& _rName,const ::rtl::OUString& _sURL);
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getObject( const ::rtl::OUString& _rURL );
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > loadObjectFromURL(const OUString& _rName,const OUString& _sURL);
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getObject( const OUString& _rURL );
/** sets all properties which were transient at the data source. e.g. password
@param _sURL The file URL of the data source
@param _xObject The data source itself.
*/
- void setTransientProperties(const ::rtl::OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel );
+ void setTransientProperties(const OUString& _sURL, ODatabaseModelImpl& _rDataSourceModel );
/** creates a new data source
*/
@@ -128,13 +128,13 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments ) throw (::com::sun::star::uno::Exception, ::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);
// XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException );
- static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
@@ -146,23 +146,23 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException);
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
// XNamingService
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL registerObject( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokeObject( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL registerObject( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL revokeObject( const OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XDatabaseRegistrations
- virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRegistrationNames() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getDatabaseLocation( const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL registerDatabaseLocation( const ::rtl::OUString& Name, const ::rtl::OUString& Location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokeDatabaseLocation( const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL changeDatabaseLocation( const ::rtl::OUString& Name, const ::rtl::OUString& NewLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRegistrationNames() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addDatabaseRegistrationsListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseRegistrationsListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeDatabaseRegistrationsListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseRegistrationsListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
@@ -176,7 +176,7 @@ public:
void registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl);
void revokeDatabaseDocument( const ODatabaseModelImpl& _rModelImpl);
- void databaseDocumentURLChange(const ::rtl::OUString& _sOldName, const ::rtl::OUString& _sNewName);
+ void databaseDocumentURLChange(const OUString& _sOldName, const OUString& _sNewName);
void storeTransientProperties( ODatabaseModelImpl& _rModelImpl);
void appendAtTerminateListener(const ODatabaseModelImpl& _rDataSourceModel);
void removeFromTerminateListener(const ODatabaseModelImpl& _rDataSourceModel);
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 31b21b2..29ac584 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -43,12 +43,12 @@ namespace dbaccess
namespace
{
- void lcl_extractHostAndPort(const String& _sUrl,String& _sHostname,sal_Int32& _nPortNumber)
+ void lcl_extractHostAndPort(const OUString& _sUrl,OUString& _sHostname,sal_Int32& _nPortNumber)
{
if ( comphelper::string::getTokenCount(_sUrl, ':') >= 2 )
{
- _sHostname = _sUrl.GetToken(0,':');
- _nPortNumber = _sUrl.GetToken(1,':').ToInt32();
+ _sHostname = _sUrl.getToken(0,':');
+ _nPortNumber = _sUrl.getToken(1,':').toInt32();
}
}
}
@@ -65,9 +65,9 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< :
#endif
{
DBG_CTOR(ODsnTypeCollection,NULL);
- const uno::Sequence< ::rtl::OUString > aURLs = m_aDriverConfig.getURLs();
- const ::rtl::OUString* pIter = aURLs.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aURLs.getLength();
+ const uno::Sequence< OUString > aURLs = m_aDriverConfig.getURLs();
+ const OUString* pIter = aURLs.getConstArray();
+ const OUString* pEnd = pIter + aURLs.getLength();
for(;pIter != pEnd;++pIter )
{
m_aDsnPrefixes.push_back(*pIter);
@@ -85,27 +85,28 @@ ODsnTypeCollection::~ODsnTypeCollection()
OSL_ENSURE(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!");
}
//-------------------------------------------------------------------------
-String ODsnTypeCollection::getTypeDisplayName(const ::rtl::OUString& _sURL) const
+OUString ODsnTypeCollection::getTypeDisplayName(const OUString& _sURL) const
{
return m_aDriverConfig.getDriverTypeDisplayName(_sURL);
}
//-------------------------------------------------------------------------
-String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const
+OUString ODsnTypeCollection::cutPrefix(const OUString& _sURL) const
{
- String sURL( _sURL);
- String sRet;
- String sOldPattern;
+ OUString sURL( _sURL);
+ OUString sRet;
+ OUString sOldPattern;
StringVector::const_iterator aIter = m_aDsnPrefixes.begin();
StringVector::const_iterator aEnd = m_aDsnPrefixes.end();
+
for(;aIter != aEnd;++aIter)
{
WildCard aWildCard(*aIter);
- if ( sOldPattern.Len() < aIter->Len() && aWildCard.Matches(_sURL) )
+ if ( sOldPattern.getLength() < aIter->getLength() && aWildCard.Matches(_sURL) )
{
- if ( aIter->Len() < sURL.Len() )
- sRet = sURL.Copy(sURL.Match(*aIter));
+ if ( aIter->getLength() < sURL.getLength() )
+ sRet = sURL.copy(sURL.match(*aIter));
else
- sRet = sURL.Copy(aIter->Match(sURL));
+ sRet = sURL.copy(aIter->match(sURL));
sOldPattern = *aIter;
}
}
@@ -114,22 +115,22 @@ String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const
}
//-------------------------------------------------------------------------
-String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const
+OUString ODsnTypeCollection::getPrefix(const OUString& _sURL) const
{
- String sURL( _sURL);
- String sRet;
- String sOldPattern;
+ OUString sURL( _sURL);
+ OUString sRet;
+ OUString sOldPattern;
StringVector::const_iterator aIter = m_aDsnPrefixes.begin();
StringVector::const_iterator aEnd = m_aDsnPrefixes.end();
for(;aIter != aEnd;++aIter)
{
WildCard aWildCard(*aIter);
- if ( sOldPattern.Len() < aIter->Len() && aWildCard.Matches(sURL) )
+ if ( sOldPattern.getLength() < aIter->getLength() && aWildCard.Matches(sURL) )
{
- if ( aIter->Len() < sURL.Len() )
- sRet = aIter->Copy(0,sURL.Match(*aIter));
+ if ( aIter->getLength() < sURL.getLength() )
+ sRet = aIter->copy(0,sURL.match(*aIter));
else
- sRet = sURL.Copy(0,aIter->Match(sURL));
+ sRet = sURL.copy(0,aIter->match(sURL));
sRet = comphelper::string::stripEnd(sRet, '*');
sOldPattern = *aIter;
}
@@ -141,48 +142,48 @@ String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const
//-------------------------------------------------------------------------
bool ODsnTypeCollection::hasDriver( const sal_Char* _pAsciiPattern ) const
{
- String sPrefix( getPrefix( ::rtl::OUString::createFromAscii( _pAsciiPattern ) ) );
- return ( sPrefix.Len() > 0 );
+ OUString sPrefix( getPrefix( OUString::createFromAscii( _pAsciiPattern ) ) );
+ return ( sPrefix.getLength() > 0 );
}
// -----------------------------------------------------------------------------
-bool ODsnTypeCollection::isConnectionUrlRequired(const ::rtl::OUString& _sURL) const
+bool ODsnTypeCollection::isConnectionUrlRequired(const OUString& _sURL) const
{
- String sURL( _sURL);
- String sRet;
- String sOldPattern;
+ OUString sURL( _sURL);
+ OUString sRet;
+ OUString sOldPattern;
StringVector::const_iterator aIter = m_aDsnPrefixes.begin();
StringVector::const_iterator aEnd = m_aDsnPrefixes.end();
for(;aIter != aEnd;++aIter)
{
WildCard aWildCard(*aIter);
- if ( sOldPattern.Len() < aIter->Len() && aWildCard.Matches(sURL) )
+ if ( sOldPattern.getLength() < aIter->getLength() && aWildCard.Matches(sURL) )
{
sRet = *aIter;
sOldPattern = *aIter;
}
}
- return sRet.Len() > 0 && sRet.GetChar(sRet.Len()-1) == '*';
+ return sRet.getLength() > 0 && sRet[sRet.getLength()-1] == '*';
}
// -----------------------------------------------------------------------------
-String ODsnTypeCollection::getMediaType(const ::rtl::OUString& _sURL) const
+OUString ODsnTypeCollection::getMediaType(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
- return aFeatures.getOrDefault("MediaType",::rtl::OUString());
+ return aFeatures.getOrDefault("MediaType",OUString());
}
// -----------------------------------------------------------------------------
-String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUString& _sMediaType,const ::rtl::OUString& _sExtension)
+OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _sMediaType,const OUString& _sExtension)
{
- String sURL, sFallbackURL;
- const uno::Sequence< ::rtl::OUString > aURLs = m_aDriverConfig.getURLs();
- const ::rtl::OUString* pIter = aURLs.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aURLs.getLength();
+ OUString sURL, sFallbackURL;
+ const uno::Sequence< OUString > aURLs = m_aDriverConfig.getURLs();
+ const OUString* pIter = aURLs.getConstArray();
+ const OUString* pEnd = pIter + aURLs.getLength();
for(;pIter != pEnd;++pIter )
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(*pIter);
- if ( aFeatures.getOrDefault("MediaType",::rtl::OUString()) == _sMediaType )
+ if ( aFeatures.getOrDefault("MediaType",OUString()) == _sMediaType )
{
- const ::rtl::OUString sFileExtension = aFeatures.getOrDefault("Extension",::rtl::OUString());
+ const OUString sFileExtension = aFeatures.getOrDefault("Extension",OUString());
if ( _sExtension == sFileExtension )
{
sURL = *pIter;
@@ -193,14 +194,14 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin
}
}
- if ( !sURL.Len() && sFallbackURL.Len() )
+ if ( !sURL.getLength() && sFallbackURL.getLength() )
sURL = sFallbackURL;
sURL = comphelper::string::stripEnd(sURL, '*');
return sURL;
}
// -----------------------------------------------------------------------------
-bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL ) const
+bool ODsnTypeCollection::isShowPropertiesEnabled( const OUString& _sURL ) const
{
return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1)
|| _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1)
@@ -213,20 +214,20 @@ bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL )
|| _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1) );
}
// -----------------------------------------------------------------------------
-void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String& _sDatabaseName,String& _rsHostname,sal_Int32& _nPortNumber) const
+void ODsnTypeCollection::extractHostNamePort(const OUString& _rDsn,OUString& _sDatabaseName,OUString& _rsHostname,sal_Int32& _nPortNumber) const
{
- String sUrl = cutPrefix(_rDsn);
+ OUString sUrl = cutPrefix(_rDsn);
if ( _rDsn.matchIgnoreAsciiCaseAsciiL("jdbc:oracle:thin:",sizeof("jdbc:oracle:thin:")-1) )
{
lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
- if ( !_rsHostname.Len() && comphelper::string::getTokenCount(sUrl, ':') == 2 )
+ if ( !_rsHostname.getLength() && comphelper::string::getTokenCount(sUrl, ':') == 2 )
{
_nPortNumber = -1;
- _rsHostname = sUrl.GetToken(0,':');
+ _rsHostname = sUrl.getToken(0,':');
}
- if ( _rsHostname.Len() )
- _rsHostname = _rsHostname.GetToken(comphelper::string::getTokenCount(_rsHostname, '@') - 1, '@');
- _sDatabaseName = sUrl.GetToken(comphelper::string::getTokenCount(sUrl, ':') - 1, ':');
+ if ( _rsHostname.getLength() )
+ _rsHostname = _rsHostname.getToken(comphelper::string::getTokenCount(_rsHostname, '@') - 1, '@');
+ _sDatabaseName = sUrl.getToken(comphelper::string::getTokenCount(sUrl, ':') - 1, ':');
}
else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:address:ldap:",sizeof("sdbc:address:ldap:")-1) )
{
@@ -236,14 +237,14 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
{
lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
- if ( _nPortNumber == -1 && !_rsHostname.Len() && comphelper::string::getTokenCount(sUrl, '/') == 2 )
- _rsHostname = sUrl.GetToken(0,'/');
- _sDatabaseName = sUrl.GetToken(comphelper::string::getTokenCount(sUrl, '/') - 1, '/');
+ if ( _nPortNumber == -1 && !_rsHostname.getLength() && comphelper::string::getTokenCount(sUrl, '/') == 2 )
+ _rsHostname = sUrl.getToken(0,'/');
+ _sDatabaseName = sUrl.getToken(comphelper::string::getTokenCount(sUrl, '/') - 1, '/');
}
else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=",sizeof("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=")-1)
|| _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=",sizeof("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=")-1))
{
- ::rtl::OUString sNewFileName;
+ OUString sNewFileName;
if ( ::osl::FileBase::getFileURLFromSystemPath( sUrl, sNewFileName ) == ::osl::FileBase::E_None )
{
_sDatabaseName = sNewFileName;
@@ -251,52 +252,52 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
}
}
// -----------------------------------------------------------------------------
-String ODsnTypeCollection::getJavaDriverClass(const ::rtl::OUString& _sURL) const
+OUString ODsnTypeCollection::getJavaDriverClass(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getProperties(_sURL);
- return aFeatures.getOrDefault("JavaDriverClass",::rtl::OUString());
+ return aFeatures.getOrDefault("JavaDriverClass",OUString());
}
//-------------------------------------------------------------------------
-sal_Bool ODsnTypeCollection::isFileSystemBased(const ::rtl::OUString& _sURL) const
+sal_Bool ODsnTypeCollection::isFileSystemBased(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("FileSystemBased",sal_False);
}
// -----------------------------------------------------------------------------
-sal_Bool ODsnTypeCollection::supportsTableCreation(const ::rtl::OUString& _sURL) const
+sal_Bool ODsnTypeCollection::supportsTableCreation(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("SupportsTableCreation",sal_False);
}
// -----------------------------------------------------------------------------
-sal_Bool ODsnTypeCollection::supportsColumnDescription(const ::rtl::OUString& _sURL) const
+sal_Bool ODsnTypeCollection::supportsColumnDescription(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("SupportsColumnDescription",sal_False);
}
// -----------------------------------------------------------------------------
-sal_Bool ODsnTypeCollection::supportsBrowsing(const ::rtl::OUString& _sURL) const
+sal_Bool ODsnTypeCollection::supportsBrowsing(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("SupportsBrowsing",sal_False);
}
// -----------------------------------------------------------------------------
-bool ODsnTypeCollection::needsJVM(const String& _sURL) const
+bool ODsnTypeCollection::needsJVM(const OUString& _sURL) const
{
const ::comphelper::NamedValueCollection& aFeatures = m_aDriverConfig.getMetaData(_sURL);
return aFeatures.getOrDefault("UseJava",sal_False);
}
// -----------------------------------------------------------------------------
-Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const ::rtl::OUString& _sURL ) const
+Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const OUString& _sURL ) const
{
const ::comphelper::NamedValueCollection& aProperties = m_aDriverConfig.getProperties(_sURL);
return aProperties.getPropertyValues();
}
//-------------------------------------------------------------------------
-bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) const
+bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) const
{
- const ::rtl::OUString sEmbeddedDatabaseURL = getEmbeddedDatabase();
+ const OUString sEmbeddedDatabaseURL = getEmbeddedDatabase();
WildCard aWildCard(sEmbeddedDatabaseURL);
return aWildCard.Matches(_sURL);
}
@@ -333,10 +334,10 @@ ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const
return TypeIterator(this, m_aDsnTypesDisplayNames.size());
}
//-------------------------------------------------------------------------
-DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
+DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const
{
- String sDsn(comphelper::string::stripEnd(_rDsn, '*'));
- sal_uInt16 nSeparator = sDsn.Search((sal_Unicode)':');
+ OUString sDsn(comphelper::string::stripEnd(_rDsn, '*'));
+ sal_uInt16 nSeparator = sDsn.indexOf((sal_Unicode)':');
if (STRING_NOTFOUND == nSeparator)
{
// there should be at least one such separator
@@ -344,22 +345,22 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
return DST_UNKNOWN;
}
// find first :
- sal_uInt16 nOracleSeparator = sDsn.Search((sal_Unicode)':', nSeparator + 1);
+ sal_uInt16 nOracleSeparator = sDsn.indexOf((sal_Unicode)':', nSeparator + 1);
if ( nOracleSeparator != STRING_NOTFOUND )
{
- nOracleSeparator = sDsn.Search((sal_Unicode)':', nOracleSeparator + 1);
- if (nOracleSeparator != STRING_NOTFOUND && sDsn.EqualsIgnoreCaseAscii("jdbc:oracle:thin", 0, nOracleSeparator))
+ nOracleSeparator = sDsn.indexOf((sal_Unicode)':', nOracleSeparator + 1);
+ if (nOracleSeparator != STRING_NOTFOUND && sDsn.equalsIgnoreAsciiCaseAsciiL("jdbc:oracle:thin", nOracleSeparator))
return DST_ORACLE_JDBC;
}
- if (sDsn.EqualsIgnoreCaseAscii("jdbc", 0, nSeparator))
+ if (sDsn.equalsIgnoreAsciiCaseAsciiL("jdbc", nSeparator))
return DST_JDBC;
- if (sDsn.EqualsIgnoreCaseAscii("sdbc:embedded:hsqldb", 0, sDsn.Len()))
+ if (sDsn.equalsIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb", sDsn.getLength()))
return DST_EMBEDDED_HSQLDB;
// find second :
- nSeparator = sDsn.Search((sal_Unicode)':', nSeparator + 1);
+ nSeparator = sDsn.indexOf((sal_Unicode)':', nSeparator + 1);
if (STRING_NOTFOUND == nSeparator)
{
// at the moment only jdbc is allowed to have just one separator
@@ -367,13 +368,13 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
return DST_UNKNOWN;
}
- if (sDsn.EqualsIgnoreCaseAscii("sdbc:ado:", 0, nSeparator))
+ if (sDsn.equalsIgnoreAsciiCaseAsciiL("sdbc:ado:", nSeparator))
{
- nSeparator = sDsn.Search((sal_Unicode)':', nSeparator + 1);
- if (STRING_NOTFOUND != nSeparator && sDsn.EqualsIgnoreCaseAscii("sdbc:ado:access",0, nSeparator) )
+ nSeparator = sDsn.indexOf((sal_Unicode)':', nSeparator + 1);
+ if (STRING_NOTFOUND != nSeparator && sDsn.equalsIgnoreAsciiCaseAsciiL("sdbc:ado:access", nSeparator) )
{
- nSeparator = sDsn.Search((sal_Unicode)';', nSeparator + 1);
- if (STRING_NOTFOUND != nSeparator && sDsn.EqualsIgnoreCaseAscii("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0",0, nSeparator) )
+ nSeparator = sDsn.indexOf((sal_Unicode)';', nSeparator + 1);
+ if (STRING_NOTFOUND != nSeparator && sDsn.equalsIgnoreAsciiCaseAsciiL("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0", nSeparator) )
return DST_MSACCESS_2007;
return DST_MSACCESS;
@@ -425,15 +426,15 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
for ( size_t i=0; i < sizeof( aKnowPrefixes ) / sizeof( aKnowPrefixes[0] ); ++i )
{
- sal_uInt16 nMatchLen = aKnowPrefixes[i].bMatchComplete ? sDsn.Len() : (sal_uInt16)rtl_str_getLength( aKnowPrefixes[i].pAsciiPrefix );
- if ( sDsn.EqualsIgnoreCaseAscii( aKnowPrefixes[i].pAsciiPrefix, 0, nMatchLen ) )
+ sal_uInt16 nMatchLen = aKnowPrefixes[i].bMatchComplete ? sDsn.getLength() : (sal_uInt16)rtl_str_getLength( aKnowPrefixes[i].pAsciiPrefix );
+ if ( sDsn.equalsIgnoreAsciiCaseAsciiL( aKnowPrefixes[i].pAsciiPrefix, nMatchLen ) )
return aKnowPrefixes[i].eType;
}
return DST_UNKNOWN;
}
// -----------------------------------------------------------------------------
-void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const
+void ODsnTypeCollection::fillPageIds(const OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const
{
DATASOURCE_TYPE eType = determineType(_sURL);
switch(eType)
@@ -495,15 +496,15 @@ void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<
}
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODsnTypeCollection::getType(const ::rtl::OUString& _sURL) const
+OUString ODsnTypeCollection::getType(const OUString& _sURL) const
{
- ::rtl::OUString sOldPattern;
+ OUString sOldPattern;
StringVector::const_iterator aIter = m_aDsnPrefixes.begin();
StringVector::const_iterator aEnd = m_aDsnPrefixes.end();
for(;aIter != aEnd;++aIter)
{
WildCard aWildCard(*aIter);
- if ( sOldPattern.getLength() < aIter->Len() && aWildCard.Matches(_sURL) )
+ if ( sOldPattern.getLength() < aIter->getLength() && aWildCard.Matches(_sURL) )
{
sOldPattern = *aIter;
}
@@ -511,17 +512,17 @@ void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<
return sOldPattern;
}
// -----------------------------------------------------------------------------
-sal_Int32 ODsnTypeCollection::getIndexOf(const ::rtl::OUString& _sURL) const
+sal_Int32 ODsnTypeCollection::getIndexOf(const OUString& _sURL) const
{
sal_Int32 nRet = -1;
- String sURL( _sURL);
- String sOldPattern;
+ OUString sURL( _sURL);
+ OUString sOldPattern;
StringVector::const_iterator aIter = m_aDsnPrefixes.begin();
StringVector::const_iterator aEnd = m_aDsnPrefixes.end();
for(sal_Int32 i = 0;aIter != aEnd;++aIter,++i)
{
WildCard aWildCard(*aIter);
- if ( sOldPattern.Len() < aIter->Len() && aWildCard.Matches(sURL) )
+ if ( sOldPattern.getLength() < aIter->getLength() && aWildCard.Matches(sURL) )
{
nRet = i;
sOldPattern = *aIter;
@@ -568,13 +569,13 @@ ODsnTypeCollection::TypeIterator::~TypeIterator()
}
//-------------------------------------------------------------------------
-String ODsnTypeCollection::TypeIterator::getDisplayName() const
+OUString ODsnTypeCollection::TypeIterator::getDisplayName() const
{
OSL_ENSURE(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::getDisplayName : invalid position!");
return m_pContainer->m_aDsnTypesDisplayNames[m_nPosition];
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODsnTypeCollection::TypeIterator::getURLPrefix() const
+OUString ODsnTypeCollection::TypeIterator::getURLPrefix() const
{
OSL_ENSURE(m_nPosition < (sal_Int32)m_pContainer->m_aDsnPrefixes.size(), "ODsnTypeCollection::TypeIterator::getDisplayName : invalid position!");
return m_pContainer->m_aDsnPrefixes[m_nPosition];
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 4410d85..53fbca5 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -64,15 +64,15 @@ namespace dbaxml
class ODBExportHelper
{
public:
- static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
- static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
+ static OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
+ static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
static Reference< XInterface > SAL_CALL Create(const Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
};
class ODBFullExportHelper
{
public:
- static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
- static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
+ static OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
+ static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
static Reference< XInterface > SAL_CALL Create(const Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
};
}
@@ -105,15 +105,15 @@ namespace dbaxml
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB),EXPORT_SETTINGS | EXPORT_PRETTY ));
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
+ return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -124,29 +124,29 @@ namespace dbaxml
return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB),EXPORT_ALL));
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.sdb.XMLFullExporter");
+ return OUString("com.sun.star.comp.sdb.XMLFullExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
//---------------------------------------------------------------------
- ::rtl::OUString lcl_implGetPropertyXMLType(const Type& _rType)
+ OUString lcl_implGetPropertyXMLType(const Type& _rType)
{
// possible types we can write (either because we recognize them directly or because we convert _rValue
// into one of these types)
- static const ::rtl::OUString s_sTypeBoolean ("boolean");
- static const ::rtl::OUString s_sTypeShort ("short");
- static const ::rtl::OUString s_sTypeInteger ("int");
- static const ::rtl::OUString s_sTypeLong ("long");
- static const ::rtl::OUString s_sTypeDouble ("double");
- static const ::rtl::OUString s_sTypeString ("string");
+ static const OUString s_sTypeBoolean ("boolean");
+ static const OUString s_sTypeShort ("short");
+ static const OUString s_sTypeInteger ("int");
+ static const OUString s_sTypeLong ("long");
+ static const OUString s_sTypeDouble ("double");
+ static const OUString s_sTypeString ("string");
// handle the type description
switch (_rType.getTypeClass())
@@ -236,27 +236,27 @@ ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext,sal_uInt16
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_TABLE_TABLE,
- rtl::OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ),
+ OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ),
m_xExportHelper.get(),
- rtl::OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX ));
+ OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX ));
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_TABLE_COLUMN,
- rtl::OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ),
+ OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ),
m_xColumnExportHelper.get(),
- rtl::OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX ));
+ OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX ));
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_TABLE_CELL,
- rtl::OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ),
+ OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ),
m_xCellExportHelper.get(),
- rtl::OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX ));
+ OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX ));
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_TABLE_ROW,
- rtl::OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ),
+ OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ),
m_xRowExportHelper.get(),
- rtl::OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ));
+ OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ));
}
// -----------------------------------------------------------------------------
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODBExport, "com.sun.star.comp.sdb.DBExportFilter")
@@ -291,11 +291,11 @@ void ODBExport::exportDataSource()
xSettingsState->getPropertyDefault( INFO_THOUSANDSDELIMITER ) >>= aDelimiter.sThousand;
::connectivity::DriversConfig aDriverConfig(getComponentContext());
- const ::rtl::OUString sURL = ::comphelper::getString(xProp->getPropertyValue(PROPERTY_URL));
+ const OUString sURL = ::comphelper::getString(xProp->getPropertyValue(PROPERTY_URL));
::comphelper::NamedValueCollection aDriverSupportedProperties( aDriverConfig.getProperties( sURL ) );
- static ::rtl::OUString s_sTrue(::xmloff::token::GetXMLToken( XML_TRUE ));
- static ::rtl::OUString s_sFalse(::xmloff::token::GetXMLToken( XML_FALSE ));
+ static OUString s_sTrue(::xmloff::token::GetXMLToken( XML_TRUE ));
+ static OUString s_sFalse(::xmloff::token::GetXMLToken( XML_FALSE ));
// loop through the properties, and export only those which are not defaulted
TSettingsMap aSettingsMap;
Sequence< Property > aProperties = xSettingsInfo->getProperties();
@@ -303,7 +303,7 @@ void ODBExport::exportDataSource()
const Property* pPropertiesEnd = pProperties + aProperties.getLength();
for ( ; pProperties != pPropertiesEnd; ++pProperties )
{
- ::rtl::OUString sValue;
+ OUString sValue;
Any aValue = xDataSourceSettings->getPropertyValue( pProperties->Name );
switch ( aValue.getValueTypeClass() )
{
@@ -312,7 +312,7 @@ void ODBExport::exportDataSource()
break;
case TypeClass_DOUBLE:
// let the unit converter format is as string
- sValue = ::rtl::OUString::valueOf( getDouble( aValue ) );
+ sValue = OUString::valueOf( getDouble( aValue ) );
break;
case TypeClass_BOOLEAN:
sValue = ::xmloff::token::GetXMLToken( getBOOL( aValue ) ? XML_TRUE : XML_FALSE );
@@ -321,7 +321,7 @@ void ODBExport::exportDataSource()
case TypeClass_SHORT:
case TypeClass_LONG:
// let the unit converter format is as string
- sValue = ::rtl::OUString::valueOf( getINT32( aValue ) );
+ sValue = OUString::valueOf( getINT32( aValue ) );
break;
default:
break;
@@ -331,18 +331,18 @@ void ODBExport::exportDataSource()
struct PropertyMap
{
- const ::rtl::OUString sPropertyName;
+ const OUString sPropertyName;
const XMLTokenEnum eAttributeToken;
- const ::boost::optional< ::rtl::OUString > aXMLDefault;
+ const ::boost::optional< OUString > aXMLDefault;
- PropertyMap( const ::rtl::OUString& _rPropertyName, const XMLTokenEnum _eToken )
+ PropertyMap( const OUString& _rPropertyName, const XMLTokenEnum _eToken )
:sPropertyName( _rPropertyName )
,eAttributeToken( _eToken )
,aXMLDefault()
{
}
- PropertyMap( const ::rtl::OUString& _rPropertyName, const XMLTokenEnum _eToken, const ::rtl::OUString& _rDefault )
+ PropertyMap( const OUString& _rPropertyName, const XMLTokenEnum _eToken, const OUString& _rDefault )
:sPropertyName( _rPropertyName )
,eAttributeToken( _eToken )
,aXMLDefault( _rDefault )
@@ -404,13 +404,13 @@ void ODBExport::exportDataSource()
sal_Int32 nValue = 0;
aValue >>= nValue;
if ( sValue == "0" )
- sValue = ::rtl::OUString("equal-integer");
+ sValue = OUString("equal-integer");
else if ( sValue == "1" )
- sValue = ::rtl::OUString("is-boolean");
+ sValue = OUString("is-boolean");
else if ( sValue == "2" )
- sValue = ::rtl::OUString("equal-boolean");
+ sValue = OUString("equal-boolean");
else if ( sValue == "3" )
- sValue = ::rtl::OUString("equal-use-only-zero");
+ sValue = OUString("equal-use-only-zero");
if ( sValue == "equal-integer" )
continue;
eToken = XML_BOOLEAN_COMPARISON_MODE;
@@ -510,7 +510,7 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS, sal_True, sal_True);
Reference<XPropertySet> xProp(getDataSource());
- Sequence< ::rtl::OUString> aValue;
+ Sequence< OUString> aValue;
xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aValue;
if ( aValue.getLength() )
{
@@ -551,7 +551,7 @@ void ODBExport::exportConnectionData()
SvXMLElementExport aConnData(*this,XML_NAMESPACE_DB, XML_CONNECTION_DATA, sal_True, sal_True);
{
- ::rtl::OUString sValue;
+ OUString sValue;
Reference<XPropertySet> xProp(getDataSource());
xProp->getPropertyValue(PROPERTY_URL) >>= sValue;
if ( m_aTypeCollection.isFileSystemBased(sValue) )
@@ -559,12 +559,12 @@ void ODBExport::exportConnectionData()
SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, sal_True, sal_True);
{
SvtPathOptions aPathOptions;
- const String sOrigUrl = m_aTypeCollection.cutPrefix(sValue);
- String sFileName = aPathOptions.SubstituteVariable(sOrigUrl);
+ const OUString sOrigUrl = m_aTypeCollection.cutPrefix(sValue);
+ OUString sFileName = aPathOptions.SubstituteVariable(sOrigUrl);
if ( sOrigUrl == sFileName )
{
::svt::OFileNotation aTransformer( sFileName );
- ::rtl::OUStringBuffer sURL( aTransformer.get( ::svt::OFileNotation::N_URL ) );
+ OUStringBuffer sURL( aTransformer.get( ::svt::OFileNotation::N_URL ) );
if (sURL.getLength() == 0 || sURL[sURL.getLength() - 1] != '/')
sURL.append('/');
@@ -576,9 +576,9 @@ void ODBExport::exportConnectionData()
const ::dbaccess::DATASOURCE_TYPE eType = m_aTypeCollection.determineType(sValue);
try
{
- ::rtl::OUString sExtension;
+ OUString sExtension;
if ( eType == dbaccess::DST_MSACCESS )
- sExtension = ::rtl::OUString("mdb");
+ sExtension = OUString("mdb");
else
{
Reference< XPropertySet > xDataSourceSettings;
@@ -596,19 +596,19 @@ void ODBExport::exportConnectionData()
}
else
{
- String sDatabaseName,sHostName;
+ OUString sDatabaseName,sHostName;
sal_Int32 nPort = -1;
m_aTypeCollection.extractHostNamePort(sValue,sDatabaseName,sHostName,nPort);
- if ( sHostName.Len() )
+ if ( sHostName.getLength() )
{
SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, sal_True, sal_True);
{
- String sType = comphelper::string::stripEnd(m_aTypeCollection.getPrefix(sValue), ':');
+ OUString sType = comphelper::string::stripEnd(m_aTypeCollection.getPrefix(sValue), ':');
AddAttribute(XML_NAMESPACE_DB,XML_TYPE,sType);
AddAttribute(XML_NAMESPACE_DB,XML_HOSTNAME,sHostName);
if ( nPort != -1 )
- AddAttribute(XML_NAMESPACE_DB,XML_PORT,::rtl::OUString::valueOf(nPort));
- if ( sDatabaseName.Len() )
+ AddAttribute(XML_NAMESPACE_DB,XML_PORT,OUString::valueOf(nPort));
+ if ( sDatabaseName.getLength() )
AddAttribute(XML_NAMESPACE_DB,XML_DATABASE_NAME,sDatabaseName);
try
@@ -639,10 +639,10 @@ void ODBExport::exportConnectionData()
++i
)
{
- const ::rtl::OUString sPropertyName = ::rtl::OUString::createFromAscii( aProperties[i].pAsciiPropertyName );
+ const OUString sPropertyName = OUString::createFromAscii( aProperties[i].pAsciiPropertyName );
if ( xSettingsInfo->hasPropertyByName( sPropertyName ) )
{
- ::rtl::OUString sPropertyValue;
+ OUString sPropertyValue;
if ( ( xDataSourceSettings->getPropertyValue( sPropertyName ) >>= sPropertyValue ) && !sPropertyValue.isEmpty() )
AddAttribute( XML_NAMESPACE_DB, XML_LOCAL_SOCKET, sPropertyValue );
@@ -702,7 +702,7 @@ void ODBExport::exportDataSourceSettings()
AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE );
AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, aIter->Name );
- ::rtl::OUString sTypeName = lcl_implGetPropertyXMLType( aSimpleType );
+ OUString sTypeName = lcl_implGetPropertyXMLType( aSimpleType );
if ( bIsSequence && aSimpleType.getTypeClass() == TypeClass_ANY )
{
Sequence<Any> aSeq;
@@ -727,7 +727,7 @@ void ODBExport::exportDataSourceSettings()
switch (aSimpleType.getTypeClass())
{
case TypeClass_STRING:
- exportDataSourceSettingsSequence< ::rtl::OUString >(
+ exportDataSourceSettingsSequence< OUString >(
aIter );
break;
case TypeClass_DOUBLE:
@@ -788,18 +788,18 @@ void ODBExport::exportAutoIncrement()
}
}
// -----------------------------------------------------------------------------
-void ODBExport::exportSequence(const Sequence< ::rtl::OUString>& _aValue
+void ODBExport::exportSequence(const Sequence< OUString>& _aValue
,::xmloff::token::XMLTokenEnum _eTokenFilter
,::xmloff::token::XMLTokenEnum _eTokenType)
{
Reference<XPropertySet> xProp(getDataSource());
- Sequence< ::rtl::OUString> aValue;
+ Sequence< OUString> aValue;
if ( _aValue.getLength() )
{
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, sal_True, sal_True);
- const ::rtl::OUString* pIter = _aValue.getConstArray();
- const ::rtl::OUString* pEnd = pIter + _aValue.getLength();
+ const OUString* pIter = _aValue.getConstArray();
+ const OUString* pEnd = pIter + _aValue.getLength();
for(;pIter != pEnd;++pIter)
{
SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB, _eTokenType, sal_True, sal_False);
@@ -811,7 +811,7 @@ void ODBExport::exportSequence(const Sequence< ::rtl::OUString>& _aValue
void ODBExport::exportLogin()
{
Reference<XPropertySet> xProp(getDataSource());
- ::rtl::OUString sValue;
+ OUString sValue;
xProp->getPropertyValue(PROPERTY_USER) >>= sValue;
sal_Bool bAddLogin = !sValue.isEmpty();
if ( bAddLogin )
@@ -840,9 +840,9 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
SAL_WNODEPRECATED_DECLARATIONS_POP
if ( _bExportContext )
pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True));
- Sequence< ::rtl::OUString> aSeq = _xCollection->getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ Sequence< OUString> aSeq = _xCollection->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
for(;pIter != pEnd;++pIter)
{
Reference<XPropertySet> xProp(_xCollection->getByName(*pIter),UNO_QUERY);
@@ -861,14 +861,14 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
// -----------------------------------------------------------------------------
void ODBExport::exportComponent(XPropertySet* _xProp)
{
- ::rtl::OUString sValue;
+ OUString sValue;
_xProp->getPropertyValue(PROPERTY_PERSISTENT_NAME) >>= sValue;
sal_Bool bIsForm = sal_True;
- _xProp->getPropertyValue(::rtl::OUString("IsForm")) >>= bIsForm;
+ _xProp->getPropertyValue(OUString("IsForm")) >>= bIsForm;
if ( bIsForm )
- sValue = ::rtl::OUString("forms/") + sValue;
+ sValue = OUString("forms/") + sValue;
else
- sValue = ::rtl::OUString("reports/") + sValue;
+ sValue = OUString("reports/") + sValue;
AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
sal_Bool bAsTemplate = sal_False;
@@ -945,7 +945,7 @@ void ODBExport::exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,cons
// -----------------------------------------------------------------------------
void ODBExport::exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate)
{
- ::rtl::OUString sValue;
+ OUString sValue;
_xProp->getPropertyValue(_bUpdate ? PROPERTY_UPDATE_TABLENAME : PROPERTY_NAME) >>= sValue;
if ( !sValue.isEmpty() )
{
@@ -965,11 +965,11 @@ void ODBExport::exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate)
}
// -----------------------------------------------------------------------------
void ODBExport::exportFilter(XPropertySet* _xProp
- ,const ::rtl::OUString& _sProp
+ ,const OUString& _sProp
,enum ::xmloff::token::XMLTokenEnum _eStatementType)
{
OSL_PRECOND(!GetAttrList().getLength(),"Invalid attribute length!");
- ::rtl::OUString sCommand;
+ OUString sCommand;
_xProp->getPropertyValue(_sProp) >>= sCommand;
if ( !sCommand.isEmpty() )
{
@@ -1006,9 +1006,9 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
}
SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True);
- Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ Sequence< OUString> aSeq = xNameAccess->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
for( ; pIter != pEnd ; ++pIter)
{
Reference<XPropertySet> xProp(xNameAccess->getByName(*pIter),UNO_QUERY);
@@ -1020,7 +1020,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
sal_Bool bHidden = getBOOL(xProp->getPropertyValue(PROPERTY_HIDDEN));
- ::rtl::OUString sValue;
+ OUString sValue;
xProp->getPropertyValue(PROPERTY_HELPTEXT) >>= sValue;
Any aColumnDefault;
aColumnDefault = xProp->getPropertyValue(PROPERTY_CONTROLDEFAULT);
@@ -1036,7 +1036,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
if ( aColumnDefault.hasValue() )
{
- ::rtl::OUStringBuffer sColumnDefaultString,sType;
+ OUStringBuffer sColumnDefaultString,sType;
::sax::Converter::convertAny(
sColumnDefaultString, sType, aColumnDefault );
AddAttribute(XML_NAMESPACE_DB, XML_TYPE_NAME,sType.makeStringAndClear());
@@ -1063,7 +1063,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup)
void ODBExport::exportForms()
{
Any aValue;
- ::rtl::OUString sService;
+ OUString sService;
dbtools::getDataSourceSetting(getDataSource(),"Forms",aValue);
aValue >>= sService;
if ( sService.isEmpty() )
@@ -1084,7 +1084,7 @@ void ODBExport::exportForms()
void ODBExport::exportReports()
{
Any aValue;
- ::rtl::OUString sService;
+ OUString sService;
dbtools::getDataSourceSetting(getDataSource(),"Reports",aValue);
aValue >>= sService;
if ( sService.isEmpty() )
@@ -1105,7 +1105,7 @@ void ODBExport::exportReports()
void ODBExport::exportQueries(sal_Bool _bExportContext)
{
Any aValue;
- ::rtl::OUString sService;
+ OUString sService;
dbtools::getDataSourceSetting(getDataSource(),"CommandDefinitions",aValue);
aValue >>= sService;
if ( sService.isEmpty() )
@@ -1314,10 +1314,10 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
{
sal_Int32 nLength = aProps.getLength();
aProps.realloc(nLength + 1);
- aProps[nLength].Name = ::rtl::OUString("Queries");
- Sequence< ::rtl::OUString> aSeq = xCollection->getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ aProps[nLength].Name = OUString("Queries");
+ Sequence< OUString> aSeq = xCollection->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
Sequence<PropertyValue> aQueries(aSeq.getLength());
for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i)
@@ -1354,7 +1354,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
if ( aPropValues.getLength() )
{
aProps.realloc(nLength + 1);
- aProps[nLength].Name = ::rtl::OUString("layout-settings");
+ aProps[nLength].Name = OUString("layout-settings");
aProps[nLength].Value = aValue;
}
}
@@ -1365,14 +1365,14 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
}
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODBExport::implConvertAny(const Any& _rValue)
+OUString ODBExport::implConvertAny(const Any& _rValue)
{
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
switch (_rValue.getValueTypeClass())
{
case TypeClass_STRING:
{ // extract the string
- ::rtl::OUString sCurrentValue;
+ OUString sCurrentValue;
_rValue >>= sCurrentValue;
aBuffer.append(sCurrentValue);
}
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 68ce900..e9a04e5 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -64,29 +64,29 @@ using namespace ::com::sun::star::xml::sax;
class ODBExport : public SvXMLExport
{
- typedef ::std::map< ::xmloff::token::XMLTokenEnum, ::rtl::OUString> TSettingsMap;
+ typedef ::std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap;
- typedef ::std::pair< ::rtl::OUString ,::rtl::OUString> TStringPair;
+ typedef ::std::pair< OUString ,OUString> TStringPair;
struct TDelimiter
{
- ::rtl::OUString sText;
- ::rtl::OUString sField;
- ::rtl::OUString sDecimal;
- ::rtl::OUString sThousand;
+ OUString sText;
+ OUString sField;
+ OUString sDecimal;
+ OUString sThousand;
bool bUsed;
TDelimiter() : bUsed( false ) { }
};
- typedef ::std::map< Reference<XPropertySet> ,::rtl::OUString > TPropertyStyleMap;
+ typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap;
typedef ::std::map< Reference<XPropertySet> ,Reference<XPropertySet> > TTableColumnMap;
struct TypedPropertyValue
{
- ::rtl::OUString Name;
+ OUString Name;
::com::sun::star::uno::Type Type;
::com::sun::star::uno::Any Value;
- TypedPropertyValue( const ::rtl::OUString& _name, const ::com::sun::star::uno::Type& _type, const ::com::sun::star::uno::Any& _value )
+ TypedPropertyValue( const OUString& _name, const ::com::sun::star::uno::Type& _type, const ::com::sun::star::uno::Any& _value )
:Name( _name )
,Type( _type )
,Value( _value )
@@ -102,7 +102,7 @@ class ODBExport : public SvXMLExport
TPropertyStyleMap m_aCellAutoStyleNames;
TPropertyStyleMap m_aRowAutoStyleNames;
TTableColumnMap m_aTableDummyColumns;
- ::rtl::OUString m_sCharSet;
+ OUString m_sCharSet;
UniReference < SvXMLExportPropertyMapper> m_xExportHelper;
UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper;
UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper;
@@ -122,7 +122,7 @@ class ODBExport : public SvXMLExport
void exportDriverSettings(const TSettingsMap& _aSettings);
void exportApplicationConnectionSettings(const TSettingsMap& _aSettings);
void exportLogin();
- void exportSequence(const Sequence< ::rtl::OUString>& _aValue
+ void exportSequence(const Sequence< OUString>& _aValue
,::xmloff::token::XMLTokenEnum _eTokenFilter
,::xmloff::token::XMLTokenEnum _eTokenType);
void exportDelimiter();
@@ -147,14 +147,14 @@ class ODBExport : public SvXMLExport
void exportQuery(XPropertySet* _xProp);
void exportTable(XPropertySet* _xProp);
void exportFilter(XPropertySet* _xProp
- ,const ::rtl::OUString& _sProp
+ ,const OUString& _sProp
,enum ::xmloff::token::XMLTokenEnum _eStatementType);
void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate);
void exportAutoStyle(XPropertySet* _xProp);
void exportColumns(const Reference<XColumnsSupplier>& _xColSup);
void collectComponentStyles();
- ::rtl::OUString implConvertAny(const Any& _rValue);
+ OUString implConvertAny(const Any& _rValue);
UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const;
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index fc2d64d..eec1af6 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -104,7 +104,7 @@ enum DATASOURCE_TYPE
class OOO_DLLPUBLIC_DBA ODsnTypeCollection
{
protected:
- DECLARE_STL_VECTOR(String, StringVector);
+ DECLARE_STL_VECTOR(OUString, StringVector);
StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types
StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource
@@ -123,69 +123,69 @@ public:
~ODsnTypeCollection();
/// get the datasource type display name from a DSN string
- String getTypeDisplayName(const ::rtl::OUString& _sURL) const;
+ OUString getTypeDisplayName(const OUString& _sURL) const;
/// on a given string, cut the type prefix and return the result
- String cutPrefix(const ::rtl::OUString& _sURL) const;
+ OUString cutPrefix(const OUString& _sURL) const;
/// on a given string, return the type prefix
- String getPrefix(const ::rtl::OUString& _sURL) const;
+ OUString getPrefix(const OUString& _sURL) const;
/// determines whether there is a driver for the given URL prefix/pattern
bool hasDriver( const sal_Char* _pAsciiPattern ) const;
/// on a given string, return the Java Driver Class
- String getJavaDriverClass(const ::rtl::OUString& _sURL) const;
+ OUString getJavaDriverClass(const OUString& _sURL) const;
/// returns the media type of a file based database
- String getMediaType(const ::rtl::OUString& _sURL) const;
+ OUString getMediaType(const OUString& _sURL) const;
/// returns the dsn prefix for a given media type
- String getDatasourcePrefixFromMediaType(const ::rtl::OUString& _sMediaType,const ::rtl::OUString& _sExtension = ::rtl::OUString() );
+ OUString getDatasourcePrefixFromMediaType(const OUString& _sMediaType,const OUString& _sExtension = OUString() );
- void extractHostNamePort(const ::rtl::OUString& _rDsn,String& _sDatabaseName,String& _rHostname,sal_Int32& _nPortNumber) const;
+ void extractHostNamePort(const OUString& _rDsn,OUString& _sDatabaseName,OUString& _rHostname,sal_Int32& _nPortNumber) const;
/// check if the given data source allows creation of tables
- sal_Bool supportsTableCreation(const ::rtl::OUString& _sURL) const;
+ sal_Bool supportsTableCreation(const OUString& _sURL) const;
/// check if the given data source allows to show column description.
- sal_Bool supportsColumnDescription(const ::rtl::OUString& _sURL) const;
+ sal_Bool supportsColumnDescription(const OUString& _sURL) const;
// check if a Browse button may be shown to insert connection url
- sal_Bool supportsBrowsing(const ::rtl::OUString& _sURL) const;
+ sal_Bool supportsBrowsing(const OUString& _sURL) const;
/// check if the given data source tyoe is based on the file system - i.e. the URL is a prefix plus a file URL
- sal_Bool isFileSystemBased(const ::rtl::OUString& _sURL) const;
+ sal_Bool isFileSystemBased(const OUString& _sURL) const;
- bool isConnectionUrlRequired(const ::rtl::OUString& _sURL) const;
+ bool isConnectionUrlRequired(const OUString& _sURL) const;
/// checks if the given data source type embeds its data into the database document
- bool isEmbeddedDatabase( const ::rtl::OUString& _sURL ) const;
+ bool isEmbeddedDatabase( const OUString& _sURL ) const;
- ::rtl::OUString getEmbeddedDatabase() const;
+ OUString getEmbeddedDatabase() const;
// returns true when the properties dialog can be shown, otherwise false.
- bool isShowPropertiesEnabled( const ::rtl::OUString& _sURL ) const;
+ bool isShowPropertiesEnabled( const OUString& _sURL ) const;
/** returns default settings for newly created databases of the given type.
*/
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>
- getDefaultDBSettings( const ::rtl::OUString& _sURL ) const;
+ getDefaultDBSettings( const OUString& _sURL ) const;
/// get access to the first element of the types collection
TypeIterator begin() const;
/// get access to the (last + 1st) element of the types collection
TypeIterator end() const;
- void fillPageIds(const ::rtl::OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const;
+ void fillPageIds(const OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const;
- DATASOURCE_TYPE determineType(const String& _rDsn) const;
+ DATASOURCE_TYPE determineType(const OUString& _rDsn) const;
- bool needsJVM(const String& _rDsn) const;
+ bool needsJVM(const OUString& _rDsn) const;
- sal_Int32 getIndexOf(const ::rtl::OUString& _sURL) const;
+ sal_Int32 getIndexOf(const OUString& _sURL) const;
sal_Int32 size() const;
- ::rtl::OUString getType(const ::rtl::OUString& _sURL) const;
+ OUString getType(const OUString& _sURL) const;
};
//-------------------------------------------------------------------------
@@ -206,8 +206,8 @@ public:
TypeIterator(const TypeIterator& _rSource);
~TypeIterator();
- ::rtl::OUString getURLPrefix() const;
- String getDisplayName() const;
+ OUString getURLPrefix() const;
+ OUString getDisplayName() const;
/// prefix increment
const TypeIterator& operator++();
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index cc96224..c21c161 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -164,25 +164,25 @@ namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OApplicationController::getImplementationName() throw( RuntimeException )
+OUString SAL_CALL OApplicationController::getImplementationName() throw( RuntimeException )
{
return getImplementationName_Static();
}
//------------------------------------------------------------------------------
-::rtl::OUString OApplicationController::getImplementationName_Static() throw( RuntimeException )
+OUString OApplicationController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString(SERVICE_SDB_APPLICATIONCONTROLLER);
+ return OUString(SERVICE_SDB_APPLICATIONCONTROLLER);
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> OApplicationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
+Sequence< OUString> OApplicationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
- Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.application.DefaultViewController"));
+ Sequence< OUString> aSupported(1);
+ aSupported.getArray()[0] = OUString("com.sun.star.sdb.application.DefaultViewController");
return aSupported;
}
//-------------------------------------------------------------------------
-Sequence< ::rtl::OUString> SAL_CALL OApplicationController::getSupportedServiceNames() throw(RuntimeException)
+Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
@@ -386,7 +386,7 @@ void SAL_CALL OApplicationController::disposing()
if ( m_xDataSource.is() )
{
- m_xDataSource->removePropertyChangeListener(::rtl::OUString(), this);
+ m_xDataSource->removePropertyChangeListener(OUString(), this);
m_xDataSource->removePropertyChangeListener(PROPERTY_INFO, this);
m_xDataSource->removePropertyChangeListener(PROPERTY_URL, this);
m_xDataSource->removePropertyChangeListener(PROPERTY_ISPASSWORDREQUIRED, this);
@@ -406,13 +406,13 @@ void SAL_CALL OApplicationController::disposing()
if ( m_xModel.is() )
{
- ::rtl::OUString sUrl = m_xModel->getURL();
+ OUString sUrl = m_xModel->getURL();
if ( !sUrl.isEmpty() )
{
::comphelper::NamedValueCollection aArgs( m_xModel->getArgs() );
if ( true == aArgs.getOrDefault( "PickListEntry", true ) )
{
- ::rtl::OUString aFilter;
+ OUString aFilter;
INetURLObject aURL( m_xModel->getURL() );
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
@@ -423,7 +423,7 @@ void SAL_CALL OApplicationController::disposing()
aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
aFilter,
getStrippedDatabaseName(),
- ::rtl::OUString() );
+ OUString() );
}
}
@@ -531,7 +531,7 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt
if ( xBroadcaster.is() )
{
xBroadcaster->notifyDocumentEvent(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnPrepareViewClosing" ) ),
+ OUString("OnPrepareViewClosing"),
this,
Any()
);
@@ -660,7 +660,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = xEnumAccess.is();
if ( aReturn.bEnabled )
{
- const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext);
+ const OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext);
aReturn.bEnabled = !sReportEngineServiceName.isEmpty();
if ( aReturn.bEnabled )
{
@@ -746,7 +746,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = xEnumAccess.is();
if ( aReturn.bEnabled )
{
- static ::rtl::OUString s_sReportDesign(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory"));
+ static OUString s_sReportDesign("com.sun.star.report.pentaho.SOReportJobFactory");
Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(s_sReportDesign);
aReturn.bEnabled = xEnumDrivers.is() && xEnumDrivers->hasMoreElements();
}
@@ -804,10 +804,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
&& ( getContainer()->isALeafSelected() )
)
{
- ::std::vector< ::rtl::OUString > aSelected;
+ ::std::vector< OUString > aSelected;
getSelectionElementNames( aSelected );
bool bAlterableViews = true;
- for ( ::std::vector< ::rtl::OUString >::const_iterator selectedName = aSelected.begin();
+ for ( ::std::vector< OUString >::const_iterator selectedName = aSelected.begin();
bAlterableViews && ( selectedName != aSelected.end() ) ;
++selectedName
)
@@ -898,12 +898,12 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = m_xDataSource.is();
if ( aReturn.bEnabled )
{
- ::rtl::OUString sURL;
+ OUString sURL;
m_xDataSource->getPropertyValue(PROPERTY_URL) >>= sURL;
- ::rtl::OUString sDSTypeName;
+ OUString sDSTypeName;
if ( m_aTypeCollection.isEmbeddedDatabase( sURL ) )
{
- sDSTypeName = String( ModuleRes( RID_STR_EMBEDDED_DATABASE ) );
+ sDSTypeName = OUString( ModuleRes( RID_STR_EMBEDDED_DATABASE ) );
}
else
{
@@ -916,20 +916,20 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = m_xDataSource.is();
if ( aReturn.bEnabled )
{
- ::rtl::OUString sURL;
+ OUString sURL;
m_xDataSource->getPropertyValue(PROPERTY_URL) >>= sURL;
- String sDatabaseName;
- String sHostName;
+ OUString sDatabaseName;
+ OUString sHostName;
sal_Int32 nPortNumber( -1 );
m_aTypeCollection.extractHostNamePort( sURL, sDatabaseName, sHostName, nPortNumber );
- if ( !sDatabaseName.Len() )
+ if ( !sDatabaseName.getLength() )
sDatabaseName = m_aTypeCollection.cutPrefix( sURL );
if ( m_aTypeCollection.isFileSystemBased(sURL) )
{
sDatabaseName = SvtPathOptions().SubstituteVariable( sDatabaseName );
- if ( sDatabaseName.Len() )
+ if ( sDatabaseName.getLength() )
{
::svt::OFileNotation aFileNotation(sDatabaseName);
// set this decoded URL as text
@@ -937,7 +937,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
}
}
- if ( sDatabaseName.Len() == 0 )
+ if ( sDatabaseName.getLength() == 0 )
sDatabaseName = m_aTypeCollection.getTypeDisplayName( sURL );
aReturn.sTitle = sDatabaseName;
@@ -952,10 +952,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = m_xDataSource.is();
if ( aReturn.bEnabled )
{
- ::rtl::OUString sURL;
+ OUString sURL;
m_xDataSource->getPropertyValue( PROPERTY_URL ) >>= sURL;
- String sHostName, sDatabaseName;
+ OUString sHostName, sDatabaseName;
sal_Int32 nPortNumber = -1;
m_aTypeCollection.extractHostNamePort( sURL, sDatabaseName, sHostName, nPortNumber );
aReturn.sTitle = sHostName;
@@ -1044,7 +1044,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case E_TABLE:
{
// get the selected tablename
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
getSelectionElementNames( aList );
if ( !aList.empty() )
m_aTableCopyHelper.SetTableNameForAppend( *aList.begin() );
@@ -1061,9 +1061,9 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
break;
default:
{
- ::std::vector< ::rtl::OUString> aList;
+ ::std::vector< OUString> aList;
getSelectionElementNames(aList);
- ::rtl::OUString sFolderNameToInsertInto;
+ OUString sFolderNameToInsertInto;
if ( !aList.empty() )
{
Reference< XHierarchicalNameAccess > xContainer(getElements(eType),UNO_QUERY);
@@ -1092,7 +1092,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
::std::vector<SotFormatStringId> aFormatIds;
getSupportedFormats(getContainer()->getElementType(),aFormatIds);
const ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end();
- ::rtl::OUString sEmpty;
+ OUString sEmpty;
for (::std::vector<SotFormatStringId>::iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter)
pDlg->Insert(*aIter,sEmpty);
@@ -1126,16 +1126,16 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
switch(_nId)
{
case SID_HELP_INDEX:
- aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:HelpIndex"));
+ aURL.Complete = OUString(".uno:HelpIndex");
break;
case SID_OPENDOC:
- aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"));
+ aURL.Complete = OUString(".uno:Open");
break;
}
if ( m_xUrlTransformer.is() )
m_xUrlTransformer->parseStrict( aURL );
- Reference < XDispatch > xDisp = xProv->queryDispatch( aURL, String(), 0 );
+ Reference < XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 );
if ( xDisp.is() )
xDisp->dispatch( aURL, Sequence < PropertyValue >() );
}
@@ -1157,7 +1157,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case ID_BROWSER_SAVEASDOC:
{
- ::rtl::OUString sUrl;
+ OUString sUrl;
if ( m_xModel.is() )
sUrl = m_xModel->getURL();
if ( sUrl.isEmpty() )
@@ -1252,7 +1252,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
eType = E_QUERY;
break;
case ID_NEW_QUERY_DESIGN:
- aCreationArgs.put( (::rtl::OUString)PROPERTY_GRAPHICAL_DESIGN, sal_True );
+ aCreationArgs.put( (OUString)PROPERTY_GRAPHICAL_DESIGN, sal_True );
// run through
case ID_NEW_QUERY_SQL:
eType = E_QUERY;
@@ -1277,7 +1277,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case SID_APP_NEW_FOLDER:
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list