diff options
21 files changed, 133 insertions, 133 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 1da9dc9b8a2b..60868c4fd973 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -257,7 +257,7 @@ static ContentBroker* getContentBroker( bool bThrow ) { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( "No Content Broker!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Content Broker!")), Reference< XInterface >() ); } else @@ -535,7 +535,7 @@ Reference< XCommandInfo > Content::getCommands() throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getCommandInfo" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo")); aCommand.Handle = -1; // n/a aCommand.Argument = Any(); @@ -551,7 +551,7 @@ Reference< XPropertySetInfo > Content::getProperties() throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getPropertySetInfo" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo")); aCommand.Handle = -1; // n/a aCommand.Argument = Any(); @@ -678,7 +678,7 @@ Reference< XRow > Content::getPropertyValuesInterface( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -711,7 +711,7 @@ Reference< XRow > Content::getPropertyValuesInterface( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -759,7 +759,7 @@ Sequence< Any > Content::setPropertyValues( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "setPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -807,7 +807,7 @@ Sequence< Any > Content::setPropertyValues( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "setPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -876,7 +876,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames, aArg.Properties = aProps; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -909,7 +909,7 @@ Any Content::createCursorAny( const Sequence< sal_Int32 >& rPropertyHandles, aArg.Properties = aProps; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1022,7 +1022,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor, @@ -1057,7 +1057,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor, @@ -1097,7 +1097,7 @@ Reference< XResultSet > Content::createSortedCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet, @@ -1151,7 +1151,7 @@ Reference< XResultSet > Content::createSortedCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet, @@ -1198,7 +1198,7 @@ Reference< XInputStream > Content::openStream() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1223,7 +1223,7 @@ Reference< XInputStream > Content::openStreamNoLock() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1248,7 +1248,7 @@ Reference< XStream > Content::openWriteableStream() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1273,7 +1273,7 @@ Reference< XStream > Content::openWriteableStreamNoLock() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1296,7 +1296,7 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink ) aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1319,7 +1319,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream ) aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1338,7 +1338,7 @@ void Content::writeStream( const Reference< XInputStream >& rStream, aArg.ReplaceExisting = bReplaceExisting; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "insert" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1354,7 +1354,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo() // First, try it using "CreatableContentsInfo" property -> the "new" way. Sequence< ContentInfo > aInfo; if ( getPropertyValue( - rtl::OUString::createFromAscii( "CreatableContentsInfo" ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")) ) >>= aInfo ) return aInfo; @@ -1415,7 +1415,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, aInfo.Attributes = 0; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "createNewContent" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aInfo; @@ -1449,7 +1449,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, Content aNewContent( xNew, m_xImpl->getEnvironment() ); aNewContent.setPropertyValues( rPropertyNames, rPropertyValues ); - aNewContent.executeCommand( rtl::OUString::createFromAscii( "insert" ), + aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), makeAny( InsertCommandArgument( rData.is() ? rData : new EmptyInputStream, @@ -1478,7 +1478,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, aInfo.Attributes = 0; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "createNewContent" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aInfo; @@ -1512,7 +1512,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, Content aNewContent( xNew, m_xImpl->getEnvironment() ); aNewContent.setPropertyValues( nPropertyHandles, rPropertyValues ); - aNewContent.executeCommand( rtl::OUString::createFromAscii( "insert" ), + aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), makeAny( InsertCommandArgument( rData.is() ? rData : new EmptyInputStream, @@ -1582,7 +1582,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, rTitle, nNameClashAction ); Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "globalTransfer" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("globalTransfer")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aTransferArg; @@ -1595,7 +1595,7 @@ sal_Bool Content::isFolder() throw( CommandAbortedException, RuntimeException, Exception ) { sal_Bool bFolder = sal_False; - if ( getPropertyValue( rtl::OUString::createFromAscii( "IsFolder" ) ) + if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder ) return bFolder; @@ -1616,7 +1616,7 @@ sal_Bool Content::isDocument() throw( CommandAbortedException, RuntimeException, Exception ) { sal_Bool bDoc = sal_False; - if ( getPropertyValue( rtl::OUString::createFromAscii( "IsDocument" ) ) + if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) ) >>= bDoc ) return bDoc; diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 8c26104a07b6..e805f2afcd74 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -742,14 +742,14 @@ void InternetProxyDecider_Impl::setNoProxyList( if ( nColonPos == -1 ) { // No port given, server pattern equals current token - aPort = rtl::OUString::createFromAscii( "*" ); + aPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); if ( aToken.indexOf( '*' ) == -1 ) { // pattern describes exactly one server aServer = aToken; } - aToken += rtl::OUString::createFromAscii( ":*" ); + aToken += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":*")); } else { diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 9f2f97d558fd..d2c8296e0b2e 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -309,7 +309,7 @@ XTYPEPROVIDER_IMPL_9( ResultSet, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, - rtl::OUString::createFromAscii( "ResultSet" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResultSet")), rtl::OUString::createFromAscii( RESULTSET_SERVICE_NAME ) ); //========================================================================= @@ -1358,13 +1358,13 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName, throw beans::UnknownPropertyException(); if ( aPropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) ) { // property is read-only. throw lang::IllegalArgumentException(); } else if ( aPropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) { // property is read-only. throw lang::IllegalArgumentException(); @@ -1389,12 +1389,12 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( uno::Any aValue; if ( PropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) ) { aValue <<= m_pImpl->m_xDataSupplier->currentCount(); } else if ( PropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) { aValue <<= m_pImpl->m_xDataSupplier->isCountFinal(); } @@ -1421,9 +1421,9 @@ void SAL_CALL ResultSet::addPropertyChangeListener( if ( aPropertyName.getLength() && !aPropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) && + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) && !aPropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) throw beans::UnknownPropertyException(); if ( !m_pImpl->m_pPropertyChangeListeners ) @@ -1447,9 +1447,9 @@ void SAL_CALL ResultSet::removePropertyChangeListener( if ( aPropertyName.getLength() && !aPropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) && + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) && !aPropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) throw beans::UnknownPropertyException(); if ( m_pImpl->m_pPropertyChangeListeners ) @@ -1536,7 +1536,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew ) propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - rtl::OUString::createFromAscii( "RowCount" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")), sal_False, 1001, uno::makeAny( nOld ), // old value @@ -1552,7 +1552,7 @@ void ResultSet::rowCountFinal() propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - rtl::OUString::createFromAscii( "IsRowCountFinal" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")), sal_False, 1000, uno:: makeAny( sal_False ), // old value diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx index a787ed64467f..23f885de94a7 100644 --- a/ucbhelper/workben/myucp/myucp_content.cxx +++ b/ucbhelper/workben/myucp/myucp_content.cxx @@ -179,7 +179,7 @@ rtl::OUString SAL_CALL Content::getImplementationName() { // @@@ Adjust implementation name. // Prefix with reversed company domain name. - return rtl::OUString::createFromAscii( "com.sun.star.comp.myucp.Content" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.myucp.Content")); } //========================================================================= @@ -571,27 +571,27 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( rtl::OUString::createFromAscii( "ContentType" ), + beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.aContentType ); xRow->appendString ( - beans::Property( rtl::OUString::createFromAscii( "Title" ), + beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( - beans::Property( rtl::OUString::createFromAscii( "IsDocument" ), + beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.bIsDocument ); xRow->appendBoolean( - beans::Property( rtl::OUString::createFromAscii( "IsFolder" ), + beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -820,7 +820,7 @@ void Content::queryChildren( ContentRefList& rChildren ) if ( nPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += ::rtl::OUString::createFromAscii( "/" ); + aURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); } sal_Int32 nLen = aURL.getLength(); @@ -895,7 +895,7 @@ void Content::insert( ucb::IOErrorCode_ALREADY_EXISTING, uno::Sequence< uno::Any >(&aProps, 1), Environment, - rtl::OUString::createFromAscii( "content already existing!!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content already existing!!")), this ); // Unreachable } diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx index 7ab10a200535..56be6f1a4243 100644 --- a/ucbhelper/workben/myucp/myucp_services.cxx +++ b/ucbhelper/workben/myucp/myucp_services.cxx @@ -44,9 +44,9 @@ sal_Bool writeInfo( void * pRegistryKey, const rtl::OUString & rImplementationName, uno::Sequence< rtl::OUString > const & rServiceNames ) { - rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); + rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") ); aKeyName += rImplementationName; - aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); + aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); uno::Reference< registry::XRegistryKey > xKey; try diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index cd8b03453c44..f647feb959fd 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -587,7 +587,7 @@ void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent ) { Sequence< OUString > aPropertyNames( 0 ); // OUString* pNames = aPropertyNames.getArray(); -// pNames[ 0 ] = OUString::createFromAscii( "Title" ); +// pNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); uno::Reference< XResultSet > xResultSet = pEntry->m_aContent.createCursor( @@ -689,7 +689,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) { Property aProp = pEntry->m_aContent.getProperties()->getPropertyByName( - OUString::createFromAscii( "Title" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ); bEnable = !( aProp.Attributes & PropertyAttribute::READONLY ); } catch( UnknownPropertyException const & ) @@ -750,7 +750,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) try { pEntry->m_aContent.getPropertyValue( - OUString::createFromAscii( "Title" ) ) + OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aNewTitle; } catch ( CommandAbortedException const & ) @@ -769,7 +769,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) StringInputDialog* pDlg = new StringInputDialog( *xManager.get(), - OUString::createFromAscii( "Title" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aNewTitle ); USHORT nRet = pDlg->Execute(); @@ -794,7 +794,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) try { pEntry->m_aContent.setPropertyValue( - OUString::createFromAscii( "Title" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aValue ); bOK = sal_True; } @@ -818,7 +818,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) try { pEntry->m_aContent.getPropertyValue( - OUString::createFromAscii( "TargetURL" ) ) + OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ) >>= aTargetURL; } catch ( CommandAbortedException const & ) @@ -836,7 +836,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) if ( aTargetURL.getLength() > 0 ) { // Insert link. - aText += OUString::createFromAscii( " --> " ); + aText += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> ")); aText += aTargetURL; } @@ -853,7 +853,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) try { pEntry->m_aContent.executeCommand( - OUString::createFromAscii( "delete" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_True ) ); } catch ( CommandAbortedException const & ) @@ -917,9 +917,9 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry( { OUString aTitle; rContent.getPropertyValue( - OUString::createFromAscii( "Title" ) ) >>= aTitle; + OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle; if ( !aTitle.getLength() ) - aTitle = OUString::createFromAscii( "/" ); + aTitle = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); UcbExplorerListBoxEntry* pEntry = 0; @@ -940,7 +940,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry( try { rContent.getPropertyValue( - OUString::createFromAscii( "TargetURL" ) ) >>= aTargetURL; + OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ) >>= aTargetURL; } catch ( CommandAbortedException const & ) { @@ -957,7 +957,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry( if ( aTargetURL.getLength() > 0 ) { // Insert link. - aTitle += OUString::createFromAscii( " --> " ); + aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> ")); aTitle += aTargetURL; pEntry = static_cast< UcbExplorerListBoxEntry * >( SvTreeListBox::InsertEntry( aTitle, @@ -1122,8 +1122,8 @@ void MyApp::Main() ::ucbhelper::ContentProviderDataList aProviders; aProviders.push_back( ::ucbhelper::ContentProviderData( - OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ), - OUString::createFromAscii( "file" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider")), + OUString(RTL_CONSTASCII_USTRINGPARAM("file")), OUString() ) ); sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aProviders ); #endif diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx index a44e9639dcbf..5c96ab7d049f 100644 --- a/unotools/source/config/accelcfg.cxx +++ b/unotools/source/config/accelcfg.cxx @@ -84,7 +84,7 @@ SvtAcceleratorConfig_Impl::SvtAcceleratorConfig_Impl( Reference< XInputStream >& : bModified( false ) { Reference< XParser > xParser( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY); // connect stream to input stream to the parser @@ -104,7 +104,7 @@ bool SvtAcceleratorConfig_Impl::Commit( Reference< XOutputStream >& rOutputStrea Reference< XDocumentHandler > xWriter; xWriter = Reference< XDocumentHandler >( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ; + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))), UNO_QUERY) ; Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY ); xDataSource->setOutputStream( rOutputStream ); diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index e906fc5da5b5..283c9a2b5bed 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -87,7 +87,7 @@ ItemHolder1::ItemHolder1() { css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); css::uno::Reference< css::lang::XComponent > xCfg( - xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), css::uno::UNO_QUERY); if (xCfg.is()) xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this)); diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 32b1a2d84a90..396f5cedf2b8 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -1357,16 +1357,16 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const { switch( eModule ) { - case SvtModuleOptions::E_SWRITER : { return ::rtl::OUString::createFromAscii("Writer"); } - case SvtModuleOptions::E_SWEB : { return ::rtl::OUString::createFromAscii("Web"); } - case SvtModuleOptions::E_SGLOBAL : { return ::rtl::OUString::createFromAscii("Global"); } - case SvtModuleOptions::E_SCALC : { return ::rtl::OUString::createFromAscii("Calc"); } - case SvtModuleOptions::E_SDRAW : { return ::rtl::OUString::createFromAscii("Draw"); } - case SvtModuleOptions::E_SIMPRESS : { return ::rtl::OUString::createFromAscii("Impress"); } - case SvtModuleOptions::E_SMATH : { return ::rtl::OUString::createFromAscii("Math"); } - case SvtModuleOptions::E_SCHART : { return ::rtl::OUString::createFromAscii("Chart"); } - case SvtModuleOptions::E_SBASIC : { return ::rtl::OUString::createFromAscii("Basic"); } - case SvtModuleOptions::E_SDATABASE : { return ::rtl::OUString::createFromAscii("Database"); } + case SvtModuleOptions::E_SWRITER : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } + case SvtModuleOptions::E_SWEB : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Web")); } + case SvtModuleOptions::E_SGLOBAL : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Global")); } + case SvtModuleOptions::E_SCALC : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); } + case SvtModuleOptions::E_SDRAW : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); } + case SvtModuleOptions::E_SIMPRESS : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); } + case SvtModuleOptions::E_SMATH : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); } + case SvtModuleOptions::E_SCHART : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Chart")); } + case SvtModuleOptions::E_SBASIC : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); } + case SvtModuleOptions::E_SDATABASE : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Database")); } default: OSL_ASSERT( "unknown module" ); break; @@ -1379,16 +1379,16 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const { switch( eFactory ) { - case SvtModuleOptions::E_WRITER : { return ::rtl::OUString::createFromAscii("Writer"); } - case SvtModuleOptions::E_WRITERWEB : { return ::rtl::OUString::createFromAscii("Writer"); } - case SvtModuleOptions::E_WRITERGLOBAL : { return ::rtl::OUString::createFromAscii("Writer"); } - case SvtModuleOptions::E_CALC : { return ::rtl::OUString::createFromAscii("Calc"); } - case SvtModuleOptions::E_DRAW : { return ::rtl::OUString::createFromAscii("Draw"); } - case SvtModuleOptions::E_IMPRESS : { return ::rtl::OUString::createFromAscii("Impress"); } - case SvtModuleOptions::E_MATH : { return ::rtl::OUString::createFromAscii("Math"); } - case SvtModuleOptions::E_CHART : { return ::rtl::OUString::createFromAscii("Chart"); } - case SvtModuleOptions::E_BASIC : { return ::rtl::OUString::createFromAscii("Basic"); } - case SvtModuleOptions::E_DATABASE : { return ::rtl::OUString::createFromAscii("Database"); } + case SvtModuleOptions::E_WRITER : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } + case SvtModuleOptions::E_WRITERWEB : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } + case SvtModuleOptions::E_WRITERGLOBAL : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); } + case SvtModuleOptions::E_CALC : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); } + case SvtModuleOptions::E_DRAW : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); } + case SvtModuleOptions::E_IMPRESS : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); } + case SvtModuleOptions::E_MATH : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); } + case SvtModuleOptions::E_CHART : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Chart")); } + case SvtModuleOptions::E_BASIC : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); } + case SvtModuleOptions::E_DATABASE : { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Database")); } default: OSL_ASSERT( "unknown factory" ); break; @@ -1468,9 +1468,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O try { xFilterCfg = css::uno::Reference< css::container::XNameAccess >( - xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.FilterFactory")), css::uno::UNO_QUERY); + xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"))), css::uno::UNO_QUERY); xTypeCfg = css::uno::Reference< css::container::XNameAccess >( - xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), css::uno::UNO_QUERY); + xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), css::uno::UNO_QUERY); } catch(const css::uno::RuntimeException&) { throw; } @@ -1480,13 +1480,13 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O ::comphelper::SequenceAsHashMap stlDesc(lMediaDescriptor); // is there already a filter inside the descriptor? - ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("FilterName"), ::rtl::OUString()); + ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")), ::rtl::OUString()); if (sFilterName.getLength()) { try { ::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sFilterName)); - ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("DocumentService"), ::rtl::OUString()); + ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")), ::rtl::OUString()); SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService); if (eApp != E_UNKNOWN_FACTORY) @@ -1499,7 +1499,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O } // is there already a type inside the descriptor? - ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("TypeName"), ::rtl::OUString()); + ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")), ::rtl::OUString()); if (!sTypeName.getLength()) { // no :-( @@ -1516,9 +1516,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O try { ::comphelper::SequenceAsHashMap stlTypeProps (xTypeCfg->getByName(sTypeName)); - ::rtl::OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("PreferredFilter"), ::rtl::OUString()); + ::rtl::OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString()); ::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sPreferredFilter)); - ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("DocumentService"), ::rtl::OUString()); + ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")), ::rtl::OUString()); SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService); if (eApp != E_UNKNOWN_FACTORY) diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 8c850a805372..cb1e790bb82b 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -1062,7 +1062,7 @@ void SAL_CALL PathService::flush( ) throw(::com::sun::star::uno::RuntimeExcepti ::rtl::OUString SAL_CALL PathService::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { - return OUString::createFromAscii("com.sun.star.comp.unotools.PathService"); + return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.unotools.PathService")); } sal_Bool SAL_CALL PathService::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) @@ -1076,7 +1076,7 @@ sal_Bool SAL_CALL PathService::supportsService( const ::rtl::OUString& ServiceNa ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL PathService::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { Sequence< OUString > aRet(1); - *aRet.getArray() = OUString::createFromAscii("com.sun.star.config.SpecialConfigManager"); + *aRet.getArray() = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager")); return aRet; } diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx index f102285ccf16..aad9dc205c3a 100644 --- a/unotools/source/config/regoptions.cxx +++ b/unotools/source/config/regoptions.cxx @@ -259,13 +259,13 @@ namespace utl // create the config node for all our registration information m_aRegistrationNode = OConfigurationTreeRoot::createWithServiceFactory( ::comphelper::getProcessServiceFactory(), - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.Common/Help/Registration" ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/Help/Registration")) ); // cache some data //the URL to use for online registration ::rtl::OUString sStringValue; - m_aRegistrationNode.getNodeValue( ::rtl::OUString::createFromAscii( "URL" ) ) >>= sStringValue; + m_aRegistrationNode.getNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= sStringValue; m_sRegistrationURL = sStringValue; // the state of the dialog diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 5a812fece4f0..8f1ee3d4bd16 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -382,7 +382,7 @@ Sequence< OUString > GetPropertyNames() // ----------------------------------------------------------------------- SvtSaveOptions_Impl::SvtSaveOptions_Impl() - : ConfigItem( OUString::createFromAscii("Office.Common/Save") ) + : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Save")) ) , nAutoSaveTime( 0 ) , bUseUserData( sal_False ) , bBackup( sal_False ) @@ -543,18 +543,18 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() { css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( ::utl::getProcessServiceFactory(), - ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")), ::comphelper::ConfigurationHelper::E_READONLY); ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString::createFromAscii("AutoSave"), - ::rtl::OUString::createFromAscii("Enabled")) >>= bAutoSave; + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled"))) >>= bAutoSave; ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString::createFromAscii("AutoSave"), - ::rtl::OUString::createFromAscii("TimeIntervall")) >>= nAutoSaveTime; + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall"))) >>= nAutoSaveTime; } catch(const css::uno::Exception&) { DBG_ERROR("Could not find needed informations for AutoSave feature."); } @@ -713,19 +713,19 @@ void SvtSaveOptions_Impl::Commit() css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( ::utl::getProcessServiceFactory(), - ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")), ::comphelper::ConfigurationHelper::E_STANDARD); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString::createFromAscii("AutoSave"), - ::rtl::OUString::createFromAscii("TimeIntervall"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall")), css::uno::makeAny(nAutoSaveTime)); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString::createFromAscii("AutoSave"), - ::rtl::OUString::createFromAscii("Enabled"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), css::uno::makeAny(bAutoSave)); ::comphelper::ConfigurationHelper::flush(xCFG); @@ -757,7 +757,7 @@ public: const sal_Char cUserDefinedSettings[] = "UserDefinedSettings"; SvtLoadOptions_Impl::SvtLoadOptions_Impl() - : ConfigItem( OUString::createFromAscii("Office.Common/Load") ) + : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Load")) ) , bLoadUserDefinedSettings( sal_False ) { Sequence< OUString > aNames(1); diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index c4cae792c953..f7d6333afac0 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -83,7 +83,7 @@ public: SvtSearchOptions_Impl::SvtSearchOptions_Impl() : - ConfigItem( OUString::createFromAscii( "Office.Common/SearchOptions" ) ) + ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/SearchOptions")) ) { RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()"); nFlags = 0x0003FFFF; // set all options values to 'true' diff --git a/unotools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx index 0dafd7097d3f..13978c99b53d 100644 --- a/unotools/source/config/sourceviewconfig.cxx +++ b/unotools/source/config/sourceviewconfig.cxx @@ -99,7 +99,7 @@ sal_Int32 SourceViewConfig::m_nRefCount = 0; namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; } SourceViewConfig_Impl::SourceViewConfig_Impl() : - ConfigItem(OUString::createFromAscii("Office.Common/Font/SourceViewFont")), + ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/SourceViewFont"))), m_nFontHeight(12), m_bProportionalFontOnly(sal_False) { diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx index f7e985c71318..1e55eea775fe 100644 --- a/unotools/source/config/undoopt.cxx +++ b/unotools/source/config/undoopt.cxx @@ -69,7 +69,7 @@ public: // ----------------------------------------------------------------------- SvtUndoOptions_Impl::SvtUndoOptions_Impl() - : ConfigItem( OUString::createFromAscii("Office.Common/Undo") ) + : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Undo")) ) , nUndoCount( 20 ) { Load(); diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index d7e52619ebc0..7019d5648921 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -750,7 +750,7 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment ) sFullName = GetFirstName(); sFullName.trim(); if ( sFullName.getLength() ) - sFullName += ::rtl::OUString::createFromAscii(" "); + sFullName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); sFullName += GetLastName(); sFullName.trim(); diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index 75b3dc650602..d421ad3dd5f8 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -183,7 +183,7 @@ DECLARE_LIST( StringList_Impl, ::rtl::OUString* ) Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; ::com::sun::star::uno::Sequence< ::rtl::OUString > aProps(1); ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString::createFromAscii( "Url" ); + pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Url")); try { diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 5a99c522035f..160a4572553e 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -75,10 +75,10 @@ rtl::OUString getParentName( const rtl::OUString& aFileName ) rtl::OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 ) - aParent += rtl::OUString::createFromAscii( "/" ); + aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); if( 0 == aParent.compareToAscii( "file://" ) ) - aParent = rtl::OUString::createFromAscii( "file:///" ); + aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///")); return aParent; } diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 01b99f85e8ec..c289730bfbc0 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -109,7 +109,7 @@ sal_Bool UCBContentHelper::Transfer_Impl( const String& rSource, const String& r { Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - OUString aTransferName = OUString::createFromAscii( "transfer" ); + OUString aTransferName(RTL_CONSTASCII_USTRINGPARAM("transfer")); if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, makeAny( @@ -240,7 +240,7 @@ sal_Bool UCBContentHelper::GetTitle( const String& rContent, String& rTitle ) { Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); OUString aTemp; - if ( aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTemp ) + if ( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTemp ) { rTitle = String( aTemp ); bRet = sal_True; @@ -266,7 +266,7 @@ sal_Bool UCBContentHelper::Kill( const String& rContent ) try { Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { @@ -295,9 +295,9 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder uno::Reference< XResultSet > xResultSet; Sequence< OUString > aProps( bSorted ? 2 : 1 ); OUString* pProps = aProps.getArray(); - pProps[0] = OUString::createFromAscii( "Title" ); + pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); if ( bSorted ) - pProps[1] = OUString::createFromAscii( "IsFolder" ); + pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); try { @@ -314,7 +314,7 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder uno::Reference < com::sun::star::ucb::XAnyCompareFactory > xFactory; uno::Reference < XMultiServiceFactory > xMgr = getProcessServiceFactory(); uno::Reference < com::sun::star::ucb::XSortedDynamicResultSetFactory > xSRSFac( - xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), UNO_QUERY ); + xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), UNO_QUERY ); Sequence< com::sun::star::ucb::NumberedSortingInfo > aSortInfo( 2 ); com::sun::star::ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray(); @@ -395,10 +395,10 @@ Sequence < OUString > UCBContentHelper::GetResultSet( const String& rURL ) uno::Reference< com::sun::star::ucb::XDynamicResultSet > xDynResultSet; Sequence< OUString > aProps(3); OUString* pProps = aProps.getArray(); - pProps[0] = OUString::createFromAscii( "Title" ); - pProps[1] = OUString::createFromAscii( "ContentType" ); + pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")); // TODO: can be optimized, property never used: - pProps[2] = OUString::createFromAscii( "IsFolder" ); + pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); try { @@ -636,7 +636,7 @@ ULONG UCBContentHelper::GetSize( const String& rContent ) try { Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.getPropertyValue( OUString::createFromAscii( "Size" ) ) >>= nTemp; + aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) >>= nTemp; } catch( ::com::sun::star::ucb::CommandAbortedException& ) { @@ -662,11 +662,11 @@ sal_Bool UCBContentHelper::IsYounger( const String& rIsYoung, const String& rIsO uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > aCmdEnv; Content aYoung( aYoungObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv ); ::com::sun::star::util::DateTime aTempYoungDate; - aYoung.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aTempYoungDate; + aYoung.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ) >>= aTempYoungDate; CONVERT_DATETIME( aTempYoungDate, aYoungDate ); Content aOlder( aOlderObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv ); ::com::sun::star::util::DateTime aTempOlderDate; - aOlder.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aTempOlderDate; + aOlder.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ) >>= aTempOlderDate; CONVERT_DATETIME( aTempOlderDate, aOlderDate ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 272412d39fe2..ebce86d50205 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1372,7 +1372,7 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp { Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); Reference< XOutputStream > rxTempOut = Reference < XOutputStream > ( - xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ), UNO_QUERY ); if( rxTempOut.is() ) @@ -1707,7 +1707,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo { Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY ); Command aCommand; - aCommand.Name = ::rtl::OUString::createFromAscii("setPropertyValues"); + aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); aCommand.Handle = -1; /* unknown */ aCommand.Argument <<= rProps; xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() ); diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index dc99c388594c..b6692e260940 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -72,7 +72,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode { // truncate is implemented with deleting the original file ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >() ); - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); } catch ( CommandAbortedException& ) @@ -103,7 +103,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode aInsertArg.ReplaceExisting = sal_False; Any aCmdArg; aCmdArg <<= aInsertArg; - aContent.executeCommand( ::rtl::OUString::createFromAscii( "insert" ), aCmdArg ); + aContent.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), aCmdArg ); } // it is NOT an error when the stream already exists and no truncation was desired |