diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-22 22:54:33 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-22 22:54:33 +0100 |
commit | 7d0f24c822b0f8af6b0b5fa82ed6bd288cdebe96 (patch) | |
tree | dcf7e38704e01f7037ece56e108db3d5faef9372 /ucbhelper | |
parent | RTL_CONSTASCII_USTRINGPARAM in libs-gui 08 (diff) | |
download | core-7d0f24c822b0f8af6b0b5fa82ed6bd288cdebe96.tar.gz core-7d0f24c822b0f8af6b0b5fa82ed6bd288cdebe96.zip |
RTL_CONSTASCII_USTRINGPARAM in libs-gui 09
Diffstat (limited to 'ucbhelper')
-rw-r--r-- | ucbhelper/source/client/content.cxx | 56 | ||||
-rw-r--r-- | ucbhelper/source/client/proxydecider.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 22 | ||||
-rw-r--r-- | ucbhelper/workben/myucp/myucp_content.cxx | 14 | ||||
-rw-r--r-- | ucbhelper/workben/myucp/myucp_services.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/workben/ucbexplorer/ucbexplorer.cxx | 28 |
6 files changed, 64 insertions, 64 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 |