diff options
Diffstat (limited to 'ucb/source/ucp/webdav/webdavcontent.cxx')
-rw-r--r-- | ucb/source/ucp/webdav/webdavcontent.cxx | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index e7f36d16a619..81e96793e6e9 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -344,8 +344,8 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( - "com.sun.star.comp.ucb.WebDAVContent" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.WebDAVContent" )); } //========================================================================= @@ -355,7 +355,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() { uno::Sequence< rtl::OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_SERVICE_NAME )); return aSNS; } @@ -384,9 +384,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_COLLECTION_TYPE )); - return rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_TYPE )); } //========================================================================= @@ -423,8 +423,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -445,8 +445,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -457,8 +457,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "No properties!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "No properties!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -500,8 +500,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -522,8 +522,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -587,8 +587,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -609,8 +609,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -652,8 +652,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Wrong argument type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -952,7 +952,7 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_TYPE )); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; @@ -967,7 +967,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_COLLECTION_TYPE )); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -1001,18 +1001,18 @@ Content::createNewContent( const ucb::ContentInfo& Info ) "WebdavContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); sal_Bool isCollection; if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) ) { - aURL += rtl::OUString::createFromAscii( "New_Collection" ); + aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Collection")); isCollection = sal_True; } else { - aURL += rtl::OUString::createFromAscii( "New_Content" ); + aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Content")); isCollection = sal_False; } @@ -1527,8 +1527,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1541,8 +1541,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName.equalsAsciiL( @@ -1550,8 +1550,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName.equalsAsciiL( @@ -1559,8 +1559,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) @@ -1593,8 +1593,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Invalid content identifier!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Invalid content identifier!" )), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1602,8 +1602,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( - "Empty title not allowed!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Empty title not allowed!" )), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1611,8 +1611,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString::createFromAscii( - "Property value has wrong type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property value has wrong type!" )), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1632,8 +1632,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString::createFromAscii( - "Property is unknown!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is unknown!" )), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1642,8 +1642,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName.equalsAsciiL( @@ -1651,8 +1651,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName.equalsAsciiL( @@ -1660,8 +1660,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName.equalsAsciiL( @@ -1670,8 +1670,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } if ( rName.equalsAsciiL( @@ -1679,8 +1679,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1745,8 +1745,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::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 ) ); } } @@ -1810,7 +1810,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( rtl::OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString::createFromAscii( "/" ); + aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aNewURL += NeonUri::escapeSegment( aNewTitle ); @@ -1853,7 +1853,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString::createFromAscii( "Exchange failed!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1871,7 +1871,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" ); + aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -2174,7 +2174,7 @@ void Content::queryChildren( ContentRefList& rChildren ) if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); } sal_Int32 nLen = aURL.getLength(); @@ -2236,7 +2236,7 @@ void Content::insert( OSL_ENSURE( sal_False, "Content::insert - Title missing!" ); uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" ); + aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( rtl::OUString(), @@ -2267,8 +2267,8 @@ void Content::insert( if ( !bTransient || ( bTransient && !bCollection ) ) { ucb::UnsupportedNameClashException aEx( - rtl::OUString::createFromAscii( - "Unable to write without overwrite!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to write without overwrite!" )), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2315,8 +2315,8 @@ void Content::insert( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString::createFromAscii( - "Unknown interaction selection!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unknown interaction selection!" )), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2335,7 +2335,7 @@ void Content::insert( // Assemble new content identifier... rtl::OUString aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aURL += aEscapedTitle; @@ -2489,19 +2489,19 @@ void Content::transfer( RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); } else if ( aScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); } else if ( aScheme.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTPS_URL_SCHEME )) ); } else { @@ -2513,8 +2513,8 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( - "Unsupported URL scheme!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unsupported URL scheme!" )), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2524,11 +2524,11 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2541,8 +2541,8 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( - "Different hosts!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Different hosts!" )), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2564,7 +2564,7 @@ void Content::transfer( rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) != aTargetURL.getLength() ) - aTargetURL += rtl::OUString::createFromAscii( "/" ); + aTargetURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aTargetURL += aTitle; @@ -2770,7 +2770,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString::createFromAscii( "http://ucb.openoffice.org" ); + <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://ucb.openoffice.org")); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2904,7 +2904,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" ); + aProperties[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2933,13 +2933,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1, uno::makeAny(m_xIdentifier->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Not found!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not found!")), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -3021,7 +3021,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) #if 1 aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_xIdentifier->getContentIdentifier(), @@ -3030,13 +3030,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1, uno::makeAny(m_xIdentifier->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Locked!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_LOCKING_VIOLATION, @@ -3048,7 +3048,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked (self)!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked (self)!")), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_xIdentifier->getContentIdentifier(), @@ -3058,7 +3058,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString::createFromAscii( "Not locked!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not locked!")), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_xIdentifier->getContentIdentifier() ); @@ -3067,7 +3067,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString::createFromAscii( "Lock expired!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lock expired!")), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_xIdentifier->getContentIdentifier() ); @@ -3175,13 +3175,13 @@ const Content::ResourceType & Content::getResourceType( std::vector< rtl::OUString > aPropNames; uno::Sequence< beans::Property > aProperties( 5 ); aProperties[ 0 ].Name - = rtl::OUString::createFromAscii( "IsFolder" ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); aProperties[ 1 ].Name - = rtl::OUString::createFromAscii( "IsDocument" ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")); aProperties[ 2 ].Name - = rtl::OUString::createFromAscii( "IsReadOnly" ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")); aProperties[ 3 ].Name - = rtl::OUString::createFromAscii( "MediaType" ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; |