summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/package
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /ucb/source/ucp/package
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'ucb/source/ucp/package')
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx256
-rw-r--r--ucb/source/ucp/package/pkgcontent.hxx24
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx112
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.cxx30
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.hxx4
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx24
-rw-r--r--ucb/source/ucp/package/pkgprovider.hxx4
-rw-r--r--ucb/source/ucp/package/pkguri.cxx25
-rw-r--r--ucb/source/ucp/package/pkguri.hxx34
9 files changed, 256 insertions, 257 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 5453c195b328..d19cccb956e1 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -84,7 +84,7 @@ using namespace package_ucp;
//=========================================================================
//=========================================================================
-ContentProperties::ContentProperties( const rtl::OUString& rContentType )
+ContentProperties::ContentProperties( const OUString& rContentType )
: aContentType( rContentType ),
nSize( 0 ),
bCompressed( sal_True ),
@@ -107,9 +107,9 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const
{
uno::Sequence< beans::Property > aProps( 1 );
aProps.getArray()[ 0 ] = beans::Property(
- rtl::OUString("Title"),
+ OUString("Title"),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND );
uno::Sequence< ucb::ContentInfo > aSeq( 2 );
@@ -151,7 +151,7 @@ Content* Content::create(
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier )
{
- rtl::OUString aURL = Identifier->getContentIdentifier();
+ OUString aURL = Identifier->getContentIdentifier();
PackageUri aURI( aURL );
ContentProperties aProps;
uno::Reference< container::XHierarchicalNameAccess > xPackage;
@@ -226,14 +226,14 @@ Content* Content::create(
//=========================================================================
// static
-::rtl::OUString Content::getContentType(
- const ::rtl::OUString& aScheme, sal_Bool bFolder )
+OUString Content::getContentType(
+ const OUString& aScheme, sal_Bool bFolder )
{
- return ( rtl::OUString("application/")
+ return ( OUString("application/")
+ aScheme
+ ( bFolder
- ? rtl::OUString("-folder")
- : rtl::OUString("-stream") ) );
+ ? OUString("-folder")
+ : OUString("-stream") ) );
}
//=========================================================================
@@ -404,22 +404,22 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
//=========================================================================
// virtual
-rtl::OUString SAL_CALL Content::getImplementationName()
+OUString SAL_CALL Content::getImplementationName()
throw( uno::RuntimeException )
{
- return rtl::OUString( "com.sun.star.comp.ucb.PackageContent" );
+ return OUString( "com.sun.star.comp.ucb.PackageContent" );
}
//=========================================================================
// virtual
-uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
if ( isFolder() )
- aSNS.getArray()[ 0 ] = rtl::OUString( PACKAGE_FOLDER_CONTENT_SERVICE_NAME );
+ aSNS.getArray()[ 0 ] = OUString( PACKAGE_FOLDER_CONTENT_SERVICE_NAME );
else
- aSNS.getArray()[ 0 ] = rtl::OUString( PACKAGE_STREAM_CONTENT_SERVICE_NAME );
+ aSNS.getArray()[ 0 ] = OUString( PACKAGE_STREAM_CONTENT_SERVICE_NAME );
return aSNS;
}
@@ -431,7 +431,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
//=========================================================================
// virtual
-rtl::OUString SAL_CALL Content::getContentType()
+OUString SAL_CALL Content::getContentType()
throw( uno::RuntimeException )
{
return m_aProps.aContentType;
@@ -465,7 +465,7 @@ uno::Any SAL_CALL Content::execute(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "Wrong argument type!" ),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -485,7 +485,7 @@ uno::Any SAL_CALL Content::execute(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "Wrong argument type!" ),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -496,7 +496,7 @@ uno::Any SAL_CALL Content::execute(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "No properties!" ),
+ OUString( "No properties!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -534,7 +534,7 @@ uno::Any SAL_CALL Content::execute(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "Wrong argument type!" ),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -554,7 +554,7 @@ uno::Any SAL_CALL Content::execute(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "Wrong argument type!" ),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -582,7 +582,7 @@ uno::Any SAL_CALL Content::execute(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(m_xIdentifier->
getContentIdentifier()),
@@ -591,7 +591,7 @@ uno::Any SAL_CALL Content::execute(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
Environment,
- rtl::OUString( "Cannot remove persistent data!" ),
+ OUString( "Cannot remove persistent data!" ),
this );
// Unreachable
}
@@ -611,7 +611,7 @@ uno::Any SAL_CALL Content::execute(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "Wrong argument type!" ),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -633,7 +633,7 @@ uno::Any SAL_CALL Content::execute(
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString( "Wrong argument type!" ),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -654,7 +654,7 @@ uno::Any SAL_CALL Content::execute(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(m_xIdentifier->
getContentIdentifier()),
@@ -663,7 +663,7 @@ uno::Any SAL_CALL Content::execute(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
Environment,
- rtl::OUString( "Cannot write file to disk!" ),
+ OUString( "Cannot write file to disk!" ),
this );
// Unreachable
}
@@ -676,7 +676,7 @@ uno::Any SAL_CALL Content::execute(
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::UnsupportedCommandException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ) ) ),
Environment );
// Unreachable
@@ -727,14 +727,14 @@ Content::createNewContent( const ucb::ContentInfo& Info )
getContentType( m_aUri.getScheme(), sal_False ) ) )
return uno::Reference< ucb::XContent >();
- rtl::OUString aURL = m_aUri.getUri();
- aURL += rtl::OUString("/");
+ OUString aURL = m_aUri.getUri();
+ aURL += OUString("/");
if ( Info.Type.equalsIgnoreAsciiCase(
getContentType( m_aUri.getScheme(), sal_True ) ) )
- aURL += rtl::OUString("New_Folder");
+ aURL += OUString("New_Folder");
else
- aURL += rtl::OUString("New_Stream");
+ aURL += OUString("New_Stream");
uno::Reference< ucb::XContentIdentifier > xId(
new ::ucbhelper::ContentIdentifier( aURL ) );
@@ -755,7 +755,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
//=========================================================================
// virtual
-rtl::OUString Content::getParentURL()
+OUString Content::getParentURL()
{
return m_aUri.getParentUri();
}
@@ -766,7 +766,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Sequence< beans::Property >& rProperties,
ContentProvider* pProvider,
- const rtl::OUString& rContentId )
+ const OUString& rContentId )
{
ContentProperties aData;
uno::Reference< container::XHierarchicalNameAccess > xPackage;
@@ -805,7 +805,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const ContentProperties& rData,
const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >&
rProvider,
- const rtl::OUString& rContentId )
+ const OUString& rContentId )
{
// Note: Empty sequence means "get values of all supported properties".
@@ -922,22 +922,22 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// Append all Core Properties.
xRow->appendString (
beans::Property(
- rtl::OUString("ContentType"),
+ OUString("ContentType"),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.aContentType );
xRow->appendString(
beans::Property(
- rtl::OUString("Title"),
+ OUString("Title"),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
rData.aTitle );
xRow->appendBoolean(
beans::Property(
- rtl::OUString("IsDocument"),
+ OUString("IsDocument"),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -945,7 +945,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
rData.bIsDocument );
xRow->appendBoolean(
beans::Property(
- rtl::OUString("IsFolder"),
+ OUString("IsFolder"),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -953,7 +953,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
rData.bIsFolder );
xRow->appendObject(
beans::Property(
- rtl::OUString("CreatableContentsInfo"),
+ OUString("CreatableContentsInfo"),
-1,
getCppuType( static_cast<
const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -963,9 +963,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) );
xRow->appendString(
beans::Property(
- rtl::OUString("MediaType"),
+ OUString("MediaType"),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
rData.aMediaType );
@@ -974,7 +974,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
{
xRow->appendLong(
beans::Property(
- rtl::OUString("Size"),
+ OUString("Size"),
-1,
getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
beans::PropertyAttribute::BOUND
@@ -983,7 +983,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendBoolean(
beans::Property(
- rtl::OUString("Compressed"),
+ OUString("Compressed"),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND ),
@@ -991,7 +991,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
xRow->appendBoolean(
beans::Property(
- rtl::OUString("Encrypted"),
+ OUString("Encrypted"),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND ),
@@ -1004,7 +1004,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
{
xRow->appendBoolean(
beans::Property(
- rtl::OUString("HasEncryptedEntries"),
+ OUString("HasEncryptedEntries"),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -1064,7 +1064,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
sal_Bool bTriedToGetAdditonalPropSet = sal_False;
sal_Bool bExchange = sal_False;
sal_Bool bStore = sal_False;
- rtl::OUString aNewTitle;
+ OUString aNewTitle;
sal_Int32 nTitlePos = -1;
for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -1075,7 +1075,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1083,7 +1083,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1091,7 +1091,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1099,7 +1099,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1109,13 +1109,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
else
{
- rtl::OUString aNewValue;
+ OUString aNewValue;
if ( rValue.Value >>= aNewValue )
{
// No empty titles!
@@ -1139,7 +1139,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
aRet[ n ] <<=
lang::IllegalArgumentException(
- rtl::OUString(
+ OUString(
"Empty title not allowed!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 );
@@ -1149,7 +1149,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
aRet[ n ] <<=
beans::IllegalTypeException(
- rtl::OUString(
+ OUString(
"Property value has wrong type!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1157,7 +1157,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
}
else if ( rValue.Name == "MediaType" )
{
- rtl::OUString aNewValue;
+ OUString aNewValue;
if ( rValue.Value >>= aNewValue )
{
if ( aNewValue != m_aProps.aMediaType )
@@ -1175,7 +1175,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::IllegalTypeException(
- rtl::OUString(
+ OUString(
"Property value has wrong type!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1184,7 +1184,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1211,7 +1211,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::IllegalTypeException(
- rtl::OUString(
+ OUString(
"Property value has wrong type!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1219,7 +1219,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::UnknownPropertyException(
- rtl::OUString(
+ OUString(
"Compressed only supported by streams!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1247,7 +1247,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::IllegalTypeException(
- rtl::OUString(
+ OUString(
"Property value has wrong type!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1255,7 +1255,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::UnknownPropertyException(
- rtl::OUString(
+ OUString(
"Encrypted only supported by streams!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1264,7 +1264,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
// Read-only property!
aRet[ n ] <<= lang::IllegalAccessException(
- rtl::OUString(
+ OUString(
"Property is read-only!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1296,7 +1296,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::IllegalTypeException(
- rtl::OUString(
+ OUString(
"Property value has wrong type!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1304,7 +1304,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= beans::UnknownPropertyException(
- rtl::OUString(
+ OUString(
"EncryptionKey not supported by non-root folder!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1358,7 +1358,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
aRet[ n ] <<= uno::Exception(
- rtl::OUString(
+ OUString(
"No property set for storing the value!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
@@ -1370,8 +1370,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
uno::Reference< ucb::XContentIdentifier > xOldId = m_xIdentifier;
// Assemble new content identifier...
- rtl::OUString aNewURL = m_aUri.getParentUri();
- aNewURL += rtl::OUString("/");
+ OUString aNewURL = m_aUri.getParentUri();
+ aNewURL += OUString("/");
aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle );
uno::Reference< ucb::XContentIdentifier > xNewId
= new ::ucbhelper::ContentIdentifier( aNewURL );
@@ -1390,18 +1390,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
// Do not set new title!
- aNewTitle = rtl::OUString();
+ aNewTitle = OUString();
// Set error .
aRet[ nTitlePos ] <<= uno::Exception(
- rtl::OUString("Exchange failed!"),
+ OUString("Exchange failed!"),
static_cast< cppu::OWeakObject * >( this ) );
}
}
if ( !aNewTitle.isEmpty() )
{
- aEvent.PropertyName = rtl::OUString("Title");
+ aEvent.PropertyName = OUString("Title");
aEvent.OldValue = uno::makeAny( m_aProps.aTitle );
aEvent.NewValue = uno::makeAny( aNewTitle );
@@ -1422,7 +1422,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(
+ OUString(
"Uri"),
-1,
uno::makeAny(m_xIdentifier->
@@ -1432,7 +1432,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString(
+ OUString(
"Cannot store persistent data!" ),
this );
// Unreachable
@@ -1477,7 +1477,7 @@ uno::Any Content::open(
// Currently(?) unsupported.
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::UnsupportedOpenModeException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
sal_Int16( rArg.Mode ) ) ),
xEnv );
@@ -1496,7 +1496,7 @@ uno::Any Content::open(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(
+ OUString(
"Uri"),
-1,
uno::makeAny(m_xIdentifier->
@@ -1508,7 +1508,7 @@ uno::Any Content::open(
m_eState == PERSISTENT
? xEnv
: uno::Reference< ucb::XCommandEnvironment >(),
- rtl::OUString("Got no data stream!"),
+ OUString("Got no data stream!"),
this );
// Unreachable
}
@@ -1556,7 +1556,7 @@ uno::Any Content::open(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(m_xIdentifier->
getContentIdentifier()),
@@ -1568,7 +1568,7 @@ uno::Any Content::open(
? xEnv
: uno::Reference<
ucb::XCommandEnvironment >(),
- rtl::OUString( "Got no data stream!" ),
+ OUString( "Got no data stream!" ),
this );
// Unreachable
}
@@ -1584,7 +1584,7 @@ uno::Any Content::open(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedDataSinkException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
rArg.Sink ) ),
xEnv );
@@ -1621,7 +1621,7 @@ void Content::insert(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::MissingInputStreamException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
// Unreachable
@@ -1633,9 +1633,9 @@ void Content::insert(
m_aProps.aTitle = m_aUri.getName();
}
- rtl::OUString aNewURL = m_aUri.getParentUri();
+ OUString aNewURL = m_aUri.getParentUri();
if (1 + aNewURL.lastIndexOf('/') != aNewURL.getLength())
- aNewURL += rtl::OUString("/");
+ aNewURL += OUString("/");
aNewURL += ::ucb_impl::urihelper::encodeSegment( m_aProps.aTitle );
PackageUri aNewUri( aNewURL );
@@ -1648,7 +1648,7 @@ void Content::insert(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::NameClashException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
task::InteractionClassification_ERROR,
m_aProps.aTitle ) ),
@@ -1669,9 +1669,9 @@ void Content::insert(
do
{
- rtl::OUString aNew = aNewUri.getUri();
- aNew += rtl::OUString("_");
- aNew += rtl::OUString::valueOf( ++nTry );
+ OUString aNew = aNewUri.getUri();
+ aNew += OUString("_");
+ aNew += OUString::valueOf( ++nTry );
aNewUri.setUri( aNew );
}
while ( hasData( aNewUri ) && ( nTry < 1000 ) );
@@ -1681,7 +1681,7 @@ void Content::insert(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString( "Unable to resolve name clash!" ),
+ OUString( "Unable to resolve name clash!" ),
static_cast< cppu::OWeakObject * >( this ),
nNameClashResolve ) ),
xEnv );
@@ -1689,8 +1689,8 @@ void Content::insert(
}
else
{
- m_aProps.aTitle += rtl::OUString("_");
- m_aProps.aTitle += rtl::OUString::valueOf( nTry );
+ m_aProps.aTitle += OUString("_");
+ m_aProps.aTitle += OUString::valueOf( nTry );
}
}
break;
@@ -1703,7 +1703,7 @@ void Content::insert(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ),
nNameClashResolve ) ),
xEnv );
@@ -1725,7 +1725,7 @@ void Content::insert(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(m_xIdentifier->
getContentIdentifier()),
@@ -1734,7 +1734,7 @@ void Content::insert(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString("Cannot store persistent data!"),
+ OUString("Cannot store persistent data!"),
this );
// Unreachable
}
@@ -1772,7 +1772,7 @@ void Content::destroy(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::UnsupportedCommandException(
- rtl::OUString( "Not persistent!" ),
+ OUString( "Not persistent!" ),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
// Unreachable
@@ -1814,7 +1814,7 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::UnsupportedCommandException(
- rtl::OUString( "Not persistent!" ),
+ OUString( "Not persistent!" ),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
// Unreachable
@@ -1827,15 +1827,15 @@ void Content::transfer(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( ucb::InteractiveBadTransferURLException(
- rtl::OUString(),
+ OUString(),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
// Unreachable
}
// Is source not a parent of me / not me?
- rtl::OUString aId = m_aUri.getParentUri();
- aId += rtl::OUString("/");
+ OUString aId = m_aUri.getParentUri();
+ aId += OUString("/");
if ( rInfo.SourceURL.getLength() <= aId.getLength() )
{
@@ -1844,7 +1844,7 @@ void Content::transfer(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(rInfo.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1852,7 +1852,7 @@ void Content::transfer(
ucb::IOErrorCode_RECURSIVE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString( "Target is equal to or is a child of source!" ),
+ OUString( "Target is equal to or is a child of source!" ),
this );
// Unreachable
}
@@ -1883,7 +1883,7 @@ void Content::transfer(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(xId->getContentIdentifier()),
beans::PropertyState_DIRECT_VALUE));
@@ -1891,7 +1891,7 @@ void Content::transfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString( "Cannot instanciate source object!" ),
+ OUString( "Cannot instanciate source object!" ),
this );
// Unreachable
}
@@ -1900,7 +1900,7 @@ void Content::transfer(
// 1) Create new child content.
//////////////////////////////////////////////////////////////////////
- rtl::OUString aType = xSource->isFolder()
+ OUString aType = xSource->isFolder()
? getContentType( m_aUri.getScheme(), sal_True )
: getContentType( m_aUri.getScheme(), sal_False );
ucb::ContentInfo aContentInfo;
@@ -1915,7 +1915,7 @@ void Content::transfer(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString( "Folder"),
+ OUString( "Folder"),
-1,
uno::makeAny(aId),
beans::PropertyState_DIRECT_VALUE));
@@ -1923,7 +1923,7 @@ void Content::transfer(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString( "XContentCreator::createNewContent failed!" ),
+ OUString( "XContentCreator::createNewContent failed!" ),
this );
// Unreachable
}
@@ -2024,7 +2024,7 @@ void Content::transfer(
break;
}
- rtl::OUString aName = xNamed->getName();
+ OUString aName = xNamed->getName();
if ( aName.isEmpty() )
{
@@ -2032,16 +2032,16 @@ void Content::transfer(
break;
}
- rtl::OUString aChildId = xId->getContentIdentifier();
+ OUString aChildId = xId->getContentIdentifier();
if ( ( aChildId.lastIndexOf( '/' ) + 1 )
!= aChildId.getLength() )
- aChildId += rtl::OUString("/");
+ aChildId += OUString("/");
aChildId += ::ucb_impl::urihelper::encodeSegment( aName );
ucb::TransferInfo aInfo;
aInfo.MoveData = sal_False;
- aInfo.NewTitle = rtl::OUString();
+ aInfo.NewTitle = OUString();
aInfo.SourceURL = aChildId;
aInfo.NameClash = rInfo.NameClash;
@@ -2072,7 +2072,7 @@ void Content::transfer(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString( "Uri"),
+ OUString( "Uri"),
-1,
uno::makeAny(
xSource->m_xIdentifier->
@@ -2082,7 +2082,7 @@ void Content::transfer(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString( "Cannot remove persistent data of source object!" ),
+ OUString( "Cannot remove persistent data of source object!" ),
this );
// Unreachable
}
@@ -2116,7 +2116,7 @@ sal_Bool Content::exchangeIdentity(
PackageUri aNewUri( xNewId->getContentIdentifier() );
if ( !hasData( aNewUri ) )
{
- rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier();
+ OUString aOldURL = m_xIdentifier->getContentIdentifier();
aGuard.clear();
if ( exchange( xNewId ) )
@@ -2139,9 +2139,9 @@ sal_Bool Content::exchangeIdentity(
// Create new content identifier for the child...
uno::Reference< ucb::XContentIdentifier > xOldChildId
= xChild->getIdentifier();
- rtl::OUString aOldChildURL
+ OUString aOldChildURL
= xOldChildId->getContentIdentifier();
- rtl::OUString aNewChildURL
+ OUString aNewChildURL
= aOldChildURL.replaceAt(
0,
aOldURL.getLength(),
@@ -2173,12 +2173,12 @@ void Content::queryChildren( ContentRefList& rChildren )
::ucbhelper::ContentRefList aAllContents;
m_xProvider->queryExistingContents( aAllContents );
- rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
+ OUString aURL = m_xIdentifier->getContentIdentifier();
OSL_ENSURE( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ),
"Content::queryChildren - Invalid URL!" );
- aURL += rtl::OUString("/");
+ aURL += OUString("/");
sal_Int32 nLen = aURL.getLength();
@@ -2188,7 +2188,7 @@ void Content::queryChildren( ContentRefList& rChildren )
while ( it != end )
{
::ucbhelper::ContentImplHelperRef xChild = (*it);
- rtl::OUString aChildURL
+ OUString aChildURL
= xChild->getIdentifier()->getContentIdentifier();
// Is aURL a prefix of aChildURL?
@@ -2292,7 +2292,7 @@ sal_Bool Content::loadData(
{
uno::Any aHasEncryptedEntries
= xPackagePropSet->getPropertyValue(
- rtl::OUString( "HasEncryptedEntries" ) );
+ OUString( "HasEncryptedEntries" ) );
if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) )
{
OSL_FAIL( "Content::loadData - "
@@ -2340,7 +2340,7 @@ sal_Bool Content::loadData(
{
uno::Any aMediaType
= xPropSet->getPropertyValue(
- rtl::OUString("MediaType") );
+ OUString("MediaType") );
if ( !( aMediaType >>= rProps.aMediaType ) )
{
OSL_FAIL( "Content::loadData - Got no MediaType value!" );
@@ -2384,7 +2384,7 @@ sal_Bool Content::loadData(
{
uno::Any aSize
= xPropSet->getPropertyValue(
- rtl::OUString("Size") );
+ OUString("Size") );
if ( !( aSize >>= rProps.nSize ) )
{
OSL_FAIL( "Content::loadData - Got no Size value!" );
@@ -2407,7 +2407,7 @@ sal_Bool Content::loadData(
{
uno::Any aCompressed
= xPropSet->getPropertyValue(
- rtl::OUString("Compressed") );
+ OUString("Compressed") );
if ( !( aCompressed >>= rProps.bCompressed ) )
{
OSL_FAIL( "Content::loadData - Got no Compressed value!" );
@@ -2430,7 +2430,7 @@ sal_Bool Content::loadData(
{
uno::Any aEncrypted
= xPropSet->getPropertyValue(
- rtl::OUString("Encrypted") );
+ OUString("Encrypted") );
if ( !( aEncrypted >>= rProps.bEncrypted ) )
{
OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
@@ -2528,7 +2528,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
try
{
xPackagePropSet->setPropertyValue(
- rtl::OUString("EncryptionKey"),
+ OUString("EncryptionKey"),
uno::makeAny( m_aProps.aEncryptionKey ) );
m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED;
}
@@ -2653,7 +2653,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
if ( m_nModifiedProps & MEDIATYPE_MODIFIED )
{
xPropSet->setPropertyValue(
- rtl::OUString("MediaType"),
+ OUString("MediaType"),
uno::makeAny( m_aProps.aMediaType ) );
m_nModifiedProps &= ~MEDIATYPE_MODIFIED;
}
@@ -2662,7 +2662,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
{
if ( !isFolder() )
xPropSet->setPropertyValue(
- rtl::OUString("Compressed"),
+ OUString("Compressed"),
uno::makeAny( m_aProps.bCompressed ) );
m_nModifiedProps &= ~COMPRESSED_MODIFIED;
@@ -2672,7 +2672,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
{
if ( !isFolder() )
xPropSet->setPropertyValue(
- rtl::OUString("Encrypted"),
+ OUString("Encrypted"),
uno::makeAny( m_aProps.bEncrypted ) );
m_nModifiedProps &= ~ENCRYPTED_MODIFIED;
@@ -2682,7 +2682,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
{
if ( !isFolder() )
xPropSet->setPropertyValue(
- rtl::OUString("EncryptionKey"),
+ OUString("EncryptionKey"),
uno::makeAny( m_aProps.aEncryptionKey ) );
m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED;
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 1d5db315f9a7..1d10ae216588 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -69,11 +69,11 @@ namespace package_ucp
struct ContentProperties
{
- ::rtl::OUString aTitle; // Title
- ::rtl::OUString aContentType; // ContentType
+ OUString aTitle; // Title
+ OUString aContentType; // ContentType
sal_Bool bIsDocument; // IsDocument
sal_Bool bIsFolder; // IsFolder
- ::rtl::OUString aMediaType; // MediaType
+ OUString aMediaType; // MediaType
com::sun::star::uno::Sequence <
sal_Int8 > aEncryptionKey; // EncryptionKey
sal_Int64 nSize; // Size
@@ -86,7 +86,7 @@ struct ContentProperties
bCompressed( sal_True ), bEncrypted( sal_False ),
bHasEncryptedEntries( sal_False ) {}
- ContentProperties( const ::rtl::OUString& rContentType );
+ ContentProperties( const OUString& rContentType );
com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
getCreatableContentsInfo( PackageUri const & rUri ) const;
@@ -139,7 +139,7 @@ private:
virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
getCommands( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv );
- virtual ::rtl::OUString getParentURL();
+ virtual OUString getParentURL();
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
getPropertyValues( const ::com::sun::star::uno::Reference<
@@ -149,7 +149,7 @@ private:
const ContentProperties& rData,
const rtl::Reference<
::ucbhelper::ContentProviderImplHelper >& rProvider,
- const ::rtl::OUString& rContentId );
+ const OUString& rContentId );
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
getPropertyValues( const ::com::sun::star::uno::Sequence<
@@ -261,15 +261,15 @@ public:
XTYPEPROVIDER_DECL()
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName()
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException );
// XContent
- virtual rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getContentType()
throw( com::sun::star::uno::RuntimeException );
@@ -311,15 +311,15 @@ public:
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property >& rProperties,
ContentProvider* pProvider,
- const ::rtl::OUString& rContentId );
+ const OUString& rContentId );
// Called from resultset data supplier.
::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration >
getIterator();
- static ::rtl::OUString
- getContentType( const ::rtl::OUString& aScheme, sal_Bool bFolder );
+ static OUString
+ getContentType( const OUString& aScheme, sal_Bool bFolder );
};
}
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index a1261eb565ba..25ed29e6c2d8 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -103,30 +103,30 @@ uno::Sequence< beans::Property > Content::getProperties(
// Required properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "ContentType" ),
+ OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "IsDocument" ),
+ OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "IsFolder" ),
+ OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "Title" ),
+ OUString( "Title" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
@@ -134,13 +134,13 @@ uno::Sequence< beans::Property > Content::getProperties(
// Optional standard properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "MediaType" ),
+ OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
),
beans::Property(
- rtl::OUString(
+ OUString(
"CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
@@ -152,7 +152,7 @@ uno::Sequence< beans::Property > Content::getProperties(
// New properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "HasEncryptedEntries" ),
+ OUString( "HasEncryptedEntries" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -175,43 +175,43 @@ uno::Sequence< beans::Property > Content::getProperties(
// Required properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "ContentType" ),
+ OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "IsDocument" ),
+ OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "IsFolder" ),
+ OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "Title" ),
+ OUString( "Title" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
),
///////////////////////////////////////////////////////////////
// Optional standard properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "MediaType" ),
+ OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
),
beans::Property(
- rtl::OUString(
+ OUString(
"CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
@@ -240,50 +240,50 @@ uno::Sequence< beans::Property > Content::getProperties(
// Required properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "ContentType" ),
+ OUString( "ContentType" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "IsDocument" ),
+ OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "IsFolder" ),
+ OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( "Title" ),
+ OUString( "Title" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
),
///////////////////////////////////////////////////////////////
// Optional standard properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "MediaType" ),
+ OUString( "MediaType" ),
-1,
- getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
),
beans::Property(
- rtl::OUString( "Size" ),
+ OUString( "Size" ),
-1,
getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString(
+ OUString(
"CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
@@ -295,13 +295,13 @@ uno::Sequence< beans::Property > Content::getProperties(
// New properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( "Compressed" ),
+ OUString( "Compressed" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
),
beans::Property(
- rtl::OUString( "Encrypted" ),
+ OUString( "Encrypted" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -334,24 +334,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Required commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "getCommandInfo" ),
+ OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "getPropertySetInfo" ),
+ OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "getPropertyValues" ),
+ OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast<
uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "setPropertyValues" ),
+ OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -361,19 +361,19 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "open" ),
+ OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "transfer" ),
+ OUString( "transfer" ),
-1,
getCppuType(
static_cast< ucb::TransferInfo * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "createNewContent" ),
+ OUString( "createNewContent" ),
-1,
getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
),
@@ -381,7 +381,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// New commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "flush" ),
+ OUString( "flush" ),
-1,
getCppuVoidType()
)
@@ -403,24 +403,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Required commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "getCommandInfo" ),
+ OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "getPropertySetInfo" ),
+ OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "getPropertyValues" ),
+ OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast<
uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "setPropertyValues" ),
+ OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -430,29 +430,29 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "delete" ),
+ OUString( "delete" ),
-1,
getCppuBooleanType()
),
ucb::CommandInfo(
- rtl::OUString( "insert" ),
+ OUString( "insert" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "open" ),
+ OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "transfer" ),
+ OUString( "transfer" ),
-1,
getCppuType(
static_cast< ucb::TransferInfo * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "createNewContent" ),
+ OUString( "createNewContent" ),
-1,
getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
),
@@ -460,7 +460,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// New commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "flush" ),
+ OUString( "flush" ),
-1,
getCppuVoidType()
)
@@ -483,23 +483,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Required commands
///////////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "getCommandInfo" ),
+ OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "getPropertySetInfo" ),
+ OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "getPropertyValues" ),
+ OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( "setPropertyValues" ),
+ OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -509,17 +509,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( "delete" ),
+ OUString( "delete" ),
-1,
getCppuBooleanType()
),
ucb::CommandInfo(
- rtl::OUString( "insert" ),
+ OUString( "insert" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( "open" ),
+ OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index 74fbaa9f434a..f0e9b8d2f995 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -50,12 +50,12 @@ namespace package_ucp
struct ResultListEntry
{
- rtl::OUString aURL;
+ OUString aURL;
uno::Reference< ucb::XContentIdentifier > xId;
uno::Reference< ucb::XContent > xContent;
uno::Reference< sdbc::XRow > xRow;
- ResultListEntry( const rtl::OUString& rURL ) : aURL( rURL ) {}
+ ResultListEntry( const OUString& rURL ) : aURL( rURL ) {}
};
//=========================================================================
@@ -134,13 +134,13 @@ DataSupplier::~DataSupplier()
//=========================================================================
// virtual
-rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
+OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
{
osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
if ( nIndex < m_pImpl->m_aResults.size() )
{
- rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aURL;
+ OUString aId = m_pImpl->m_aResults[ nIndex ]->aURL;
if ( !aId.isEmpty() )
{
// Already cached.
@@ -153,7 +153,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
// Note: getResult fills m_pImpl->m_aResults[ nIndex ]->aURL.
return m_pImpl->m_aResults[ nIndex ]->aURL;
}
- return rtl::OUString();
+ return OUString();
}
//=========================================================================
@@ -174,7 +174,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
}
}
- rtl::OUString aId = queryContentIdentifierString( nIndex );
+ OUString aId = queryContentIdentifierString( nIndex );
if ( !aId.isEmpty() )
{
uno::Reference< ucb::XContentIdentifier > xId
@@ -258,7 +258,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
break;
}
- rtl::OUString aName = xNamed->getName();
+ OUString aName = xNamed->getName();
if ( aName.isEmpty() )
{
@@ -267,7 +267,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
}
// Assemble URL for child.
- rtl::OUString aURL = assembleChildURL( aName );
+ OUString aURL = assembleChildURL( aName );
m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) );
@@ -336,7 +336,7 @@ sal_uInt32 DataSupplier::totalCount()
break;
}
- rtl::OUString aName = xNamed->getName();
+ OUString aName = xNamed->getName();
if ( aName.isEmpty() )
{
@@ -345,7 +345,7 @@ sal_uInt32 DataSupplier::totalCount()
}
// Assemble URL for child.
- rtl::OUString aURL = assembleChildURL( aName );
+ OUString aURL = assembleChildURL( aName );
m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) );
}
@@ -451,10 +451,10 @@ void DataSupplier::validate()
}
//=========================================================================
-::rtl::OUString DataSupplier::assembleChildURL( const ::rtl::OUString& aName )
+OUString DataSupplier::assembleChildURL( const OUString& aName )
{
- rtl::OUString aURL;
- rtl::OUString aContURL
+ OUString aURL;
+ OUString aContURL
= m_pImpl->m_xContent->getIdentifier()->getContentIdentifier();
sal_Int32 nParam = aContURL.indexOf( '?' );
if ( nParam >= 0 )
@@ -463,7 +463,7 @@ void DataSupplier::validate()
sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' );
if ( nPackageUrlEnd != aURL.getLength() - 1 )
- aURL += rtl::OUString("/");
+ aURL += OUString("/");
aURL += ::ucb_impl::urihelper::encodeSegment( aName );
aURL += aContURL.copy( nParam );
@@ -474,7 +474,7 @@ void DataSupplier::validate()
sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' );
if ( nPackageUrlEnd != aURL.getLength() - 1 )
- aURL += rtl::OUString("/");
+ aURL += OUString("/");
aURL += ::ucb_impl::urihelper::encodeSegment( aName );
}
diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index 871ca6e4cdc7..e8f7ab947d3a 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
@@ -39,7 +39,7 @@ public:
sal_Int32 nOpenMode );
virtual ~DataSupplier();
- virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex );
+ virtual OUString queryContentIdentifierString( sal_uInt32 nIndex );
virtual com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >
queryContentIdentifier( sal_uInt32 nIndex );
@@ -61,7 +61,7 @@ public:
virtual void validate()
throw( com::sun::star::ucb::ResultSetException );
- ::rtl::OUString assembleChildURL( const ::rtl::OUString& aName );
+ OUString assembleChildURL( const OUString& aName );
};
}
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 605851a25869..c27e3f27633d 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -50,12 +50,12 @@ class Package : public cppu::OWeakObject,
{
friend class ContentProvider;
- rtl::OUString m_aName;
+ OUString m_aName;
uno::Reference< container::XHierarchicalNameAccess > m_xNA;
ContentProvider* m_pOwner;
public:
- Package( const rtl::OUString& rName,
+ Package( const OUString& rName,
const uno::Reference< container::XHierarchicalNameAccess > & xNA,
ContentProvider* pOwner )
: m_aName( rName ), m_xNA( xNA ), m_pOwner( pOwner ) {}
@@ -75,11 +75,11 @@ public:
// XHierarchicalNameAccess
virtual uno::Any SAL_CALL
- getByHierarchicalName( const rtl::OUString& aName )
+ getByHierarchicalName( const OUString& aName )
throw( container::NoSuchElementException, uno::RuntimeException )
{ return m_xNA->getByHierarchicalName( aName ); }
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const rtl::OUString& aName )
+ hasByHierarchicalName( const OUString& aName )
throw( uno::RuntimeException )
{ return m_xNA->hasByHierarchicalName( aName ); }
};
@@ -93,7 +93,7 @@ public:
struct equalString
{
bool operator()(
- const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const
+ const OUString& rKey1, const OUString& rKey2 ) const
{
return !!( rKey1 == rKey2 );
}
@@ -101,7 +101,7 @@ struct equalString
struct hashString
{
- size_t operator()( const rtl::OUString & rName ) const
+ size_t operator()( const OUString & rName ) const
{
return rName.hashCode();
}
@@ -109,7 +109,7 @@ struct hashString
typedef boost::unordered_map
<
- rtl::OUString,
+ OUString,
Package*,
hashString,
equalString
@@ -173,8 +173,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
//=========================================================================
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
- rtl::OUString( "com.sun.star.comp.ucb.PackageContentProvider" ),
- rtl::OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
+ OUString( "com.sun.star.comp.ucb.PackageContentProvider" ),
+ OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
//=========================================================================
//
@@ -232,7 +232,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
//=========================================================================
uno::Reference< container::XHierarchicalNameAccess >
-ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString & rParam )
+ContentProvider::createPackage( const OUString & rName, const OUString & rParam )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -242,7 +242,7 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString
return uno::Reference< container::XHierarchicalNameAccess >();
}
- rtl::OUString rURL = rName + rParam;
+ OUString rURL = rName + rParam;
if ( m_pPackages )
{
@@ -297,7 +297,7 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString
}
//=========================================================================
-sal_Bool ContentProvider::removePackage( const rtl::OUString & rName )
+sal_Bool ContentProvider::removePackage( const OUString & rName )
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 2f19adfbda09..a2d671f0d142 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -87,9 +87,9 @@ public:
::com::sun::star::uno::Reference<
::com::sun::star::container::XHierarchicalNameAccess >
- createPackage( const rtl::OUString & rName, const rtl::OUString & rParam );
+ createPackage( const OUString & rName, const OUString & rParam );
sal_Bool
- removePackage( const rtl::OUString & rName );
+ removePackage( const OUString & rName );
};
}
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index cfa46a17a9db..29e9cd61c404 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -34,7 +34,6 @@
using namespace package_ucp;
-using ::rtl::OUString;
//=========================================================================
//=========================================================================
@@ -77,7 +76,7 @@ void PackageUri::init() const
if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) )
{
// error, but remember that we did a init().
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
return;
}
@@ -92,11 +91,11 @@ void PackageUri::init() const
!= sal_Unicode( '/' ) ) )
{
// error, but remember that we did a init().
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
return;
}
- rtl::OUString aPureUri;
+ OUString aPureUri;
sal_Int32 nParam = m_aUri.indexOf( '?' );
if( nParam >= 0 )
{
@@ -116,8 +115,8 @@ void PackageUri::init() const
{
m_aParam +=
( !m_aParam.isEmpty()
- ? ::rtl::OUString( "&purezip" )
- : ::rtl::OUString( "?purezip" ) );
+ ? OUString( "&purezip" )
+ : OUString( "?purezip" ) );
}
aPureUri = aPureUri.replaceAt( 0,
@@ -131,7 +130,7 @@ void PackageUri::init() const
// Only <scheme>:/// - Empty authority
// error, but remember that we did a init().
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
return;
}
else if ( nEnd == ( aPureUri.getLength() - 1 ) )
@@ -142,7 +141,7 @@ void PackageUri::init() const
// Only <scheme>://// or <scheme>://<something>//
// error, but remember that we did a init().
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
return;
}
@@ -163,7 +162,7 @@ void PackageUri::init() const
nStart, aPureUri.getLength() - nStart, aNormPackage );
m_aPackage
= ::ucb_impl::urihelper::decodeSegment( aNormPackage );
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
m_aUri = m_aUri.replaceAt( 0,
( nParam >= 0 )
? nParam
@@ -189,11 +188,11 @@ void PackageUri::init() const
if ( m_aPath.indexOf( "//" ) != -1
|| m_aPath.indexOf( "%2F" ) != -1
|| m_aPath.indexOf( "%2f" ) != -1
- || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( ".." ) )
- || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( "." ) ) )
+ || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( ".." ) )
+ || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( "." ) ) )
{
// error, but remember that we did a init().
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
return;
}
@@ -230,7 +229,7 @@ void PackageUri::init() const
else
{
// error, but remember that we did a init().
- m_aPath = rtl::OUString( "/" );
+ m_aPath = OUString( "/" );
}
}
}
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index bbf861338a74..1b5506ab2b77 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -34,13 +34,13 @@ namespace package_ucp {
class PackageUri
{
- mutable ::rtl::OUString m_aUri;
- mutable ::rtl::OUString m_aParentUri;
- mutable ::rtl::OUString m_aPackage;
- mutable ::rtl::OUString m_aPath;
- mutable ::rtl::OUString m_aName;
- mutable ::rtl::OUString m_aParam;
- mutable ::rtl::OUString m_aScheme;
+ mutable OUString m_aUri;
+ mutable OUString m_aParentUri;
+ mutable OUString m_aPackage;
+ mutable OUString m_aPath;
+ mutable OUString m_aName;
+ mutable OUString m_aParam;
+ mutable OUString m_aScheme;
mutable bool m_bValid;
private:
@@ -48,34 +48,34 @@ private:
public:
PackageUri() : m_bValid( false ) {}
- PackageUri( const ::rtl::OUString & rPackageUri )
+ PackageUri( const OUString & rPackageUri )
: m_aUri( rPackageUri ), m_bValid( false ) {}
sal_Bool isValid() const
{ init(); return m_bValid; }
- const ::rtl::OUString & getUri() const
+ const OUString & getUri() const
{ init(); return m_aUri; }
- void setUri( const ::rtl::OUString & rPackageUri )
- { m_aPath = ::rtl::OUString(); m_aUri = rPackageUri; m_bValid = false; }
+ void setUri( const OUString & rPackageUri )
+ { m_aPath = OUString(); m_aUri = rPackageUri; m_bValid = false; }
- const ::rtl::OUString & getParentUri() const
+ const OUString & getParentUri() const
{ init(); return m_aParentUri; }
- const ::rtl::OUString & getPackage() const
+ const OUString & getPackage() const
{ init(); return m_aPackage; }
- const ::rtl::OUString & getPath() const
+ const OUString & getPath() const
{ init(); return m_aPath; }
- const ::rtl::OUString & getName() const
+ const OUString & getName() const
{ init(); return m_aName; }
- const ::rtl::OUString & getParam() const
+ const OUString & getParam() const
{ init(); return m_aParam; }
- const ::rtl::OUString & getScheme() const
+ const OUString & getScheme() const
{ init(); return m_aScheme; }
inline sal_Bool isRootFolder() const;
generated by cgit (git 2.34.1) at 2024-12-29 12:28:48 +0000