summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/tdoc
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/tdoc')
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx202
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.hxx8
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_services.cxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_uri.cxx2
5 files changed, 109 insertions, 109 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index ccac497786..8ffdcb0116 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -319,8 +319,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.TransientDocumentsContent" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.TransientDocumentsContent" ));
}
//=========================================================================
@@ -333,17 +333,17 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
uno::Sequence< rtl::OUString > aSNS( 1 );
if ( m_aProps.getType() == STREAM )
- aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
- TDOC_STREAM_CONTENT_SERVICE_NAME );
+ aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ TDOC_STREAM_CONTENT_SERVICE_NAME ));
else if ( m_aProps.getType() == FOLDER )
- aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
- TDOC_FOLDER_CONTENT_SERVICE_NAME );
+ aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ TDOC_FOLDER_CONTENT_SERVICE_NAME ));
else if ( m_aProps.getType() == DOCUMENT )
- aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
- TDOC_DOCUMENT_CONTENT_SERVICE_NAME );
+ aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ TDOC_DOCUMENT_CONTENT_SERVICE_NAME ));
else
- aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
- TDOC_ROOT_CONTENT_SERVICE_NAME );
+ aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ TDOC_ROOT_CONTENT_SERVICE_NAME ));
return aSNS;
}
@@ -410,8 +410,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 );
@@ -432,8 +432,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 );
@@ -444,8 +444,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 );
@@ -484,8 +484,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 );
@@ -541,8 +541,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 );
@@ -600,8 +600,8 @@ uno::Any SAL_CALL Content::execute(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
Environment,
- rtl::OUString::createFromAscii(
- "Cannot remove persistent data!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Cannot remove persistent data!" )),
this );
// Unreachable
}
@@ -641,8 +641,8 @@ uno::Any SAL_CALL Content::execute(
OSL_ENSURE( sal_False, "Wrong argument type!" );
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 );
@@ -684,8 +684,8 @@ uno::Any SAL_CALL Content::execute(
OSL_ENSURE( sal_False, "Wrong argument type!" );
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 );
@@ -774,12 +774,12 @@ Content::createNewContent( const ucb::ContentInfo& Info )
"Content::createNewContent - empty identifier!" );
if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
- aURL += rtl::OUString::createFromAscii( "/" );
+ aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
if ( bCreateFolder )
- aURL += rtl::OUString::createFromAscii( "New_Folder" );
+ aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Folder"));
else
- aURL += rtl::OUString::createFromAscii( "New_Stream" );
+ aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Stream"));
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL );
@@ -842,7 +842,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();
@@ -1104,7 +1104,7 @@ 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
@@ -1114,7 +1114,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
ContentType eType = rData.getType();
xRow->appendString (
- beans::Property( rtl::OUString::createFromAscii( "Title" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
// Title is read-only for root and documents.
@@ -1124,14 +1124,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
: 0 ),
rData.getTitle() );
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.getIsDocument() );
xRow->appendBoolean(
- beans::Property( rtl::OUString::createFromAscii( "IsFolder" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -1139,7 +1139,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
rData.getIsFolder() );
xRow->appendObject(
beans::Property(
- rtl::OUString::createFromAscii( "CreatableContentsInfo" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")),
-1,
getCppuType( static_cast<
const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -1150,7 +1150,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// Storage is only supported by folders.
if ( eType == FOLDER )
xRow->appendObject(
- beans::Property( rtl::OUString::createFromAscii( "Storage" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),
-1,
getCppuType(
static_cast<
@@ -1162,7 +1162,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// DocumentModel is only supported by documents.
if ( eType == DOCUMENT )
xRow->appendObject(
- beans::Property( rtl::OUString::createFromAscii( "DocumentModel" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentModel")),
-1,
getCppuType(
static_cast<
@@ -1234,8 +1234,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 ( rValue.Name.equalsAsciiL(
@@ -1243,8 +1243,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 ( rValue.Name.equalsAsciiL(
@@ -1252,8 +1252,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 ( rValue.Name.equalsAsciiL(
@@ -1261,8 +1261,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 ( rValue.Name.equalsAsciiL(
@@ -1273,8 +1273,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( ( eType == ROOT ) || ( eType == DOCUMENT ) )
{
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
@@ -1304,8 +1304,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 );
}
@@ -1313,8 +1313,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::IllegalTypeException(
- rtl::OUString::createFromAscii(
- "Title Property value has wrong type!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Title Property value has wrong type!" )),
static_cast< cppu::OWeakObject * >( this ) );
}
}
@@ -1326,16 +1326,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( eType == FOLDER )
{
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
{
// Storage is only supported by folders.
aRet[ n ] <<= beans::UnknownPropertyException(
- rtl::OUString::createFromAscii(
- "Storage property only supported by folders" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Storage property only supported by folders" )),
static_cast< cppu::OWeakObject * >( this ) );
}
}
@@ -1346,17 +1346,17 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( eType == DOCUMENT )
{
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
{
// Storage is only supported by folders.
aRet[ n ] <<= beans::UnknownPropertyException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"DocumentModel property only supported by "
- "documents" ),
+ "documents" )),
static_cast< cppu::OWeakObject * >( this ) );
}
}
@@ -1409,8 +1409,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 ) );
}
}
@@ -1442,14 +1442,14 @@ 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 ) );
}
}
if ( aOldTitle.getLength() )
{
- aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+ aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
aEvent.OldValue = uno::makeAny( aOldTitle );
aEvent.NewValue = uno::makeAny( m_aProps.getTitle() );
@@ -1477,8 +1477,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Cannot store persistent data!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Cannot store persistent data!" )),
this );
// Unreachable
}
@@ -1558,8 +1558,8 @@ uno::Any Content::open(
m_eState == PERSISTENT
? xEnv
: uno::Reference< ucb::XCommandEnvironment >(),
- rtl::OUString::createFromAscii(
- "Got no data stream!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Got no data stream!" )),
this );
// Unreachable
}
@@ -1594,7 +1594,7 @@ uno::Any Content::open(
m_eState == PERSISTENT
? xEnv
: uno::Reference< ucb::XCommandEnvironment >(),
- rtl::OUString::createFromAscii( "Got no data stream!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Got no data stream!")),
this );
// Unreachable
}
@@ -1656,8 +1656,8 @@ uno::Any Content::open(
? xEnv
: uno::Reference<
ucb::XCommandEnvironment >(),
- rtl::OUString::createFromAscii(
- "Got no data stream!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Got no data stream!" )),
this );
// Unreachable
}
@@ -1785,8 +1785,8 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString::createFromAscii(
- "Unable to resolve name clash!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to resolve name clash!" )),
static_cast< cppu::OWeakObject * >( this ),
nNameClashResolve ) ),
xEnv );
@@ -1842,7 +1842,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii( "Cannot store persistent data!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot store persistent data!")),
this );
// Unreachable
}
@@ -1880,8 +1880,8 @@ void Content::destroy( sal_Bool bDeletePhysical,
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::UnsupportedCommandException(
- rtl::OUString::createFromAscii(
- "Not persistent!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Not persistent!" )),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
// Unreachable
@@ -2022,8 +2022,8 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::UnsupportedCommandException(
- rtl::OUString::createFromAscii(
- "Not persistent!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Not persistent!" )),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
// Unreachable
@@ -2063,8 +2063,8 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString::createFromAscii(
- "Invalid source URI! Syntax!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Invalid source URI! Syntax!" )),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
xEnv );
@@ -2075,9 +2075,9 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Invalid source URI! "
- "Must describe a folder or stream!" ),
+ "Must describe a folder or stream!" )),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
xEnv );
@@ -2090,7 +2090,7 @@ void Content::transfer(
if ( nPos != ( aId.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aId += rtl::OUString::createFromAscii( "/" );
+ aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
}
if ( rInfo.SourceURL.getLength() <= aId.getLength() )
@@ -2109,8 +2109,8 @@ void Content::transfer(
ucb::IOErrorCode_RECURSIVE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Target is equal to or is a child of source!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Target is equal to or is a child of source!" )),
this );
// Unreachable
}
@@ -2132,10 +2132,10 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Invalid source URI! "
"Streams cannot be created as "
- "children of document root!" ),
+ "children of document root!" )),
static_cast< cppu::OWeakObject * >(
this ),
-1 ) ),
@@ -2162,9 +2162,9 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Invalid source URI! "
- "Unabale to determine source type!" ),
+ "Unabale to determine source type!" )),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
xEnv );
@@ -2207,7 +2207,7 @@ void Content::transfer(
rtl::OUString aTargetUri = m_xIdentifier->getContentIdentifier();
if ( ( aTargetUri.lastIndexOf( '/' ) + 1 ) != aTargetUri.getLength() )
- aTargetUri += rtl::OUString::createFromAscii( "/" );
+ aTargetUri += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
if ( rInfo.NewTitle.getLength() > 0 )
aTargetUri += ::ucb_impl::urihelper::encodeSegment( rInfo.NewTitle );
@@ -2270,8 +2270,8 @@ void Content::transfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Cannot instanciate target object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Cannot instanciate target object!" )),
this );
// Unreachable
}
@@ -2315,8 +2315,8 @@ void Content::transfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Cannot instanciate target object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Cannot instanciate target object!" )),
this );
// Unreachable
}
@@ -2339,8 +2339,8 @@ void Content::transfer(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Cannot remove persistent data of source object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Cannot remove persistent data of source object!" )),
this );
// Unreachable
}
@@ -2360,8 +2360,8 @@ void Content::transfer(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Cannot remove additional properties of source object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Cannot remove additional properties of source object!" )),
this );
// Unreachable
}
@@ -3067,7 +3067,7 @@ ContentProperties::getCreatableContentsInfo() const
{
uno::Sequence< beans::Property > aProps( 1 );
aProps.getArray()[ 0 ] = beans::Property(
- rtl::OUString::createFromAscii( "Title" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND );
@@ -3080,7 +3080,7 @@ ContentProperties::getCreatableContentsInfo() const
// Folder.
aSeq.getArray()[ 0 ].Type
- = rtl::OUString::createFromAscii( TDOC_FOLDER_CONTENT_TYPE );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ));
aSeq.getArray()[ 0 ].Attributes
= ucb::ContentInfoAttribute::KIND_FOLDER;
aSeq.getArray()[ 0 ].Properties = aProps;
@@ -3094,14 +3094,14 @@ ContentProperties::getCreatableContentsInfo() const
// Folder.
aSeq.getArray()[ 0 ].Type
- = rtl::OUString::createFromAscii( TDOC_FOLDER_CONTENT_TYPE );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ));
aSeq.getArray()[ 0 ].Attributes
= ucb::ContentInfoAttribute::KIND_FOLDER;
aSeq.getArray()[ 0 ].Properties = aProps;
// Stream.
aSeq.getArray()[ 1 ].Type
- = rtl::OUString::createFromAscii( TDOC_STREAM_CONTENT_TYPE );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_STREAM_CONTENT_TYPE ));
aSeq.getArray()[ 1 ].Attributes
= ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
| ucb::ContentInfoAttribute::KIND_DOCUMENT;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index dd617d8dab..33a111374e 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -72,12 +72,12 @@ public:
ContentProperties( const ContentType & rType, const rtl::OUString & rTitle )
: m_eType( rType ),
m_aContentType( rType == STREAM
- ? rtl::OUString::createFromAscii( TDOC_STREAM_CONTENT_TYPE )
+ ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_STREAM_CONTENT_TYPE ))
: rType == FOLDER
- ? rtl::OUString::createFromAscii( TDOC_FOLDER_CONTENT_TYPE )
+ ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ))
: rType == DOCUMENT
- ? rtl::OUString::createFromAscii( TDOC_DOCUMENT_CONTENT_TYPE )
- : rtl::OUString::createFromAscii( TDOC_ROOT_CONTENT_TYPE ) ),
+ ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_DOCUMENT_CONTENT_TYPE ))
+ : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_ROOT_CONTENT_TYPE )) ),
m_aTitle( rTitle )
{}
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 2d37c9a23a..340d23db79 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -462,7 +462,7 @@ ResultSetDataSupplier::assembleChildURL( const ::rtl::OUString& aName )
sal_Int32 nUrlEnd = aURL.lastIndexOf( '/' );
if ( nUrlEnd != aURL.getLength() - 1 )
- aURL += rtl::OUString::createFromAscii( "/" );
+ aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aURL += aName;
return aURL;
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 4fd0c16aa2..29fcd29625 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -44,9 +44,9 @@ static 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/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 4011675469..9c9871584a 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -128,7 +128,7 @@ void Uri::init() const
if ( nSlash != - 1 )
m_aInternalPath = m_aPath.copy( nSlash );
else
- m_aInternalPath = rtl::OUString::createFromAscii( "/" );
+ m_aInternalPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
}
m_eState = VALID;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 15:20:22 +0000