diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess')
15 files changed, 56 insertions, 60 deletions
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index fb6bf98877fc..22ac97723d01 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -89,7 +89,7 @@ void SAL_CALL OContentHelper::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - // say our listeners goobye + // say goodbye to our listeners EventObject aEvt(*this); m_aContentListeners.disposeAndClear(aEvt); @@ -363,24 +363,27 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue { // Read-only property! aRet[ n ] <<= IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Property is read-only!") + ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) { // Read-only property! aRet[ n ] <<= IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Property is read-only!") + ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) { // Read-only property! aRet[ n ] <<= IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Property is read-only!") + ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) @@ -415,8 +418,9 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue else { aRet[ n ] <<= IllegalTypeException( - rtl::OUString::createFromAscii( - "Property value has wrong type!" ), + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Property value has wrong type!") + ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -424,17 +428,15 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue else { aRet[ n ] <<= Exception( - rtl::OUString::createFromAscii( - "No property set for storing the value!" ), + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("No property set for storing the value!") + ), static_cast< cppu::OWeakObject * >( this ) ); } } if ( nChanged > 0 ) { - // @@@ Save changes. -// storeData(); - notifyDataSourceModified(); aGuard.clear(); aChanges.realloc( nChanged ); @@ -486,27 +488,27 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& { // Append all Core Properties. xRow->appendString ( - Property( rtl::OUString::createFromAscii( "ContentType" ), + Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), getContentType() ); xRow->appendString ( - Property( rtl::OUString::createFromAscii( "Title" ), + Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), PropertyAttribute::BOUND ), m_pImpl->m_aProps.aTitle ); xRow->appendBoolean( - Property( rtl::OUString::createFromAscii( "IsDocument" ), + Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), m_pImpl->m_aProps.bIsDocument ); xRow->appendBoolean( - Property( rtl::OUString::createFromAscii( "IsFolder" ), + Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")), -1, getCppuBooleanType(), PropertyAttribute::BOUND diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 5d31055d2cc2..56fecd7e6867 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -440,9 +440,9 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >& { // some kind of default DBG_CTOR(ODatabaseModelImpl,NULL); - m_sConnectURL = ::rtl::OUString::createFromAscii("jdbc:"); + m_sConnectURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jdbc:")); m_aTableFilter.realloc(1); - m_aTableFilter[0] = ::rtl::OUString::createFromAscii("%"); + m_aTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); impl_construct_nothrow(); } diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index d18f820bff47..d4899c247ab5 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -573,7 +573,7 @@ public: inline void checkDisposed() const { if ( !m_pImpl.is() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString::createFromAscii( "Component is already disposed." ), getThis() ); + throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Component is already disposed.")), getThis() ); } inline void lockModify() diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 6c18633de23e..87ad268e9e49 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -38,7 +38,6 @@ namespace dbaccess using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -// using namespace ::com::sun::star::reflection; using namespace connectivity; DBG_NAME(OSharedConnection) diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index a7d17634a81d..372e48bbd5e8 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -70,7 +70,7 @@ void OBookmarkContainer::dispose() { MutexGuard aGuard(m_rMutex); - // say our listeners goobye + // say goodbye to our listeners EventObject aEvt(*this); m_aContainerListeners.disposeAndClear(aEvt); @@ -97,7 +97,7 @@ OBookmarkContainer::~OBookmarkContainer() // XServiceInfo ::rtl::OUString SAL_CALL OBookmarkContainer::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.dba.OBookmarkContainer"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.OBookmarkContainer")); } sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) @@ -110,7 +110,7 @@ sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _r Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aReturn(1); - aReturn.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.DefinitionContainer"); + aReturn.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DefinitionContainer")); return aReturn; } diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 8ab8abe30755..e96da41181ea 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -115,7 +115,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP ::rtl::OUString OCommandDefinition::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.dba.OCommandDefinition"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.OCommandDefinition")); } ::rtl::OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 89840f11e2cb..d3a1086da46d 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -88,7 +88,7 @@ namespace dbaccess rtl::OUString OConnection::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getImplementationName" ); - return rtl::OUString::createFromAscii("com.sun.star.comp.dbaccess.Connection"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dbaccess.Connection")); } sal_Bool OConnection::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 16d578588f0d..2f32428cb2b7 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -160,7 +160,7 @@ namespace dbaccess { Reference<util::XCloseable> xCloseable(xModel,UNO_QUERY_THROW); xCloseable->close(sal_False); - } // if ( !xModel->getControllers()->hasMoreElements() ) + } } catch(const CloseVetoException&) { diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f6dea5f99b3c..60b237bb5bfb 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1056,7 +1056,7 @@ void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const ::rtl::OUString& _rURL ) const { Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess; - m_pImpl->m_aContext.createComponent( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ,xTempAccess); + m_pImpl->m_aContext.createComponent( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ,xTempAccess); Reference< io::XStream > xStream = xTempAccess->openFileReadWrite( _rURL ); Reference< io::XTruncate > xTruncate(xStream,UNO_QUERY); if ( xTruncate.is() ) @@ -1711,7 +1711,7 @@ void ODatabaseDocument::disposing() // the security warning, again. m_pImpl->resetMacroExecutionMode(); - // similar argueing for our ViewMonitor + // similar arguing for our ViewMonitor m_aViewMonitor.reset(); // tell our Impl to forget us @@ -1760,7 +1760,7 @@ rtl::OUString ODatabaseDocument::getImplementationName( ) throw(RuntimeExceptio rtl::OUString ODatabaseDocument::getImplementationName_static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ODatabaseDocument"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseDocument")); } Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames( ) throw (RuntimeException) @@ -1991,7 +1991,6 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel } catch(uno::Exception) { - // ni } uno::Reference< frame::XUntitledNumbers > xNumberedControllers; @@ -2003,7 +2002,7 @@ 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::createFromAscii(" : ")); + //pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : "))); m_aNumberedControllers.insert(TNumberedController::value_type(sModuleId,xNumberedControllers)); } diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 83b6d482b769..e2a521b71d23 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -67,19 +67,19 @@ namespace dbaccess static const ::rtl::OUString& getConfigurationRootPath() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/RegisteredNames"); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/RegisteredNames")); return s_sNodeName; } const ::rtl::OUString& getLocationNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii( "Location" ); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Location")); return s_sNodeName; } const ::rtl::OUString& getNameNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii( "Name" ); + static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Name")); return s_sNodeName; } diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 092432d7e487..12cbdd5244e6 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -203,7 +203,7 @@ void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) t } OAuthenticationContinuation::OAuthenticationContinuation() - :m_bRemberPassword(sal_True), // TODO: a meaningfull default + :m_bRemberPassword(sal_True), // TODO: a meaningful default m_bCanSetUserName(sal_True) { } @@ -220,7 +220,7 @@ void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& /*Re sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName( ) throw(RuntimeException) { - // we alwas allow this, even if the database document is read-only. In this case, + // we always allow this, even if the database document is read-only. In this case, // it's simply that the user cannot store the new user name. return m_bCanSetUserName; } @@ -316,7 +316,7 @@ class OSharedConnectionManager : public OConnectionHelper_BASE typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections ::osl::Mutex m_aMutex; - TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest + TConnectionMap m_aConnections; // remember the master connection in conjunction with the digest TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map Reference< XProxyFactory > m_xProxyFactory; @@ -602,7 +602,7 @@ rtl::OUString ODatabaseSource::getImplementationName( ) throw(RuntimeException) rtl::OUString ODatabaseSource::getImplementationName_static( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationName_static" ); - return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ODatabaseSource"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseSource")); } Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames( ) throw (RuntimeException) @@ -680,13 +680,13 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O sal_Int32 nArgPos = 0; if (sUser.getLength()) { - aUserPwd[ nArgPos ].Name = ::rtl::OUString::createFromAscii("user"); + aUserPwd[ nArgPos ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); aUserPwd[ nArgPos ].Value <<= sUser; ++nArgPos; } if (sPwd.getLength()) { - aUserPwd[ nArgPos ].Name = ::rtl::OUString::createFromAscii("password"); + aUserPwd[ nArgPos ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")); aUserPwd[ nArgPos ].Value <<= sPwd; } Reference< XDriver > xDriver; @@ -876,9 +876,9 @@ namespace } }; - /** sets a new set of property values at a given property bag instance + /** sets a new set of property values for a given property bag instance - The methods takes a property bag, and a sequence of property values to set at this bag. + The method takes a property bag, and a sequence of property values to set for this bag. Upon return, every property which is not part of the given sequence is <ul><li>removed from the bag, if it's a removeable property</li> <li><em>or</em>reset to its default value, if it's not a removeable property</li> @@ -887,7 +887,7 @@ namespace @param _rxPropertyBag the property bag to operate on @param _rAllNewPropertyValues - the new property values to set at the bag + the new property values to set for the bag */ void lcl_setPropertyValues_resetOrRemoveOther( const Reference< XPropertyAccess >& _rxPropertyBag, const Sequence< PropertyValue >& _rAllNewPropertyValues ) { @@ -920,7 +920,7 @@ namespace continue; // this property is not to be set, but currently exists in the bag. - // -> Remove, respectively default, it + // -> Remove it, or reset it to the default. if ( ( pExistentProperty->Attributes & PropertyAttribute::REMOVEABLE ) != 0 ) xPropertyContainer->removeProperty( pExistentProperty->Name ); else @@ -952,7 +952,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const break; case PROPERTY_ID_USER: rValue >>= m_pImpl->m_sUser; - // if the user name changed, reset the password + // if the user name has changed, reset the password m_pImpl->m_aPassword = ::rtl::OUString(); break; case PROPERTY_ID_PASSWORD: @@ -1031,7 +1031,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con Sequence< PropertyValue > aValues( m_pImpl->m_xSettings->getPropertyValues() ); // transform them so that only property values which fulfill certain - // criterions survive + // criteria survive Sequence< PropertyValue > aNonDefaultOrUserDefined( aValues.getLength() ); const PropertyValue* pCopyEnd = ::std::remove_copy_if( aValues.getConstArray(), diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index ef3c8af0a61b..f670d3b383fc 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -530,7 +530,7 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer ODefinitionContainer_Impl::const_iterator aFind = rDefinitions.find( _rName ); if ( aFind == rDefinitions.end() ) { - // ensure that the new object thas the proper name. + // ensure that the new object has the proper name. // Somebody could create an object with name "foo", and insert it as "bar" // into a container. In this case, we need to ensure that the object name // is also "bar" diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 498882f5885e..410ee2a52971 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -186,7 +186,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments { MutexGuard aGuard(m_aMutex); - // extrat known arguments + // extract known arguments ::rtl::OUString sName, sPersistentName, sURL, sMediaType, sDocServiceName; Reference< XCommandProcessor > xCopyFrom; Reference< XConnection > xConnection; @@ -572,7 +572,6 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const } catch(WrappedTargetException e) { - // throw IllegalArgumentException(); throw; } return xComp; @@ -752,8 +751,6 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName ) // do the removal implRemove(_rName); - // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name - notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers ); } diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 305a01363177..3b1dfa8dc649 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -219,7 +219,6 @@ namespace dbaccess if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition ) { m_bInChangingState = true; - //m_pDefinition->save(sal_False); m_bInChangingState = false; } } @@ -1509,9 +1508,9 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const bool bAllowDocumentMacros = !m_pImpl->m_pDataSource || ( m_pImpl->m_pDataSource->determineEmbeddedMacros() == ODatabaseModelImpl::eSubDocumentMacros ); - // if *any* of the objects of the database document already has macros, we continue to allow it - // to have them, until the user did a migration. - // If there are no macros, yet, we don't allow to create them + // if *any* of the objects of the database document already has macros, we + // continue to allow it to have them, until the user does a migration. + // If there are no macros, we don't allow them to be created. return bAllowDocumentMacros; } diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 7fe1d9089bbc..204ad978d2d6 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -171,12 +171,12 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString::createFromAscii( "SaveTo" ); + aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveTo")); aNewArgs[nInd].Value <<= sal_True; } Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - _URL, ::rtl::OUString::createFromAscii( "_self" ), 0 ); + _URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( _URL, aNewArgs ); } @@ -204,7 +204,7 @@ IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher ) if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() ) { Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - pHelper->aURL, ::rtl::OUString::createFromAscii( "_self" ), 0 ); + pHelper->aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0 ); if ( xDispatch.is() ) { Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY); |