summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/cmis
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/cmis
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/cmis')
-rw-r--r--ucb/source/ucp/cmis/auth_provider.cxx8
-rw-r--r--ucb/source/ucp/cmis/auth_provider.hxx8
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx170
-rw-r--r--ucb/source/ucp/cmis/cmis_content.hxx22
-rw-r--r--ucb/source/ucp/cmis/cmis_datasupplier.cxx6
-rw-r--r--ucb/source/ucp/cmis/cmis_datasupplier.hxx2
-rw-r--r--ucb/source/ucp/cmis/cmis_provider.cxx12
-rw-r--r--ucb/source/ucp/cmis/cmis_provider.hxx6
-rw-r--r--ucb/source/ucp/cmis/cmis_repo_content.cxx54
-rw-r--r--ucb/source/ucp/cmis/cmis_repo_content.hxx10
-rw-r--r--ucb/source/ucp/cmis/cmis_url.cxx32
-rw-r--r--ucb/source/ucp/cmis/cmis_url.hxx32
12 files changed, 181 insertions, 181 deletions
diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx
index a641a442075d..1c7c9494c37a 100644
--- a/ucb/source/ucp/cmis/auth_provider.cxx
+++ b/ucb/source/ucp/cmis/auth_provider.cxx
@@ -26,8 +26,8 @@
* instead of those above.
*/
-#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() )
-#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
+#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() )
+#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -51,10 +51,10 @@ namespace cmis
{
rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest
= new ucbhelper::SimpleAuthenticationRequest(
- m_sUrl, m_sBindingUrl, ::rtl::OUString(),
+ m_sUrl, m_sBindingUrl, OUString(),
STD_TO_OUSTR( username ),
STD_TO_OUSTR( password ),
- ::rtl::OUString(), true, false );
+ OUString(), true, false );
xIH->handle( xRequest.get() );
rtl::Reference< ucbhelper::InteractionContinuation > xSelection
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index 7d3767e155b8..dd76a060b6e8 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -37,14 +37,14 @@ namespace cmis
class AuthProvider : public libcmis::AuthProvider
{
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& m_xEnv;
- rtl::OUString m_sUrl;
- rtl::OUString m_sBindingUrl;
+ OUString m_sUrl;
+ OUString m_sBindingUrl;
public:
AuthProvider ( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment>& xEnv,
- rtl::OUString sUrl,
- rtl::OUString sBindingUrl ):
+ OUString sUrl,
+ OUString sBindingUrl ):
m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { }
bool authenticationQuery( std::string& username, std::string& password );
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 8791e3670e48..a32fdbbb11d3 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -67,8 +67,8 @@
#include "cmis_provider.hxx"
#include "cmis_resultset.hxx"
-#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() )
-#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
+#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() )
+#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
using namespace com::sun::star;
using namespace std;
@@ -106,8 +106,8 @@ namespace
vector< string > aCmisStrings = pProperty->getStrings( );
if ( bMultiValued )
{
- uno::Sequence< rtl::OUString > aStrings( aCmisStrings.size( ) );
- rtl::OUString* aStringsArr = aStrings.getArray( );
+ uno::Sequence< OUString > aStrings( aCmisStrings.size( ) );
+ OUString* aStringsArr = aStrings.getArray( );
sal_Int32 i = 0;
for ( vector< string >::iterator it = aCmisStrings.begin( );
it != aCmisStrings.end( ); ++it, ++i )
@@ -262,13 +262,13 @@ namespace cmis
INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) );
const ucbhelper::InternetProxyServer& rProxy = aProxyDecider.getProxy(
INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() );
- rtl::OUString sProxy = rProxy.aName;
+ OUString sProxy = rProxy.aName;
if ( rProxy.nPort > 0 )
- sProxy += ":" + rtl::OUString::valueOf( rProxy.nPort );
+ sProxy += ":" + OUString::valueOf( rProxy.nPort );
libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() );
// Look for a cached session, key is binding url + repo id
- rtl::OUString sSessionId = m_aURL.getBindingUrl( ) + m_aURL.getRepositoryId( );
+ OUString sSessionId = m_aURL.getBindingUrl( ) + m_aURL.getRepositoryId( );
if ( NULL == m_pSession )
m_pSession = m_pProvider->getSession( sSessionId );
@@ -290,7 +290,7 @@ namespace cmis
ucb::IOErrorCode_INVALID_DEVICE,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString( ) );
+ OUString( ) );
m_pProvider->registerSession( sSessionId, m_pSession );
}
else
@@ -371,7 +371,7 @@ namespace cmis
INetURLObject aParentUrl( m_sURL );
string sName = OUSTR_TO_STDSTR( aParentUrl.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ) );
aParentUrl.removeSegment( );
- rtl::OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::NO_DECODE );
+ OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::NO_DECODE );
Content aParent( m_xContext, m_pProvider, new ucbhelper::ContentIdentifier( sParentUrl ) );
libcmis::FolderPtr pParentFolder = boost::dynamic_pointer_cast< libcmis::Folder >( aParent.getObject( xEnv ) );
@@ -396,7 +396,7 @@ namespace cmis
{
m_pObject = getSession( xEnv )->getRootFolder( );
m_sObjectPath = "/";
- m_sObjectId = rtl::OUString( );
+ m_sObjectId = OUString( );
}
}
@@ -417,7 +417,7 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what( ) ) );
+ OUString::createFromAscii( e.what( ) ) );
}
return bIsFolder;
}
@@ -425,7 +425,7 @@ namespace cmis
uno::Any Content::getBadArgExcept()
{
return uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString("Wrong argument type!"),
+ OUString("Wrong argument type!"),
static_cast< cppu::OWeakObject * >( this ), -1) );
}
@@ -477,7 +477,7 @@ namespace cmis
}
else if ( rProp.Name == "Title" )
{
- rtl::OUString sTitle;
+ OUString sTitle;
try
{
sTitle = STD_TO_OUSTR( getObject( xEnv )->getName() );
@@ -499,7 +499,7 @@ namespace cmis
// Nothing worked... get it from the path
if ( sTitle.isEmpty( ) )
{
- rtl::OUString sPath = m_sObjectPath;
+ OUString sPath = m_sObjectPath;
// Get rid of the trailing slash problem
if ( sPath[ sPath.getLength( ) - 1 ] == '/' )
@@ -726,7 +726,7 @@ namespace cmis
uno::Sequence< uno::Any > aArgs( 1 );
aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier();
uno::Any aErr = uno::makeAny(
- ucb::InteractiveAugmentedIOException(rtl::OUString(), static_cast< cppu::OWeakObject * >( this ),
+ ucb::InteractiveAugmentedIOException(OUString(), static_cast< cppu::OWeakObject * >( this ),
task::InteractionClassification_ERROR,
bIsFolder ? ucb::IOErrorCode_NOT_EXISTING_PATH : ucb::IOErrorCode_NOT_EXISTING, aArgs)
);
@@ -757,7 +757,7 @@ namespace cmis
{
ucbhelper::cancelCommandExecution(
uno::makeAny ( ucb::UnsupportedOpenModeException
- ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ),
+ ( OUString(), static_cast< cppu::OWeakObject * >( this ),
sal_Int16( rOpenCommand.Mode ) ) ),
xEnv );
}
@@ -771,7 +771,7 @@ namespace cmis
ucbhelper::cancelCommandExecution(
uno::makeAny (ucb::UnsupportedDataSinkException
- ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ),
+ ( OUString(), static_cast< cppu::OWeakObject * >( this ),
rOpenCommand.Sink ) ),
xEnv );
}
@@ -782,7 +782,7 @@ namespace cmis
return aRet;
}
- rtl::OUString Content::checkIn( const ucb::CheckinArgument& rArg,
+ OUString Content::checkIn( const ucb::CheckinArgument& rArg,
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw( uno::Exception )
{
@@ -834,10 +834,10 @@ namespace cmis
return aCmisUrl.asString( );
}
- rtl::OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
+ OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw( uno::Exception )
{
- rtl::OUString aRet;
+ OUString aRet;
try
{
// Checkout the document if possible
@@ -876,15 +876,15 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what() ) );
+ OUString::createFromAscii( e.what() ) );
}
return aRet;
}
- rtl::OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
+ OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw( uno::Exception )
{
- rtl::OUString aRet;
+ OUString aRet;
try
{
libcmis::DocumentPtr pPwc = boost::dynamic_pointer_cast< libcmis::Document >( getObject( xEnv ) );
@@ -942,7 +942,7 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what() ) );
+ OUString::createFromAscii( e.what() ) );
}
return aRet;
}
@@ -955,13 +955,13 @@ namespace cmis
INetURLObject aSourceUrl( rTransferInfo.SourceURL );
if ( aSourceUrl.GetProtocol() != INET_PROT_CMIS )
{
- rtl::OUString sSrcBindingUrl = URL( rTransferInfo.SourceURL ).getBindingUrl( );
+ OUString sSrcBindingUrl = URL( rTransferInfo.SourceURL ).getBindingUrl( );
if ( sSrcBindingUrl != m_aURL.getBindingUrl( ) )
{
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::InteractiveBadTransferURLException(
- rtl::OUString("Unsupported URL scheme!"),
+ OUString("Unsupported URL scheme!"),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
}
@@ -971,7 +971,7 @@ namespace cmis
}
void Content::insert( const uno::Reference< io::XInputStream > & xInputStream,
- sal_Bool bReplaceExisting, const rtl::OUString& rMimeType,
+ sal_Bool bReplaceExisting, const OUString& rMimeType,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw( uno::Exception )
{
@@ -979,14 +979,14 @@ namespace cmis
{
ucbhelper::cancelCommandExecution( uno::makeAny
( ucb::MissingInputStreamException
- ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ) ) ),
+ ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
}
// For transient content, the URL is the one of the parent
if ( m_bTransient )
{
- rtl::OUString sNewPath;
+ OUString sNewPath;
// Try to get the object from the server if there is any
libcmis::Folder* pFolder = NULL;
@@ -1149,7 +1149,7 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what() ) );
+ OUString::createFromAscii( e.what() ) );
}
sal_Int32 nCount = rValues.getLength();
@@ -1167,17 +1167,17 @@ namespace cmis
rValue.Name == "Size" ||
rValue.Name == "CreatableContentsInfo" )
{
- lang::IllegalAccessException e ( rtl::OUString("Property is read-only!"),
+ lang::IllegalAccessException e ( OUString("Property is read-only!"),
static_cast< cppu::OWeakObject* >( this ) );
aRet[ n ] <<= e;
}
else if ( rValue.Name == "Title" )
{
- rtl::OUString aNewTitle;
+ OUString aNewTitle;
if (!( rValue.Value >>= aNewTitle ))
{
aRet[ n ] <<= beans::IllegalTypeException
- ( rtl::OUString("Property value has wrong type!"),
+ ( OUString("Property value has wrong type!"),
static_cast< cppu::OWeakObject * >( this ) );
continue;
}
@@ -1185,7 +1185,7 @@ namespace cmis
if ( aNewTitle.getLength() <= 0 )
{
aRet[ n ] <<= lang::IllegalArgumentException
- ( rtl::OUString("Empty title not allowed!"),
+ ( OUString("Empty title not allowed!"),
static_cast< cppu::OWeakObject * >( this ), -1 );
continue;
@@ -1197,7 +1197,7 @@ namespace cmis
else
{
SAL_INFO( "cmisucp", "Couln't set property: " << rValue.Name );
- lang::IllegalAccessException e ( rtl::OUString("Property is read-only!"),
+ lang::IllegalAccessException e ( OUString("Property is read-only!"),
static_cast< cppu::OWeakObject* >( this ) );
aRet[ n ] <<= e;
}
@@ -1217,7 +1217,7 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what() ) );
+ OUString::createFromAscii( e.what() ) );
}
return aRet;
@@ -1260,7 +1260,7 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what() ) );
+ OUString::createFromAscii( e.what() ) );
}
return sal_True;
@@ -1271,52 +1271,52 @@ namespace cmis
{
static const beans::Property aGenericProperties[] =
{
- beans::Property( rtl::OUString( "IsDocument" ),
+ beans::Property( OUString( "IsDocument" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "IsFolder" ),
+ beans::Property( OUString( "IsFolder" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "Title" ),
- -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ beans::Property( OUString( "Title" ),
+ -1, getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
- beans::Property( rtl::OUString( "TitleOnServer" ),
- -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ beans::Property( OUString( "TitleOnServer" ),
+ -1, getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
- beans::Property( rtl::OUString( "IsReadOnly" ),
+ beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "DateCreated" ),
+ beans::Property( OUString( "DateCreated" ),
-1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "DateModified" ),
+ beans::Property( OUString( "DateModified" ),
-1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "Size" ),
+ beans::Property( OUString( "Size" ),
-1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "CreatableContentsInfo" ),
+ beans::Property( OUString( "CreatableContentsInfo" ),
-1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "MediaType" ),
- -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ beans::Property( OUString( "MediaType" ),
+ -1, getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
- beans::Property( rtl::OUString( "CmisPropertiesValues" ),
+ beans::Property( OUString( "CmisPropertiesValues" ),
-1, getCppuType( static_cast< const beans::PropertyValues * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
- beans::Property( rtl::OUString( "CmisPropertiesDisplayNames" ),
+ beans::Property( OUString( "CmisPropertiesDisplayNames" ),
-1, getCppuType( static_cast< const beans::PropertyValues * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
- beans::Property( rtl::OUString( "IsVersionable" ),
+ beans::Property( OUString( "IsVersionable" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "CanCheckOut" ),
+ beans::Property( OUString( "CanCheckOut" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "CanCancelCheckOut" ),
+ beans::Property( OUString( "CanCancelCheckOut" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "CanCheckIn" ),
+ beans::Property( OUString( "CanCheckIn" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
};
@@ -1332,41 +1332,41 @@ namespace cmis
{
// 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<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
// Optional standard commands
ucb::CommandInfo
- ( rtl::OUString( "delete" ),
+ ( OUString( "delete" ),
-1, getCppuBooleanType() ),
ucb::CommandInfo
- ( rtl::OUString( "insert" ),
+ ( OUString( "insert" ),
-1, getCppuType( static_cast<ucb::InsertCommandArgument2 * >( 0 ) ) ),
ucb::CommandInfo
- ( rtl::OUString( "open" ),
+ ( OUString( "open" ),
-1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
// Mandatory CMIS-only commands
- ucb::CommandInfo ( rtl::OUString( "checkout" ), -1, getCppuVoidType() ),
- ucb::CommandInfo ( rtl::OUString( "cancelCheckout" ), -1, getCppuVoidType() ),
- ucb::CommandInfo ( rtl::OUString( "checkIn" ), -1,
+ ucb::CommandInfo ( OUString( "checkout" ), -1, getCppuVoidType() ),
+ ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, getCppuVoidType() ),
+ ucb::CommandInfo ( OUString( "checkIn" ), -1,
getCppuType( static_cast<ucb::TransferInfo * >( 0 ) ) ),
// Folder Only, omitted if not a folder
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 ) ) )
};
@@ -1374,9 +1374,9 @@ namespace cmis
return uno::Sequence< ucb::CommandInfo >(aCommandInfoTable, isFolder( xEnv ) ? nProps : nProps - 2);
}
- ::rtl::OUString Content::getParentURL( )
+ OUString Content::getParentURL( )
{
- rtl::OUString sRet;
+ OUString sRet;
SAL_INFO( "cmisucp", "Content::getParentURL()" );
@@ -1443,24 +1443,24 @@ namespace cmis
return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType);
}
- rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException )
+ OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException )
{
- return rtl::OUString("com.sun.star.comp.CmisContent");
+ return OUString("com.sun.star.comp.CmisContent");
}
- 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 );
aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CmisContent";
return aSNS;
}
- rtl::OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException )
+ OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException )
{
return isFolder( uno::Reference< ucb::XCommandEnvironment >() )
- ? rtl::OUString(CMIS_FOLDER_TYPE)
- : rtl::OUString(CMIS_FILE_TYPE);
+ ? OUString(CMIS_FOLDER_TYPE)
+ : OUString(CMIS_FILE_TYPE);
}
uno::Any SAL_CALL Content::execute(
@@ -1547,7 +1547,7 @@ namespace cmis
ucb::IOErrorCode_GENERAL,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( e.what() ) );
+ OUString::createFromAscii( e.what() ) );
}
}
else if ( aCommand.Name == "checkout" )
@@ -1573,7 +1573,7 @@ namespace cmis
ucbhelper::cancelCommandExecution
( uno::makeAny( ucb::UnsupportedCommandException
- ( rtl::OUString(),
+ ( OUString(),
static_cast< cppu::OWeakObject * >( this ) ) ),
xEnv );
}
@@ -1608,7 +1608,7 @@ namespace cmis
return uno::Reference< ucb::XContent >();
}
- rtl::OUString sParentURL = m_xIdentifier->getContentIdentifier();
+ OUString sParentURL = m_xIdentifier->getContentIdentifier();
URL aParentURL( sParentURL );
// Set the parent URL for the transient objects
@@ -1672,19 +1672,19 @@ namespace cmis
// Minimum set of props we really need
uno::Sequence< beans::Property > props( 1 );
props[0] = beans::Property(
- rtl::OUString("Title"),
+ OUString("Title"),
-1,
- getCppuType( static_cast< rtl::OUString* >( 0 ) ),
+ getCppuType( static_cast< OUString* >( 0 ) ),
beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
// file
- seq[0].Type = rtl::OUString(CMIS_FILE_TYPE);
+ seq[0].Type = OUString(CMIS_FILE_TYPE);
seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM |
ucb::ContentInfoAttribute::KIND_DOCUMENT );
seq[0].Properties = props;
// folder
- seq[1].Type = rtl::OUString(CMIS_FOLDER_TYPE);
+ seq[1].Type = OUString(CMIS_FOLDER_TYPE);
seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER;
seq[1].Properties = props;
@@ -1716,7 +1716,7 @@ namespace cmis
// TODO Cache the objects
URL aUrl( m_sURL );
- rtl::OUString sPath( m_sObjectPath );
+ OUString sPath( m_sObjectPath );
if ( sPath[sPath.getLength( ) - 1] != '/' )
sPath += "/";
sPath += STD_TO_OUSTR( ( *it )->getName( ) );
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 7260cb38517a..566f5156927e 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -74,9 +74,9 @@ private:
ContentProvider* m_pProvider;
libcmis::Session* m_pSession;
libcmis::ObjectPtr m_pObject;
- rtl::OUString m_sObjectPath;
- rtl::OUString m_sObjectId;
- rtl::OUString m_sURL;
+ OUString m_sObjectPath;
+ OUString m_sObjectId;
+ OUString m_sURL;
cmis::URL m_aURL;
// Members to be set for non-persistent content
@@ -112,18 +112,18 @@ private:
throw( com::sun::star::uno::Exception );
void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream,
- sal_Bool bReplaceExisting, const ::rtl::OUString & rMimeType,
+ sal_Bool bReplaceExisting, const OUString & rMimeType,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw( com::sun::star::uno::Exception );
- rtl::OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg,
+ OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
throw( com::sun::star::uno::Exception );
- rtl::OUString checkOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
+ OUString checkOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
throw( com::sun::star::uno::Exception );
- rtl::OUString cancelCheckOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
+ OUString cancelCheckOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
throw( com::sun::star::uno::Exception );
void destroy( ) throw( com::sun::star::uno::Exception );
@@ -163,21 +163,21 @@ public:
getCommands( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv );
- virtual ::rtl::OUString getParentURL();
+ virtual OUString getParentURL();
XINTERFACE_DECL()
XTYPEPROVIDER_DECL()
- 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 );
- virtual rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getContentType()
throw( com::sun::star::uno::RuntimeException );
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index 04a44d1ef6d9..f404d39b156a 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -42,7 +42,7 @@ namespace cmis
for ( list< uno::Reference< ucb::XContent > >::iterator it = aChildren.begin();
it != aChildren.end(); ++it )
{
- rtl::OUString sContentType = ( *it )->getContentType( );
+ OUString sContentType = ( *it )->getContentType( );
bool bIsFolder = sContentType != CMIS_FILE_TYPE;
if ( ( mnOpenMode == ucb::OpenMode::FOLDERS && bIsFolder ) ||
( mnOpenMode == ucb::OpenMode::DOCUMENTS && !bIsFolder ) ||
@@ -66,7 +66,7 @@ namespace cmis
}
}
- ::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
+ OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
{
return queryContentIdentifier( nIndex )->getContentIdentifier( );
}
@@ -134,7 +134,7 @@ namespace cmis
xContent, uno::UNO_QUERY_THROW );
sal_Int32 nCmdId( xCmdProc->createCommandIdentifier() );
ucb::Command aCmd;
- aCmd.Name = rtl::OUString("getPropertyValues");
+ aCmd.Name = OUString("getPropertyValues");
aCmd.Handle = -1;
aCmd.Argument <<= getResultSet()->getProperties();
uno::Any aResult( xCmdProc->execute(
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index a2d4db58a324..88b1a9f848b6 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -51,7 +51,7 @@ namespace cmis
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 );
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 012e6c756806..18a21ee9e53c 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -80,10 +80,10 @@ ContentProvider::queryContent(
return xContent;
}
-libcmis::Session* ContentProvider::getSession( const rtl::OUString& sBindingUrl )
+libcmis::Session* ContentProvider::getSession( const OUString& sBindingUrl )
{
libcmis::Session* pSession = NULL;
- std::map< rtl::OUString, libcmis::Session* >::iterator it = m_aSessionCache.find( sBindingUrl );
+ std::map< OUString, libcmis::Session* >::iterator it = m_aSessionCache.find( sBindingUrl );
if ( it != m_aSessionCache.end( ) )
{
pSession = it->second;
@@ -91,9 +91,9 @@ libcmis::Session* ContentProvider::getSession( const rtl::OUString& sBindingUrl
return pSession;
}
-void ContentProvider::registerSession( const rtl::OUString& sBindingUrl, libcmis::Session* pSession )
+void ContentProvider::registerSession( const OUString& sBindingUrl, libcmis::Session* pSession )
{
- m_aSessionCache.insert( std::pair< rtl::OUString, libcmis::Session* >( sBindingUrl, pSession ) );
+ m_aSessionCache.insert( std::pair< OUString, libcmis::Session* >( sBindingUrl, pSession ) );
}
ContentProvider::ContentProvider(
@@ -117,8 +117,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
com::sun::star::ucb::XContentProvider );
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
- rtl::OUString("com.sun.star.comp.CmisContentProvider"),
- rtl::OUString("com.sun.star.ucb.CmisContentProvider") );
+ OUString("com.sun.star.comp.CmisContentProvider"),
+ OUString("com.sun.star.ucb.CmisContentProvider") );
ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 75d7de7e1d53..fb8fa91190c3 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -39,7 +39,7 @@ namespace cmis
class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
{
private:
- std::map< rtl::OUString, libcmis::Session* > m_aSessionCache;
+ std::map< OUString, libcmis::Session* > m_aSessionCache;
public:
ContentProvider( const ::com::sun::star::uno::Reference<
@@ -63,8 +63,8 @@ public:
throw( ::com::sun::star::ucb::IllegalIdentifierException,
::com::sun::star::uno::RuntimeException );
- libcmis::Session* getSession( const rtl::OUString& sBindingUrl );
- void registerSession( const rtl::OUString& sBindingUrl, libcmis::Session* pSession );
+ libcmis::Session* getSession( const OUString& sBindingUrl );
+ void registerSession( const OUString& sBindingUrl, libcmis::Session* pSession );
};
}
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 18877c8a53e6..8f0c5bb235af 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -49,8 +49,8 @@
#include "cmis_repo_content.hxx"
#include "cmis_resultset.hxx"
-#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() )
-#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
+#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() )
+#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 )
using namespace com::sun::star;
using namespace std;
@@ -68,7 +68,7 @@ namespace cmis
m_aRepositories( aRepos )
{
// Split the URL into bits
- rtl::OUString sURL = m_xIdentifier->getContentIdentifier( );
+ OUString sURL = m_xIdentifier->getContentIdentifier( );
SAL_INFO( "cmisucp", "RepoContent::RepoContent() " << sURL );
m_sRepositoryId = m_aURL.getObjectPath( );
@@ -84,7 +84,7 @@ namespace cmis
uno::Any RepoContent::getBadArgExcept()
{
return uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString("Wrong argument type!"),
+ OUString("Wrong argument type!"),
static_cast< cppu::OWeakObject * >( this ), -1) );
}
@@ -144,9 +144,9 @@ namespace cmis
INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) );
const ucbhelper::InternetProxyServer& rProxy = aProxyDecider.getProxy(
INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() );
- rtl::OUString sProxy = rProxy.aName;
+ OUString sProxy = rProxy.aName;
if ( rProxy.nPort > 0 )
- sProxy += ":" + rtl::OUString::valueOf( rProxy.nPort );
+ sProxy += ":" + OUString::valueOf( rProxy.nPort );
libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() );
if ( m_aRepositories.empty() )
@@ -174,7 +174,7 @@ namespace cmis
ucb::IOErrorCode_ABORT,
uno::Sequence< uno::Any >( 0 ),
xEnv,
- rtl::OUString::createFromAscii( "Authentication cancelled" ) );
+ OUString::createFromAscii( "Authentication cancelled" ) );
}
}
}
@@ -203,16 +203,16 @@ namespace cmis
{
static const beans::Property aGenericProperties[] =
{
- beans::Property( rtl::OUString( "IsDocument" ),
+ beans::Property( OUString( "IsDocument" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "IsFolder" ),
+ beans::Property( OUString( "IsFolder" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
- beans::Property( rtl::OUString( "Title" ),
- -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
+ beans::Property( OUString( "Title" ),
+ -1, getCppuType( static_cast< const OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
- beans::Property( rtl::OUString( "IsReadOnly" ),
+ beans::Property( OUString( "IsReadOnly" ),
-1, getCppuBooleanType(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
};
@@ -228,21 +228,21 @@ namespace cmis
{
// 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<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
// Optional standard commands
ucb::CommandInfo
- ( rtl::OUString( "open" ),
+ ( OUString( "open" ),
-1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 0 ) ) ),
};
@@ -250,9 +250,9 @@ namespace cmis
return uno::Sequence< ucb::CommandInfo >(aCommandInfoTable, nProps );
}
- ::rtl::OUString RepoContent::getParentURL( )
+ OUString RepoContent::getParentURL( )
{
- rtl::OUString sRet;
+ OUString sRet;
SAL_INFO( "cmisucp", "RepoContent::getParentURL()" );
@@ -278,22 +278,22 @@ namespace cmis
return ContentImplHelper::queryInterface(rType);
}
- rtl::OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException )
+ OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException )
{
- return rtl::OUString("com.sun.star.comp.CmisRepoContent");
+ return OUString("com.sun.star.comp.CmisRepoContent");
}
- uno::Sequence< rtl::OUString > SAL_CALL RepoContent::getSupportedServiceNames()
+ uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = "com.sun.star.ucb.Content";
return aSNS;
}
- rtl::OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException )
+ OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException )
{
- return rtl::OUString( CMIS_REPO_TYPE );
+ return OUString( CMIS_REPO_TYPE );
}
uno::Any SAL_CALL RepoContent::execute(
@@ -383,8 +383,8 @@ namespace cmis
else
{
// Return the repository root as child
- rtl::OUString sUrl;
- rtl::OUString sEncodedBinding = rtl::Uri::encode(
+ OUString sUrl;
+ OUString sEncodedBinding = rtl::Uri::encode(
m_aURL.getBindingUrl( ) + "#" + m_sRepositoryId,
rtl_UriCharClassRelSegment,
rtl_UriEncodeKeepEscapes,
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 176df1b5f6cf..30dc12ceb76e 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -69,7 +69,7 @@ class RepoContent : public ::ucbhelper::ContentImplHelper,
private:
ContentProvider* m_pProvider;
URL m_aURL;
- rtl::OUString m_sRepositoryId;
+ OUString m_sRepositoryId;
std::list< libcmis::RepositoryPtr > m_aRepositories;
@@ -108,21 +108,21 @@ public:
getCommands( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv );
- virtual ::rtl::OUString getParentURL();
+ virtual OUString getParentURL();
XINTERFACE_DECL()
XTYPEPROVIDER_DECL()
- 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 );
- virtual rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getContentType()
throw( com::sun::star::uno::RuntimeException );
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 565962144d8b..47c8a83fb91d 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -36,12 +36,12 @@ using namespace std;
namespace cmis
{
- URL::URL( rtl::OUString const & urlStr )
+ URL::URL( OUString const & urlStr )
{
INetURLObject aUrl( urlStr );
// Decode the authority to get the binding URL and repository id
- rtl::OUString sDecodedHost = aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET );
+ OUString sDecodedHost = aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET );
INetURLObject aHostUrl( sDecodedHost );
m_sBindingUrl = aHostUrl.GetURLNoMark( );
m_sRepositoryId = aHostUrl.GetMark( );
@@ -54,45 +54,45 @@ namespace cmis
m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET );
if ( !m_sId.isEmpty( ) )
- m_sPath = rtl::OUString( );
+ m_sPath = OUString( );
}
- rtl::OUString& URL::getObjectPath( )
+ OUString& URL::getObjectPath( )
{
return m_sPath;
}
- rtl::OUString& URL::getObjectId( )
+ OUString& URL::getObjectId( )
{
return m_sId;
}
- rtl::OUString& URL::getBindingUrl( )
+ OUString& URL::getBindingUrl( )
{
return m_sBindingUrl;
}
- rtl::OUString& URL::getRepositoryId( )
+ OUString& URL::getRepositoryId( )
{
return m_sRepositoryId;
}
- void URL::setObjectPath( rtl::OUString sPath )
+ void URL::setObjectPath( OUString sPath )
{
m_sPath = sPath;
- m_sId = rtl::OUString( );
+ m_sId = OUString( );
}
- void URL::setObjectId( rtl::OUString sId )
+ void URL::setObjectId( OUString sId )
{
- m_sPath = rtl::OUString( );
+ m_sPath = OUString( );
m_sId = sId;
}
- rtl::OUString URL::asString( )
+ OUString URL::asString( )
{
- rtl::OUString sUrl;
- rtl::OUString sEncodedBinding = rtl::Uri::encode(
+ OUString sUrl;
+ OUString sEncodedBinding = rtl::Uri::encode(
m_sBindingUrl + "#" + m_sRepositoryId,
rtl_UriCharClassRelSegment,
rtl_UriEncodeKeepEscapes,
@@ -102,7 +102,7 @@ namespace cmis
if ( !m_sPath.isEmpty( ) )
{
sal_Int32 nPos = -1;
- rtl::OUString sEncodedPath;
+ OUString sEncodedPath;
do
{
sal_Int32 nStartPos = nPos + 1;
@@ -110,7 +110,7 @@ namespace cmis
sal_Int32 nLen = nPos - nStartPos;
if ( nPos == -1 )
nLen = m_sPath.getLength( ) - nStartPos;
- rtl::OUString sSegment = m_sPath.copy( nStartPos, nLen );
+ OUString sSegment = m_sPath.copy( nStartPos, nLen );
if ( !sSegment.isEmpty( ) )
{
diff --git a/ucb/source/ucp/cmis/cmis_url.hxx b/ucb/source/ucp/cmis/cmis_url.hxx
index e2912d4bb494..191ce68d236a 100644
--- a/ucb/source/ucp/cmis/cmis_url.hxx
+++ b/ucb/source/ucp/cmis/cmis_url.hxx
@@ -39,26 +39,26 @@ namespace cmis
class URL
{
private:
- rtl::OUString m_sBindingUrl;
- rtl::OUString m_sRepositoryId;
- rtl::OUString m_sPath;
- rtl::OUString m_sId;
- rtl::OUString m_sUser;
- rtl::OUString m_sPass;
+ OUString m_sBindingUrl;
+ OUString m_sRepositoryId;
+ OUString m_sPath;
+ OUString m_sId;
+ OUString m_sUser;
+ OUString m_sPass;
public:
- URL( rtl::OUString const & urlStr );
+ URL( OUString const & urlStr );
- rtl::OUString& getObjectPath( );
- rtl::OUString& getObjectId( );
- rtl::OUString& getBindingUrl( );
- rtl::OUString& getRepositoryId( );
- rtl::OUString& getUsername( ) { return m_sUser; }
- rtl::OUString& getPassword( ) { return m_sPass; }
- void setObjectPath( rtl::OUString sPath );
- void setObjectId( rtl::OUString sId );
+ OUString& getObjectPath( );
+ OUString& getObjectId( );
+ OUString& getBindingUrl( );
+ OUString& getRepositoryId( );
+ OUString& getUsername( ) { return m_sUser; }
+ OUString& getPassword( ) { return m_sPass; }
+ void setObjectPath( OUString sPath );
+ void setObjectId( OUString sId );
- rtl::OUString asString( );
+ OUString asString( );
};
}