[Libreoffice-commits] .: dbaccess/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 10 01:24:17 PST 2013
dbaccess/source/core/dataaccess/connection.cxx | 64 +++---
dbaccess/source/core/dataaccess/databasedocument.cxx | 167 ++++++++----------
dbaccess/source/core/dataaccess/datasource.cxx | 110 +++++------
dbaccess/source/core/dataaccess/documentcontainer.cxx | 116 ++++++------
4 files changed, 226 insertions(+), 231 deletions(-)
New commits:
commit 0f2a3a3bdc157d997fe1967e10300fc6fecf2bec
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Tue Jan 8 19:46:57 2013 -0200
Removed some RTL_* macros and rtl:: prefixes in dbaccess
Change-Id: I467ad9307536e6cdd32ebcdd40539bd5f8614c85
Conflicts:
dbaccess/source/core/dataaccess/documentcontainer.cxx
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index fcfe219..12dafb6 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -73,22 +73,22 @@ namespace dbaccess
//==========================================================================
// XServiceInfo
-rtl::OUString OConnection::getImplementationName( ) throw(RuntimeException)
+OUString OConnection::getImplementationName( ) throw(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getImplementationName" );
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dbaccess.Connection"));
+ return OUString("com.sun.star.comp.dbaccess.Connection");
}
-sal_Bool OConnection::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+sal_Bool OConnection::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::supportsService" );
return findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
}
-Sequence< ::rtl::OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeException)
+Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getSupportedServiceNames" );
- Sequence< ::rtl::OUString > aSupported = OConnectionWrapper::getSupportedServiceNames();
+ Sequence< OUString > aSupported = OConnectionWrapper::getSupportedServiceNames();
if ( 0 == findValue( aSupported, SERVICE_SDB_CONNECTION, sal_True ).getLength() )
{
@@ -131,7 +131,7 @@ Reference< XStatement > OConnection::createStatement(void) throw( SQLException,
}
return xStatement;
}
-Reference< XPreparedStatement > OConnection::prepareStatement(const rtl::OUString& sql) throw( SQLException, RuntimeException )
+Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& sql) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::prepareStatement" );
MutexGuard aGuard(m_aMutex);
@@ -148,7 +148,7 @@ Reference< XPreparedStatement > OConnection::prepareStatement(const rtl::OUStri
return xStatement;
}
-Reference< XPreparedStatement > OConnection::prepareCall(const rtl::OUString& sql) throw( SQLException, RuntimeException )
+Reference< XPreparedStatement > OConnection::prepareCall(const OUString& sql) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::prepareCall" );
MutexGuard aGuard(m_aMutex);
@@ -164,7 +164,7 @@ Reference< XPreparedStatement > OConnection::prepareCall(const rtl::OUString& s
return xStatement;
}
-rtl::OUString OConnection::nativeSQL(const rtl::OUString& sql) throw( SQLException, RuntimeException )
+OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::nativeSQL" );
MutexGuard aGuard(m_aMutex);
@@ -228,7 +228,7 @@ sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException )
return m_xMasterConnection->isReadOnly();
}
-void OConnection::setCatalog(const rtl::OUString& catalog) throw( SQLException, RuntimeException )
+void OConnection::setCatalog(const OUString& catalog) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::setCatalog" );
MutexGuard aGuard(m_aMutex);
@@ -236,7 +236,7 @@ void OConnection::setCatalog(const rtl::OUString& catalog) throw( SQLException,
m_xMasterConnection->setCatalog(catalog);
}
-rtl::OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException )
+OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getCatalog" );
MutexGuard aGuard(m_aMutex);
@@ -341,11 +341,11 @@ OConnection::OConnection(ODatabaseSource& _rDB
Reference<XResultSet> xRes = xMeta->getTableTypes();
if(xRes.is())
{
- ::rtl::OUString sView(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
+ OUString sView("VIEW");
Reference<XRow> xRow(xRes,UNO_QUERY);
while(xRes->next())
{
- ::rtl::OUString sValue = xRow->getString(1);
+ OUString sValue = xRow->getString(1);
if( !xRow->wasNull() && sValue == sView)
{
m_bSupportsViews = sal_True;
@@ -634,20 +634,20 @@ Reference< XNameAccess > OConnection::getQueries(void) throw( RuntimeException
}
// ::com::sun::star::sdb::XCommandPreparation
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const ::rtl::OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::prepareCommand" );
MutexGuard aGuard(m_aMutex);
checkDisposed();
- rtl::OUString aStatement;
+ OUString aStatement;
switch (commandType)
{
case CommandType::TABLE:
{
- aStatement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM "));
+ aStatement = "SELECT * FROM ";
- ::rtl::OUString sCatalog, sSchema, sTable;
+ OUString sCatalog, sSchema, sTable;
::dbtools::qualifiedNameComponents( getMetaData(), command, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
aStatement += ::dbtools::composeTableNameForSelect( this, sCatalog, sSchema, sTable );
}
@@ -666,7 +666,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const ::r
return prepareStatement(aStatement);
}
-Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUString& _sServiceSpecifier ) throw (Exception, RuntimeException)
+Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier ) throw (Exception, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::createInstance" );
Reference< XServiceInfo > xRet;
@@ -684,7 +684,7 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
{
Sequence<Any> aArgs(1);
Reference<XConnection> xMy(this);
- aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),makeAny(xMy));
+ aArgs[0] <<= NamedValue("ActiveConnection",makeAny(xMy));
aFind = m_aSupportServices.insert(TSupportServices::value_type(_sServiceSpecifier,m_aContext.createComponentWithArguments(_sServiceSpecifier,aArgs))).first;
}
return aFind->second;
@@ -693,16 +693,16 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const ::rtl::OUStr
return Reference< XInterface >(xRet,UNO_QUERY);
}
-Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const ::rtl::OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException)
+Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::createInstanceWithArguments" );
return createInstance(_sServiceSpecifier);
}
-Sequence< ::rtl::OUString > SAL_CALL OConnection::getAvailableServiceNames( ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames( ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getAvailableServiceNames" );
- Sequence< ::rtl::OUString > aRet(1);
+ Sequence< OUString > aRet(1);
aRet[0] = SERVICE_NAME_SINGLESELECTQUERYCOMPOSER;
return aRet;
}
@@ -751,10 +751,10 @@ void OConnection::impl_loadConnectionTools_throw()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::impl_loadConnectionTools_throw" );
Sequence< Any > aArguments( 1 );
- aArguments[0] <<= NamedValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Connection" ) ), makeAny( Reference< XConnection >( this ) ) );
+ aArguments[0] <<= NamedValue( "Connection" , makeAny( Reference< XConnection >( this ) ) );
if ( !m_aContext.createComponentWithArguments( "com.sun.star.sdb.tools.ConnectionTools", aArguments, m_xConnectionTools ) )
- throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "service not registered: com.sun.star.sdb.tools.ConnectionTools" ) ), *this );
+ throw RuntimeException( "service not registered: com.sun.star.sdb.tools.ConnectionTools" , *this );
}
Reference< XTableName > SAL_CALL OConnection::createTableName( ) throw (RuntimeException)
@@ -787,7 +787,7 @@ Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData( )
return m_xConnectionTools->getDataSourceMetaData();
}
-Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, RuntimeException)
+Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getFieldsByCommandDescriptor" );
MutexGuard aGuard(m_aMutex);
@@ -797,7 +797,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getF
return m_xConnectionTools->getFieldsByCommandDescriptor(commandType,command,keepFieldsAlive);
}
-Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException)
+Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getComposer" );
MutexGuard aGuard(m_aMutex);
@@ -818,20 +818,20 @@ void OConnection::impl_checkTableQueryNames_nothrow()
try
{
Reference< XNameAccess > xTables( getTables() );
- Sequence< ::rtl::OUString > aTableNames( xTables->getElementNames() );
- ::std::set< ::rtl::OUString > aSortedTableNames( aTableNames.getConstArray(), aTableNames.getConstArray() + aTableNames.getLength() );
+ Sequence< OUString > aTableNames( xTables->getElementNames() );
+ ::std::set< OUString > aSortedTableNames( aTableNames.getConstArray(), aTableNames.getConstArray() + aTableNames.getLength() );
Reference< XNameAccess > xQueries( getQueries() );
- Sequence< ::rtl::OUString > aQueryNames( xQueries->getElementNames() );
+ Sequence< OUString > aQueryNames( xQueries->getElementNames() );
- for ( const ::rtl::OUString* pQueryName = aQueryNames.getConstArray();
+ for ( const OUString* pQueryName = aQueryNames.getConstArray();
pQueryName != aQueryNames.getConstArray() + aQueryNames.getLength();
++pQueryName
)
{
if ( aSortedTableNames.find( *pQueryName ) != aSortedTableNames.end() )
{
- ::rtl::OUString sConflictWarning( DBACORE_RESSTRING( RID_STR_CONFLICTING_NAMES ) );
+ OUString sConflictWarning( DBACORE_RESSTRING( RID_STR_CONFLICTING_NAMES ) );
m_aWarnings.appendWarning( sConflictWarning, "01SB0", *this );
}
}
@@ -842,7 +842,7 @@ void OConnection::impl_checkTableQueryNames_nothrow()
}
}
-Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException)
+Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getTableIcon" );
Reference< XGraphic > xReturn;
@@ -859,7 +859,7 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const ::rtl::OUString&
return xReturn;
}
-Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const ::rtl::OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
+Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::getTableEditor" );
Reference< XInterface > xReturn;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e3c799d..09919f3 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -324,7 +324,7 @@ namespace
try
{
if ( _bStart )
- xStatusIndicator->start( ::rtl::OUString(), (sal_Int32)1000000 );
+ xStatusIndicator->start( OUString(), (sal_Int32)1000000 );
else
xStatusIndicator->end();
}
@@ -356,7 +356,7 @@ namespace
try
{
- _rxStatusIndicator->start( ::rtl::OUString(), (sal_Int32)1000000 );
+ _rxStatusIndicator->start( OUString(), (sal_Int32)1000000 );
sal_Int32 nLength = _rCallArgs.getLength();
_rCallArgs.realloc( nLength + 1 );
@@ -368,7 +368,7 @@ namespace
}
}
- static Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const ::rtl::OUString _rURL )
+ static Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const OUString _rURL )
{
::comphelper::NamedValueCollection aMutableDescriptor( _rDescriptor );
if ( !_rURL.isEmpty() )
@@ -380,7 +380,7 @@ namespace
}
}
-static rtl::OUString sPictures( RTL_CONSTASCII_USTRINGPARAM("Pictures") );
+static OUString sPictures( "Pictures" );
// base documents seem to have a different behaviour to other documents, the
// root storage contents at least seem to be re-used over different saves, thus if there is a
@@ -402,28 +402,28 @@ static rtl::OUString sPictures( RTL_CONSTASCII_USTRINGPARAM("Pictures") );
void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const ::comphelper::ComponentContext& aContext ) throw ( RuntimeException )
{
- Sequence< rtl::OUString > sLibraries = xDlgCont->getElementNames();
- Reference< XStorage > xTmpPic = xStorage->openStorageElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("tempPictures") ), ElementModes::READWRITE );
+ Sequence< OUString > sLibraries = xDlgCont->getElementNames();
+ Reference< XStorage > xTmpPic = xStorage->openStorageElement( "tempPictures", ElementModes::READWRITE );
- std::vector< rtl::OUString > vEmbedImgUrls;
+ std::vector< OUString > vEmbedImgUrls;
for ( sal_Int32 i=0; i < sLibraries.getLength(); ++i )
{
- rtl::OUString sLibrary( sLibraries[ i ] );
+ OUString sLibrary( sLibraries[ i ] );
xDlgCont->loadLibrary( sLibrary );
Reference< XNameContainer > xLib;
xDlgCont->getByName( sLibrary ) >>= xLib;
if ( xLib.is() )
{
- Sequence< rtl::OUString > sDialogs = xLib->getElementNames();
+ Sequence< OUString > sDialogs = xLib->getElementNames();
sal_Int32 nDialogs( sDialogs.getLength() );
for ( sal_Int32 j=0; j < nDialogs; ++j )
{
Reference < ::com::sun::star::awt::XDialogProvider > xDlgPrv;
Sequence< Any > aArgs(1);
aArgs[ 0 ] <<= rxModel;
- xDlgPrv.set( aContext.createComponentWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")) , aArgs), UNO_QUERY );
- rtl::OUString sDialogUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:") );
- sDialogUrl = sDialogUrl.concat( sLibraries[ i ] ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("." ) ) ).concat ( sDialogs[ j ] ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
+ xDlgPrv.set( aContext.createComponentWithArguments( "com.sun.star.awt.DialogProvider", aArgs), UNO_QUERY );
+ OUString sDialogUrl = "vnd.sun.star.script:";
+ sDialogUrl = sDialogUrl.concat( sLibraries[ i ] ).concat( "." ).concat ( sDialogs[ j ] ).concat( "?location=document" );
Reference< ::com::sun::star::awt::XControl > xDialog( xDlgPrv->createDialog( sDialogUrl ), UNO_QUERY );
Reference< XInterface > xModel( xDialog->getModel() );
@@ -438,9 +438,9 @@ void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibrar
Sequence< Any > aArgs( 1 );
aArgs[ 0 ] <<= xTmpPic;
Reference< XGraphicObjectResolver > xGraphicResolver(
- aContext.createComponentWithArguments( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Svx.GraphicExportHelper" ) ), aArgs ), UNO_QUERY );
- std::vector< rtl::OUString >::iterator it = vEmbedImgUrls.begin();
- std::vector< rtl::OUString >::iterator it_end = vEmbedImgUrls.end();
+ aContext.createComponentWithArguments( "com.sun.star.comp.Svx.GraphicExportHelper", aArgs ), UNO_QUERY );
+ std::vector< OUString >::iterator it = vEmbedImgUrls.begin();
+ std::vector< OUString >::iterator it_end = vEmbedImgUrls.end();
if ( xGraphicResolver.is() )
{
for ( sal_Int32 count = 0; it != it_end; ++it, ++count )
@@ -501,13 +501,13 @@ void ODatabaseDocument::impl_import_nolck_throw( const ::comphelper::ComponentCo
/** property map for import info set */
comphelper::PropertyMapEntry aExportInfoMap[] =
{
- { MAP_LEN( "BaseURI"), 0,&::getCppuType( (::rtl::OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamName"), 0,&::getCppuType( (::rtl::OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "BaseURI"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "StreamName"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(_rResource.getOrDefault("URL",::rtl::OUString())));
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))));
+ xInfoSet->setPropertyValue("BaseURI", uno::makeAny(_rResource.getOrDefault("URL",OUString())));
+ xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("content.xml")));
const sal_Int32 nCount = aFilterCreationArgs.getLength();
aFilterCreationArgs.realloc(nCount + 1);
@@ -674,7 +674,7 @@ namespace
return sal_False;
}
-void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
+void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
{
DocumentGuard aGuard( *this );
ModifyLock aLock( *this );
@@ -706,16 +706,16 @@ void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const ::rtl::OUString& i_T
throw;
}
- throw WrappedTargetException( ::rtl::OUString(), *this, aError );
+ throw WrappedTargetException( OUString(), *this, aError );
}
}
-void SAL_CALL ODatabaseDocument::recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
+void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException )
{
DocumentGuard aGuard( *this, DocumentGuard::InitMethod );
if ( i_SourceLocation.isEmpty() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
try
{
@@ -738,7 +738,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const ::rtl::OUString& i_Sourc
// by definition (of XDocumentRecovery), we're responsible for delivering a fully-initialized document,
// which includes an attachResource call.
- const ::rtl::OUString sLogicalDocumentURL( i_SalvagedFile.isEmpty() ? i_SourceLocation : i_SalvagedFile );
+ const OUString sLogicalDocumentURL( i_SalvagedFile.isEmpty() ? i_SourceLocation : i_SalvagedFile );
impl_attachResource( sLogicalDocumentURL, aMediaDescriptor.getPropertyValues(), aGuard );
// <- SYNCHRONIZED
}
@@ -754,18 +754,18 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const ::rtl::OUString& i_Sourc
throw;
}
- throw WrappedTargetException( ::rtl::OUString(), *this, aError );
+ throw WrappedTargetException( OUString(), *this, aError );
}
}
// XModel
-sal_Bool SAL_CALL ODatabaseDocument::attachResource( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
+sal_Bool SAL_CALL ODatabaseDocument::attachResource( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
{
DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
return impl_attachResource( _rURL, _rArguments, aGuard );
}
-sal_Bool ODatabaseDocument::impl_attachResource( const ::rtl::OUString& i_rLogicalDocumentURL,
+sal_Bool ODatabaseDocument::impl_attachResource( const OUString& i_rLogicalDocumentURL,
const Sequence< PropertyValue >& i_rMediaDescriptor, DocumentGuard& _rDocGuard )
{
if ( ( i_rLogicalDocumentURL == getURL() )
@@ -781,7 +781,7 @@ sal_Bool ODatabaseDocument::impl_attachResource( const ::rtl::OUString& i_rLogic
// if no URL has been provided, the caller was lazy enough to not call our getURL - which is not allowed anymore,
// now since getURL and getLocation both return the same, so calling one of those should be simple.
- ::rtl::OUString sDocumentURL( i_rLogicalDocumentURL );
+ OUString sDocumentURL( i_rLogicalDocumentURL );
OSL_ENSURE( !sDocumentURL.isEmpty(), "ODatabaseDocument::impl_attachResource: invalid URL!" );
if ( sDocumentURL.isEmpty() )
sDocumentURL = getURL();
@@ -806,7 +806,7 @@ sal_Bool ODatabaseDocument::impl_attachResource( const ::rtl::OUString& i_rLogic
return sal_True;
}
-::rtl::OUString SAL_CALL ODatabaseDocument::getURL( ) throw (RuntimeException)
+OUString SAL_CALL ODatabaseDocument::getURL( ) throw (RuntimeException)
{
DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
return m_pImpl->getURL();
@@ -963,7 +963,7 @@ sal_Bool SAL_CALL ODatabaseDocument::hasLocation( ) throw (RuntimeException)
return !getLocation().isEmpty();
}
-::rtl::OUString SAL_CALL ODatabaseDocument::getLocation( ) throw (RuntimeException)
+OUString SAL_CALL ODatabaseDocument::getLocation( ) throw (RuntimeException)
{
DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
return m_pImpl->getURL();
@@ -981,7 +981,7 @@ void SAL_CALL ODatabaseDocument::store( ) throw (IOException, RuntimeException)
{
DocumentGuard aGuard( *this );
- ::rtl::OUString sDocumentURL( m_pImpl->getURL() );
+ OUString sDocumentURL( m_pImpl->getURL() );
if ( !sDocumentURL.isEmpty() )
{
if ( m_pImpl->getDocFileLocation() == m_pImpl->getURL() )
@@ -1010,13 +1010,13 @@ void SAL_CALL ODatabaseDocument::store( ) throw (IOException, RuntimeException)
// allowed to leave
throw;
}
- impl_throwIOExceptionCausedBySave_throw( aError, ::rtl::OUString() );
+ impl_throwIOExceptionCausedBySave_throw( aError, OUString() );
}
}
-void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rError, const ::rtl::OUString& i_rTargetURL ) const
+void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rError, const OUString& i_rTargetURL ) const
{
- ::rtl::OUString sErrorMessage = extractExceptionMessage( m_pImpl->m_aContext, i_rError );
+ OUString sErrorMessage = extractExceptionMessage( m_pImpl->m_aContext, i_rError );
sErrorMessage = ResourceManager::loadString(
RID_STR_ERROR_WHILE_SAVING,
"$location$", i_rTargetURL,
@@ -1025,7 +1025,7 @@ void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rE
throw IOException( sErrorMessage, *const_cast< ODatabaseDocument* >( this ) );
}
-void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments,
+void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments,
const StoreType _eType, DocumentGuard& _rGuard ) throw ( IOException, RuntimeException )
{
OSL_PRECOND( ( _eType == SAVE ) || ( _eType == SAVE_AS ),
@@ -1127,7 +1127,7 @@ void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const
impl_notifyStorageChange_nolck_nothrow( xNewRootStorage );
}
-Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const ::rtl::OUString& _rURL ) const
+Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const OUString& _rURL ) const
{
Reference< ucb::XSimpleFileAccess3 > xTempAccess(ucb::SimpleFileAccess::create(m_pImpl->m_aContext.getUNOContext()));
Reference< io::XStream > xStream = xTempAccess->openFileReadWrite( _rURL );
@@ -1144,7 +1144,7 @@ Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const ::rt
return Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aParam ), UNO_QUERY_THROW );
}
-void SAL_CALL ODatabaseDocument::storeAsURL( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException)
+void SAL_CALL ODatabaseDocument::storeAsURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException)
{
// SYNCHRONIZED ->
DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
@@ -1196,10 +1196,10 @@ void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >&
DocumentGuard& _rDocGuard ) const
{
if ( !_rxTargetStorage.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *const_cast< ODatabaseDocument* >( this ), 1 );
+ throw IllegalArgumentException( OUString(), *const_cast< ODatabaseDocument* >( this ), 1 );
if ( !m_pImpl.is() )
- throw DisposedException( ::rtl::OUString(), *const_cast< ODatabaseDocument* >( this ) );
+ throw DisposedException( OUString(), *const_cast< ODatabaseDocument* >( this ) );
try
{
@@ -1232,7 +1232,7 @@ void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >&
}
}
-void SAL_CALL ODatabaseDocument::storeToURL( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException)
+void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException)
{
DocumentGuard aGuard( *this );
ModifyLock aLock( *this );
@@ -1345,10 +1345,10 @@ void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< X
m_aEventNotifier.removeDocumentEventListener( _Listener );
}
-void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
+void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
{
if ( _EventName.isEmpty() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
// SYNCHRONIZED ->
DocumentGuard aGuard( *this );
@@ -1413,12 +1413,12 @@ Reference< XNameAccess > ODatabaseDocument::impl_getDocumentContainer_throw( ODa
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xMy(*this);
if ( dbtools::getDataSourceSetting(xMy,bFormsContainer ? "Forms" : "Reports",aValue) )
{
- ::rtl::OUString sSupportService;
+ OUString sSupportService;
aValue >>= sSupportService;
if ( !sSupportService.isEmpty() )
{
Sequence<Any> aArgs(1);
- aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseDocument")),makeAny(xMy));
+ aArgs[0] <<= NamedValue("DatabaseDocument",makeAny(xMy));
xContainer.set(m_pImpl->m_aContext.createComponentWithArguments(sSupportService,aArgs),UNO_QUERY);
rContainerRef = xContainer;
}
@@ -1555,7 +1555,7 @@ void ODatabaseDocument::WriteThroughComponent( const Reference< XComponent >& xC
OSL_ENSURE( pServiceName, "Need service name!" );
// open stream
- ::rtl::OUString sStreamName = ::rtl::OUString::createFromAscii( pStreamName );
+ OUString sStreamName = OUString::createFromAscii( pStreamName );
Reference< XStream > xStream = _xStorageToSaveTo->openStreamElement( sStreamName, ElementModes::READWRITE | ElementModes::TRUNCATE );
if ( !xStream.is() )
return;
@@ -1570,8 +1570,8 @@ void ODatabaseDocument::WriteThroughComponent( const Reference< XComponent >& xC
xSeek->seek(0);
Reference< XPropertySet > xStreamProp( xOutputStream, UNO_QUERY_THROW );
- xStreamProp->setPropertyValue( INFO_MEDIATYPE, makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/xml" ) ) ) );
- xStreamProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), makeAny( (sal_Bool)sal_True ) );
+ xStreamProp->setPropertyValue( INFO_MEDIATYPE, makeAny( OUString( "text/xml" ) ) );
+ xStreamProp->setPropertyValue( "Compressed", makeAny( (sal_Bool)sal_True ) );
// write the stuff
WriteThroughComponent( xOutputStream, xComponent, pServiceName, _rArguments, rMediaDesc );
@@ -1621,19 +1621,19 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
/** property map for export info set */
comphelper::PropertyMapEntry aExportInfoMap[] =
{
- { MAP_LEN( "BaseURI"), 0,&::getCppuType( (::rtl::OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamName"), 0,&::getCppuType( (::rtl::OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "BaseURI"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "StreamName"), 0,&::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 },
{ MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0},
{ NULL, 0, 0, NULL, 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
SvtSaveOptions aSaveOpt;
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")), uno::makeAny(aSaveOpt.IsPrettyPrinting()));
+ xInfoSet->setPropertyValue("UsePrettyPrinting", uno::makeAny(aSaveOpt.IsPrettyPrinting()));
if ( aSaveOpt.IsSaveRelFSys() )
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(_rMediaDescriptor.getOrDefault("URL",::rtl::OUString())));
+ xInfoSet->setPropertyValue("BaseURI", uno::makeAny(_rMediaDescriptor.getOrDefault("URL",OUString())));
- ::rtl::OUString aVersion;
+ OUString aVersion;
SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion();
// older versions can not have this property set, it exists only starting from ODF1.2
@@ -1644,7 +1644,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
{
try
{
- xInfoSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Version" )), uno::makeAny( aVersion ) );
+ xInfoSet->setPropertyValue( "Version" , uno::makeAny( aVersion ) );
}
catch( const uno::Exception& )
{
@@ -1656,18 +1656,18 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
aDelegatorArguments[nArgsLen++] <<= xInfoSet;
Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
- xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( (rtl::OUString)MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) );
+ xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( (OUString)MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ) );
Reference< XComponent > xComponent( *const_cast< ODatabaseDocument* >( this ), UNO_QUERY_THROW );
Sequence< PropertyValue > aMediaDescriptor;
_rMediaDescriptor >>= aMediaDescriptor;
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("settings.xml"))));
+ xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("settings.xml")));
WriteThroughComponent( xComponent, "settings.xml", "com.sun.star.comp.sdb.XMLSettingsExporter",
aDelegatorArguments, aMediaDescriptor, _rxTargetStorage );
- xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))));
+ xInfoSet->setPropertyValue("StreamName", uno::makeAny(OUString("content.xml")));
WriteThroughComponent( xComponent, "content.xml", "com.sun.star.comp.sdb.DBExportFilter",
aDelegatorArguments, aMediaDescriptor, _rxTargetStorage );
@@ -1702,15 +1702,15 @@ Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurat
Reference< XUIConfigurationStorage > xUIConfigStorage( m_xUIConfigurationManager, UNO_QUERY );
if ( xUIConfigStorage.is() )
{
- rtl::OUString aUIConfigFolderName( RTL_CONSTASCII_USTRINGPARAM( "Configurations2" ));
+ OUString aUIConfigFolderName( "Configurations2" );
Reference< XStorage > xConfigStorage;
// First try to open with READWRITE and then READ
xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, ElementModes::READWRITE );
if ( xConfigStorage.is() )
{
- rtl::OUString aUIConfigMediaType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.xml.ui.configuration" ));
- rtl::OUString aMediaType;
+ OUString aUIConfigMediaType( "application/vnd.sun.xml.ui.configuration" );
+ OUString aMediaType;
Reference< XPropertySet > xPropSet( xConfigStorage, UNO_QUERY );
Any a = xPropSet->getPropertyValue( INFO_MEDIATYPE );
if ( !( a >>= aMediaType ) || aMediaType.isEmpty() )
@@ -1730,7 +1730,7 @@ Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurat
return m_xUIConfigurationManager;
}
-Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (RuntimeException)
+Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (RuntimeException)
{
DocumentGuard aGuard( *this );
@@ -1738,7 +1738,7 @@ Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const :
return xStorageAccess->getDocumentSubStorage( aStorageName, nMode );
}
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, RuntimeException)
+Sequence< OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, RuntimeException)
{
Reference< XDocumentSubStorageSupplier > xStorageAccess( m_pImpl->getDocumentSubStorageSupplier() );
return xStorageAccess->getDocumentSubStoragesNames();
@@ -1850,17 +1850,17 @@ void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEv
}
// XServiceInfo
-rtl::OUString ODatabaseDocument::getImplementationName( ) throw(RuntimeException)
+OUString ODatabaseDocument::getImplementationName( ) throw(RuntimeException)
{
return getImplementationName_static();
}
-rtl::OUString ODatabaseDocument::getImplementationName_static( ) throw(RuntimeException)
+OUString ODatabaseDocument::getImplementationName_static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseDocument"));
+ return OUString("com.sun.star.comp.dba.ODatabaseDocument");
}
-Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames( ) throw (RuntimeException)
+Sequence< OUString > ODatabaseDocument::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_static();
}
@@ -1876,15 +1876,15 @@ Reference< XInterface > ODatabaseDocument::Create( const Reference< XComponentCo
return xModel.get();
}
-Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames_static( ) throw (RuntimeException)
+Sequence< OUString > ODatabaseDocument::getSupportedServiceNames_static( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aSNS( 2 );
- aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"));
- aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OfficeDocument"));
+ Sequence< OUString > aSNS( 2 );
+ aSNS[0] = "com.sun.star.sdb.OfficeDatabaseDocument";
+ aSNS[1] = "com.sun.star.document.OfficeDocument";
return aSNS;
}
-sal_Bool ODatabaseDocument::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+sal_Bool ODatabaseDocument::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
{
return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
}
@@ -2018,28 +2018,24 @@ Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) throw (
return new ::comphelper::OAnyEnumeration(aController);
}
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames( ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aNames(1);
+ Sequence< OUString > aNames(1);
aNames[0] = SERVICE_SDB_APPLICATIONCONTROLLER;
return aNames;
}
Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
{
- return createViewController(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Default" ) ),
- Sequence< PropertyValue >(),
- _Frame
- );
+ return createViewController( "Default", Sequence< PropertyValue >(), _Frame);
}
-Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const ::rtl::OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
+Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& _ViewName, const Sequence< PropertyValue >& _Arguments, const Reference< XFrame >& _Frame ) throw (IllegalArgumentException, Exception, RuntimeException)
{
if ( _ViewName != "Default" && _ViewName != "Preview" )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
if ( !_Frame.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 3 );
+ throw IllegalArgumentException( OUString(), *this, 3 );
DocumentGuard aGuard( *this );
::comphelper::ComponentContext aContext( m_pImpl->m_aContext );
@@ -2079,7 +2075,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
if ( !m_xModuleManager.is() )
m_xModuleManager.set( ModuleManager::create(m_pImpl->m_aContext.getUNOContext()) );
- ::rtl::OUString sModuleId;
+ OUString sModuleId;
try
{
sModuleId = m_xModuleManager->identify( _xComponent );
@@ -2097,7 +2093,6 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
xNumberedControllers.set(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW);
pHelper->setOwner (xThis);
- //pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
m_aNumberedControllers.insert(TNumberedController::value_type(sModuleId,xNumberedControllers));
}
@@ -2108,7 +2103,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
}
// css.frame.XTitle
-::rtl::OUString SAL_CALL ODatabaseDocument::getTitle()
+OUString SAL_CALL ODatabaseDocument::getTitle()
throw (uno::RuntimeException)
{
// SYNCHRONIZED ->
@@ -2117,7 +2112,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
}
// css.frame.XTitle
-void SAL_CALL ODatabaseDocument::setTitle( const ::rtl::OUString& sTitle )
+void SAL_CALL ODatabaseDocument::setTitle( const OUString& sTitle )
throw (uno::RuntimeException)
{
// SYNCHRONIZED ->
@@ -2177,9 +2172,9 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference
}
// css.frame.XUntitledNumbers
-::rtl::OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() throw (uno::RuntimeException)
+OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() throw (uno::RuntimeException)
{
- return ::rtl::OUString();/*RTL_CONSTASCII_USTRINGPARAM(" : "));*/
+ return OUString();
}
} // namespace dbaccess
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 611042b..d858c4f 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -203,7 +203,7 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm( ) throw(RuntimeExce
return sal_False;
}
-void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& /*Realm*/ ) throw(RuntimeException)
+void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ ) throw(RuntimeException)
{
OSL_FAIL("OAuthenticationContinuation::setRealm: not supported!");
}
@@ -215,7 +215,7 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName( ) throw(RuntimeE
return m_bCanSetUserName;
}
-void SAL_CALL OAuthenticationContinuation::setUserName( const ::rtl::OUString& _rUser ) throw(RuntimeException)
+void SAL_CALL OAuthenticationContinuation::setUserName( const OUString& _rUser ) throw(RuntimeException)
{
m_sUser = _rUser;
}
@@ -225,7 +225,7 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword( ) throw(RuntimeE
return sal_True;
}
-void SAL_CALL OAuthenticationContinuation::setPassword( const ::rtl::OUString& _rPassword ) throw(RuntimeException)
+void SAL_CALL OAuthenticationContinuation::setPassword( const OUString& _rPassword ) throw(RuntimeException)
{
m_sPassword = _rPassword;
}
@@ -247,7 +247,7 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount( ) throw(RuntimeEx
return sal_False;
}
-void SAL_CALL OAuthenticationContinuation::setAccount( const ::rtl::OUString& ) throw(RuntimeException)
+void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& ) throw(RuntimeException)
{
OSL_FAIL("OAuthenticationContinuation::setAccount: not supported!");
}
@@ -317,9 +317,9 @@ public:
OSharedConnectionManager(const Reference< XComponentContext >& _rxContext);
void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException);
- Reference<XConnection> getConnection( const rtl::OUString& url,
- const rtl::OUString& user,
- const rtl::OUString& password,
+ Reference<XConnection> getConnection( const OUString& url,
+ const OUString& user,
+ const OUString& password,
const Sequence< PropertyValue >& _aInfo,
ODatabaseSource* _pDataSource);
void addEventListener(const Reference<XConnection>& _rxConnection,TConnectionMap::iterator& _rIter);
@@ -354,9 +354,9 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang:
}
}
-Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUString& url,
- const rtl::OUString& user,
- const rtl::OUString& password,
+Reference<XConnection> OSharedConnectionManager::getConnection( const OUString& url,
+ const OUString& user,
+ const OUString& password,
const Sequence< PropertyValue >& _aInfo,
ODatabaseSource* _pDataSource)
{
@@ -365,13 +365,13 @@ Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUStr
Sequence< PropertyValue > aInfoCopy(_aInfo);
sal_Int32 nPos = aInfoCopy.getLength();
aInfoCopy.realloc( nPos + 2 );
- aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter"));
+ aInfoCopy[nPos].Name = "TableFilter";
aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableFilter;
- aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter"));
+ aInfoCopy[nPos].Name = "TableTypeFilter";
aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter;
- ::rtl::OUString sUser = user;
- ::rtl::OUString sPassword = password;
+ OUString sUser = user;
+ OUString sPassword = password;
if ((sUser.isEmpty()) && (sPassword.isEmpty()) && (!_pDataSource->m_pImpl->m_sUser.isEmpty()))
{ // ease the usage of this method. data source which are intended to have a user automatically
// fill in the user/password combination if the caller of this method does not specify otherwise
@@ -412,7 +412,7 @@ void OSharedConnectionManager::addEventListener(const Reference<XConnection>& _r
namespace
{
- Sequence< PropertyValue > lcl_filterDriverProperties( const Reference< XDriver >& _xDriver, const ::rtl::OUString& _sUrl,
+ Sequence< PropertyValue > lcl_filterDriverProperties( const Reference< XDriver >& _xDriver, const OUString& _sUrl,
const Sequence< PropertyValue >& _rDataSourceSettings, const AsciiPropertyValue* _pKnownSettings )
{
if ( _xDriver.is() )
@@ -458,7 +458,7 @@ namespace
return Sequence< PropertyValue >();
}
- typedef ::std::map< ::rtl::OUString, sal_Int32 > PropertyAttributeCache;
+ typedef ::std::map< OUString, sal_Int32 > PropertyAttributeCache;
struct IsDefaultAndNotRemoveable : public ::std::unary_function< PropertyValue, bool >
{
@@ -517,7 +517,7 @@ ODatabaseSource::~ODatabaseSource()
}
}
-void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocument, const ::rtl::OUString& _rNewName, DBContextAccess )
+void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocument, const OUString& _rNewName, DBContextAccess )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::setName" );
ODatabaseSource& rModelImpl = dynamic_cast< ODatabaseSource& >( *_rxDocument.get() );
@@ -582,19 +582,19 @@ void SAL_CALL ODatabaseSource::disposing( const ::com::sun::star::lang::EventObj
m_pImpl->disposing(Source);
}
// XServiceInfo
-rtl::OUString ODatabaseSource::getImplementationName( ) throw(RuntimeException)
+OUString ODatabaseSource::getImplementationName( ) throw(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getImplementationName" );
return getImplementationName_static();
}
-rtl::OUString ODatabaseSource::getImplementationName_static( ) throw(RuntimeException)
+OUString ODatabaseSource::getImplementationName_static( ) throw(RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getImplementationName_static" );
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseSource"));
+ return OUString("com.sun.star.comp.dba.ODatabaseSource");
}
-Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames( ) throw (RuntimeException)
+Sequence< OUString > ODatabaseSource::getSupportedServiceNames( ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getSupportedServiceNames" );
return getSupportedServiceNames_static();
@@ -607,16 +607,16 @@ Reference< XInterface > ODatabaseSource::Create( const Reference< XComponentCont
return xDBContext->createInstance();
}
-Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames_static( ) throw (RuntimeException)
+Sequence< OUString > ODatabaseSource::getSupportedServiceNames_static( ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getSupportedServiceNames_static" );
- Sequence< ::rtl::OUString > aSNS( 2 );
+ Sequence< OUString > aSNS( 2 );
aSNS[0] = SERVICE_SDB_DATASOURCE;
- aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DocumentDataSource"));
+ aSNS[1] = "com.sun.star.sdb.DocumentDataSource";
return aSNS;
}
-sal_Bool ODatabaseSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::supportsService" );
return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
@@ -637,7 +637,7 @@ void ODatabaseSource::disposing()
m_pImpl.clear();
}
-Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::OUString& _rUid, const ::rtl::OUString& _rPwd)
+Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString& _rUid, const OUString& _rPwd)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::buildLowLevelConnection" );
Reference< XConnection > xReturn;
@@ -650,8 +650,8 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
// no connection pool installed, fall back to driver manager
xManager.set( DriverManager::create(m_pImpl->m_aContext.getUNOContext() ), UNO_QUERY_THROW );
- ::rtl::OUString sUser(_rUid);
- ::rtl::OUString sPwd(_rPwd);
+ OUString sUser(_rUid);
+ OUString sPwd(_rPwd);
if ((sUser.isEmpty()) && (sPwd.isEmpty()) && (!m_pImpl->m_sUser.isEmpty()))
{ // ease the usage of this method. data source which are intended to have a user automatically
// fill in the user/password combination if the caller of this method does not specify otherwise
@@ -671,13 +671,13 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
sal_Int32 nArgPos = 0;
if (sUser.getLength())
{
- aUserPwd[ nArgPos ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user"));
+ aUserPwd[ nArgPos ].Name = "user";
aUserPwd[ nArgPos ].Value <<= sUser;
++nArgPos;
}
if (!sPwd.isEmpty())
{
- aUserPwd[ nArgPos ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password"));
+ aUserPwd[ nArgPos ].Name = "password";
aUserPwd[ nArgPos ].Value <<= sPwd;
}
Reference< XDriver > xDriver;
@@ -711,11 +711,11 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
{
sal_Int32 nCount = aDriverInfo.getLength();
aDriverInfo.realloc(nCount + 2 );
- aDriverInfo[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+ aDriverInfo[nCount].Name = "URL";
aDriverInfo[nCount++].Value <<= m_pImpl->getURL();
- aDriverInfo[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage"));
+ aDriverInfo[nCount].Name = "Storage";
Reference< css::document::XDocumentSubStorageSupplier> xDocSup( m_pImpl->getDocumentSubStorageSupplier() );
- aDriverInfo[nCount++].Value <<= xDocSup->getDocumentSubStorage(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database")),ElementModes::READWRITE);
+ aDriverInfo[nCount++].Value <<= xDocSup->getDocumentSubStorage("database",ElementModes::READWRITE);
}
if (nAdditionalArgs)
xReturn = xManager->getConnectionWithInfo(m_pImpl->m_sConnectURL, ::comphelper::concatSequences(aUserPwd,aDriverInfo));
@@ -737,7 +737,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
if ( !xReturn.is() )
{
- ::rtl::OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId );
+ OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId );
SQLContext aContext;
aContext.Message = DBACORE_RESSTRING(RID_STR_CONNECTION_REQUEST).
@@ -765,15 +765,15 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt
DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND);
DECL_PROP1_BOOL(ISREADONLY, READONLY);
DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND);
- DECL_PROP1(NAME, ::rtl::OUString, READONLY);
+ DECL_PROP1(NAME, OUString, READONLY);
DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT);
- DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT);
+ DECL_PROP1(PASSWORD, OUString, TRANSIENT);
DECL_PROP2_IFACE(SETTINGS, XPropertySet, BOUND, READONLY);
DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND);
- DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND);
- DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND);
- DECL_PROP1(URL, ::rtl::OUString, BOUND);
- DECL_PROP1(USER, ::rtl::OUString, BOUND);
+ DECL_PROP1(TABLEFILTER, Sequence< OUString >,BOUND);
+ DECL_PROP1(TABLETYPEFILTER, Sequence< OUString >,BOUND);
+ DECL_PROP1(URL, OUString, BOUND);
+ DECL_PROP1(USER, OUString, BOUND);
END_PROPERTY_HELPER();
}
@@ -858,10 +858,10 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any &
namespace
{
- struct SelectPropertyName : public ::std::unary_function< PropertyValue, ::rtl::OUString >
+ struct SelectPropertyName : public ::std::unary_function< PropertyValue, OUString >
{
public:
- const ::rtl::OUString& operator()( const PropertyValue& _lhs )
+ const OUString& operator()( const PropertyValue& _lhs )
{
return _lhs.Name;
}
@@ -883,7 +883,7 @@ namespace
void lcl_setPropertyValues_resetOrRemoveOther( const Reference< XPropertyAccess >& _rxPropertyBag, const Sequence< PropertyValue >& _rAllNewPropertyValues )
{
// sequences are ugly to operate on
- typedef ::std::set< ::rtl::OUString > StringSet;
+ typedef ::std::set< OUString > StringSet;
StringSet aToBeSetPropertyNames;
::std::transform(
_rAllNewPropertyValues.getConstArray(),
@@ -944,7 +944,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
case PROPERTY_ID_USER:
rValue >>= m_pImpl->m_sUser;
// if the user name has changed, reset the password
- m_pImpl->m_aPassword = ::rtl::OUString();
+ m_pImpl->m_aPassword = OUString();
break;
case PROPERTY_ID_PASSWORD:
rValue >>= m_pImpl->m_aPassword;
@@ -1009,7 +1009,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
Reference< XPropertySet > xSettingsAsProps( m_pImpl->m_xSettings, UNO_QUERY_THROW );
Reference< XPropertySetInfo > xPST( xSettingsAsProps->getPropertySetInfo(), UNO_QUERY_THROW );
Sequence< Property > aSettings( xPST->getProperties() );
- ::std::map< ::rtl::OUString, sal_Int32 > aPropertyAttributes;
+ ::std::map< OUString, sal_Int32 > aPropertyAttributes;
for ( const Property* pSettings = aSettings.getConstArray();
pSettings != aSettings.getConstArray() + aSettings.getLength();
++pSettings
@@ -1082,13 +1082,13 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
return connectWithCompletion(_rxHandler,sal_False);
}
-Reference< XConnection > ODatabaseSource::getConnection(const rtl::OUString& user, const rtl::OUString& password) throw( SQLException, RuntimeException )
+Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getConnection" );
return getConnection(user,password,sal_False);
}
-Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getIsolatedConnection" );
return getConnection(user,password,sal_True);
@@ -1111,7 +1111,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
return getConnection(m_pImpl->m_sUser, m_pImpl->m_aPassword,_bIsolated);
}
- ::rtl::OUString sUser(m_pImpl->m_sUser), sPassword(m_pImpl->m_aPassword);
+ OUString sUser(m_pImpl->m_sUser), sPassword(m_pImpl->m_aPassword);
sal_Bool bNewPasswordGiven = sal_False;
if (m_pImpl->m_bPasswordRequired && sPassword.isEmpty())
@@ -1124,7 +1124,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
OAuthenticationContinuation* pAuthenticate = new OAuthenticationContinuation;
// the name which should be referred in the login dialog
- ::rtl::OUString sServerName( m_pImpl->m_sName );
+ OUString sServerName( m_pImpl->m_sName );
INetURLObject aURLCheck( sServerName );
if ( aURLCheck.GetProtocol() != INET_PROT_NOT_VALID )
sServerName = aURLCheck.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_UNAMBIGUOUS );
@@ -1166,7 +1166,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
m_pImpl->m_aPassword = pAuthenticate->getPassword();
bNewPasswordGiven = sal_True;
}
- m_pImpl->m_sFailedPassword = ::rtl::OUString();
+ m_pImpl->m_sFailedPassword = OUString();
}
try
@@ -1181,13 +1181,13 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
// assume that we had an authentication problem. Without this we may, after an unsucessful connect, while
// the user gave us a password an the order to remember it, never allow an password input again (at least
// not without restarting the session)
- m_pImpl->m_aPassword = ::rtl::OUString();
+ m_pImpl->m_aPassword = OUString();
}
throw;
}
}
-Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const rtl::OUString& user, const rtl::OUString& password)
+Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString& user, const OUString& password)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::buildIsolatedConnection" );
Reference< XConnection > xConn;
@@ -1202,7 +1202,7 @@ Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const rtl::OUS
return xConn;
}
-Reference< XConnection > ODatabaseSource::getConnection(const rtl::OUString& user, const rtl::OUString& password,sal_Bool _bIsolated) throw( SQLException, RuntimeException )
+Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,sal_Bool _bIsolated) throw( SQLException, RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getConnection" );
ModelMethodGuard aGuard( *this );
@@ -1253,12 +1253,12 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xMy(*this);
if ( dbtools::getDataSourceSetting(xMy,"CommandDefinitions",aValue) )
{
- ::rtl::OUString sSupportService;
+ OUString sSupportService;
aValue >>= sSupportService;
if ( !sSupportService.isEmpty() )
{
Sequence<Any> aArgs(1);
- aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSource")),makeAny(xMy));
+ aArgs[0] <<= NamedValue("DataSource",makeAny(xMy));
xContainer.set(m_pImpl->m_aContext.createComponentWithArguments(sSupportService,aArgs),UNO_QUERY);
}
}
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 311263d..d765d7e 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -75,10 +75,10 @@ public:
{
}
- void SAL_CALL approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& _rxElement );
+ void SAL_CALL approveElement( const OUString& _rName, const Reference< XInterface >& _rxElement );
};
-void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+void SAL_CALL LocalNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
{
if ( _rName.indexOf( '/' ) != -1 )
throw IllegalArgumentException(
@@ -126,19 +126,19 @@ IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer, "com.sun.star.comp.dba.ODocu
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODocumentContainer);
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer)
-Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
+ Sequence< OUString > aSupported(1);
aSupported[0] = m_bFormsContainer ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION;
return aSupported;
}
-::rtl::OUString ODocumentContainer::determineContentType() const
+OUString ODocumentContainer::determineContentType() const
{
- return ::rtl::OUString();
+ return OUString();
}
-Reference< XContent > ODocumentContainer::createObject( const ::rtl::OUString& _rName)
+Reference< XContent > ODocumentContainer::createObject( const OUString& _rName)
{
const ODefinitionContainer_Impl& rDefinitions( getDefinitions() );
ODefinitionContainer_Impl::const_iterator aFind = rDefinitions.find( _rName );
@@ -148,7 +148,7 @@ Reference< XContent > ODocumentContainer::createObject( const ::rtl::OUString& _
return new ODocumentDefinition( *this, m_aContext.getLegacyServiceFactory(), aFind->second, m_bFormsContainer );
}
-Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (Exception, RuntimeException)
+Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const OUString& aServiceSpecifier ) throw (Exception, RuntimeException)
{
return createInstanceWithArguments( aServiceSpecifier, Sequence< Any >() );
}
@@ -156,7 +156,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const ::rtl
namespace
{
template< class TYPE >
- void lcl_extractAndRemove( ::comphelper::NamedValueCollection& io_rArguments, const ::rtl::OUString& i_rName, TYPE& o_rValue )
+ void lcl_extractAndRemove( ::comphelper::NamedValueCollection& io_rArguments, const OUString& i_rName, TYPE& o_rValue )
{
if ( io_rArguments.has( i_rName ) )
{
@@ -166,7 +166,7 @@ namespace
}
}
-Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException)
+Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException)
{
Reference< XInterface > xRet;
Reference< XContent > xContent;
@@ -175,7 +175,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
MutexGuard aGuard(m_aMutex);
// extract known arguments
- ::rtl::OUString sName, sPersistentName, sURL, sMediaType, sDocServiceName;
+ OUString sName, sPersistentName, sURL, sMediaType, sDocServiceName;
Reference< XCommandProcessor > xCopyFrom;
Reference< XConnection > xConnection;
sal_Bool bAsTemplate( sal_False );
@@ -189,7 +189,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
lcl_extractAndRemove( aArgs, PROPERTY_ACTIVE_CONNECTION, xConnection );
lcl_extractAndRemove( aArgs, PROPERTY_AS_TEMPLATE, bAsTemplate );
lcl_extractAndRemove( aArgs, INFO_MEDIATYPE, sMediaType );
- lcl_extractAndRemove( aArgs, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentServiceName" ) ), sDocServiceName );
+ lcl_extractAndRemove( aArgs, "DocumentServiceName" , sDocServiceName );
// ClassID has two allowed types, so a special treatment here
Any aClassIDArg = aArgs.get( "ClassID" );
@@ -198,15 +198,15 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
if ( !( aClassIDArg >>= aClassID ) )
{
// Extended for usage also with a string
- ::rtl::OUString sClassIDString;
+ OUString sClassIDString;
if ( !( aClassIDArg >>= sClassIDString ) )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 2 );
+ throw IllegalArgumentException( OUString(), *this, 2 );
aClassID = ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( sClassIDString );
}
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OUString sClassIDString = ::comphelper::MimeConfigurationHelper::GetStringClassIDRepresentation( aClassID );
+ OUString sClassIDString = ::comphelper::MimeConfigurationHelper::GetStringClassIDRepresentation( aClassID );
(void)sClassIDString;
#endif
aArgs.remove( "ClassID" );
@@ -218,10 +218,10 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
sal_Bool bNew = sPersistentName.isEmpty();
if ( bNew )
{
- const static ::rtl::OUString sBaseName(RTL_CONSTASCII_USTRINGPARAM("Obj"));
+ const static OUString sBaseName("Obj");
sPersistentName = sBaseName;
- sPersistentName += ::rtl::OUString::valueOf(sal_Int32(rDefinitions.size() + 1));
+ sPersistentName += OUString::valueOf(sal_Int32(rDefinitions.size() + 1));
Reference<XNameAccess> xElements(getContainerStorage(),UNO_QUERY);
if ( xElements.is() )
sPersistentName = ::dbtools::createUniqueName(xElements,sPersistentName);
@@ -233,7 +233,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
aIni[0] <<= getContainerStorage();
aIni[1] <<= sPersistentName;
Command aCommand;
- aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("copyTo"));
+ aCommand.Name = "copyTo";
aCommand.Argument <<= aIni;
xCopyFrom->execute(aCommand,-1,Reference< XCommandEnvironment >());
@@ -293,7 +293,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
Sequence<Any> aIni(2);
aIni[0] <<= sURL;
Command aCommand;
- aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert"));
+ aCommand.Name = "insert";
aCommand.Argument <<= aIni;
Reference< XCommandProcessor > xCommandProcessor(xContent,UNO_QUERY);
if ( xContent.is() )
@@ -307,7 +307,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
const Any* pBegin = _aArguments.getConstArray();
const Any* pEnd = pBegin + _aArguments.getLength();
PropertyValue aValue;
- ::rtl::OUString sName;
+ OUString sName;
Reference<XNameAccess> xCopyFrom;
for(;pBegin != pEnd;++pBegin)
{
@@ -339,9 +339,9 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
// copy children
if ( xCopyFrom.is() )
{
- Sequence< ::rtl::OUString> aSeq = xCopyFrom->getElementNames();
- const ::rtl::OUString* elements = aSeq.getConstArray();
- const ::rtl::OUString* elementsEnd = elements + aSeq.getLength();
+ Sequence< OUString> aSeq = xCopyFrom->getElementNames();
+ const OUString* elements = aSeq.getConstArray();
+ const OUString* elementsEnd = elements + aSeq.getLength();
Reference<XContent> xObjectToCopy;
Reference<XMultiServiceFactory> xORB(xContent,UNO_QUERY);
@@ -354,11 +354,11 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
Sequence< Any > aArguments(3);
PropertyValue aArgument;
// set as folder
- aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ aArgument.Name = "Name";
aArgument.Value <<= *elements;
aArguments[0] <<= aArgument;
//parent
- aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent"));
+ aArgument.Name = "Parent";
aArgument.Value <<= xContent;
aArguments[1] <<= aArgument;
@@ -366,7 +366,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
aArgument.Value <<= xObjectToCopy;
aArguments[2] <<= aArgument;
- ::rtl::OUString sServiceName;
+ OUString sServiceName;
if ( Reference< XNameAccess >( xObjectToCopy, UNO_QUERY ).is() )
{
if ( m_bFormsContainer )
@@ -389,9 +389,9 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
return xRet;
}
-Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames( ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aSe(3);
+ Sequence< OUString > aSe(3);
aSe[0] = SERVICE_SDB_DOCUMENTDEFINITION;
aSe[1] = SERVICE_NAME_FORM_COLLECTION;
aSe[2] = SERVICE_NAME_REPORT_COLLECTION;
@@ -412,7 +412,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -439,7 +439,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
// Unsupported.
ucbhelper::cancelCommandExecution(
makeAny( UnsupportedOpenModeException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
sal_Int16( aOpenCommand.Mode ) ) ),
Environment );
@@ -458,7 +458,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -470,9 +470,9 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
//////////////////////////////////////////////////////////////////
// delete
//////////////////////////////////////////////////////////////////
- Sequence< ::rtl::OUString> aSeq = getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ Sequence< OUString> aSeq = getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
for(;pIter != pEnd;++pIter)
removeByName(*pIter);
@@ -485,11 +485,11 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
namespace
{
- sal_Bool lcl_queryContent(const ::rtl::OUString& _sName,Reference< XNameContainer >& _xNameContainer,Any& _rRet,::rtl::OUString& _sSimpleName)
+ sal_Bool lcl_queryContent(const OUString& _sName,Reference< XNameContainer >& _xNameContainer,Any& _rRet,OUString& _sSimpleName)
{
sal_Bool bRet = sal_False;
sal_Int32 nIndex = 0;
- ::rtl::OUString sName = _sName.getToken(0,'/',nIndex);
+ OUString sName = _sName.getToken(0,'/',nIndex);
bRet = _xNameContainer->hasByName(sName);
if ( bRet )
{
@@ -516,8 +516,8 @@ namespace
}
}
-Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const ::rtl::OUString& _sURL
- , const ::rtl::OUString& /*TargetFrameName*/
+Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const OUString& _sURL
+ , const OUString& /*TargetFrameName*/
, sal_Int32 /*SearchFlags*/
, const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException)
{
@@ -529,10 +529,10 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
{
Any aContent;
Reference< XNameContainer > xNameContainer(this);
- ::rtl::OUString sName;
+ OUString sName;
if ( !lcl_queryContent(_sURL,xNameContainer,aContent,sName) )
{
- ::rtl::OUString sMessage(
+ OUString sMessage(
DBA_RES(RID_STR_NAME_NOT_FOUND).replaceFirst("$name$", _sURL));
throw IllegalArgumentException( sMessage, *this, 1 );
}
@@ -543,7 +543,7 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
Command aCommand;
::comphelper::NamedValueCollection aArgs( Arguments );
- aCommand.Name = aArgs.getOrDefault( "OpenMode", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ) );
+ aCommand.Name = aArgs.getOrDefault( "OpenMode", OUString("open") );
aArgs.remove( "OpenMode" );
OpenCommandArgument2 aOpenCommand;
@@ -565,28 +565,28 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
return xComp;
}
-Any SAL_CALL ODocumentContainer::getByHierarchicalName( const ::rtl::OUString& _sName ) throw (NoSuchElementException, RuntimeException)
+Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName ) throw (NoSuchElementException, RuntimeException)
{
MutexGuard aGuard(m_aMutex);
Any aContent;
Reference< XNameContainer > xNameContainer(this);
- ::rtl::OUString sName;
+ OUString sName;
if ( lcl_queryContent(_sName,xNameContainer,aContent,sName) )
return aContent;
throw NoSuchElementException(_sName,*this);
}
-sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const ::rtl::OUString& _sName ) throw (RuntimeException)
+sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sName ) throw (RuntimeException)
{
MutexGuard aGuard(m_aMutex);
Any aContent;
Reference< XNameContainer > xNameContainer(this);
- ::rtl::OUString sName;
+ OUString sName;
return lcl_queryContent(_sName,xNameContainer,aContent,sName);
}
// XHierarchicalNameContainer
-void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
{
Reference< XContent > xContent(_aElement,UNO_QUERY);
if ( !xContent.is() )
@@ -595,14 +595,14 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUStrin
ClearableMutexGuard aGuard(m_aMutex);
Any aContent;
Reference< XNameContainer > xNameContainer(this);
- ::rtl::OUString sName;
+ OUString sName;
if ( lcl_queryContent(_sName,xNameContainer,aContent,sName) )
throw ElementExistException(_sName,*this);
if ( !xNameContainer.is() )
{
sal_Int32 index = sName.getLength();
- ::rtl::OUString sMessage(
+ OUString sMessage(
DBA_RES(RID_STR_NO_SUB_FOLDER).replaceFirst("$folder$",
_sName.getToken(0,'/',index)));
throw IllegalArgumentException( sMessage, *this, 1 );
@@ -611,14 +611,14 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUStrin
xNameContainer->insertByName(sName,_aElement);
}
-void SAL_CALL ODocumentContainer::removeByHierarchicalName( const ::rtl::OUString& _sName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
+void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
{
if ( _sName.isEmpty() )
throw NoSuchElementException(_sName,*this);
ClearableMutexGuard aGuard(m_aMutex);
Any aContent;
- ::rtl::OUString sName;
+ OUString sName;
Reference< XNameContainer > xNameContainer(this);
if ( !lcl_queryContent(_sName,xNameContainer,aContent,sName) )
throw NoSuchElementException(_sName,*this);
@@ -627,7 +627,7 @@ void SAL_CALL ODocumentContainer::removeByHierarchicalName( const ::rtl::OUStrin
}
// XHierarchicalNameReplace
-void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
+void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
{
Reference< XContent > xContent(_aElement,UNO_QUERY);
if ( !xContent.is() )
@@ -635,7 +635,7 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUStri
ClearableMutexGuard aGuard(m_aMutex);
Any aContent;
- ::rtl::OUString sName;
+ OUString sName;
Reference< XNameContainer > xNameContainer(this);
if ( !lcl_queryContent(_sName,xNameContainer,aContent,sName) )
throw NoSuchElementException(_sName,*this);
@@ -643,13 +643,13 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUStri
xNameContainer->replaceByName(sName,_aElement);
}
-::rtl::OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeException)
+OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
return impl_getHierarchicalName( false );
}
-::rtl::OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const ::rtl::OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
+OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException)
{
::rtl::OUStringBuffer aBuffer;
aBuffer.append( getHierarchicalName() );
@@ -658,7 +658,7 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const ::rtl::OUStri
return aBuffer.makeStringAndClear();
}
-::rtl::Reference<OContentHelper> ODocumentContainer::getContent(const ::rtl::OUString& _sName) const
+::rtl::Reference<OContentHelper> ODocumentContainer::getContent(const OUString& _sName) const
{
::rtl::Reference<OContentHelper> pContent = NULL;
try
@@ -717,7 +717,7 @@ Reference< XStorage> ODocumentContainer::getContainerStorage() const
: Reference< XStorage>();
}
-void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
ResettableMutexGuard aGuard(m_aMutex);
@@ -733,7 +733,7 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName )
{
Command aCommand;
- aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete"));
+ aCommand.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("delete"));
xContent->execute(aCommand,xContent->createCommandIdentifier(),Reference< XCommandEnvironment >());
}
@@ -743,7 +743,7 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName )
notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers );
}
-void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
+void SAL_CALL ODocumentContainer::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
{
try
{
More information about the Libreoffice-commits
mailing list