diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /ucb/source | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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')
243 files changed, 4226 insertions, 4253 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index a9fcddba56f5..52e7d2f9dd55 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; #define COMSUNSTARUCBCCRS_DEFAULT_FETCH_SIZE 256 #define COMSUNSTARUCBCCRS_DEFAULT_FETCH_DIRECTION FetchDirection::FORWARD diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 1f15bc5017a7..3d3df4b78aee 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -96,7 +96,7 @@ class CachedContentResultSet throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - const rtl::OUString& SAL_CALL + const OUString& SAL_CALL getContentIdentifierString( sal_Int32 nRow ) throw( com::sun::star::uno::RuntimeException ); @@ -216,7 +216,7 @@ public: //----------------------------------------------------------------- virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -225,7 +225,7 @@ public: com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); @@ -249,7 +249,7 @@ public: //----------------------------------------------------------------- // XContentAccess inherited //----------------------------------------------------------------- - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( com::sun::star::uno::RuntimeException ); @@ -348,7 +348,7 @@ public: throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 4069056c0d44..23b986353e52 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet > xOrigin ) : ContentResultSetWrapper( xOrigin ) diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 8c6f61f1b5d5..5ab38ff3cea6 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -48,8 +48,8 @@ private: sal_Bool m_bFirstFetchSizePropagationDone; sal_Int32 m_nLastFetchSize; sal_Bool m_bLastFetchDirection; - const rtl::OUString m_aPropertyNameForFetchSize; - const rtl::OUString m_aPropertyNameForFetchDirection; + const OUString m_aPropertyNameForFetchSize; + const OUString m_aPropertyNameForFetchDirection; void SAL_CALL diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index fef33a44e682..8b9f1a9a6959 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; CachedDynamicResultSet::CachedDynamicResultSet( Reference< XDynamicResultSet > xOrigin diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 4581c6838a98..c370a59cdc37 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; CachedDynamicResultSetStub::CachedDynamicResultSetStub( Reference< XDynamicResultSet > xOrigin diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 79cc52af4f04..3fc37fdb0fa8 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -using ::rtl::OUString; //========================================================================= extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 6d072994e7d1..14fa320cc8d9 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index d04463e93cc6..7d1b3bf65740 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -54,7 +54,7 @@ protected: struct equalStr_Impl { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -62,14 +62,14 @@ protected: struct hashStr_Impl { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } }; typedef cppu::OMultiTypeInterfaceContainerHelperVar - < rtl::OUString , hashStr_Impl , equalStr_Impl > + < OUString , hashStr_Impl , equalStr_Impl > PropertyChangeListenerContainer_Impl; //-------------------------------------------------------------------------- // class ReacquireableGuard @@ -260,7 +260,7 @@ public: throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -269,13 +269,13 @@ public: com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& aPropertyName, + addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -283,7 +283,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& aPropertyName, + removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -291,7 +291,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -299,7 +299,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -325,7 +325,7 @@ public: //----------------------------------------------------------------- // XContentAccess //----------------------------------------------------------------- - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( com::sun::star::uno::RuntimeException ); @@ -424,7 +424,7 @@ public: throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 30a2b1f8ff79..3faca33ec7aa 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace cppu; -using ::rtl::OUString; //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 43799dbd1303..ce3b9d6d346c 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -76,7 +76,7 @@ void SAL_CALL UcbCommandEnvironment::initialize( //========================================================================= // virtual -::rtl::OUString SAL_CALL UcbCommandEnvironment::getImplementationName() +OUString SAL_CALL UcbCommandEnvironment::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_Static(); @@ -85,11 +85,11 @@ void SAL_CALL UcbCommandEnvironment::initialize( //========================================================================= // virtual sal_Bool SAL_CALL -UcbCommandEnvironment::supportsService( const ::rtl::OUString& ServiceName ) +UcbCommandEnvironment::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -100,7 +100,7 @@ UcbCommandEnvironment::supportsService( const ::rtl::OUString& ServiceName ) //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UcbCommandEnvironment::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -109,17 +109,17 @@ UcbCommandEnvironment::getSupportedServiceNames() //========================================================================= // static -rtl::OUString UcbCommandEnvironment::getImplementationName_Static() +OUString UcbCommandEnvironment::getImplementationName_Static() { - return rtl::OUString( "com.sun.star.comp.ucb.CommandEnvironment" ); + return OUString( "com.sun.star.comp.ucb.CommandEnvironment" ); } //========================================================================= // static -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UcbCommandEnvironment::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CommandEnvironment"; return aSNS; } diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index c8b33310f66c..4ba7c7c3bf6d 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -53,14 +53,14 @@ public: com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) 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 ); @@ -75,9 +75,9 @@ public: throw ( com::sun::star::uno::RuntimeException ); // Non-UNO interfaces - static rtl::OUString + static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static com::sun::star::uno::Reference< diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index e9e7d953ace1..209aeeda0c44 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; -using ::rtl::OUString; //========================================================================= // diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx index e512463b425c..8c504f7a5e75 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -36,7 +36,7 @@ class ContentIdentifier : { public: ContentIdentifier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const rtl::OUString& ContentId ); + const OUString& ContentId ); virtual ~ContentIdentifier(); // XInterface @@ -46,15 +46,15 @@ public: XTYPEPROVIDER_DECL() // XContentIdentifier - virtual rtl::OUString SAL_CALL getContentIdentifier() + virtual OUString SAL_CALL getContentIdentifier() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getContentProviderScheme() + virtual OUString SAL_CALL getContentProviderScheme() throw( com::sun::star::uno::RuntimeException ); private: com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; - rtl::OUString m_aContentId; - rtl::OUString m_aProviderScheme; + OUString m_aContentId; + OUString m_aProviderScheme; }; #endif /* !_IDENTIFY_HXX */ diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index a9bb3a4f4165..4447cc88df09 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; //========================================================================= //========================================================================= @@ -382,7 +381,7 @@ UcbContentProviderProxy::getContentProvider() } OSL_ENSURE( m_xProvider.is(), - rtl::OStringBuffer("UcbContentProviderProxy::getContentProvider - No provider for '").append(rtl::OUStringToOString(m_aService, osl_getThreadTextEncoding())).append(".").getStr() ); + OStringBuffer("UcbContentProviderProxy::getContentProvider - No provider for '").append(OUStringToOString(m_aService, osl_getThreadTextEncoding())).append(".").getStr() ); return m_xTargetProvider; } diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index b2dbb215929d..fd40d0ca733c 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -71,7 +71,7 @@ public: // XContentProviderFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL - createContentProvider( const ::rtl::OUString& Service ) + createContentProvider( const OUString& Service ) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -90,9 +90,9 @@ class UcbContentProviderProxy : public com::sun::star::ucb::XParameterizedContentProvider { ::osl::Mutex m_aMutex; - ::rtl::OUString m_aService; - ::rtl::OUString m_aTemplate; - ::rtl::OUString m_aArguments; + OUString m_aService; + OUString m_aTemplate; + OUString m_aArguments; sal_Bool m_bReplace; sal_Bool m_bRegister; @@ -107,7 +107,7 @@ public: UcbContentProviderProxy( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const ::rtl::OUString& Service ); + const OUString& Service ); virtual ~UcbContentProviderProxy(); // XInterface @@ -142,15 +142,15 @@ public: // XParameterizedContentProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL - registerInstance( const ::rtl::OUString& Template, - const ::rtl::OUString& Arguments, + registerInstance( const OUString& Template, + const OUString& Arguments, sal_Bool ReplaceExisting ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL - deregisterInstance( const ::rtl::OUString& Template, - const ::rtl::OUString& Arguments ) + deregisterInstance( const OUString& Template, + const OUString& Arguments ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); }; diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 8a30605561b1..324641dc6ce2 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -58,8 +58,6 @@ using namespace ucb_impl; using namespace com::sun::star; using namespace ucbhelper; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define CONFIG_CONTENTPROVIDERS_KEY \ "/org.openoffice.ucb.Configuration/ContentProviders" diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index 1f11b330c6af..50d5d699cc16 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -100,7 +100,7 @@ public: registerContentProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& Provider, - const rtl::OUString& Scheme, + const OUString& Scheme, sal_Bool ReplaceExisting ) throw( com::sun::star::ucb::DuplicateProviderException, com::sun::star::uno::RuntimeException ); @@ -108,7 +108,7 @@ public: deregisterContentProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& Provider, - const rtl::OUString& Scheme ) + const OUString& Scheme ) throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentProviderInfo > SAL_CALL @@ -116,7 +116,7 @@ public: throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > SAL_CALL - queryContentProvider( const rtl::OUString& Identifier ) + queryContentProvider( const OUString& Identifier ) throw( com::sun::star::uno::RuntimeException ); // XContentProvider @@ -136,7 +136,7 @@ public: // XContentIdentifierFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL - createContentIdentifier( const rtl::OUString& ContentId ) + createContentIdentifier( const OUString& ContentId ) throw( com::sun::star::uno::RuntimeException ); // XCommandProcessor @@ -169,7 +169,7 @@ public: private: com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > - queryContentProvider( const rtl::OUString& Identifier, + queryContentProvider( const OUString& Identifier, sal_Bool bResolved ); com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > @@ -191,8 +191,8 @@ private: throw ( com::sun::star::uno::RuntimeException); bool getContentProviderData( - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, + const OUString & rKey1, + const OUString & rKey2, ucbhelper::ContentProviderDataList & rListToFill); void prepareAndRegister( const ucbhelper::ContentProviderDataList& rData); diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 043ceefbef8d..3c4fdd71fe02 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -221,12 +221,12 @@ public: virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() throw( uno::RuntimeException ); virtual ucb::CommandInfo SAL_CALL - getCommandInfoByName( const rtl::OUString& Name ) + getCommandInfoByName( const OUString& Name ) throw( ucb::UnsupportedCommandException, uno::RuntimeException ); virtual ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) throw( ucb::UnsupportedCommandException, uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasCommandByName( const rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) throw( uno::RuntimeException ); virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) throw( uno::RuntimeException ); @@ -239,19 +239,19 @@ CommandProcessorInfo::CommandProcessorInfo() (*m_pInfo)[ 0 ] = ucb::CommandInfo( - rtl::OUString( GETCOMMANDINFO_NAME ), // Name + OUString( GETCOMMANDINFO_NAME ), // Name GETCOMMANDINFO_HANDLE, // Handle getCppuVoidType() ); // ArgType (*m_pInfo)[ 1 ] = ucb::CommandInfo( - rtl::OUString( GLOBALTRANSFER_NAME ), // Name + OUString( GLOBALTRANSFER_NAME ), // Name GLOBALTRANSFER_HANDLE, // Handle getCppuType( static_cast< ucb::GlobalTransferCommandArgument * >( 0 ) ) ); // ArgType (*m_pInfo)[ 2 ] = ucb::CommandInfo( - rtl::OUString( CHECKIN_NAME ), // Name + OUString( CHECKIN_NAME ), // Name CHECKIN_HANDLE, // Handle getCppuType( static_cast< @@ -277,7 +277,7 @@ CommandProcessorInfo::getCommands() //========================================================================= // virtual ucb::CommandInfo SAL_CALL -CommandProcessorInfo::getCommandInfoByName( const rtl::OUString& Name ) +CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) throw( ucb::UnsupportedCommandException, uno::RuntimeException ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) @@ -307,7 +307,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) //========================================================================= // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( uno::RuntimeException ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) @@ -337,10 +337,10 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) //========================================================================= //========================================================================= -rtl::OUString createDesiredName( - const rtl::OUString & rSourceURL, const rtl::OUString & rNewTitle ) +OUString createDesiredName( + const OUString & rSourceURL, const OUString & rNewTitle ) { - rtl::OUString aName( rNewTitle ); + OUString aName( rNewTitle ); if ( aName.isEmpty() ) { // calculate name using source URL @@ -383,16 +383,16 @@ rtl::OUString createDesiredName( if ( nPos != -1 ) aName = aName.copy( 0, nPos ); } - return rtl::OUString( aName ); + return OUString( aName ); } -rtl::OUString createDesiredName( +OUString createDesiredName( const ucb::GlobalTransferCommandArgument & rArg ) { return createDesiredName( rArg.SourceURL, rArg.NewTitle ); } -rtl::OUString createDesiredName( +OUString createDesiredName( const ucb::TransferInfo & rArg ) { return createDesiredName( rArg.SourceURL, rArg.NewTitle ); @@ -403,16 +403,16 @@ enum NameClashContinuation { NOT_HANDLED, ABORT, OVERWRITE, NEW_NAME, UNKNOWN }; NameClashContinuation interactiveNameClashResolve( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rTargetURL, - const rtl::OUString & rClashingName, + const OUString & rTargetURL, + const OUString & rClashingName, /* [out] */ uno::Any & rException, - /* [out] */ rtl::OUString & rNewName ) + /* [out] */ OUString & rNewName ) { rtl::Reference< ucbhelper::SimpleNameClashResolveRequest > xRequest( new ucbhelper::SimpleNameClashResolveRequest( rTargetURL, // target folder URL rClashingName, // clashing name - rtl::OUString(), // no proposal for new name + OUString(), // no proposal for new name sal_True /* bSupportsOverwriteData */ ) ); rException = xRequest->getRequest(); @@ -478,19 +478,19 @@ NameClashContinuation interactiveNameClashResolve( bool setTitle( const uno::Reference< ucb::XCommandProcessor > & xCommandProcessor, const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rNewTitle ) + const OUString & rNewTitle ) throw( uno::RuntimeException ) { try { uno::Sequence< beans::PropertyValue > aPropValues( 1 ); aPropValues[ 0 ].Name - = rtl::OUString( "Title" ); + = OUString( "Title" ); aPropValues[ 0 ].Handle = -1; aPropValues[ 0 ].Value = uno::makeAny( rNewTitle ); ucb::Command aSetPropsCommand( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, uno::makeAny( aPropValues ) ); @@ -546,7 +546,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -554,19 +554,19 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString("Target is no XCommandProcessor!"), + OUString("Target is no XCommandProcessor!"), rContext.xProcessor ); // Unreachable } uno::Sequence< beans::Property > aPropsToObtain( 1 ); aPropsToObtain[ 0 ].Name - = rtl::OUString("CreatableContentsInfo"); + = OUString("CreatableContentsInfo"); aPropsToObtain[ 0 ].Handle = -1; ucb::Command aGetPropsCommand( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aPropsToObtain ) ); @@ -599,7 +599,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -607,7 +607,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString("Target is no XContentCreator!"), + OUString("Target is no XContentCreator!"), rContext.xProcessor ); // Unreachable } @@ -620,7 +620,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString("Folder"), + OUString("Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -628,7 +628,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString("No types creatable!"), + OUString("No types creatable!"), rContext.xProcessor ); // Unreachable } @@ -694,7 +694,7 @@ uno::Reference< ucb::XContent > createNew( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Unknown transfer operation!" ), + OUString( "Unknown transfer operation!" ), rContext.xProcessor, -1 ) ), rContext.xOrigEnv ); @@ -714,7 +714,7 @@ uno::Reference< ucb::XContent > createNew( // First, try it using "CreatabeleContentsInfo" property and // "createNewContent" command -> the "new" way. ucb::Command aCreateNewCommand( - rtl::OUString("createNewContent"), + OUString("createNewContent"), -1, uno::makeAny( aTypesInfo[ n ] ) ); @@ -734,7 +734,7 @@ uno::Reference< ucb::XContent > createNew( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -742,7 +742,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "createNewContent failed!" ), + OUString( "createNewContent failed!" ), rContext.xProcessor ); // Unreachable } @@ -761,7 +761,7 @@ void transferProperties( throw( uno::Exception ) { ucb::Command aGetPropertySetInfoCommand( - rtl::OUString("getPropertySetInfo"), + OUString("getPropertySetInfo"), -1, uno::Any() ); @@ -773,7 +773,7 @@ void transferProperties( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -781,7 +781,7 @@ void transferProperties( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get propertyset info from source object!" ), + OUString( "Unable to get propertyset info from source object!" ), rContext.xProcessor ); // Unreachable } @@ -789,7 +789,7 @@ void transferProperties( uno::Sequence< beans::Property > aAllProps = xInfo->getProperties(); ucb::Command aGetPropsCommand1( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aAllProps ) ); @@ -801,7 +801,7 @@ void transferProperties( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -809,7 +809,7 @@ void transferProperties( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get properties from source object!" ), + OUString( "Unable to get properties from source object!" ), rContext.xProcessor ); // Unreachable } @@ -880,7 +880,7 @@ void transferProperties( if ( !bHasTitle && !rContext.aArg.NewTitle.isEmpty() ) { aPropValues[ nWritePos ].Name - = rtl::OUString("Title"); + = OUString("Title"); aPropValues[ nWritePos ].Handle = -1; aPropValues[ nWritePos ].Value <<= rContext.aArg.NewTitle; @@ -892,7 +892,7 @@ void transferProperties( == ucb::TransferCommandOperation_LINK ) ) { aPropValues[ nWritePos ].Name - = rtl::OUString("TargetURL"); + = OUString("TargetURL"); aPropValues[ nWritePos ].Handle = -1; aPropValues[ nWritePos ].Value <<= rContext.aArg.SourceURL; @@ -904,7 +904,7 @@ void transferProperties( // Set properties at new object. ucb::Command aSetPropsCommand( - rtl::OUString("setPropertyValues"), + OUString("setPropertyValues"), -1, uno::makeAny( aPropValues ) ); @@ -939,7 +939,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused ucb::Command aOpenCommand( - rtl::OUString("open"), + OUString("open"), -1, uno::makeAny( aArg ) ); @@ -974,7 +974,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); ucb::Command aOpenCommand( - rtl::OUString("open"), + OUString("open"), -1, uno::makeAny( aArg ) ); @@ -1006,11 +1006,11 @@ uno::Reference< sdbc::XResultSet > getResultSet( uno::Sequence< beans::Property > aProps( 3 ); - aProps[ 0 ].Name = rtl::OUString("IsFolder"); + aProps[ 0 ].Name = OUString("IsFolder"); aProps[ 0 ].Handle = -1; /* unknown */ - aProps[ 1 ].Name = rtl::OUString("IsDocument"); + aProps[ 1 ].Name = OUString("IsDocument"); aProps[ 1 ].Handle = -1; /* unknown */ - aProps[ 2 ].Name = rtl::OUString("TargetURL"); + aProps[ 2 ].Name = OUString("TargetURL"); aProps[ 2 ].Handle = -1; /* unknown */ ucb::OpenCommandArgument2 aArg; @@ -1019,7 +1019,7 @@ uno::Reference< sdbc::XResultSet > getResultSet( aArg.Sink = 0; aArg.Properties = aProps; - ucb::Command aOpenCommand( rtl::OUString("open"), + ucb::Command aOpenCommand( OUString("open"), -1, uno::makeAny( aArg ) ); try @@ -1057,11 +1057,11 @@ void handleNameClashRename( // Obtain old title. uno::Sequence< beans::Property > aProps( 1 ); - aProps[ 0 ].Name = rtl::OUString("Title"); + aProps[ 0 ].Name = OUString("Title"); aProps[ 0 ].Handle = -1; ucb::Command aGetPropsCommand( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aProps ) ); @@ -1073,7 +1073,7 @@ void handleNameClashRename( uno::Any aProps2 = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri" ), + OUString( "Uri" ), -1, uno::makeAny( xNew->getIdentifier()->getContentIdentifier() ), @@ -1082,25 +1082,25 @@ void handleNameClashRename( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps2, 1 ), rContext.xOrigEnv, - rtl::OUString( "Unable to get properties from new object!" ), + OUString( "Unable to get properties from new object!" ), rContext.xProcessor ); // Unreachable } - rtl::OUString aOldTitle = xRow->getString( 1 ); + OUString aOldTitle = xRow->getString( 1 ); if ( aOldTitle.isEmpty() ) { ucbhelper::cancelCommandExecution( uno::makeAny( beans::UnknownPropertyException( - rtl::OUString( "Unable to get property 'Title' from new object!" ), + OUString( "Unable to get property 'Title' from new object!" ), rContext.xProcessor ) ), rContext.xOrigEnv ); // Unreachable } // Some pseudo-intelligence for not destroying file extensions. - rtl::OUString aOldTitlePre; - rtl::OUString aOldTitlePost; + OUString aOldTitlePre; + OUString aOldTitlePost; sal_Int32 nPos = aOldTitle.lastIndexOf( '.' ); if ( nPos != -1 ) { @@ -1111,15 +1111,15 @@ void handleNameClashRename( aOldTitlePre = aOldTitle; if ( nPos > 0 ) - aOldTitlePre += rtl::OUString("_"); + aOldTitlePre += OUString("_"); sal_Bool bContinue = sal_True; do { nTry++; - rtl::OUString aNewTitle = aOldTitlePre; - aNewTitle += rtl::OUString::valueOf( nTry ); + OUString aNewTitle = aOldTitlePre; + aNewTitle += OUString::valueOf( nTry ); aNewTitle += aOldTitlePost; // Set new title @@ -1161,7 +1161,7 @@ void handleNameClashRename( uno::Any aProps2 = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri" ), + OUString( "Uri" ), -1, uno::makeAny( xNew->getIdentifier()-> @@ -1171,7 +1171,7 @@ void handleNameClashRename( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps2, 1 ), rContext.xOrigEnv, - rtl::OUString( "Got no data stream from source!" ), + OUString( "Got no data stream from source!" ), rContext.xProcessor ); // Unreachable } @@ -1183,7 +1183,7 @@ void handleNameClashRename( aArg.ReplaceExisting = sal_False; ucb::Command aInsertCommand( - rtl::OUString("insert"), + OUString("insert"), -1, uno::makeAny( aArg ) ); @@ -1207,7 +1207,7 @@ void handleNameClashRename( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( "Unable to resolve name clash!" ), + OUString( "Unable to resolve name clash!" ), rContext.xProcessor, ucb::NameClash::RENAME ) ), rContext.xOrigEnv ); @@ -1229,7 +1229,7 @@ void globalTransfer_( { ucbhelper::cancelCommandExecution( uno::makeAny( beans::UnknownPropertyException( - rtl::OUString( "Unable to get property 'IsFolder' " + OUString( "Unable to get property 'IsFolder' " "from source object!" ), rContext.xProcessor ) ), rContext.xOrigEnv ); @@ -1242,7 +1242,7 @@ void globalTransfer_( { ucbhelper::cancelCommandExecution( uno::makeAny( beans::UnknownPropertyException( - rtl::OUString( "Unable to get property 'IsDocument' " + OUString( "Unable to get property 'IsDocument' " "from source object!" ), rContext.xProcessor ) ), rContext.xOrigEnv ); @@ -1268,7 +1268,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1276,7 +1276,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "No matching content type at target!" ), + OUString( "No matching content type at target!" ), rContext.xProcessor ); // Unreachable } @@ -1293,7 +1293,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( xNew->getIdentifier()-> @@ -1303,7 +1303,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "New content is not a XCommandProcessor!" ), + OUString( "New content is not a XCommandProcessor!" ), rContext.xProcessor ); // Unreachable } @@ -1316,7 +1316,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1324,7 +1324,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Source content is not a XCommandProcessor!" ), + OUString( "Source content is not a XCommandProcessor!" ), rContext.xProcessor ); // Unreachable } @@ -1384,7 +1384,7 @@ void globalTransfer_( break; } - rtl::OUString aDesiredName = createDesiredName( rContext.aArg ); + OUString aDesiredName = createDesiredName( rContext.aArg ); bool bRetry; do @@ -1394,7 +1394,7 @@ void globalTransfer_( try { ucb::Command aInsertCommand( - rtl::OUString("insert"), + OUString("insert"), -1, uno::makeAny( aArg ) ); @@ -1412,7 +1412,7 @@ void globalTransfer_( // No chance to solve name clashes, because I'm not able to detect // whether there is one. throw ucb::UnsupportedNameClashException( - rtl::OUString( + OUString( "Unable to resolve name clashes, no chance to detect " "that there is one!" ), rContext.xProcessor, @@ -1440,7 +1440,7 @@ void globalTransfer_( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( + OUString( "BUG: insert + replace == true MUST NOT " "throw NameClashException." ), rContext.xProcessor, @@ -1466,7 +1466,7 @@ void globalTransfer_( case ucb::NameClash::ASK: { uno::Any aExc; - rtl::OUString aNewTitle; + OUString aNewTitle; NameClashContinuation eCont = interactiveNameClashResolve( rContext.xOrigEnv, // always use original environment! @@ -1488,7 +1488,7 @@ void globalTransfer_( case ABORT: throw ucb::CommandFailedException( - rtl::OUString( + OUString( "abort requested via interaction " "handler" ), uno::Reference< uno::XInterface >(), @@ -1520,7 +1520,7 @@ void globalTransfer_( { // error setting title. Abort. throw ucb::CommandFailedException( - rtl::OUString( "error setting Title property!" ), + OUString( "error setting Title property!" ), uno::Reference< uno::XInterface >(), aExc ); } @@ -1538,7 +1538,7 @@ void globalTransfer_( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( + OUString( "default action, don't know how to " "handle name clash" ), rContext.xProcessor, @@ -1571,7 +1571,7 @@ void globalTransfer_( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1579,7 +1579,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get properties from children of source!" ), + OUString( "Unable to get properties from children of source!" ), rContext.xProcessor ); // Unreachable } @@ -1592,7 +1592,7 @@ void globalTransfer_( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1600,7 +1600,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get children of source!" ), + OUString( "Unable to get children of source!" ), rContext.xProcessor ); // Unreachable } @@ -1609,10 +1609,10 @@ void globalTransfer_( { ucb::GlobalTransferCommandArgument2 aTransArg( rContext.aArg.Operation, - rtl::OUString(), // SourceURL; filled later + OUString(), // SourceURL; filled later xNew->getIdentifier() ->getContentIdentifier(), // TargetURL - rtl::OUString(), // NewTitle; + OUString(), // NewTitle; rContext.aArg.NameClash, rContext.aArg.MimeType ); @@ -1657,13 +1657,13 @@ void globalTransfer_( aAny = xcp->execute( ucb::Command( - rtl::OUString("getCommandInfo"), + OUString("getCommandInfo"), -1, uno::Any()), 0, rContext.xEnv ); - const rtl::OUString cmdName("flush"); + const OUString cmdName("flush"); if((aAny >>= xci) && xci->hasCommandByName(cmdName)) xcp->execute( ucb::Command( @@ -1737,7 +1737,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1745,7 +1745,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Can't instanciate target object!" ), + OUString( "Can't instanciate target object!" ), this ); // Unreachable } @@ -1760,7 +1760,7 @@ void UniversalContentBroker::globalTransfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1768,7 +1768,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Target content is not a XCommandProcessor!" ), + OUString( "Target content is not a XCommandProcessor!" ), this ); // Unreachable } @@ -1789,7 +1789,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - rtl::OUString( "transfer" ), // Name + OUString( "transfer" ), // Name -1, // Handle uno::makeAny( aTransferArg ) ); // Argument @@ -1826,7 +1826,7 @@ void UniversalContentBroker::globalTransfer( aTransferArg.MimeType ); ucb::Command aCommand1( - rtl::OUString("transfer"), + OUString("transfer"), -1, uno::makeAny( aTransferArg1 ) ); @@ -1846,7 +1846,7 @@ void UniversalContentBroker::globalTransfer( // There's a clash. Use interaction handler to solve it. uno::Any aExc; - rtl::OUString aNewTitle; + OUString aNewTitle; NameClashContinuation eCont = interactiveNameClashResolve( xEnv, // always use original environment! @@ -1869,7 +1869,7 @@ void UniversalContentBroker::globalTransfer( case ABORT: throw ucb::CommandFailedException( - rtl::OUString( + OUString( "abort requested via interaction " "handler" ), uno::Reference< uno::XInterface >(), @@ -1923,7 +1923,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1931,7 +1931,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Can't instanciate source object!" ), + OUString( "Can't instanciate source object!" ), this ); // Unreachable } @@ -1942,7 +1942,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1950,7 +1950,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Source content is not a XCommandProcessor!" ), + OUString( "Source content is not a XCommandProcessor!" ), this ); // Unreachable } @@ -1959,17 +1959,17 @@ void UniversalContentBroker::globalTransfer( uno::Sequence< beans::Property > aProps( 4 ); - aProps[ 0 ].Name = rtl::OUString("IsFolder"); + aProps[ 0 ].Name = OUString("IsFolder"); aProps[ 0 ].Handle = -1; /* unknown */ - aProps[ 1 ].Name = rtl::OUString("IsDocument"); + aProps[ 1 ].Name = OUString("IsDocument"); aProps[ 1 ].Handle = -1; /* unknown */ - aProps[ 2 ].Name = rtl::OUString("TargetURL"); + aProps[ 2 ].Name = OUString("TargetURL"); aProps[ 2 ].Handle = -1; /* unknown */ - aProps[ 3 ].Name = rtl::OUString("BaseURI"); + aProps[ 3 ].Name = OUString("BaseURI"); aProps[ 3 ].Handle = -1; /* unknown */ ucb::Command aGetPropsCommand( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aProps ) ); @@ -1980,7 +1980,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps2 = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1988,7 +1988,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps2, 1), xEnv, - rtl::OUString( "Unable to get properties from source object!" ), + OUString( "Unable to get properties from source object!" ), this ); // Unreachable } @@ -1999,11 +1999,11 @@ void UniversalContentBroker::globalTransfer( if ( rArg.NewTitle.isEmpty() ) { // BaseURI: property is optional. - rtl::OUString aBaseURI( xRow->getString( 4 ) ); + OUString aBaseURI( xRow->getString( 4 ) ); if ( !aBaseURI.isEmpty() ) { aTransferCtx.aArg.NewTitle - = createDesiredName( aBaseURI, rtl::OUString() ); + = createDesiredName( aBaseURI, OUString() ); } } @@ -2021,7 +2021,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - rtl::OUString("delete"), // Name + OUString("delete"), // Name -1, // Handle uno::makeAny( sal_Bool( sal_True ) ) ); // Argument @@ -2072,14 +2072,14 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri" ), -1, + OUString( "Uri" ), -1, uno::makeAny( rArg.TargetURL ), beans::PropertyState_DIRECT_VALUE ) ); ucbhelper::cancelCommandExecution( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps, 1 ), xEnv, - rtl::OUString( "Can't instanciate target object!" ), + OUString( "Can't instanciate target object!" ), this ); // Unreachable } @@ -2091,14 +2091,14 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri" ), -1, + OUString( "Uri" ), -1, uno::makeAny( rArg.TargetURL ), beans::PropertyState_DIRECT_VALUE ) ); ucbhelper::cancelCommandExecution( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps, 1 ), xEnv, - rtl::OUString( "Target content is not a XCommandProcessor!" ), + OUString( "Target content is not a XCommandProcessor!" ), this ); // Unreachable } @@ -2106,7 +2106,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, try { ucb::Command aCommand( - rtl::OUString( "checkin" ), -1, + OUString( "checkin" ), -1, uno::makeAny( rArg ) ); aRet = xCommandProcessor->execute( aCommand, 0, xLocalEnv ); diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 3c14a2048dd2..5d0c9dc6660a 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using ::rtl::OUString; //========================================================================= // @@ -62,7 +61,7 @@ struct PropertyTableEntry static const com::sun::star::uno::Type& OUString_getCppuType() { - return getCppuType( static_cast< const rtl::OUString * >( 0 ) ); + return getCppuType( static_cast< const OUString * >( 0 ) ); } static const com::sun::star::uno::Type& sal_uInt16_getCppuType() diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 51e28e235b28..c63c03a8b4cf 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -49,7 +49,7 @@ class UcbPropertiesManager : osl::Mutex m_aMutex; private: - sal_Bool queryProperty( const rtl::OUString& rName, + sal_Bool queryProperty( const OUString& rName, com::sun::star::beans::Property& rProp ); public: @@ -73,11 +73,11 @@ public: getProperties() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::beans::Property SAL_CALL - getPropertyByName( const rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); }; diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index ae327989dbe3..9c1379592758 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 4e7b9ef98085..319a9457a48b 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -48,8 +48,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; //========================================================================= OUString makeHierarchalNameSegment( const OUString & rIn ) diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 2963f1829860..8364bd23dabb 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -75,7 +75,7 @@ public: // XPropertySetRegistryFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > SAL_CALL - createPropertySetRegistry( const rtl::OUString& URL ) + createPropertySetRegistry( const OUString& URL ) throw( com::sun::star::uno::RuntimeException ); // XInitialization @@ -114,8 +114,8 @@ private: void add ( PersistentPropertySet* pSet ); void remove( PersistentPropertySet* pSet ); - void renamePropertySet( const rtl::OUString& rOldKey, - const rtl::OUString& rNewKey ); + void renamePropertySet( const OUString& rOldKey, + const OUString& rNewKey ); public: PropertySetRegistry( @@ -137,10 +137,10 @@ public: // XPropertySetRegistry virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > SAL_CALL - openPropertySet( const rtl::OUString& key, sal_Bool create ) + openPropertySet( const OUString& key, sal_Bool create ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertySet( const rtl::OUString& key ) + removePropertySet( const OUString& key ) throw( com::sun::star::uno::RuntimeException ); // XElementAccess ( XNameAccess is derived from it ) @@ -153,22 +153,22 @@ public: // XNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); // Non-interface methods com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getRootConfigReadAccess(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - getConfigWriteAccess( const rtl::OUString& rPath ); + getConfigWriteAccess( const OUString& rPath ); }; //========================================================================= @@ -201,7 +201,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rXSMgr, PropertySetRegistry& rCreator, - const rtl::OUString& rKey ); + const OUString& rKey ); virtual ~PersistentPropertySet(); // XInterface @@ -232,7 +232,7 @@ public: getPropertySetInfo() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -240,33 +240,33 @@ public: com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& aPropertyName, + addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& aPropertyName, + removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -278,21 +278,21 @@ public: com::sun::star::ucb::XPropertySetRegistry > SAL_CALL getRegistry() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getKey() throw( com::sun::star::uno::RuntimeException ); // XNamed - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setName( const ::rtl::OUString& aName ) + setName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException ); // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -300,7 +300,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -331,7 +331,7 @@ public: // Non-interface methods. PropertySetRegistry& getPropertySetRegistry(); - const rtl::OUString& getFullKey(); + const OUString& getFullKey(); }; #endif /* !_UCBSTORE_HXX */ diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx index b59b7187bd0c..ddee7c11314d 100644 --- a/ucb/source/inc/regexp.hxx +++ b/ucb/source/inc/regexp.hxx @@ -42,25 +42,25 @@ public: inline Kind getKind() const { return m_eKind; } - bool matches(rtl::OUString const & rString, rtl::OUString * pTranslation, + bool matches(OUString const & rString, OUString * pTranslation, bool * pTranslated) const; - rtl::OUString getRegexp(bool bReverse) const; + OUString getRegexp(bool bReverse) const; - static Regexp parse(rtl::OUString const & rRegexp); + static Regexp parse(OUString const & rRegexp); private: Kind m_eKind; - rtl::OUString m_aPrefix; - rtl::OUString m_aInfix; - rtl::OUString m_aReversePrefix; + OUString m_aPrefix; + OUString m_aInfix; + OUString m_aReversePrefix; bool m_bEmptyDomain; bool m_bTranslation; - inline Regexp(Kind eTheKind, rtl::OUString const & rThePrefix, - bool bTheEmptyDomain, rtl::OUString const & rTheInfix, + inline Regexp(Kind eTheKind, OUString const & rThePrefix, + bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, - rtl::OUString const & rTheReversePrefix); + OUString const & rTheReversePrefix); }; inline bool Regexp::operator ==(Regexp const & rOther) const diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index fc4b218f16ce..3e960d1bd93b 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -33,18 +33,18 @@ template< typename Val > class RegexpMapEntry { public: - inline RegexpMapEntry(rtl::OUString const & rTheRegexp, + inline RegexpMapEntry(OUString const & rTheRegexp, Val * pTheValue): m_aRegexp(rTheRegexp), m_pValue(pTheValue) {} - rtl::OUString getRegexp() const { return m_aRegexp; } + OUString getRegexp() const { return m_aRegexp; } Val const & getValue() const { return *m_pValue; } Val & getValue() { return *m_pValue; } private: - rtl::OUString m_aRegexp; + OUString m_aRegexp; Val * m_pValue; }; @@ -130,11 +130,11 @@ public: RegexpMap & operator =(RegexpMap const & rOther); - bool add(rtl::OUString const & rKey, Val const & rValue, bool bOverwrite, - rtl::OUString * pReverse = 0); + bool add(OUString const & rKey, Val const & rValue, bool bOverwrite, + OUString * pReverse = 0); // throws com::sun::star::lang::IllegalArgumentException - iterator find(rtl::OUString const & rKey, rtl::OUString * pReverse = 0); + iterator find(OUString const & rKey, OUString * pReverse = 0); // throws com::sun::star::lang::IllegalArgumentException void erase(iterator const & rPos); @@ -151,8 +151,8 @@ public: size_type size() const; - Val const * map(rtl::OUString const & rString, - rtl::OUString * pTranslation = 0, bool * pTranslated = 0) + Val const * map(OUString const & rString, + OUString * pTranslation = 0, bool * pTranslated = 0) const; private: diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index ffa318caac45..280c8604af28 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -39,10 +39,10 @@ using namespace ucb_impl; // //============================================================================ -inline Regexp::Regexp(Kind eTheKind, rtl::OUString const & rThePrefix, - bool bTheEmptyDomain, rtl::OUString const & rTheInfix, +inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, + bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, - rtl::OUString const & rTheReversePrefix): + OUString const & rTheReversePrefix): m_eKind(eTheKind), m_aPrefix(rThePrefix), m_aInfix(rTheInfix), @@ -60,7 +60,7 @@ namespace unnamed_ucb_regexp { bool matchStringIgnoreCase(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, - rtl::OUString const & rString) + OUString const & rString) { sal_Unicode const * p = *pBegin; @@ -88,8 +88,8 @@ bool matchStringIgnoreCase(sal_Unicode const ** pBegin, } -bool Regexp::matches(rtl::OUString const & rString, - rtl::OUString * pTranslation, bool * pTranslated) const +bool Regexp::matches(OUString const & rString, + OUString * pTranslation, bool * pTranslated) const { sal_Unicode const * pBegin = rString.getStr(); sal_Unicode const * pEnd = pBegin + rString.getLength(); @@ -151,7 +151,7 @@ bool Regexp::matches(rtl::OUString const & rString, { if (pTranslation) { - rtl::OUStringBuffer aBuffer(m_aReversePrefix); + OUStringBuffer aBuffer(m_aReversePrefix); aBuffer.append(pBlock1Begin, pBlock1End - pBlock1Begin); aBuffer.append(m_aInfix); aBuffer.append(pBlock2Begin, pBlock2End - pBlock2Begin); @@ -176,7 +176,7 @@ bool Regexp::matches(rtl::OUString const & rString, //============================================================================ namespace unnamed_ucb_regexp { -bool isScheme(rtl::OUString const & rString, bool bColon) +bool isScheme(OUString const & rString, bool bColon) { using comphelper::string::isalphaAscii; using comphelper::string::isdigitAscii; @@ -197,8 +197,8 @@ bool isScheme(rtl::OUString const & rString, bool bColon) return false; } -void appendStringLiteral(rtl::OUStringBuffer * pBuffer, - rtl::OUString const & rString) +void appendStringLiteral(OUStringBuffer * pBuffer, + OUString const & rString) { OSL_ASSERT(pBuffer); @@ -217,11 +217,11 @@ void appendStringLiteral(rtl::OUStringBuffer * pBuffer, } -rtl::OUString Regexp::getRegexp(bool bReverse) const +OUString Regexp::getRegexp(bool bReverse) const { if (m_bTranslation) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if (bReverse) { if (!m_aReversePrefix.isEmpty()) @@ -268,7 +268,7 @@ rtl::OUString Regexp::getRegexp(bool bReverse) const return m_aPrefix.copy(0, m_aPrefix.getLength() - 1); else { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if (!m_aPrefix.isEmpty()) appendStringLiteral(&aBuffer, m_aPrefix); switch (m_eKind) @@ -320,14 +320,14 @@ bool matchString(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, } bool scanStringLiteral(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, - rtl::OUString * pString) + OUString * pString) { sal_Unicode const * p = *pBegin; if (p == pEnd || *p++ != '"') return false; - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; for (;;) { if (p == pEnd) @@ -353,7 +353,7 @@ bool scanStringLiteral(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, } -Regexp Regexp::parse(rtl::OUString const & rRegexp) +Regexp Regexp::parse(OUString const & rRegexp) { // Detect an input of '<scheme>' as an abbreviation of '"<scheme>:".*' // where <scheme> is as defined in RFC 2396: @@ -361,14 +361,14 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) return Regexp(Regexp::KIND_PREFIX, rRegexp + ":", false, - rtl::OUString(), + OUString(), false, - rtl::OUString()); + OUString()); sal_Unicode const * p = rRegexp.getStr(); sal_Unicode const * pEnd = p + rRegexp.getLength(); - rtl::OUString aPrefix; + OUString aPrefix; scanStringLiteral(&p, pEnd, &aPrefix); if (p == pEnd) @@ -382,19 +382,19 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) if (p != pEnd) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_PREFIX, aPrefix, false, rtl::OUString(), - false, rtl::OUString()); + return Regexp(Regexp::KIND_PREFIX, aPrefix, false, OUString(), + false, OUString()); } else if (matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("(.*)->"))) { - rtl::OUString aReversePrefix; + OUString aReversePrefix; scanStringLiteral(&p, pEnd, &aReversePrefix); if (!matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("\\1")) || p != pEnd) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_PREFIX, aPrefix, false, rtl::OUString(), + return Regexp(Regexp::KIND_PREFIX, aPrefix, false, OUString(), true, aReversePrefix); } else if (matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("([/?#].*)?"))) @@ -402,19 +402,19 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) if (p != pEnd) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, rtl::OUString(), - false, rtl::OUString()); + return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, OUString(), + false, OUString()); } else if (matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("(([/?#].*)?)->"))) { - rtl::OUString aReversePrefix; + OUString aReversePrefix; if (!(scanStringLiteral(&p, pEnd, &aReversePrefix) && matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("\\1")) && p == pEnd)) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, rtl::OUString(), + return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, OUString(), true, aReversePrefix); } else @@ -433,13 +433,13 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) throw lang::IllegalArgumentException(); bool bEmptyDomain = *p++ == '*'; - rtl::OUString aInfix; + OUString aInfix; scanStringLiteral(&p, pEnd, &aInfix); if (!matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("([/?#].*)?"))) throw lang::IllegalArgumentException(); - rtl::OUString aReversePrefix; + OUString aReversePrefix; if (bOpen && !(matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM(")->")) && scanStringLiteral(&p, pEnd, &aReversePrefix) diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index a3bc61e7240c..d73f9b26356f 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace cppu; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 603105507efd..beeb485b4dd7 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -23,7 +23,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 83c323074683..089946a4f7de 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index 73b2ede3394c..c709da33b628 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -213,7 +213,7 @@ public: throw( css::uno::RuntimeException ); // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( css::uno::RuntimeException ); virtual css::uno::Reference< @@ -286,7 +286,7 @@ public: virtual sal_Bool SAL_CALL wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( css::sdbc::SQLException, css::uno::RuntimeException ); @@ -384,7 +384,7 @@ public: throw( css::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& PropertyName, + setPropertyValue( const OUString& PropertyName, const css::uno::Any& Value ) throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -393,13 +393,13 @@ public: css::uno::RuntimeException ); virtual css::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& PropertyName, + addPropertyChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, @@ -407,7 +407,7 @@ public: css::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& PropertyName, + removePropertyChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, @@ -415,7 +415,7 @@ public: css::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, @@ -423,7 +423,7 @@ public: css::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw( css::beans::UnknownPropertyException, 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( ); }; } diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index b823a2d91470..5648f8bb7942 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace { @@ -232,7 +231,7 @@ sal_Int32 ExpandContentProviderImpl::compareContentIds( { (void) exc; // unused OSL_FAIL( - ::rtl::OUStringToOString( + OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); return -1; } diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index c40b932273a6..fce8befeb400 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -102,11 +102,11 @@ namespace ucb { namespace ucp { namespace ext namespace { //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL ) + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); - ::rtl::OUStringBuffer aComposer( i_rBaseURL ); + OUStringBuffer aComposer( i_rBaseURL ); if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' ) aComposer.append( sal_Unicode( '/' ) ); aComposer.append( i_rRelativeURL ); @@ -114,9 +114,9 @@ namespace ucb { namespace ucp { namespace ext } //-------------------------------------------------------------------------------------------------------------- - struct SelectPropertyName : public ::std::unary_function< Property, ::rtl::OUString > + struct SelectPropertyName : public ::std::unary_function< Property, OUString > { - const ::rtl::OUString& operator()( const Property& i_rProperty ) const + const OUString& operator()( const Property& i_rProperty ) const { return i_rProperty.Name; } @@ -136,14 +136,14 @@ namespace ucb { namespace ucp { namespace ext ,m_sExtensionId() ,m_sPathIntoExtension() { - const ::rtl::OUString sURL( getIdentifier()->getContentIdentifier() ); + const OUString sURL( getIdentifier()->getContentIdentifier() ); if ( denotesRootContent( sURL ) ) { m_eExtContentType = E_ROOT; } else { - const ::rtl::OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) ); + const OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) ); const sal_Int32 nSepPos = sRelativeURL.indexOf( '/' ); if ( ( nSepPos == -1 ) || ( nSepPos == sRelativeURL.getLength() - 1 ) ) { @@ -157,7 +157,7 @@ namespace ucb { namespace ucp { namespace ext if ( m_eExtContentType != E_ROOT ) { - const ::rtl::OUString sRootURL = ContentProvider::getRootURL(); + const OUString sRootURL = ContentProvider::getRootURL(); m_sExtensionId = sURL.copy( sRootURL.getLength() ); const sal_Int32 nNextSep = m_sExtensionId.indexOf( '/' ); @@ -176,22 +176,22 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString( "org.openoffice.comp.ucp.ext.Content" ); + return OUString( "org.openoffice.comp.ucp.ext.Content" ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.Content" ); - aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContent" ); + Sequence< OUString > aServiceNames(2); + aServiceNames[0] = OUString( "com.sun.star.ucb.Content" ); + aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContent" ); return aServiceNames; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Content::getContentType() throw( RuntimeException ) + OUString SAL_CALL Content::getContentType() throw( RuntimeException ) { impl_determineContentType(); return *m_aContentType; @@ -209,7 +209,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= Properties ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -222,7 +222,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= aProperties ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -230,7 +230,7 @@ namespace ucb { namespace ucp { namespace ext if ( !aProperties.getLength() ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -253,7 +253,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= aOpenCommand ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -272,16 +272,16 @@ namespace ucb { namespace ucp { namespace ext if ( aOpenCommand.Sink.is() ) { - const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() ); + const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEvironment, m_xContext ); - aRet = aRequestedContent.executeCommand( ::rtl::OUString( "open" ), makeAny( aOpenCommand ) ); + aRet = aRequestedContent.executeCommand( OUString( "open" ), makeAny( aOpenCommand ) ); } } else { ::ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - ::rtl::OUString(), *this ) ), + OUString(), *this ) ), i_rEvironment ); // unreachable } @@ -295,22 +295,22 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::encodeIdentifier( const ::rtl::OUString& i_rIdentifier ) + OUString Content::encodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::decodeIdentifier( const ::rtl::OUString& i_rIdentifier ) + OUString Content::decodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - bool Content::denotesRootContent( const ::rtl::OUString& i_rContentIdentifier ) + bool Content::denotesRootContent( const OUString& i_rContentIdentifier ) { - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + const OUString sRootURL( ContentProvider::getRootURL() ); if ( i_rContentIdentifier == sRootURL ) return true; @@ -325,9 +325,9 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::getParentURL() + OUString Content::getParentURL() { - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + const OUString sRootURL( ContentProvider::getRootURL() ); switch ( m_eExtContentType ) { @@ -341,7 +341,7 @@ namespace ucb { namespace ucp { namespace ext case E_EXTENSION_CONTENT: { - const ::rtl::OUString sURL = m_xIdentifier->getContentIdentifier(); + const OUString sURL = m_xIdentifier->getContentIdentifier(); // cut the root URL if ( !sURL.match( sRootURL, 0 ) ) @@ -350,10 +350,10 @@ namespace ucb { namespace ucp { namespace ext break; } - ::rtl::OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); + OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); // cut the extension ID - const ::rtl::OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + ::rtl::OUString( sal_Unicode( '/' ) ) ); + const OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + OUString( sal_Unicode( '/' ) ) ); if ( !sRelativeURL.match( sSeparatedExtensionId ) ) { SAL_INFO( "ucb.ucp", "illegal URL structure - no extension ID" ); @@ -376,7 +376,7 @@ namespace ucb { namespace ucp { namespace ext const sal_Int32 nLastSep = sRelativeURL.lastIndexOf( '/' ); sRelativeURL = sRelativeURL.copy( 0, nLastSep != -1 ? nLastSep : 0 ); - ::rtl::OUStringBuffer aComposer; + OUStringBuffer aComposer; aComposer.append( sRootURL ); aComposer.append( sSeparatedExtensionId ); aComposer.append( sRelativeURL ); @@ -387,12 +387,12 @@ namespace ucb { namespace ucp { namespace ext OSL_FAIL( "Content::getParentURL: unhandled case!" ); break; } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XComponentContext >& rxContext, - const Sequence< Property >& i_rProperties, const ::rtl::OUString& i_rTitle ) + const Sequence< Property >& i_rProperties, const OUString& i_rTitle ) { // note: empty sequence means "get values of all supported properties". ::rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new ::ucbhelper::PropertyValueSet( rxContext ); @@ -434,22 +434,22 @@ namespace ucb { namespace ucp { namespace ext else { // Append all Core Properties. - xRow->appendString ( Property( ::rtl::OUString("ContentType"), + xRow->appendString ( Property( OUString("ContentType"), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), ContentProvider::getArtificialNodeContentType() ); - xRow->appendString ( Property( ::rtl::OUString("Title"), + xRow->appendString ( Property( OUString("Title"), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), i_rTitle ); - xRow->appendBoolean( Property( ::rtl::OUString("IsDocument"), + xRow->appendBoolean( Property( OUString("IsDocument"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), sal_False ); - xRow->appendBoolean( Property( ::rtl::OUString("IsFolder"), + xRow->appendBoolean( Property( OUString("IsFolder"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), @@ -460,13 +460,13 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::getPhysicalURL() const + OUString Content::getPhysicalURL() const { - ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", ::rtl::OUString() ); + ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", OUString() ); // create an ucb::XContent for the physical file within the deployed extension const Reference< XPackageInformationProvider > xPackageInfo = PackageInformationProvider::get(m_xContext); - const ::rtl::OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) ); + const OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) ); if ( m_sPathIntoExtension.isEmpty() ) return sPackageLocation; @@ -486,11 +486,11 @@ namespace ucb { namespace ucp { namespace ext return getArtificialNodePropertyValues( m_xContext, i_rProperties, m_sExtensionId ); case E_EXTENSION_CONTENT: { - const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() ); + const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEnv, m_xContext ); // translate the property request - Sequence< ::rtl::OUString > aPropertyNames( i_rProperties.getLength() ); + Sequence< OUString > aPropertyNames( i_rProperties.getLength() ); ::std::transform( i_rProperties.getConstArray(), i_rProperties.getConstArray() + i_rProperties.getLength(), @@ -538,7 +538,7 @@ namespace ucb { namespace ucp { namespace ext for ( sal_Int32 n = 0; n < nCount; ++n, ++pValues ) { // all our properties are read-only ... - aRet[ n ] <<= IllegalAccessException( ::rtl::OUString("property is read-only."), *this ); + aRet[ n ] <<= IllegalAccessException( OUString("property is read-only."), *this ); } return aRet; @@ -554,23 +554,23 @@ namespace ucb { namespace ucp { namespace ext // Mandatory commands /////////////////////////////////////////////////////////////// CommandInfo( - ::rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), CommandInfo( - ::rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), CommandInfo( - ::rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< Sequence< Property > * >( 0 ) ) ), CommandInfo( - ::rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< Sequence< PropertyValue > * >( 0 ) ) @@ -579,7 +579,7 @@ namespace ucb { namespace ucp { namespace ext // Optional standard commands /////////////////////////////////////////////////////////////// , CommandInfo( - ::rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< OpenCommandArgument2 * >( 0 ) ) ) @@ -594,27 +594,27 @@ namespace ucb { namespace ucp { namespace ext static Property aProperties[] = { Property( - ::rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ) }; @@ -631,7 +631,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = ::rtl::OUString( "IsFolder" ); + aProps[0].Name = OUString( "IsFolder" ); Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); bIsFolder = xRow->getBoolean(1); } @@ -655,7 +655,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = ::rtl::OUString( "ContentType" ); + aProps[0].Name = OUString( "ContentType" ); Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); m_aContentType.reset( xRow->getString(1) ); } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index ee29fd9778a0..f28fa7f4097b 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -63,7 +63,7 @@ namespace ucb { namespace ucp { namespace ext getArtificialNodePropertyValues( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, - const ::rtl::OUString& rTitle + const OUString& rTitle ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > @@ -72,29 +72,29 @@ namespace ucb { namespace ucp { namespace ext const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - static ::rtl::OUString - encodeIdentifier( const ::rtl::OUString& i_rIdentifier ); - static ::rtl::OUString - decodeIdentifier( const ::rtl::OUString& i_rIdentifier ); + static OUString + encodeIdentifier( const OUString& i_rIdentifier ); + static OUString + decodeIdentifier( const OUString& i_rIdentifier ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); ExtensionContentType getExtensionContentType() const { return m_eExtContentType; } /** retrieves the URL of the underlying physical content. Not to be called when getExtensionContentType() returns E_ROOT. */ - ::rtl::OUString getPhysicalURL() const; + OUString getPhysicalURL() const; protected: virtual ~Content(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XContent - virtual rtl::OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -125,7 +125,7 @@ namespace ucb { namespace ucp { namespace ext const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - static bool denotesRootContent( const ::rtl::OUString& i_rContentIdentifier ); + static bool denotesRootContent( const OUString& i_rContentIdentifier ); bool impl_isFolder(); void impl_determineContentType(); @@ -133,9 +133,9 @@ namespace ucb { namespace ucp { namespace ext private: ExtensionContentType m_eExtContentType; ::boost::optional< bool > m_aIsFolder; - ::boost::optional< ::rtl::OUString > m_aContentType; - ::rtl::OUString m_sExtensionId; - ::rtl::OUString m_sPathIntoExtension; + ::boost::optional< OUString > m_aContentType; + OUString m_sExtensionId; + OUString m_sPathIntoExtension; }; //...................................................................................................................... diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index ff93dc977b74..6f86da239e2e 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -70,7 +70,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== struct ResultListEntry { - ::rtl::OUString sId; + OUString sId; Reference< XContentIdentifier > xId; ::rtl::Reference< Content > pContent; Reference< XRow > xRow; @@ -109,11 +109,11 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== namespace { - ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL ) + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); - ::rtl::OUStringBuffer aComposer( i_rBaseURL ); + OUStringBuffer aComposer( i_rBaseURL ); if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' ) aComposer.append( sal_Unicode( '/' ) ); aComposer.append( i_rRelativeURL ); @@ -140,14 +140,14 @@ namespace ucb { namespace ucp { namespace ext { const Reference< XPackageInformationProvider > xPackageInfo = PackageInformationProvider::get( m_pImpl->m_xContext ); - const ::rtl::OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() ); + const OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() ); switch ( m_pImpl->m_xContent->getExtensionContentType() ) { case E_ROOT: { - Sequence< Sequence< ::rtl::OUString > > aExtensionInfo( xPackageInfo->getExtensionList() ); - for ( const Sequence< ::rtl::OUString >* pExtInfo = aExtensionInfo.getConstArray(); + Sequence< Sequence< OUString > > aExtensionInfo( xPackageInfo->getExtensionList() ); + for ( const Sequence< OUString >* pExtInfo = aExtensionInfo.getConstArray(); pExtInfo != aExtensionInfo.getConstArray() + aExtensionInfo.getLength(); ++pExtInfo ) @@ -158,9 +158,9 @@ namespace ucb { namespace ucp { namespace ext continue; } - const ::rtl::OUString& rLocalId = (*pExtInfo)[0]; + const OUString& rLocalId = (*pExtInfo)[0]; ResultListEntry aEntry; - aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + ::rtl::OUString( sal_Unicode( '/' ) ); + aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + OUString( sal_Unicode( '/' ) ); m_pImpl->m_aResults.push_back( aEntry ); } } @@ -168,12 +168,12 @@ namespace ucb { namespace ucp { namespace ext case E_EXTENSION_ROOT: case E_EXTENSION_CONTENT: { - const ::rtl::OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() ); + const OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() ); ::ucbhelper::Content aWrappedContent( sPackageLocation, getResultSet()->getEnvironment(), m_pImpl->m_xContext ); // obtain the properties which our result set is set up for from the wrapped content - Sequence< ::rtl::OUString > aPropertyNames(1); - aPropertyNames[0] = ::rtl::OUString( "Title" ); + Sequence< OUString > aPropertyNames(1); + aPropertyNames[0] = OUString( "Title" ); const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); @@ -202,19 +202,19 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) + OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( i_nIndex < m_pImpl->m_aResults.size() ) { - const ::rtl::OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId; + const OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId; if ( !sId.isEmpty() ) return sId; } OSL_FAIL( "DataSupplier::queryContentIdentifierString: illegal index, or illegal result entry id!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ @@ -229,7 +229,7 @@ namespace ucb { namespace ucp { namespace ext return xId; } - ::rtl::OUString sId = queryContentIdentifierString( i_nIndex ); + OUString sId = queryContentIdentifierString( i_nIndex ); if ( !sId.isEmpty() ) { Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( sId ); @@ -319,9 +319,9 @@ namespace ucb { namespace ucp { namespace ext { case E_ROOT: { - const ::rtl::OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); - ::rtl::OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); + const OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); + const OUString sRootURL( ContentProvider::getRootURL() ); + OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); if ( !sTitle.isEmpty() && ( sTitle[ sTitle.getLength() - 1 ] == '/' ) ) sTitle = sTitle.copy( 0, sTitle.getLength() - 1 ); xRow = Content::getArtificialNodePropertyValues( m_pImpl->m_xContext, getResultSet()->getProperties(), sTitle ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index 291b3a17c716..cfa5e04be074 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -51,7 +51,7 @@ namespace ucb { namespace ucp { namespace ext protected: 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 > queryContent( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 4115f52a4b96..37c384d8effb 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -63,28 +63,28 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); + return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.ContentProvider" ); - aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContentProvider" ); + Sequence< OUString > aServiceNames(2); + aServiceNames[0] = OUString( "com.sun.star.ucb.ContentProvider" ); + aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContentProvider" ); return aServiceNames; } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -96,21 +96,21 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ContentProvider::getRootURL() + OUString ContentProvider::getRootURL() { - return ::rtl::OUString( "vnd.sun.star.extension://" ); + return OUString( "vnd.sun.star.extension://" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ContentProvider::getArtificialNodeContentType() + OUString ContentProvider::getArtificialNodeContentType() { - return ::rtl::OUString( "application/vnd.sun.star.extension-content" ); + return OUString( "application/vnd.sun.star.extension-content" ); } //------------------------------------------------------------------------------------------------------------------ namespace { - void lcl_ensureAndTransfer( ::rtl::OUString& io_rIdentifierFragment, ::rtl::OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) + void lcl_ensureAndTransfer( OUString& io_rIdentifierFragment, OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) { if ( ( io_rIdentifierFragment.isEmpty() ) || ( io_rIdentifierFragment[0] != i_nLeadingChar ) ) throw IllegalIdentifierException(); @@ -124,19 +124,19 @@ namespace ucb { namespace ucp { namespace ext throw( IllegalIdentifierException, RuntimeException ) { // Check URL scheme... - const ::rtl::OUString sScheme( "vnd.sun.star.extension" ); + const OUString sScheme( "vnd.sun.star.extension" ); if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( sScheme ) ) throw IllegalIdentifierException(); // normalize the identifier - const ::rtl::OUString sIdentifier( i_rIdentifier->getContentIdentifier() ); + const OUString sIdentifier( i_rIdentifier->getContentIdentifier() ); // the scheme needs to be lower-case - ::rtl::OUStringBuffer aComposer; + OUStringBuffer aComposer; aComposer.append( sIdentifier.copy( 0, sScheme.getLength() ).toAsciiLowerCase() ); // one : is required after the scheme - ::rtl::OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) ); + OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) ); lcl_ensureAndTransfer( sRemaining, aComposer, ':' ); // and at least one / diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 88c7f58325fa..55ddc498553f 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -38,20 +38,20 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // XContentProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException); public: - static ::rtl::OUString getRootURL(); - static ::rtl::OUString getArtificialNodeContentType(); + static OUString getRootURL(); + static OUString getArtificialNodeContentType(); }; //...................................................................................................................... diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 18fa9f32cbeb..2959d5dea872 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star::ucb; // PropertyListeners -typedef cppu::OMultiTypeInterfaceContainerHelperVar< rtl::OUString,hashOUString,equalOUString > +typedef cppu::OMultiTypeInterfaceContainerHelperVar< OUString,hashOUString,equalOUString > PropertyListeners_impl; class fileaccess::PropertyListeners @@ -75,7 +75,7 @@ public: // Private Constructor for just inserted Contents BaseContent::BaseContent( shell* pMyShell, - const rtl::OUString& parentName, + const OUString& parentName, sal_Bool bFolder ) : m_pMyShell( pMyShell ), m_xContentIdentifier( 0 ), @@ -97,7 +97,7 @@ BaseContent::BaseContent( shell* pMyShell, BaseContent::BaseContent( shell* pMyShell, const Reference< XContentIdentifier >& xContentIdentifier, - const rtl::OUString& aUncPath ) + const OUString& aUncPath ) : m_pMyShell( pMyShell ), m_xContentIdentifier( xContentIdentifier ), m_aUncPath( aUncPath ), @@ -252,17 +252,17 @@ BaseContent::dispose() // XServiceInfo ////////////////////////////////////////////////////////////////////////////////////////// -rtl::OUString SAL_CALL +OUString SAL_CALL BaseContent::getImplementationName() throw( RuntimeException) { - return rtl::OUString("com.sun.star.comp.ucb.FileContent"); + return OUString("com.sun.star.comp.ucb.FileContent"); } sal_Bool SAL_CALL -BaseContent::supportsService( const rtl::OUString& ServiceName ) +BaseContent::supportsService( const OUString& ServiceName ) throw( RuntimeException) { if ( ServiceName == "com.sun.star.ucb.FileContent" ) @@ -273,12 +273,12 @@ BaseContent::supportsService( const rtl::OUString& ServiceName ) -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL BaseContent::getSupportedServiceNames() throw( RuntimeException ) { - Sequence< rtl::OUString > ret( 1 ); - ret[0] = rtl::OUString("com.sun.star.ucb.FileContent"); + Sequence< OUString > ret( 1 ); + ret[0] = OUString("com.sun.star.ucb.FileContent"); return ret; } @@ -410,12 +410,12 @@ BaseContent::execute( const Command& aCommand, { Sequence< beans::Property > seq(1); seq[0] = beans::Property( - rtl::OUString("CasePreservingURL"), + OUString("CasePreservingURL"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); Reference< sdbc::XRow > xRow = getPropertyValues( CommandId,seq ); - rtl::OUString CasePreservingURL = xRow->getString(1); + OUString CasePreservingURL = xRow->getString(1); if(!xRow->wasNull()) aAny <<= CasePreservingURL; } @@ -443,7 +443,7 @@ BaseContent::execute( const Command& aCommand, void SAL_CALL BaseContent::addPropertiesChangeListener( - const Sequence< rtl::OUString >& PropertyNames, + const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) throw( RuntimeException ) { @@ -457,7 +457,7 @@ BaseContent::addPropertiesChangeListener( if( PropertyNames.getLength() == 0 ) - m_pPropertyListener->addInterface( rtl::OUString(),Listener ); + m_pPropertyListener->addInterface( OUString(),Listener ); else { Reference< beans::XPropertySetInfo > xProp = m_pMyShell->info_p( m_aUncPath ); @@ -469,7 +469,7 @@ BaseContent::addPropertiesChangeListener( void SAL_CALL -BaseContent::removePropertiesChangeListener( const Sequence< rtl::OUString >& PropertyNames, +BaseContent::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) throw( RuntimeException ) { @@ -484,7 +484,7 @@ BaseContent::removePropertiesChangeListener( const Sequence< rtl::OUString >& Pr for( sal_Int32 i = 0; i < PropertyNames.getLength(); ++i ) m_pPropertyListener->removeInterface( PropertyNames[i],Listener ); - m_pPropertyListener->removeInterface( rtl::OUString(), Listener ); + m_pPropertyListener->removeInterface( OUString(), Listener ); } @@ -500,7 +500,7 @@ BaseContent::getIdentifier() } -rtl::OUString SAL_CALL +OUString SAL_CALL BaseContent::getContentType() throw( RuntimeException ) { @@ -519,7 +519,7 @@ BaseContent::getContentType() { // Who am I ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -545,7 +545,7 @@ BaseContent::getContentType() } } - return rtl::OUString(); + return OUString(); } @@ -586,7 +586,7 @@ BaseContent::removeContentEventListener( void SAL_CALL BaseContent::addProperty( - const rtl::OUString& Name, + const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) throw( beans::PropertyExistException, @@ -596,7 +596,7 @@ BaseContent::addProperty( { if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() ) { - throw lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); + throw lang::IllegalArgumentException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); } m_pMyShell->associate( m_aUncPath,Name,DefaultValue,Attributes ); @@ -605,14 +605,14 @@ BaseContent::addProperty( void SAL_CALL BaseContent::removeProperty( - const rtl::OUString& Name ) + const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, RuntimeException) { if( m_nState & Deleted ) - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); m_pMyShell->deassociate( m_aUncPath, Name ); } @@ -656,7 +656,7 @@ BaseContent::createNewContent( try { Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -676,7 +676,7 @@ BaseContent::createNewContent( return Reference< XContent >(); } - rtl::OUString dstUncPath; + OUString dstUncPath; if( IsDocument ) { @@ -730,8 +730,8 @@ BaseContent::getParent( void ) throw( RuntimeException ) { - rtl::OUString ParentUnq = getParentName( m_aUncPath ); - rtl::OUString ParentUrl; + OUString ParentUnq = getParentName( m_aUncPath ); + OUString ParentUrl; sal_Bool err = m_pMyShell->getUrlFromUnq( ParentUnq, ParentUrl ); @@ -759,7 +759,7 @@ BaseContent::setParent( throw( lang::NoSupportException, RuntimeException) { - throw lang::NoSupportException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw lang::NoSupportException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -857,7 +857,7 @@ BaseContent::setPropertyValues( return Sequence< Any >( Values.getLength() ); } - const rtl::OUString Title("Title"); + const OUString Title("Title"); // Special handling for files which have to be inserted if( m_nState & JustInserted ) @@ -866,7 +866,7 @@ BaseContent::setPropertyValues( { if( Values[i].Name == Title ) { - rtl::OUString NewTitle; + OUString NewTitle; if( Values[i].Value >>= NewTitle ) { if ( m_nState & NameForInsertionSet ) @@ -887,7 +887,7 @@ BaseContent::setPropertyValues( "BaseContent::setPropertyValues: " "Invalid URL!" ); - rtl::OUStringBuffer aBuf( + OUStringBuffer aBuf( m_aUncPath.copy( 0, nLastSlash + 1 ) ); if ( !NewTitle.isEmpty() ) @@ -911,7 +911,7 @@ BaseContent::setPropertyValues( // m_aUncPath contains parent's URI. if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 ) - m_aUncPath += rtl::OUString("/"); + m_aUncPath += OUString("/"); m_aUncPath += rtl::Uri::encode( NewTitle, rtl_UriCharClassPchar, @@ -937,22 +937,22 @@ BaseContent::setPropertyValues( if( Values[i].Name != Title ) continue; // handled by setv - rtl::OUString NewTitle; + OUString NewTitle; if( !( Values[i].Value >>= NewTitle ) ) { - ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::IllegalTypeException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); break; } else if( NewTitle.isEmpty() ) { - ret[i] <<= lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); + ret[i] <<= lang::IllegalArgumentException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); break; } - rtl::OUString aDstName = getParentName( m_aUncPath ); + OUString aDstName = getParentName( m_aUncPath ); if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 ) - aDstName += rtl::OUString("/"); + aDstName += OUString("/"); aDstName += rtl::Uri::encode( NewTitle, rtl_UriCharClassPchar, @@ -1092,7 +1092,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, return; } - rtl::OUString srcUnc; + OUString srcUnc; if( m_pMyShell->getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) ) { m_pMyShell->installError( nMyCommandIdentifier, @@ -1100,10 +1100,10 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, return; } - rtl::OUString srcUncPath = srcUnc; + OUString srcUncPath = srcUnc; // Determine the new title ! - rtl::OUString NewTitle; + OUString NewTitle; if( !aTransferInfo.NewTitle.isEmpty() ) NewTitle = rtl::Uri::encode( aTransferInfo.NewTitle, rtl_UriCharClassPchar, @@ -1114,7 +1114,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // Is destination a document or a folder ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -1127,7 +1127,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, return; } - rtl::OUString dstUncPath; + OUString dstUncPath; if( IsDocument ) { // as sibling sal_Int32 lastSlash = m_aUncPath.lastIndexOf( sal_Unicode('/') ); @@ -1137,7 +1137,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // as child dstUncPath = m_aUncPath; - dstUncPath += ( rtl::OUString("/") + NewTitle ); + dstUncPath += ( OUString("/") + NewTitle ); sal_Int32 NameClash = aTransferInfo.NameClash; @@ -1183,7 +1183,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, sal_Bool bDocument = false; Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -1248,7 +1248,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, m_pMyShell->clearError( nMyCommandIdentifier ); m_aUncPath = getParentName( m_aUncPath ); if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 ) - m_aUncPath += rtl::OUString("/"); + m_aUncPath += OUString("/"); m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(), rtl_UriCharClassPchar, @@ -1301,7 +1301,7 @@ BaseContent::cDEL( void ) ContentEventNotifier* -BaseContent::cEXC( const rtl::OUString aNewName ) +BaseContent::cEXC( const OUString aNewName ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1356,7 +1356,7 @@ BaseContent::cPCL( void ) { osl::MutexGuard aGuard( m_aMutex ); - Sequence< rtl::OUString > seqNames; + Sequence< OUString > seqNames; if( m_pPropertyListener ) seqNames = m_pPropertyListener->getContainedTypes(); @@ -1382,7 +1382,7 @@ BaseContent::cPCL( void ) } -rtl::OUString BaseContent::getKey( void ) +OUString BaseContent::getKey( void ) { return m_aUncPath; } diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 76eb79c3d7fe..73aa5cdb278d 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -75,14 +75,14 @@ namespace fileaccess { // A special creator for inserted contents; Creates an ugly object BaseContent( shell* pMyShell, - const rtl::OUString& parentName, + const OUString& parentName, sal_Bool bFolder ); public: BaseContent( shell* pMyShell, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xContentIdentifier, - const rtl::OUString& aUnqPath ); + const OUString& aUnqPath ); virtual ~BaseContent(); @@ -125,15 +125,15 @@ namespace fileaccess { // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) 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 ); @@ -165,7 +165,7 @@ namespace fileaccess { void ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType( void ) throw( com::sun::star::uno::RuntimeException ); @@ -184,13 +184,13 @@ namespace fileaccess { virtual void SAL_CALL addPropertiesChangeListener( - const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames, + const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertiesChangeListener( const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames, + removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw( com::sun::star::uno::RuntimeException ); @@ -199,7 +199,7 @@ namespace fileaccess { virtual void SAL_CALL addProperty( - const rtl::OUString& Name, + const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -209,7 +209,7 @@ namespace fileaccess { virtual void SAL_CALL removeProperty( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -257,17 +257,17 @@ namespace fileaccess { // Notifier ContentEventNotifier* cDEL( void ); - ContentEventNotifier* cEXC( const rtl::OUString aNewName ); + ContentEventNotifier* cEXC( const OUString aNewName ); ContentEventNotifier* cCEL( void ); PropertySetInfoChangeNotifier* cPSL( void ); PropertyChangeNotifier* cPCL( void ); - rtl::OUString getKey( void ); + OUString getKey( void ); private: // Data members shell* m_pMyShell; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xContentIdentifier; - rtl::OUString m_aUncPath; + OUString m_aUncPath; enum state { NameForInsertionSet = 1, JustInserted = 2, diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index c0017176b780..2d96f2de05aa 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -79,7 +79,7 @@ XCommandInfo_impl::getCommands( CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( UnsupportedCommandException, uno::RuntimeException) { @@ -107,7 +107,7 @@ XCommandInfo_impl::getCommandInfoByHandle( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( uno::RuntimeException ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index e06ea9c3c10f..52df9ab8b7c9 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -68,7 +68,7 @@ namespace fileaccess { virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, com::sun::star::uno::RuntimeException); @@ -80,7 +80,7 @@ namespace fileaccess { virtual sal_Bool SAL_CALL hasCommandByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index acf69f2f6857..c3f22b6a2f01 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -58,10 +58,10 @@ using namespace com::sun::star::ucb; namespace { Sequence< Any > generateErrorArguments( - rtl::OUString const & rPhysicalUrl) + OUString const & rPhysicalUrl) { - rtl::OUString aResourceName; - rtl::OUString aResourceType; + OUString aResourceName; + OUString aResourceType; sal_Bool bRemovable; bool bResourceName = false; bool bResourceType = false; @@ -85,13 +85,13 @@ namespace { switch (aStatus.getFileType()) { case osl::FileStatus::Directory: - aResourceType = rtl::OUString( "folder"); + aResourceType = OUString( "folder"); bResourceType = true; break; case osl::FileStatus::Volume: { - aResourceType = rtl::OUString( "volume"); + aResourceType = OUString( "volume"); bResourceType = true; osl::VolumeInfo aVolumeInfo( osl_VolumeInfo_Mask_Attributes ); @@ -121,25 +121,25 @@ namespace { (bRemoveProperty ? 1 : 0) ); sal_Int32 i = 0; aArguments[i++] - <<= PropertyValue(rtl::OUString( "Uri"), + <<= PropertyValue(OUString( "Uri"), -1, makeAny(rPhysicalUrl), PropertyState_DIRECT_VALUE); if (bResourceName) aArguments[i++] - <<= PropertyValue(rtl::OUString( "ResourceName"), + <<= PropertyValue(OUString( "ResourceName"), -1, makeAny(aResourceName), PropertyState_DIRECT_VALUE); if (bResourceType) aArguments[i++] - <<= PropertyValue(rtl::OUString( "ResourceType"), + <<= PropertyValue(OUString( "ResourceType"), -1, makeAny(aResourceType), PropertyState_DIRECT_VALUE); if (bRemoveProperty) aArguments[i++] - <<= PropertyValue(rtl::OUString( "Removable"), + <<= PropertyValue(OUString( "Removable"), -1, makeAny(bRemovable), PropertyState_DIRECT_VALUE); @@ -153,8 +153,8 @@ namespace { namespace fileaccess { - sal_Bool isChild( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath ) + sal_Bool isChild( const OUString& srcUnqPath, + const OUString& dstUnqPath ) { static sal_Unicode slash = '/'; // Simple lexical comparison @@ -173,20 +173,20 @@ namespace fileaccess { } - rtl::OUString newName( - const rtl::OUString& aNewPrefix, - const rtl::OUString& aOldPrefix, - const rtl::OUString& old_Name ) + OUString newName( + const OUString& aNewPrefix, + const OUString& aOldPrefix, + const OUString& old_Name ) { sal_Int32 srcL = aOldPrefix.getLength(); - rtl::OUString new_Name = old_Name.copy( srcL ); + OUString new_Name = old_Name.copy( srcL ); new_Name = ( aNewPrefix + new_Name ); return new_Name; } - rtl::OUString getTitle( const rtl::OUString& aPath ) + OUString getTitle( const OUString& aPath ) { sal_Unicode slash = '/'; sal_Int32 lastIndex = aPath.lastIndexOf( slash ); @@ -194,23 +194,23 @@ namespace fileaccess { } - rtl::OUString getParentName( const rtl::OUString& aFileName ) + OUString getParentName( const OUString& aFileName ) { sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') ); - rtl::OUString aParent = aFileName.copy( 0,lastIndex ); + OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 ) - aParent += rtl::OUString("/"); + aParent += OUString("/"); if ( aParent == "file://" ) - aParent = rtl::OUString("file:///"); + aParent = OUString("file:///"); return aParent; } - osl::FileBase::RC osl_File_copy( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + osl::FileBase::RC osl_File_copy( const OUString& strPath, + const OUString& strDestPath, sal_Bool test ) { if( test ) @@ -224,8 +224,8 @@ namespace fileaccess { } - osl::FileBase::RC osl_File_move( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + osl::FileBase::RC osl_File_move( const OUString& strPath, + const OUString& strDestPath, sal_Bool test ) { if( test ) @@ -242,7 +242,7 @@ namespace fileaccess { sal_Int32 errorCode, sal_Int32 minorCode, const Reference< XCommandEnvironment >& xEnv, - const rtl::OUString& aUncPath, + const OUString& aUncPath, BaseContent* pContent, bool isHandled ) { @@ -252,7 +252,7 @@ namespace fileaccess { if( errorCode == TASKHANDLER_UNSUPPORTED_COMMAND ) { - aAny <<= UnsupportedCommandException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + aAny <<= UnsupportedCommandException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); cancelCommandExecution( aAny,xEnv ); } else if( errorCode == TASKHANDLING_WRONG_SETPROPERTYVALUES_ARGUMENT || @@ -368,7 +368,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred during file opening"), + OUString( "an error occurred during file opening"), xComProc); } else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING || @@ -421,7 +421,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred during opening a directory"), + OUString( "an error occurred during opening a directory"), xComProc); } else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE || @@ -436,7 +436,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred writing or reading from a file"), + OUString( "an error occurred writing or reading from a file"), xComProc ); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ) @@ -446,7 +446,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "device full"), + OUString( "device full"), xComProc); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_WRITE || @@ -498,20 +498,20 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred during opening a file"), + OUString( "an error occurred during opening a file"), xComProc); } else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND || errorCode == TASKHANDLING_NOCONTENTTYPE_INSERT_COMMAND ) { - Sequence< ::rtl::OUString > aSeq( 1 ); + Sequence< OUString > aSeq( 1 ); aSeq[0] = ( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ) ? - rtl::OUString("Title") : - rtl::OUString("ContentType"); + OUString("Title") : + OUString("ContentType"); aAny <<= MissingPropertiesException( - rtl::OUString( "a property is missing necessary" + OUString( "a property is missing necessary" "to create a content"), xComProc, aSeq); @@ -536,7 +536,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "there were problems with the filesize"), + OUString( "there were problems with the filesize"), xComProc); } else if(errorCode == TASKHANDLING_INPUTSTREAM_FOR_WRITE) @@ -544,7 +544,7 @@ namespace fileaccess { Reference<XInterface> xContext(xComProc,UNO_QUERY); aAny <<= MissingInputStreamException( - rtl::OUString( "the inputstream is missing necessary" + OUString( "the inputstream is missing necessary" "to create a content"), xContext); cancelCommandExecution(aAny,xEnv); @@ -557,7 +557,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference<XInterface> xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "file exists and overwrite forbidden"); + excep.Message = OUString( "file exists and overwrite forbidden"); aAny <<= excep; cancelCommandExecution( aAny,xEnv ); } @@ -566,9 +566,9 @@ namespace fileaccess { InteractiveAugmentedIOException excep; excep.Code = IOErrorCode_INVALID_CHARACTER; PropertyValue prop; - prop.Name = rtl::OUString("ResourceName"); + prop.Name = OUString("ResourceName"); prop.Handle = -1; - rtl::OUString m_aClashingName( + OUString m_aClashingName( rtl::Uri::decode( getTitle(aUncPath), rtl_UriDecodeWithCharset, @@ -580,7 +580,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference<XInterface> xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "the name contained invalid characters"); + excep.Message = OUString( "the name contained invalid characters"); if(isHandled) throw excep; else { @@ -592,7 +592,7 @@ namespace fileaccess { // ioErrorCode, // generateErrorArguments(aUncPath), // xEnv, -// rtl::OUString( "the name contained invalid characters"), +// OUString( "the name contained invalid characters"), // xComProc ); } else if( errorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR ) @@ -602,7 +602,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference<XInterface> xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "folder exists and overwrite forbidden"); + excep.Message = OUString( "folder exists and overwrite forbidden"); if(isHandled) throw excep; else { @@ -614,7 +614,7 @@ namespace fileaccess { // ioErrorCode, // generateErrorArguments(aUncPath), // xEnv, -// rtl::OUString( "the folder exists"), +// OUString( "the folder exists"), // xComProc ); } else if( errorCode == TASKHANDLING_ENSUREDIR_FOR_WRITE || @@ -640,7 +640,7 @@ namespace fileaccess { generateErrorArguments(getParentName(aUncPath)), //TODO! ok to supply physical URL to getParentName()? xEnv, - rtl::OUString( "a folder could not be created"), + OUString( "a folder could not be created"), xComProc ); } else if( errorCode == TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE || @@ -691,7 +691,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "a file status object could not be filled"), + OUString( "a file status object could not be filled"), xComProc ); } else if( errorCode == TASKHANDLING_DELETEFILE_FOR_REMOVE || @@ -738,7 +738,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "a file or directory could not be deleted"), + OUString( "a file or directory could not be deleted"), xComProc ); } else if( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE || @@ -750,7 +750,7 @@ namespace fileaccess { errorCode == TASKHANDLING_DIRECTORYEXHAUSTED_FOR_REMOVE || errorCode == TASKHANDLING_TRANSFER_INVALIDURL ) { - rtl::OUString aMsg; + OUString aMsg; switch( minorCode ) { case FileBase::E_NOENT: // No such file or directory @@ -760,18 +760,18 @@ namespace fileaccess { errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT ) { ioErrorCode = IOErrorCode_NOT_EXISTING; - aMsg = rtl::OUString( "source file/folder does not exist"); + aMsg = OUString( "source file/folder does not exist"); break; } else { ioErrorCode = IOErrorCode_GENERAL; - aMsg = rtl::OUString( "a general error during transfer command"); + aMsg = OUString( "a general error during transfer command"); break; } default: ioErrorCode = IOErrorCode_GENERAL; - aMsg = rtl::OUString( "a general error during transfer command"); + aMsg = OUString( "a general error during transfer command"); break; } cancelCommandExecution( @@ -788,7 +788,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "accessing the root during transfer"), + OUString( "accessing the root during transfer"), xComProc ); } else if( errorCode == TASKHANDLING_TRANSFER_INVALIDSCHEME ) @@ -797,7 +797,7 @@ namespace fileaccess { aAny <<= InteractiveBadTransferURLException( - rtl::OUString( "bad tranfer url"), + OUString( "bad tranfer url"), xContext); cancelCommandExecution( aAny,xEnv ); } @@ -812,7 +812,7 @@ namespace fileaccess { errorCode == TASKHANDLING_RENAMEMOVE_FOR_MOVE || errorCode == TASKHANDLING_RENAMEMOVE_FOR_COPY ) { - rtl::OUString aMsg( + OUString aMsg( "general error during transfer"); switch( minorCode ) @@ -837,7 +837,7 @@ namespace fileaccess { break; case FileBase::E_NOENT: // No such file or directory ioErrorCode = IOErrorCode_NOT_EXISTING; - aMsg = rtl::OUString( "file/folder does not exist"); + aMsg = OUString( "file/folder does not exist"); break; case FileBase::E_ROFS: // Read-only file system<p> ioErrorCode = IOErrorCode_NOT_EXISTING; @@ -861,7 +861,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference<XInterface> xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "name clash during copy or move"); + excep.Message = OUString( "name clash during copy or move"); aAny <<= excep; cancelCommandExecution(aAny,xEnv); @@ -874,7 +874,7 @@ namespace fileaccess { UnsupportedNameClashException excep; excep.NameClash = minorCode; excep.Context = xContext; - excep.Message = rtl::OUString( "name clash value not supported during copy or move"); + excep.Message = OUString( "name clash value not supported during copy or move"); aAny <<= excep; cancelCommandExecution(aAny,xEnv); diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx index 1ca87b410f9a..fbb6d8b266e3 100644 --- a/ucb/source/ucp/file/filglob.hxx +++ b/ucb/source/ucp/file/filglob.hxx @@ -30,7 +30,7 @@ namespace fileaccess { struct equalOUString { - bool operator()( const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const + bool operator()( const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -39,7 +39,7 @@ namespace fileaccess { struct hashOUString { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -55,22 +55,22 @@ namespace fileaccess { // Returns true if dstUnqPath is a child from srcUnqPath or both are equal - extern sal_Bool isChild( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath ); + extern sal_Bool isChild( const OUString& srcUnqPath, + const OUString& dstUnqPath ); // Changes the prefix in name - extern rtl::OUString newName( const rtl::OUString& aNewPrefix, - const rtl::OUString& aOldPrefix, - const rtl::OUString& old_Name ); + extern OUString newName( const OUString& aNewPrefix, + const OUString& aOldPrefix, + const OUString& old_Name ); // returns the last part of the given url as title - extern rtl::OUString getTitle( const rtl::OUString& aPath ); + extern OUString getTitle( const OUString& aPath ); // returns the url without last part as parentname // In case aFileName is root ( file:/// ) root is returned - extern rtl::OUString getParentName( const rtl::OUString& aFileName ); + extern OUString getParentName( const OUString& aFileName ); /** * special copy: @@ -79,8 +79,8 @@ namespace fileaccess { * osl::File::copy copies unchecked. */ - extern osl::FileBase::RC osl_File_copy( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + extern osl::FileBase::RC osl_File_copy( const OUString& strPath, + const OUString& strDestPath, sal_Bool test = false ); /** @@ -90,8 +90,8 @@ namespace fileaccess { * osl::File::move moves unchecked */ - extern osl::FileBase::RC osl_File_move( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + extern osl::FileBase::RC osl_File_move( const OUString& strPath, + const OUString& strDestPath, sal_Bool test = false ); // This function implements the global exception handler of the file_ucp; @@ -101,7 +101,7 @@ namespace fileaccess { sal_Int32 minorCode, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv, - const rtl::OUString& aUncPath, + const OUString& aUncPath, BaseContent* pContent, bool isHandled = false); // the physical URL of the object diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 0f234ca5899e..0fc415babb04 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::ucb; FileContentIdentifier::FileContentIdentifier( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool IsNormalized ) : m_pMyShell( pMyShell ) { @@ -118,7 +118,7 @@ FileContentIdentifier::getTypes( } -rtl::OUString +OUString SAL_CALL FileContentIdentifier::getContentIdentifier( void ) @@ -128,7 +128,7 @@ FileContentIdentifier::getContentIdentifier( } -rtl::OUString SAL_CALL +OUString SAL_CALL FileContentIdentifier::getContentProviderScheme( void ) throw( uno::RuntimeException ) diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index d884c4f9a9b9..febe3e61a609 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -37,7 +37,7 @@ namespace fileaccess { // This implementation has to be reworked public: FileContentIdentifier( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool IsNormalized = true ); virtual ~FileContentIdentifier(); @@ -70,21 +70,21 @@ namespace fileaccess { throw( com::sun::star::uno::RuntimeException ); // XContentIdentifier - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentIdentifier( void ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentProviderScheme( void ) throw( com::sun::star::uno::RuntimeException ); private: shell* m_pMyShell; - rtl::OUString m_aContentId; // The URL string - rtl::OUString m_aNormalizedId; // The somehow normalized string - rtl::OUString m_aProviderScheme; + OUString m_aContentId; // The URL string + OUString m_aNormalizedId; // The somehow normalized string + OUString m_aProviderScheme; }; } // end namespace fileaccess diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 94172d776caf..bc48d8a567d7 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star::ucb; -XInputStream_impl::XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ) +XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ) : m_xProvider( pMyShell->m_pProvider ), m_aFile( aUncPath ), m_nErrorCode( TASKHANDLER_NO_ERROR ), diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 62ceaf06e12e..55514b68c8fb 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -45,7 +45,7 @@ namespace fileaccess { { public: - XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ); + XInputStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ); virtual ~XInputStream_impl(); diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index ef2e2cafc5aa..c9629d45ab01 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -117,7 +117,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionAbortImpl, XInteractionRequestImpl::XInteractionRequestImpl( - const rtl::OUString& aClashingName, + const OUString& aClashingName, const Reference<XInterface>& xOrigin, shell *pShell,sal_Int32 CommandId) : p1( new XInteractionSupplyNameImpl ), @@ -186,7 +186,7 @@ XInteractionRequestImpl::getRequest() excep.Name = m_aClashingName; excep.Classification = InteractionClassification_ERROR; excep.Context = m_xOrigin; - excep.Message = rtl::OUString( "folder exists and overwritte forbidden"); + excep.Message = OUString( "folder exists and overwritte forbidden"); aAny <<= excep; } else if(m_nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) @@ -194,7 +194,7 @@ XInteractionRequestImpl::getRequest() InteractiveAugmentedIOException excep; excep.Code = IOErrorCode_INVALID_CHARACTER; PropertyValue prop; - prop.Name = rtl::OUString("ResourceName"); + prop.Name = OUString("ResourceName"); prop.Handle = -1; prop.Value <<= m_aClashingName; Sequence<Any> seq(1); @@ -202,7 +202,7 @@ XInteractionRequestImpl::getRequest() excep.Arguments = seq; excep.Classification = InteractionClassification_ERROR; excep.Context = m_xOrigin; - excep.Message = rtl::OUString( "the name contained invalid characters"); + excep.Message = OUString( "the name contained invalid characters"); aAny <<= excep; } diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index d73d59b84842..fb00e5ff22ec 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -76,13 +76,13 @@ namespace fileaccess { m_bSelected = true; } - void SAL_CALL setName(const ::rtl::OUString& Name) + void SAL_CALL setName(const OUString& Name) throw(::com::sun::star::uno::RuntimeException) { m_aNewName = Name; } - rtl::OUString getName() const + OUString getName() const { return m_aNewName; } @@ -95,7 +95,7 @@ namespace fileaccess { private: bool m_bSelected; - rtl::OUString m_aNewName; + OUString m_aNewName; }; @@ -160,7 +160,7 @@ namespace fileaccess { public: XInteractionRequestImpl( - const rtl::OUString& aClashingName, + const OUString& aClashingName, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xOrigin, shell* pShell, @@ -203,12 +203,12 @@ namespace fileaccess { return p2->isSelected(); } - rtl::OUString newName() const + OUString newName() const { if( p1->isSelected() ) return p1->getName(); else - return rtl::OUString(); + return OUString(); } private: @@ -221,7 +221,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > m_aSeq; - rtl::OUString m_aClashingName; + OUString m_aClashingName; com::sun::star::uno::Reference< com::sun::star::uno::XInterface> m_xOrigin; }; diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index 7fe9456133bd..1f38d42cfb7b 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -59,7 +59,7 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell, -void ContentEventNotifier::notifyChildInserted( const rtl::OUString& aChildName ) +void ContentEventNotifier::notifyChildInserted( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,aChildName ); uno::Reference< XContentIdentifier > xChildId( p ); @@ -98,7 +98,7 @@ void ContentEventNotifier::notifyDeleted( void ) -void ContentEventNotifier::notifyRemoved( const rtl::OUString& aChildName ) +void ContentEventNotifier::notifyRemoved( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,aChildName ); uno::Reference< XContentIdentifier > xChildId( p ); @@ -160,7 +160,7 @@ PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier( void SAL_CALL -PropertySetInfoChangeNotifier::notifyPropertyAdded( const rtl::OUString & aPropertyName ) +PropertySetInfoChangeNotifier::notifyPropertyAdded( const OUString & aPropertyName ) { beans::PropertySetInfoChangeEvent aEvt( m_xCreatorContent, aPropertyName, @@ -177,7 +177,7 @@ PropertySetInfoChangeNotifier::notifyPropertyAdded( const rtl::OUString & aPrope void SAL_CALL -PropertySetInfoChangeNotifier::notifyPropertyRemoved( const rtl::OUString & aPropertyName ) +PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aPropertyName ) { beans::PropertySetInfoChangeEvent aEvt( m_xCreatorContent, aPropertyName, @@ -227,7 +227,7 @@ void PropertyChangeNotifier::notifyPropertyChanged( // notify listeners for all Events - uno::Sequence< uno::Reference< uno::XInterface > > seqList = (*m_pListeners)[ rtl::OUString() ]; + uno::Sequence< uno::Reference< uno::XInterface > > seqList = (*m_pListeners)[ OUString() ]; for( j = 0; j < seqList.getLength(); ++j ) { uno::Reference< beans::XPropertiesChangeListener > aListener( seqList[j],uno::UNO_QUERY ); diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index ee6a2467b5ee..8bb76d1536a9 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -56,9 +56,9 @@ namespace fileaccess { const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); - void notifyChildInserted( const rtl::OUString& aChildName ); + void notifyChildInserted( const OUString& aChildName ); void notifyDeleted( void ); - void notifyRemoved( const rtl::OUString& aChildName ); + void notifyRemoved( const OUString& aChildName ); void notifyExchanged( ); }; @@ -76,12 +76,12 @@ namespace fileaccess { const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); - void SAL_CALL notifyPropertyAdded( const rtl::OUString & aPropertyName ); - void SAL_CALL notifyPropertyRemoved( const rtl::OUString & aPropertyName ); + void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); + void SAL_CALL notifyPropertyRemoved( const OUString & aPropertyName ); }; - typedef boost::unordered_map< rtl::OUString, + typedef boost::unordered_map< OUString, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, hashOUString, equalOUString > ListenerMap; @@ -109,13 +109,13 @@ namespace fileaccess { { public: // Side effect of this function is the change of the name - virtual ContentEventNotifier* cEXC( const rtl::OUString aNewName ) = 0; + virtual ContentEventNotifier* cEXC( const OUString aNewName ) = 0; // Side effect is the change of the state of the object to "deleted". virtual ContentEventNotifier* cDEL( void ) = 0; virtual ContentEventNotifier* cCEL( void ) = 0; virtual PropertySetInfoChangeNotifier* cPSL( void ) = 0; virtual PropertyChangeNotifier* cPCL( void ) = 0; - virtual rtl::OUString getKey( void ) = 0; + virtual OUString getKey( void ) = 0; protected: ~Notifier() {} diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index f107b83bf409..5b79d5a8b112 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::ucb; #include "filinl.hxx" -XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const rtl::OUString& aUnqPath ) +XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ) : m_pMyShell( pMyShell ), m_xProvider( pMyShell->m_pProvider ), m_count( 0 ), @@ -109,7 +109,7 @@ XPropertySetInfo_impl::queryInterface( beans::Property SAL_CALL XPropertySetInfo_impl::getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( beans::UnknownPropertyException, RuntimeException) { @@ -132,7 +132,7 @@ XPropertySetInfo_impl::getProperties( sal_Bool SAL_CALL XPropertySetInfo_impl::hasPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( RuntimeException ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index 44e7c5f674cc..fca4ce9a5921 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -36,7 +36,7 @@ namespace fileaccess { public com::sun::star::beans::XPropertySetInfo { public: - XPropertySetInfo_impl( shell* pMyShell,const rtl::OUString& aUnqPath ); + XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ); XPropertySetInfo_impl( shell* pMyShell,const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq ); virtual ~XPropertySetInfo_impl(); @@ -69,12 +69,12 @@ namespace fileaccess { virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); private: diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx index 53cd3a34ee5d..5a565c13cb41 100644 --- a/ucb/source/ucp/file/filrec.hxx +++ b/ucb/source/ucp/file/filrec.hxx @@ -39,7 +39,7 @@ class ReconnectingFile public: - ReconnectingFile( const ::rtl::OUString& aFileURL ) + ReconnectingFile( const OUString& aFileURL ) : m_aFile( aFileURL ) , m_nFlags( 0 ) , m_bFlagsSet( sal_False ) diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 8342985c45cb..282b7685558b 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -127,17 +127,17 @@ XRow_impl::wasNull( } -rtl::OUString SAL_CALL +OUString SAL_CALL XRow_impl::getString( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); - rtl::OUString Value; + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); + OUString Value; osl::MutexGuard aGuard( m_aMutex ); - m_nWasNull = ::convert<rtl::OUString>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); + m_nWasNull = ::convert<OUString>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); return Value; } @@ -148,7 +148,7 @@ XRow_impl::getBoolean( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Bool Value( false ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<sal_Bool>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -163,7 +163,7 @@ XRow_impl::getByte( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int8 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<sal_Int8>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -177,7 +177,7 @@ XRow_impl::getShort( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int16 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<sal_Int16>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -192,7 +192,7 @@ XRow_impl::getInt( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int32 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<sal_Int32>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -206,7 +206,7 @@ XRow_impl::getLong( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int64 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<sal_Int64>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -220,7 +220,7 @@ XRow_impl::getFloat( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); float Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<float>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -234,7 +234,7 @@ XRow_impl::getDouble( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); double Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<double>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -248,7 +248,7 @@ XRow_impl::getBytes( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Sequence< sal_Int8 > Value(0); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Sequence< sal_Int8 > >( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -262,7 +262,7 @@ XRow_impl::getDate( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); util::Date Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<util::Date>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -276,7 +276,7 @@ XRow_impl::getTime( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); util::Time Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<util::Time>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -290,7 +290,7 @@ XRow_impl::getTimestamp( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); util::DateTime Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<util::DateTime>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -305,7 +305,7 @@ XRow_impl::getBinaryStream( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< io::XInputStream > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Reference< io::XInputStream > >( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -320,7 +320,7 @@ XRow_impl::getCharacterStream( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< io::XInputStream > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert< uno::Reference< io::XInputStream> >( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -336,7 +336,7 @@ XRow_impl::getObject( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Any Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Any>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -350,7 +350,7 @@ XRow_impl::getRef( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XRef > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Reference< sdbc::XRef> >( m_pMyShell, @@ -367,7 +367,7 @@ XRow_impl::getBlob( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XBlob > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Reference< sdbc::XBlob> >( m_pMyShell, @@ -384,7 +384,7 @@ XRow_impl::getClob( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XClob > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Reference< sdbc::XClob> >( m_pMyShell, @@ -402,7 +402,7 @@ XRow_impl::getArray( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XArray > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert<uno::Reference< sdbc::XArray> >( m_pMyShell, diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 9c160110c4ef..d5b4ba093f37 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -66,7 +66,7 @@ namespace fileaccess { throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 124e58b85b27..315fe9c3e4ea 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; XResultSet_impl::XResultSet_impl( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 OpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) @@ -226,7 +226,7 @@ void XResultSet_impl::rowCountChanged() aOldValue = aNewValue-1; } beans::PropertyChangeEvent aEv; - aEv.PropertyName = rtl::OUString("RowCount"); + aEv.PropertyName = OUString("RowCount"); aEv.Further = false; aEv.PropertyHandle = -1; aEv.OldValue <<= aOldValue; @@ -251,7 +251,7 @@ void XResultSet_impl::isFinalChanged() m_bRowCountFinal = true; } beans::PropertyChangeEvent aEv; - aEv.PropertyName = rtl::OUString("IsRowCountFinal"); + aEv.PropertyName = OUString("IsRowCountFinal"); aEv.Further = false; aEv.PropertyHandle = -1; sal_Bool fval = false; @@ -279,7 +279,7 @@ XResultSet_impl::OneMore( osl::FileBase::RC err; sal_Bool IsRegular; - rtl::OUString aUnqPath; + OUString aUnqPath; osl::DirectoryItem m_aDirIte; uno::Reference< sdbc::XRow > aRow; @@ -340,7 +340,7 @@ XResultSet_impl::OneMore( } else // error fetching anything { - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); } } } @@ -498,7 +498,7 @@ XResultSet_impl::relative( uno::RuntimeException) { if( isAfterLast() || isBeforeFirst() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); if( row > 0 ) while( row-- ) next(); else if( row < 0 ) @@ -591,7 +591,7 @@ XResultSet_impl::close( -rtl::OUString SAL_CALL +OUString SAL_CALL XResultSet_impl::queryContentIdentifierString( void ) throw( uno::RuntimeException ) @@ -602,7 +602,7 @@ XResultSet_impl::queryContentIdentifierString( if( xContentId.is() ) return xContentId->getContentIdentifier(); else - return rtl::OUString(); + return OUString(); } @@ -650,7 +650,7 @@ XResultSet_impl::getStaticResultSet() osl::MutexGuard aGuard( m_aMutex ); if ( m_xListener.is() ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); return uno::Reference< sdbc::XResultSet >( this ); } @@ -666,7 +666,7 @@ XResultSet_impl::setListener( osl::ClearableMutexGuard aGuard( m_aMutex ); if ( m_xListener.is() ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); m_xListener = Listener; @@ -706,9 +706,9 @@ XResultSet_impl::connectToCache( uno::RuntimeException ) { if( m_xListener.is() ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); if( m_bStatic ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); uno::Reference< ucb::XSourceInitialization > xTarget( xCache, uno::UNO_QUERY ); @@ -732,7 +732,7 @@ XResultSet_impl::connectToCache( return; } } - throw ucb::ServiceNotFoundException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ServiceNotFoundException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } //========================================================================= @@ -788,12 +788,12 @@ XResultSet_impl::getPropertySetInfo() { uno::Sequence< beans::Property > seq(2); - seq[0].Name = rtl::OUString("RowCount"); + seq[0].Name = OUString("RowCount"); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; - seq[0].Name = rtl::OUString("IsRowCountFinal"); + seq[0].Name = OUString("IsRowCountFinal"); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; @@ -806,33 +806,33 @@ XResultSet_impl::getPropertySetInfo() void SAL_CALL XResultSet_impl::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& ) + const OUString& aPropertyName, const uno::Any& ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") || - aPropertyName == rtl::OUString("RowCount") ) + if( aPropertyName == OUString("IsRowCountFinal") || + aPropertyName == OUString("RowCount") ) return; - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL XResultSet_impl::getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == rtl::OUString("IsRowCountFinal") ) + if( PropertyName == OUString("IsRowCountFinal") ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == rtl::OUString("RowCount") ) + else if ( PropertyName == OUString("RowCount") ) { uno::Any aAny; sal_Int32 count = sal::static_int_cast<sal_Int32>(m_aItems.size()); @@ -840,18 +840,18 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue( return aAny; } else - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL XResultSet_impl::addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") ) + if( aPropertyName == OUString("IsRowCountFinal") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -860,7 +860,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") ) + else if ( aPropertyName == OUString("RowCount") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -869,24 +869,24 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( m_pRowCountListeners->addInterface( xListener ); } else - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL XResultSet_impl::removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") && + if( aPropertyName == OUString("IsRowCountFinal") && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") && + else if ( aPropertyName == OUString("RowCount") && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); @@ -894,11 +894,11 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener( m_pRowCountListeners->removeInterface( aListener ); } else - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL XResultSet_impl::addVetoableChangeListener( - const rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -908,7 +908,7 @@ void SAL_CALL XResultSet_impl::addVetoableChangeListener( void SAL_CALL XResultSet_impl::removeVetoableChangeListener( - const rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index a15600c1b2ae..67519c0ce666 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -62,7 +62,7 @@ namespace fileaccess { public: XResultSet_impl( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 OpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort ); @@ -74,7 +74,7 @@ namespace fileaccess { return 0; } - virtual ContentEventNotifier* cEXC( const rtl::OUString ) + virtual ContentEventNotifier* cEXC( const OUString ) { return 0; } @@ -94,7 +94,7 @@ namespace fileaccess { return 0; } - virtual rtl::OUString getKey( void ) + virtual OUString getKey( void ) { return m_aBaseDirectory; } @@ -160,7 +160,7 @@ namespace fileaccess { return m_nWasNull; } - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, @@ -169,7 +169,7 @@ namespace fileaccess { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); else - return rtl::OUString(); + return OUString(); } virtual sal_Bool SAL_CALL @@ -540,7 +540,7 @@ namespace fileaccess { // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString( void ) throw( com::sun::star::uno::RuntimeException ); @@ -569,7 +569,7 @@ namespace fileaccess { throw( com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -579,14 +579,14 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -594,7 +594,7 @@ namespace fileaccess { virtual void SAL_CALL removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -602,14 +602,14 @@ namespace fileaccess { virtual void SAL_CALL addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -631,12 +631,12 @@ namespace fileaccess { typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; - typedef std::vector< rtl::OUString > UnqPathSet; + typedef std::vector< OUString > UnqPathSet; IdentSet m_aIdents; ItemSet m_aItems; UnqPathSet m_aUnqPath; - const rtl::OUString m_aBaseDirectory; + const OUString m_aBaseDirectory; osl::Directory m_aFolder; com::sun::star::uno::Sequence< com::sun::star::beans::Property > m_sProperty; diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index e9d0553f249e..42f654bb6d78 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -89,7 +89,7 @@ XTYPEPROVIDER_IMPL_7( XStream_impl, -XStream_impl::XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ) +XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ) : m_bInputStreamCalled( false ), m_bOutputStreamCalled( false ), m_pMyShell( pMyShell ), @@ -175,10 +175,10 @@ void SAL_CALL XStream_impl::truncate(void) throw( io::IOException, uno::RuntimeException ) { if (osl::FileBase::E_None != m_aFile.setSize(0)) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0))) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -197,7 +197,7 @@ XStream_impl::readBytes( uno::RuntimeException) { if( ! m_nIsOpen ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); sal_Int8 * buffer; try @@ -207,7 +207,7 @@ XStream_impl::readBytes( catch (const std::bad_alloc&) { if( m_nIsOpen ) m_aFile.close(); - throw io::BufferSizeExceededException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::BufferSizeExceededException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } sal_uInt64 nrc(0); @@ -215,7 +215,7 @@ XStream_impl::readBytes( != osl::FileBase::E_None) { delete[] buffer; - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } aData = uno::Sequence< sal_Int8 > ( buffer, (sal_uInt32)nrc ); delete[] buffer; @@ -273,7 +273,7 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) const sal_Int8* p = aData.getConstArray(); if(osl::FileBase::E_None != m_aFile.write(((void*)(p)),sal_uInt64(length),nWrittenBytes) || nWrittenBytes != length ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } } @@ -291,7 +291,7 @@ XStream_impl::closeStream( if( err != osl::FileBase::E_None ) { io::IOException ex; - ex.Message = rtl::OUString( "could not close file"); + ex.Message = OUString( "could not close file"); throw ex; } @@ -337,9 +337,9 @@ XStream_impl::seek( uno::RuntimeException ) { if( location < 0 ) - throw lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); + throw lang::IllegalArgumentException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -351,7 +351,7 @@ XStream_impl::getPosition( { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); return sal_Int64( uPos ); } @@ -363,7 +363,7 @@ XStream_impl::getLength( { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); else return sal_Int64( uEndPos ); } @@ -384,7 +384,7 @@ void XStream_impl::waitForCompletion() // afterwards, there appears to be no cheaper way than to call fsync: if (m_nIsOpen && m_aFile.sync() != osl::FileBase::E_None) { throw io::IOException( - rtl::OUString( "could not synchronize file to disc"), + OUString( "could not synchronize file to disc"), static_cast< OWeakObject * >(this)); } } diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index b44769c38998..78fc1530cbdb 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -53,7 +53,7 @@ namespace fileaccess { public: - XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ); + XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ); /** * Returns an error code as given by filerror.hxx diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 3650cc1c4f0f..97a690484b7e 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -68,7 +68,7 @@ TaskManager::startTask( void SAL_CALL TaskManager::endTask( sal_Int32 CommandId, - const rtl::OUString& aUncPath, + const OUString& aUncPath, BaseContent* pContent) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 4053583a01a9..f68a276a80de 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -185,7 +185,7 @@ namespace fileaccess void SAL_CALL endTask( sal_Int32 CommandId, // the physical URL of the object - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, BaseContent* pContent); diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 4e4b6cf832e0..ee414b9bb960 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -150,7 +150,7 @@ FileProvider::initialize( throw (Exception, RuntimeException) { if( ! m_pMyShell ) { - rtl::OUString config; + OUString config; if( aArguments.getLength() > 0 && (aArguments[0] >>= config) && config.compareToAscii("NoConfig") == 0 ) @@ -179,7 +179,7 @@ XTYPEPROVIDER_IMPL_7( FileProvider, //////////////////////////////////////////////////////////////////////////////// // XServiceInfo methods. -rtl::OUString SAL_CALL +OUString SAL_CALL FileProvider::getImplementationName() throw( RuntimeException ) { @@ -189,14 +189,14 @@ FileProvider::getImplementationName() sal_Bool SAL_CALL FileProvider::supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw( RuntimeException ) { - return ServiceName == rtl::OUString("com.sun.star.ucb.FileContentProvider"); + return ServiceName == OUString("com.sun.star.ucb.FileContentProvider"); } -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL FileProvider::getSupportedServiceNames( void ) throw( RuntimeException ) @@ -227,10 +227,10 @@ FileProvider::createServiceFactory( * Reference< ::com::sun::star::XSingleServiceFactory > createSingleFactory * ( * const ::com::sun::star::Reference< ::com::sun::star::XMultiServiceFactory > & rServiceManager, - * const ::rtl::OUString & rImplementationName, + * const OUString & rImplementationName, * ComponentInstantiation pCreateFunction, - * const ::com::sun::star::Sequence< ::rtl::OUString > & rServiceNames + * const ::com::sun::star::Sequence< OUString > & rServiceNames * ); */ @@ -263,12 +263,12 @@ FileProvider::queryContent( RuntimeException) { init(); - rtl::OUString aUnc; + OUString aUnc; sal_Bool err = m_pMyShell->getUnqFromUrl( xIdentifier->getContentIdentifier(), aUnc ); if( err ) - throw IllegalIdentifierException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw IllegalIdentifierException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); return Reference< XContent >( new BaseContent( m_pMyShell,xIdentifier,aUnc ) ); } @@ -282,14 +282,14 @@ FileProvider::compareContentIds( throw( RuntimeException ) { init(); - rtl::OUString aUrl1 = Id1->getContentIdentifier(); - rtl::OUString aUrl2 = Id2->getContentIdentifier(); + OUString aUrl1 = Id1->getContentIdentifier(); + OUString aUrl2 = Id2->getContentIdentifier(); sal_Int32 iComp = aUrl1.compareTo( aUrl2 ); if ( 0 != iComp ) { - rtl::OUString aPath1, aPath2; + OUString aPath1, aPath2; m_pMyShell->getUnqFromUrl( aUrl1, aPath1 ); m_pMyShell->getUnqFromUrl( aUrl2, aPath2 ); @@ -336,7 +336,7 @@ FileProvider::compareContentIds( Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( - const rtl::OUString& ContentId ) + const OUString& ContentId ) throw( RuntimeException ) { init(); @@ -380,12 +380,12 @@ public: virtual Property SAL_CALL getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( UnknownPropertyException, RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( RuntimeException ); @@ -397,17 +397,17 @@ private: XPropertySetInfoImpl2::XPropertySetInfoImpl2() : m_seq( 3 ) { - m_seq[0] = Property( rtl::OUString("HostName"), + m_seq[0] = Property( OUString("HostName"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), PropertyAttribute::READONLY ); - m_seq[1] = Property( rtl::OUString("HomeDirectory"), + m_seq[1] = Property( OUString("HomeDirectory"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), PropertyAttribute::READONLY ); - m_seq[2] = Property( rtl::OUString("FileSystemNotation"), + m_seq[2] = Property( OUString("FileSystemNotation"), -1, getCppuType( static_cast< sal_Int32* >( 0 ) ), PropertyAttribute::READONLY ); @@ -451,7 +451,7 @@ XPropertySetInfoImpl2::queryInterface( Property SAL_CALL XPropertySetInfoImpl2::getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( UnknownPropertyException, RuntimeException) { @@ -459,7 +459,7 @@ XPropertySetInfoImpl2::getPropertyByName( if( m_seq[i].Name == aName ) return m_seq[i]; - throw UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -475,7 +475,7 @@ XPropertySetInfoImpl2::getProperties( sal_Bool SAL_CALL XPropertySetInfoImpl2::hasPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( RuntimeException ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) @@ -528,7 +528,7 @@ FileProvider::getPropertySetInfo( ) void SAL_CALL -FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, +FileProvider::setPropertyValue( const OUString& aPropertyName, const Any& ) throw( UnknownPropertyException, PropertyVetoException, @@ -541,14 +541,14 @@ FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, aPropertyName.compareToAscii( "HostName" ) == 0 ) return; else - throw UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } Any SAL_CALL FileProvider::getPropertyValue( - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) @@ -573,13 +573,13 @@ FileProvider::getPropertyValue( return aAny; } else - throw UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL FileProvider::addPropertyChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XPropertyChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -591,7 +591,7 @@ FileProvider::addPropertyChangeListener( void SAL_CALL FileProvider::removePropertyChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XPropertyChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -602,7 +602,7 @@ FileProvider::removePropertyChangeListener( void SAL_CALL FileProvider::addVetoableChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -614,7 +614,7 @@ FileProvider::addVetoableChangeListener( void SAL_CALL FileProvider::removeVetoableChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -628,7 +628,7 @@ FileProvider::removeVetoableChangeListener( // XFileIdentifierConverter sal_Int32 SAL_CALL -FileProvider::getFileProviderLocality( const rtl::OUString& BaseURL ) +FileProvider::getFileProviderLocality( const OUString& BaseURL ) throw( RuntimeException ) { // If the base URL is a 'file' URL, return 10 (very 'local'), otherwise @@ -643,23 +643,23 @@ FileProvider::getFileProviderLocality( const rtl::OUString& BaseURL ) 10 : -1; } -rtl::OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const rtl::OUString&, - const rtl::OUString& SystemPath ) +OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, + const OUString& SystemPath ) throw( RuntimeException ) { - rtl::OUString aNormalizedPath; + OUString aNormalizedPath; if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None ) - return rtl::OUString(); + return OUString(); return aNormalizedPath; } -rtl::OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const rtl::OUString& URL ) +OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const OUString& URL ) throw( RuntimeException ) { - rtl::OUString aSystemPath; + OUString aSystemPath; if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) != osl::FileBase::E_None ) - return rtl::OUString(); + return OUString(); return aSystemPath; } diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index c6336e735918..6f2a63fdd321 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -80,17 +80,17 @@ namespace fileaccess { throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) 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( void ) throw( com::sun::star::uno::RuntimeException ); @@ -126,7 +126,7 @@ namespace fileaccess { virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( - const rtl::OUString& ContentId ) + const OUString& ContentId ) throw( com::sun::star::uno::RuntimeException ); @@ -144,7 +144,7 @@ namespace fileaccess { virtual void SAL_CALL setPropertyValue( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -154,14 +154,14 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -169,7 +169,7 @@ namespace fileaccess { virtual void SAL_CALL removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -177,7 +177,7 @@ namespace fileaccess { virtual void SAL_CALL addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -185,7 +185,7 @@ namespace fileaccess { virtual void SAL_CALL removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -195,14 +195,14 @@ namespace fileaccess { // XFileIdentifierConverter virtual sal_Int32 SAL_CALL - getFileProviderLocality( const rtl::OUString& BaseURL ) + getFileProviderLocality( const OUString& BaseURL ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getFileURLFromSystemPath( const rtl::OUString& BaseURL, - const rtl::OUString& SystemPath ) + virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, + const OUString& SystemPath ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getSystemPathFromFileURL( const rtl::OUString& URL ) + virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) throw( com::sun::star::uno::RuntimeException ); @@ -215,8 +215,8 @@ namespace fileaccess { void SAL_CALL initProperties( void ); osl::Mutex m_aMutex; - rtl::OUString m_HostName; - rtl::OUString m_HomeDirectory; + OUString m_HostName; + OUString m_HomeDirectory; sal_Int32 m_FileSystemNotation; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > m_xPropertySetInfo; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 8054bbadfe46..23221fcb3968 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -113,7 +113,7 @@ shell::UnqPathData::~UnqPathData() -shell::MyProperty::MyProperty( const rtl::OUString& __PropertyName ) +shell::MyProperty::MyProperty( const OUString& __PropertyName ) : PropertyName( __PropertyName ) { // empty @@ -121,7 +121,7 @@ shell::MyProperty::MyProperty( const rtl::OUString& __Pr shell::MyProperty::MyProperty( const sal_Bool& __isNative, - const rtl::OUString& __PropertyName, + const OUString& __PropertyName, const sal_Int32& __Handle, const com::sun::star::uno::Type& __Typ, const com::sun::star::uno::Any& __Value, @@ -176,7 +176,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, m_aDefaultProperties.insert( MyProperty( true, Title, -1 , - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), uno::Any(), beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID @@ -187,7 +187,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, MyProperty( true, CasePreservingURL, -1 , - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), uno::Any(), beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID @@ -294,11 +294,11 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, // ContentType uno::Any aAny; - aAny <<= rtl::OUString(); + aAny <<= OUString(); m_aDefaultProperties.insert( MyProperty( false, ContentType, -1 , - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), aAny, beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID @@ -349,39 +349,39 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, | beans::PropertyAttribute::READONLY ) ); // Commands - m_sCommandInfo[0].Name = rtl::OUString("getCommandInfo"); + m_sCommandInfo[0].Name = OUString("getCommandInfo"); m_sCommandInfo[0].Handle = -1; m_sCommandInfo[0].ArgType = getCppuVoidType(); - m_sCommandInfo[1].Name = rtl::OUString("getPropertySetInfo"); + m_sCommandInfo[1].Name = OUString("getPropertySetInfo"); m_sCommandInfo[1].Handle = -1; m_sCommandInfo[1].ArgType = getCppuVoidType(); - m_sCommandInfo[2].Name = rtl::OUString("getPropertyValues"); + m_sCommandInfo[2].Name = OUString("getPropertyValues"); m_sCommandInfo[2].Handle = -1; m_sCommandInfo[2].ArgType = getCppuType( static_cast< uno::Sequence< beans::Property >* >( 0 ) ); - m_sCommandInfo[3].Name = rtl::OUString("setPropertyValues"); + m_sCommandInfo[3].Name = OUString("setPropertyValues"); m_sCommandInfo[3].Handle = -1; m_sCommandInfo[3].ArgType = getCppuType( static_cast< uno::Sequence< beans::PropertyValue >* >( 0 ) ); - m_sCommandInfo[4].Name = rtl::OUString("open"); + m_sCommandInfo[4].Name = OUString("open"); m_sCommandInfo[4].Handle = -1; m_sCommandInfo[4].ArgType = getCppuType( static_cast< OpenCommandArgument* >( 0 ) ); - m_sCommandInfo[5].Name = rtl::OUString("transfer"); + m_sCommandInfo[5].Name = OUString("transfer"); m_sCommandInfo[5].Handle = -1; m_sCommandInfo[5].ArgType = getCppuType( static_cast< TransferInfo* >( 0 ) ); - m_sCommandInfo[6].Name = rtl::OUString("delete"); + m_sCommandInfo[6].Name = OUString("delete"); m_sCommandInfo[6].Handle = -1; m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) ); - m_sCommandInfo[7].Name = rtl::OUString("insert"); + m_sCommandInfo[7].Name = OUString("insert"); m_sCommandInfo[7].Handle = -1; m_sCommandInfo[7].ArgType = getCppuType( static_cast< InsertCommandArgument* > ( 0 ) ); - m_sCommandInfo[7].Name = rtl::OUString("createNewContent"); + m_sCommandInfo[7].Name = OUString("createNewContent"); m_sCommandInfo[7].Handle = -1; m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) ); @@ -389,7 +389,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, { uno::Reference< XPropertySetRegistryFactory > xRegFac = ucb::Store::create( m_xContext ); // Open/create a registry - m_xFileRegistry = xRegFac->createPropertySetRegistry( rtl::OUString() ); + m_xFileRegistry = xRegFac->createPropertySetRegistry( OUString() ); } } @@ -411,7 +411,7 @@ shell::~shell() // void SAL_CALL -shell::registerNotifier( const rtl::OUString& aUnqPath, Notifier* pNotifier ) +shell::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier ) { osl::MutexGuard aGuard( m_aMutex ); @@ -435,7 +435,7 @@ shell::registerNotifier( const rtl::OUString& aUnqPath, Notifier* pNotifier ) void SAL_CALL -shell::deregisterNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ) +shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) { osl::MutexGuard aGuard( m_aMutex ); @@ -463,8 +463,8 @@ shell::deregisterNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ) // void SAL_CALL -shell::associate( const rtl::OUString& aUnqPath, - const rtl::OUString& PropertyName, +shell::associate( const OUString& aUnqPath, + const OUString& PropertyName, const uno::Any& DefaultValue, const sal_Int16 Attributes ) throw( beans::PropertyExistException, @@ -481,7 +481,7 @@ shell::associate( const rtl::OUString& aUnqPath, shell::PropertySet::iterator it1 = m_aDefaultProperties.find( newProperty ); if( it1 != m_aDefaultProperties.end() ) - throw beans::PropertyExistException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::PropertyExistException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); { osl::MutexGuard aGuard( m_aMutex ); @@ -494,7 +494,7 @@ shell::associate( const rtl::OUString& aUnqPath, PropertySet& properties = *(it->second.properties); it1 = properties.find( newProperty ); if( it1 != properties.end() ) - throw beans::PropertyExistException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::PropertyExistException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); // Property does not exist properties.insert( newProperty ); @@ -507,8 +507,8 @@ shell::associate( const rtl::OUString& aUnqPath, void SAL_CALL -shell::deassociate( const rtl::OUString& aUnqPath, - const rtl::OUString& PropertyName ) +shell::deassociate( const OUString& aUnqPath, + const OUString& PropertyName ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -517,7 +517,7 @@ shell::deassociate( const rtl::OUString& aUnqPath, shell::PropertySet::iterator it1 = m_aDefaultProperties.find( oldProperty ); if( it1 != m_aDefaultProperties.end() ) - throw beans::NotRemoveableException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::NotRemoveableException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); osl::MutexGuard aGuard( m_aMutex ); @@ -529,7 +529,7 @@ shell::deassociate( const rtl::OUString& aUnqPath, it1 = properties.find( oldProperty ); if( it1 == properties.end() ) - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); properties.erase( it1 ); @@ -567,7 +567,7 @@ shell::deassociate( const rtl::OUString& aUnqPath, void SAL_CALL shell::page( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const uno::Reference< io::XOutputStream >& xOutputStream ) throw() { @@ -658,7 +658,7 @@ void SAL_CALL shell::page( sal_Int32 CommandId, uno::Reference< io::XInputStream > SAL_CALL shell::open( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw() { @@ -695,7 +695,7 @@ shell::open( sal_Int32 CommandId, uno::Reference< io::XStream > SAL_CALL shell::open_rw( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw() { @@ -730,7 +730,7 @@ shell::open_rw( sal_Int32 CommandId, uno::Reference< XDynamicResultSet > SAL_CALL shell::ls( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const sal_Int32 OpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< NumberedSortingInfo >& seqSort ) @@ -782,7 +782,7 @@ shell::info_c() // Info for the properties uno::Reference< beans::XPropertySetInfo > SAL_CALL -shell::info_p( const rtl::OUString& aUnqPath ) +shell::info_p( const OUString& aUnqPath ) throw() { osl::MutexGuard aGuard( m_aMutex ); @@ -804,7 +804,7 @@ shell::info_p( const rtl::OUString& aUnqPath ) uno::Sequence< uno::Any > SAL_CALL -shell::setv( const rtl::OUString& aUnqPath, +shell::setv( const OUString& aUnqPath, const uno::Sequence< beans::PropertyValue >& values ) throw() { @@ -825,7 +825,7 @@ shell::setv( const rtl::OUString& aUnqPath, it1 = properties.find( toset ); if( it1 == properties.end() ) { - ret[i] <<= beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); continue; } @@ -835,7 +835,7 @@ shell::setv( const rtl::OUString& aUnqPath, if( it1->getAttributes() & beans::PropertyAttribute::READONLY ) { - ret[i] <<= lang::IllegalAccessException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= lang::IllegalAccessException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); continue; } @@ -893,12 +893,12 @@ shell::setv( const rtl::OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); ret[0] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError(IOErrorCode_GENERAL); ret[i] <<= InteractiveAugmentedIOException( - rtl::OUString(), + OUString(), 0, task::InteractionClassification_ERROR, ioError, @@ -906,7 +906,7 @@ shell::setv( const rtl::OUString& aUnqPath, } } else - ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::IllegalTypeException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } else if(values[i].Name == IsReadOnly || values[i].Name == IsHidden) @@ -957,7 +957,7 @@ shell::setv( const rtl::OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); names[0] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError; @@ -1006,7 +1006,7 @@ shell::setv( const rtl::OUString& aUnqPath, break; } ret[i] <<= InteractiveAugmentedIOException( - rtl::OUString(), + OUString(), 0, task::InteractionClassification_ERROR, ioError, @@ -1014,7 +1014,7 @@ shell::setv( const rtl::OUString& aUnqPath, } } else - ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::IllegalTypeException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } } } // end for @@ -1041,7 +1041,7 @@ shell::setv( const rtl::OUString& aUnqPath, uno::Reference< sdbc::XRow > SAL_CALL shell::getv( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const uno::Sequence< beans::Property >& properties ) throw() { @@ -1108,8 +1108,8 @@ shell::getv( sal_Int32 CommandId, void SAL_CALL shell::move( sal_Int32 CommandId, - const rtl::OUString srcUnqPath, - const rtl::OUString dstUnqPathIn, + const OUString srcUnqPath, + const OUString dstUnqPathIn, const sal_Int32 NameClash ) throw() { @@ -1119,7 +1119,7 @@ shell::move( sal_Int32 CommandId, return; // osl::FileBase::RC nError; - rtl::OUString dstUnqPath( dstUnqPathIn ); + OUString dstUnqPath( dstUnqPathIn ); switch( NameClash ) { @@ -1138,7 +1138,7 @@ shell::move( sal_Int32 CommandId, case NameClash::OVERWRITE: { // stat to determine whether we have a symlink - rtl::OUString targetPath(dstUnqPath); + OUString targetPath(dstUnqPath); osl::FileStatus aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL); osl::DirectoryItem aItem; @@ -1165,7 +1165,7 @@ shell::move( sal_Int32 CommandId, } case NameClash::RENAME: { - rtl::OUString newDstUnqPath; + OUString newDstUnqPath; nError = osl_File_move( srcUnqPath,dstUnqPath,true ); if( nError == osl::FileBase::E_EXIST ) { @@ -1186,8 +1186,8 @@ shell::move( sal_Int32 CommandId, { newDstUnqPath = dstUnqPath; - rtl::OUString aPostFix( "_" ); - aPostFix += rtl::OUString::valueOf( ++nTry ); + OUString aPostFix( "_" ); + aPostFix += OUString::valueOf( ++nTry ); newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix ); @@ -1271,8 +1271,8 @@ shell::move( sal_Int32 CommandId, copyPersistentSet( srcUnqPath,dstUnqPath,!isDocument ); - rtl::OUString aDstParent = getParentName( dstUnqPath ); - rtl::OUString aSrcParent = getParentName( srcUnqPath ); + OUString aDstParent = getParentName( dstUnqPath ); + OUString aSrcParent = getParentName( srcUnqPath ); notifyInsert( getContentEventListeners( aDstParent ),dstUnqPath ); if( aDstParent != aSrcParent ) @@ -1296,7 +1296,7 @@ shell::move( sal_Int32 CommandId, namespace { bool getType( - TaskManager & task, sal_Int32 id, rtl::OUString const & fileUrl, + TaskManager & task, sal_Int32 id, OUString const & fileUrl, osl::DirectoryItem * item, osl::FileStatus::Type * type) { OSL_ASSERT(item != 0 && type != 0); @@ -1320,13 +1320,13 @@ bool getType( void SAL_CALL shell::copy( sal_Int32 CommandId, - const rtl::OUString srcUnqPath, - const rtl::OUString dstUnqPathIn, + const OUString srcUnqPath, + const OUString dstUnqPathIn, sal_Int32 NameClash ) throw() { osl::FileBase::RC nError; - rtl::OUString dstUnqPath( dstUnqPathIn ); + OUString dstUnqPath( dstUnqPathIn ); // Resolve symbolic links within the source path. If srcUnqPath denotes a // symbolic link (targeting either a file or a folder), the contents of the @@ -1338,7 +1338,7 @@ shell::copy( if (!getType(*this, CommandId, srcUnqPath, &item, &type)) { return; } - rtl::OUString rslvdSrcUnqPath; + OUString rslvdSrcUnqPath; if (type == osl::FileStatus::Link) { osl::FileStatus stat(osl_FileStatus_Mask_LinkTargetURL); nError = item.getFileStatus(stat); @@ -1391,7 +1391,7 @@ shell::copy( } case NameClash::RENAME: { - rtl::OUString newDstUnqPath; + OUString newDstUnqPath; nError = copy_recursive( rslvdSrcUnqPath,dstUnqPath,IsWhat,true ); if( nError == osl::FileBase::E_EXIST ) @@ -1413,8 +1413,8 @@ shell::copy( { newDstUnqPath = dstUnqPath; - rtl::OUString aPostFix( "_" ); - aPostFix += rtl::OUString::valueOf( ++nTry ); + OUString aPostFix( "_" ); + aPostFix += OUString::valueOf( ++nTry ); newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix ); @@ -1495,7 +1495,7 @@ shell::copy( sal_Bool SAL_CALL shell::remove( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 IsWhat, sal_Bool MustExist ) throw() @@ -1575,7 +1575,7 @@ shell::remove( sal_Int32 CommandId, sal_Bool whileSuccess = sal_True; sal_Int32 recurse = 0; - rtl::OUString name; + OUString name; nError = aDirectory.getNextItem( aItem ); while( nError == osl::FileBase::E_None ) @@ -1659,11 +1659,11 @@ shell::remove( sal_Int32 CommandId, sal_Bool SAL_CALL shell::mkdir( sal_Int32 CommandId, - const rtl::OUString& rUnqPath, + const OUString& rUnqPath, sal_Bool OverWrite ) throw() { - rtl::OUString aUnqPath; + OUString aUnqPath; // remove trailing slash if ( rUnqPath[ rUnqPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -1694,7 +1694,7 @@ shell::mkdir( sal_Int32 CommandId, } case osl::FileBase::E_None: { - rtl::OUString aPrtPath = getParentName( aUnqPath ); + OUString aPrtPath = getParentName( aUnqPath ); notifyInsert( getContentEventListeners( aPrtPath ),aUnqPath ); return sal_True; } @@ -1720,7 +1720,7 @@ shell::mkdir( sal_Int32 CommandId, sal_Bool SAL_CALL shell::mkfil( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool Overwrite, const uno::Reference< io::XInputStream >& aInputStream ) throw() @@ -1732,7 +1732,7 @@ shell::mkfil( sal_Int32 CommandId, aInputStream ); if ( bSuccess ) { - rtl::OUString aPrtPath = getParentName( aUnqPath ); + OUString aPrtPath = getParentName( aUnqPath ); notifyInsert( getContentEventListeners( aPrtPath ),aUnqPath ); } return bSuccess; @@ -1752,7 +1752,7 @@ shell::mkfil( sal_Int32 CommandId, sal_Bool SAL_CALL shell::write( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool OverWrite, const uno::Reference< io::XInputStream >& aInputStream ) throw() @@ -1912,7 +1912,7 @@ shell::write( sal_Int32 CommandId, /*********************************************************************************/ -void SAL_CALL shell::insertDefaultProperties( const rtl::OUString& aUnqPath ) +void SAL_CALL shell::insertDefaultProperties( const OUString& aUnqPath ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1950,11 +1950,11 @@ void SAL_CALL shell::insertDefaultProperties( const rtl::OUString& aUnqPath ) /******************************************************************************/ -sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString& Unq ) +sal_Bool SAL_CALL shell::getUnqFromUrl( const OUString& Url,OUString& Unq ) { if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" ) { - Unq = rtl::OUString("file:///"); + Unq = OUString("file:///"); return false; } @@ -1972,7 +1972,7 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString& -sal_Bool SAL_CALL shell::getUrlFromUnq( const rtl::OUString& Unq,rtl::OUString& Url ) +sal_Bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) { sal_Bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url ); @@ -1986,8 +1986,8 @@ sal_Bool SAL_CALL shell::getUrlFromUnq( const rtl::OUString& Unq,rtl::OUString& // Helper function for public copy osl::FileBase::RC SAL_CALL -shell::copy_recursive( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, +shell::copy_recursive( const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Int32 TypeToCopy, sal_Bool testExistBeforeCopy ) throw() @@ -2022,12 +2022,12 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, // Getting the information for the next recursive copy sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; - rtl::OUString newSrcUnqPath; + OUString newSrcUnqPath; if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) newSrcUnqPath = aFileStatus.getFileURL(); - rtl::OUString newDstUnqPath = dstUnqPath; - rtl::OUString tit; + OUString newDstUnqPath = dstUnqPath; + OUString tit; if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) tit = rtl::Uri::encode( aFileStatus.getFileName(), rtl_UriCharClassPchar, @@ -2035,7 +2035,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, RTL_TEXTENCODING_UTF8 ); if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 ) - newDstUnqPath += rtl::OUString("/"); + newDstUnqPath += OUString("/"); newDstUnqPath += tit; @@ -2060,11 +2060,11 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, - const rtl::OUString& rUnqPath, + const OUString& rUnqPath, sal_Int32 errorCode ) throw() { - rtl::OUString aPath; + OUString aPath; if ( rUnqPath.isEmpty() ) return sal_False; @@ -2093,7 +2093,7 @@ sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, if( ! bSuccess ) { - rtl::OUString aParentDir = getParentName( aPath ); + OUString aParentDir = getParentName( aPath ); if ( aParentDir != aPath ) { // Create first the parent directory @@ -2247,7 +2247,7 @@ shell::commit( const shell::ContentMap::iterator& it, if( it->second.properties == 0 ) { - rtl::OUString aPath = it->first; + OUString aPath = it->first; insertDefaultProperties( aPath ); } @@ -2460,7 +2460,7 @@ shell::getv( Notifier* pNotifier, const uno::Sequence< beans::Property >& properties, osl::DirectoryItem& aDirItem, - rtl::OUString& aUnqPath, + OUString& aUnqPath, sal_Bool& aIsRegular ) { uno::Sequence< uno::Any > seq( properties.getLength() ); @@ -2537,7 +2537,7 @@ shell::getv( std::list< ContentEventNotifier* >* SAL_CALL -shell::getContentEventListeners( const rtl::OUString& aName ) +shell::getContentEventListeners( const OUString& aName ) { std::list< ContentEventNotifier* >* p = new std::list< ContentEventNotifier* >; std::list< ContentEventNotifier* >& listeners = *p; @@ -2564,7 +2564,7 @@ shell::getContentEventListeners( const rtl::OUString& aName ) std::list< ContentEventNotifier* >* SAL_CALL -shell::getContentDeletedEventListeners( const rtl::OUString& aName ) +shell::getContentDeletedEventListeners( const OUString& aName ) { std::list< ContentEventNotifier* >* p = new std::list< ContentEventNotifier* >; std::list< ContentEventNotifier* >& listeners = *p; @@ -2590,7 +2590,7 @@ shell::getContentDeletedEventListeners( const rtl::OUString& aName ) void SAL_CALL -shell::notifyInsert( std::list< ContentEventNotifier* >* listeners,const rtl::OUString& aChildName ) +shell::notifyInsert( std::list< ContentEventNotifier* >* listeners,const OUString& aChildName ) { std::list< ContentEventNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2619,7 +2619,7 @@ shell::notifyContentDeleted( std::list< ContentEventNotifier* >* listeners ) void SAL_CALL shell::notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, - const rtl::OUString& aChildName ) + const OUString& aChildName ) { std::list< ContentEventNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2635,7 +2635,7 @@ shell::notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, std::list< PropertySetInfoChangeNotifier* >* SAL_CALL -shell::getPropertySetListeners( const rtl::OUString& aName ) +shell::getPropertySetListeners( const OUString& aName ) { std::list< PropertySetInfoChangeNotifier* >* p = new std::list< PropertySetInfoChangeNotifier* >; std::list< PropertySetInfoChangeNotifier* >& listeners = *p; @@ -2662,7 +2662,7 @@ shell::getPropertySetListeners( const rtl::OUString& aName ) void SAL_CALL shell::notifyPropertyAdded( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { std::list< PropertySetInfoChangeNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2677,7 +2677,7 @@ shell::notifyPropertyAdded( std::list< PropertySetInfoChangeNotifier* >* listene void SAL_CALL shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { std::list< PropertySetInfoChangeNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2692,8 +2692,8 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL -shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix, - const rtl::OUString aNewPrefix, +shell::getContentExchangedEventListeners( const OUString aOldPrefix, + const OUString aNewPrefix, sal_Bool withChildren ) { @@ -2702,9 +2702,9 @@ shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix, std::vector< std::list< ContentEventNotifier* >* >& aVector = *aVectorOnHeap; sal_Int32 count; - rtl::OUString aOldName; - rtl::OUString aNewName; - std::vector< rtl::OUString > oldChildList; + OUString aOldName; + OUString aNewName; + std::vector< OUString > oldChildList; { osl::MutexGuard aGuard( m_aMutex ); @@ -2817,7 +2817,7 @@ shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* std::list< PropertyChangeNotifier* >* SAL_CALL -shell::getPropertyChangeNotifier( const rtl::OUString& aName ) +shell::getPropertyChangeNotifier( const OUString& aName ) { std::list< PropertyChangeNotifier* >* p = new std::list< PropertyChangeNotifier* >; std::list< PropertyChangeNotifier* >& listeners = *p; @@ -2863,7 +2863,7 @@ void SAL_CALL shell::notifyPropertyChanges( std::list< PropertyChangeNotifier* > /********************************************************************************/ void SAL_CALL -shell::erasePersistentSet( const rtl::OUString& aUnqPath, +shell::erasePersistentSet( const OUString& aUnqPath, sal_Bool withChildren ) { if( ! m_xFileRegistry.is() ) @@ -2872,7 +2872,7 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath, return; } - uno::Sequence< rtl::OUString > seqNames; + uno::Sequence< OUString > seqNames; if( withChildren ) { @@ -2882,7 +2882,7 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath, sal_Int32 count = withChildren ? seqNames.getLength() : 1; - rtl::OUString + OUString old_Name = aUnqPath; for( sal_Int32 j = 0; j < count; ++j ) @@ -2925,8 +2925,8 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath, void SAL_CALL -shell::copyPersistentSet( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, +shell::copyPersistentSet( const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Bool withChildren ) { if( ! m_xFileRegistry.is() ) @@ -2935,7 +2935,7 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath, return; } - uno::Sequence< rtl::OUString > seqNames; + uno::Sequence< OUString > seqNames; if( withChildren ) { @@ -2945,7 +2945,7 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath, sal_Int32 count = withChildren ? seqNames.getLength() : 1; - rtl::OUString + OUString old_Name = srcUnqPath, new_Name = dstUnqPath; @@ -3002,9 +3002,9 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo() 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 ); seq[0].Properties = props; @@ -3023,23 +3023,23 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo() /*******************************************************************************/ void SAL_CALL -shell::getScheme( rtl::OUString& Scheme ) +shell::getScheme( OUString& Scheme ) { - Scheme = rtl::OUString("file"); + Scheme = OUString("file"); } -rtl::OUString SAL_CALL +OUString SAL_CALL shell::getImplementationName_static( void ) { - return rtl::OUString("com.sun.star.comp.ucb.FileProvider"); + return OUString("com.sun.star.comp.ucb.FileProvider"); } -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL shell::getSupportedServiceNames_static( void ) { - rtl::OUString Supported("com.sun.star.ucb.FileContentProvider"); - com::sun::star::uno::Sequence< rtl::OUString > Seq( &Supported,1 ); + OUString Supported("com.sun.star.ucb.FileContentProvider"); + com::sun::star::uno::Sequence< OUString > Seq( &Supported,1 ); return Seq; } diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 6301b57ce9b4..12a7b7edd773 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -76,14 +76,14 @@ namespace fileaccess { public: // Type definitions - typedef rtl::OUString UniquePath; + typedef OUString UniquePath; typedef equalOUString eUniquePath; typedef hashOUString hUniquePath; class MyProperty { private: - rtl::OUString PropertyName; + OUString PropertyName; sal_Int32 Handle; sal_Bool isNative; com::sun::star::uno::Type Typ; // Duplicates information in Value @@ -92,9 +92,9 @@ namespace fileaccess { sal_Int16 Attributes; public: MyProperty(); - MyProperty( const rtl::OUString& __PropertyName ); + MyProperty( const OUString& __PropertyName ); MyProperty( const sal_Bool& __isNative, - const rtl::OUString& __PropertyName, + const OUString& __PropertyName, const sal_Int32& __Handle, const com::sun::star::uno::Type& __Typ, const com::sun::star::uno::Any& __Value, @@ -103,7 +103,7 @@ namespace fileaccess { ~MyProperty(); inline const sal_Bool& SAL_CALL IsNative() const; - inline const rtl::OUString& SAL_CALL getPropertyName() const { return PropertyName; } + inline const OUString& SAL_CALL getPropertyName() const { return PropertyName; } inline const sal_Int32& SAL_CALL getHandle() const; inline const com::sun::star::uno::Type& SAL_CALL getType() const; inline const com::sun::star::uno::Any& SAL_CALL getValue() const; @@ -172,9 +172,9 @@ namespace fileaccess { * to URL aUnqPath */ - void SAL_CALL registerNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ); + void SAL_CALL registerNotifier( const OUString& aUnqPath,Notifier* pNotifier ); - void SAL_CALL deregisterNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ); + void SAL_CALL deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ); @@ -184,8 +184,8 @@ namespace fileaccess { * The default value and the attributes are input */ - void SAL_CALL associate( const rtl::OUString& UnqPath, - const rtl::OUString& PropertyName, + void SAL_CALL associate( const OUString& UnqPath, + const OUString& PropertyName, const com::sun::star::uno::Any& DefaultValue, const sal_Int16 Attributes ) throw( com::sun::star::beans::PropertyExistException, @@ -193,8 +193,8 @@ namespace fileaccess { com::sun::star::uno::RuntimeException); - void SAL_CALL deassociate( const rtl::OUString& UnqPath, - const rtl::OUString& PropertyName ) + void SAL_CALL deassociate( const OUString& UnqPath, + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException); @@ -213,7 +213,7 @@ namespace fileaccess { */ void SAL_CALL page( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ) throw(); @@ -224,7 +224,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL open( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw(); @@ -236,7 +236,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL open_rw( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw(); @@ -248,7 +248,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > SAL_CALL ls( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const sal_Int32 OpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& sProperty, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo > & sSortingInfo ) @@ -266,7 +266,7 @@ namespace fileaccess { // Info for the properties com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL - info_p( const rtl::OUString& aUnqPath ) + info_p( const OUString& aUnqPath ) throw(); @@ -275,7 +275,7 @@ namespace fileaccess { */ com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL - setv( const rtl::OUString& aUnqPath, + setv( const OUString& aUnqPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& values ) throw(); @@ -287,7 +287,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL getv( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties ) throw(); @@ -302,8 +302,8 @@ namespace fileaccess { void SAL_CALL move( sal_Int32 CommandId, - const rtl::OUString srcUnqPath, // Full file(folder)-path - const rtl::OUString dstUnqPath, // Path to the destination-directory + const OUString srcUnqPath, // Full file(folder)-path + const OUString dstUnqPath, // Path to the destination-directory const sal_Int32 NameClash ) throw(); @@ -313,8 +313,8 @@ namespace fileaccess { void SAL_CALL copy( sal_Int32 CommandId, // See "move" - const rtl::OUString srcUnqPath, - const rtl::OUString dstUnqPath, + const OUString srcUnqPath, + const OUString dstUnqPath, sal_Int32 NameClash ) throw(); @@ -328,7 +328,7 @@ namespace fileaccess { sal_Bool SAL_CALL remove( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 TypeToMove = RemoveUnknown, sal_Bool MustExist = sal_True ) throw(); @@ -349,7 +349,7 @@ namespace fileaccess { sal_Bool SAL_CALL mkdir( sal_Int32 CommandId, - const rtl::OUString& aDirectoryName, + const OUString& aDirectoryName, sal_Bool OverWrite ) throw(); @@ -362,7 +362,7 @@ namespace fileaccess { sal_Bool SAL_CALL mkfil( sal_Int32 CommandId, - const rtl::OUString& aFileName, + const OUString& aFileName, sal_Bool OverWrite, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw(); @@ -375,14 +375,14 @@ namespace fileaccess { */ sal_Bool SAL_CALL write( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool OverWrite, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw(); - void SAL_CALL insertDefaultProperties( const rtl::OUString& aUnqPath ); + void SAL_CALL insertDefaultProperties( const OUString& aUnqPath ); com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > queryCreatableContentsInfo(); @@ -395,9 +395,9 @@ namespace fileaccess { /* */ /******************************************************************************/ - sal_Bool SAL_CALL getUnqFromUrl( const rtl::OUString& Url, rtl::OUString& Unq ); + sal_Bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq ); - sal_Bool SAL_CALL getUrlFromUnq( const rtl::OUString& Unq, rtl::OUString& Url ); + sal_Bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url ); sal_Bool m_bWithConfig; @@ -412,21 +412,21 @@ namespace fileaccess { /********************************************************************************/ std::list< ContentEventNotifier* >* SAL_CALL - getContentEventListeners( const rtl::OUString& aName ); + getContentEventListeners( const OUString& aName ); std::list< ContentEventNotifier* >* SAL_CALL - getContentDeletedEventListeners( const rtl::OUString& aName ); + getContentDeletedEventListeners( const OUString& aName ); std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL - getContentExchangedEventListeners( const rtl::OUString aOldPrefix, - const rtl::OUString aNewPrefix, + getContentExchangedEventListeners( const OUString aOldPrefix, + const OUString aNewPrefix, sal_Bool withChildren ); std::list< PropertyChangeNotifier* >* SAL_CALL - getPropertyChangeNotifier( const rtl::OUString& aName ); + getPropertyChangeNotifier( const OUString& aName ); std::list< PropertySetInfoChangeNotifier* >* SAL_CALL - getPropertySetListeners( const rtl::OUString& aName ); + getPropertySetListeners( const OUString& aName ); /********************************************************************************/ @@ -441,29 +441,29 @@ namespace fileaccess { std::vector< std::list< ContentEventNotifier* >* >* listeners_vec ); void SAL_CALL notifyInsert( - std::list< ContentEventNotifier* >* listeners,const rtl::OUString& aChildName ); + std::list< ContentEventNotifier* >* listeners,const OUString& aChildName ); void SAL_CALL notifyContentDeleted( std::list< ContentEventNotifier* >* listeners ); void SAL_CALL notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, - const rtl::OUString& aChildName ); + const OUString& aChildName ); void SAL_CALL notifyPropertyAdded( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ); + const OUString& aPropertyName ); void SAL_CALL notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ); + const OUString& aPropertyName ); /********************************************************************************/ /* remove persistent propertyset */ /********************************************************************************/ - void SAL_CALL erasePersistentSet( const rtl::OUString& aUnqPath, + void SAL_CALL erasePersistentSet( const OUString& aUnqPath, sal_Bool withChildren = false ); /********************************************************************************/ @@ -471,8 +471,8 @@ namespace fileaccess { /* from srcUnqPath to dstUnqPath */ /********************************************************************************/ - void SAL_CALL copyPersistentSet( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, + void SAL_CALL copyPersistentSet( const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Bool withChildren = false ); @@ -483,7 +483,7 @@ namespace fileaccess { getv( Notifier* pNotifier, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties, osl::DirectoryItem& DirItem, - rtl::OUString& aUnqPath, + OUString& aUnqPath, sal_Bool& bIsRegular ); @@ -529,8 +529,8 @@ namespace fileaccess { osl::FileBase::RC SAL_CALL copy_recursive( - const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, + const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Int32 TypeToCopy, sal_Bool testExistence ) throw(); @@ -544,7 +544,7 @@ namespace fileaccess { sal_Bool SAL_CALL ensuredir( sal_Int32 CommandId, - const rtl::OUString& aDirectoryName, + const OUString& aDirectoryName, sal_Int32 errorCode ) throw(); @@ -554,26 +554,26 @@ namespace fileaccess { // Default properties - const rtl::OUString Title; - const rtl::OUString CasePreservingURL; - const rtl::OUString IsDocument; - const rtl::OUString IsFolder; - const rtl::OUString DateModified; - const rtl::OUString Size; - const rtl::OUString IsVolume; - const rtl::OUString IsRemoveable; - const rtl::OUString IsRemote; - const rtl::OUString IsCompactDisc; - const rtl::OUString IsFloppy; - const rtl::OUString IsHidden; - const rtl::OUString ContentType; - const rtl::OUString IsReadOnly; - const rtl::OUString CreatableContentsInfo; + const OUString Title; + const OUString CasePreservingURL; + const OUString IsDocument; + const OUString IsFolder; + const OUString DateModified; + const OUString Size; + const OUString IsVolume; + const OUString IsRemoveable; + const OUString IsRemote; + const OUString IsCompactDisc; + const OUString IsFloppy; + const OUString IsHidden; + const OUString ContentType; + const OUString IsReadOnly; + const OUString CreatableContentsInfo; public: - const rtl::OUString FolderContentType; - const rtl::OUString FileContentType; + const OUString FolderContentType; + const OUString FileContentType; private: @@ -585,11 +585,11 @@ namespace fileaccess { // Misceancellous: // Methods for "writeComponentInfo" and "createComponentFactory" - static void SAL_CALL getScheme( rtl::OUString& Scheme ); + static void SAL_CALL getScheme( OUString& Scheme ); - static rtl::OUString SAL_CALL getImplementationName_static( void ); + static OUString SAL_CALL getImplementationName_static( void ); - static com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_static( void ); + static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( void ); }; // end class shell diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index f93626e35f11..3e145ad18766 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -165,8 +165,8 @@ XTYPEPROVIDER_IMPL_6( FTPContent, #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) XSERVICEINFO_IMPL_1( FTPContent, - rtl::OUString( "com.sun.star.comp.FTPContent"), - rtl::OUString( "com.sun.star.ucb.FTPContent")); + OUString( "com.sun.star.comp.FTPContent"), + OUString( "com.sun.star.ucb.FTPContent")); @@ -177,10 +177,10 @@ XSERVICEINFO_IMPL_1( FTPContent, //========================================================================= // virtual -rtl::OUString SAL_CALL FTPContent::getContentType() +OUString SAL_CALL FTPContent::getContentType() throw( RuntimeException ) { - return rtl::OUString(FTP_CONTENT_TYPE); + return OUString(FTP_CONTENT_TYPE); } @@ -284,7 +284,7 @@ Any SAL_CALL FTPContent::execute( try { if(action == THROWAUTHENTICATIONREQUEST) { // try to get a continuation first - rtl::OUString aRealm,aPassword,aAccount; + OUString aRealm,aPassword,aAccount; m_pFCP->forHost(m_aFTPURL.host(), m_aFTPURL.port(), m_aFTPURL.username(), @@ -361,7 +361,7 @@ Any SAL_CALL FTPContent::execute( { Sequence<Any> seq(1); PropertyValue value; - value.Name = rtl::OUString("Uri"); + value.Name = OUString("Uri"); value.Handle = -1; value.Value <<= m_aFTPURL.ident(false,false); value.State = PropertyState_DIRECT_VALUE; @@ -396,7 +396,7 @@ Any SAL_CALL FTPContent::execute( { Sequence<Any> seq(1); PropertyValue value; - value.Name = rtl::OUString("Uri"); + value.Name = OUString("Uri"); value.Handle = -1; value.Value <<= m_aFTPURL.ident(false,false); value.State = PropertyState_DIRECT_VALUE; @@ -421,7 +421,7 @@ Any SAL_CALL FTPContent::execute( if(!(aCommand.Argument >>= Properties)) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -435,7 +435,7 @@ Any SAL_CALL FTPContent::execute( if( ! ( aCommand.Argument >>= propertyValues ) ) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -456,7 +456,7 @@ Any SAL_CALL FTPContent::execute( InsertCommandArgument aInsertArgument; if ( ! ( aCommand.Argument >>= aInsertArgument ) ) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -471,7 +471,7 @@ Any SAL_CALL FTPContent::execute( OpenCommandArgument2 aOpenCommand; if ( !( aCommand.Argument >>= aOpenCommand ) ) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); @@ -514,7 +514,7 @@ Any SAL_CALL FTPContent::execute( if(n) { Sequence<Any> seq(1); PropertyValue value; - value.Name = rtl::OUString("Uri"); + value.Name = OUString("Uri"); value.Handle = -1; value.Value <<= m_aFTPURL.ident(false,false); value.State = PropertyState_DIRECT_VALUE; @@ -527,7 +527,7 @@ Any SAL_CALL FTPContent::execute( } else { aRet <<= UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >(this), aOpenCommand.Sink); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -558,14 +558,14 @@ Any SAL_CALL FTPContent::execute( OpenMode::DOCUMENT_SHARE_DENY_WRITE) { // Unsupported OpenMode aRet <<= UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >(this), static_cast< sal_Int16 >(aOpenCommand.Mode)); ucbhelper::cancelCommandExecution(aRet,Environment); } else { aRet <<= IllegalArgumentException( - rtl::OUString( "Unexpected OpenMode!" ), + OUString( "Unexpected OpenMode!" ), static_cast< cppu::OWeakObject * >(this), -1); @@ -577,7 +577,7 @@ Any SAL_CALL FTPContent::execute( ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1)), Environment); @@ -614,9 +614,9 @@ Any SAL_CALL FTPContent::execute( } } -#define FTP_FILE rtl::OUString( "application/vnd.sun.staroffice.ftp-file") +#define FTP_FILE OUString( "application/vnd.sun.staroffice.ftp-file") -#define FTP_FOLDER rtl::OUString( "application/vnd.sun.staroffice.ftp-folder") +#define FTP_FOLDER OUString( "application/vnd.sun.staroffice.ftp-folder") Sequence<ContentInfo > SAL_CALL FTPContent::queryCreatableContentsInfo( ) @@ -637,9 +637,9 @@ FTPContent::queryCreatableContentsInfo_Static( ) | ContentInfoAttribute::KIND_DOCUMENT; Sequence< Property > props( 1 ); props[0] = Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), PropertyAttribute::MAYBEVOID | PropertyAttribute::BOUND ); seq[0].Properties = props; @@ -688,7 +688,7 @@ FTPContent::setParent(const Reference<XInterface >& /*Parent*/ ) -rtl::OUString FTPContent::getParentURL() +OUString FTPContent::getParentURL() { return m_aFTPURL.parent(); } @@ -734,7 +734,7 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand, if(m_bInserted && !m_bTitleSet) { MissingPropertiesException excep; excep.Properties.realloc(1); - excep.Properties[0] = rtl::OUString("Title"); + excep.Properties[0] = OUString("Title"); Any aAny; aAny <<= excep; ucbhelper::cancelCommandExecution(aAny,Env); } @@ -816,7 +816,7 @@ Reference< XRow > FTPContent::getPropertyValues( FTPDirentry aDirEntry = m_aFTPURL.direntry(); for(sal_Int32 i = 0; i < seqProp.getLength(); ++i) { - const rtl::OUString& Name = seqProp[i].Name; + const OUString& Name = seqProp[i].Name; if(Name.compareToAscii("Title") == 0) xRow->appendString(seqProp[i],aDirEntry.m_aName); else if(Name.compareToAscii("CreatableContentsInfo") == 0) @@ -868,7 +868,7 @@ Sequence<Any> FTPContent::setPropertyValues( osl::MutexGuard aGuard(m_aMutex); for(sal_Int32 i = 0; i < ret.getLength(); ++i) { if ( seqPropVal[i].Name == "Title" ) { - rtl::OUString Title; + OUString Title; if(!(seqPropVal[i].Value >>= Title)) { ret[i] <<= IllegalTypeException(); continue; @@ -884,10 +884,10 @@ Sequence<Any> FTPContent::setPropertyValues( m_bTitleSet = true; } else try { - rtl::OUString OldTitle = m_aFTPURL.ren(Title); + OUString OldTitle = m_aFTPURL.ren(Title); evt.realloc(1); evt[0].PropertyName = - rtl::OUString("Title"); + OUString("Title"); evt[0].Further = false; evt[0].PropertyHandle = -1; evt[0].OldValue <<= OldTitle; @@ -908,7 +908,7 @@ Sequence<Any> FTPContent::setPropertyValues( for(sal_Int32 j = 0; j < props.getLength(); ++j) if(props[j].Name == seqPropVal[i].Name) { ret[i] <<= IllegalAccessException( - rtl::OUString( "Property is read-only!"), + OUString( "Property is read-only!"), //props[j].Attributes & PropertyAttribute::READONLY // ? "Property is read-only!" // : "Access denied!"), diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index c4618ba3af7e..4573c41b5779 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -78,7 +78,7 @@ namespace ftp XSERVICEINFO_DECL() // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); @@ -145,7 +145,7 @@ namespace ftp com::sun::star::ucb::XCommandEnvironment > & xEnv); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); com::sun::star::uno::Reference<com::sun::star::sdbc::XRow> getPropertyValues( diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 9005de240c48..eb33079a6179 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -41,56 +41,56 @@ uno::Sequence< beans::Property > FTPContent::getProperties( static const beans::Property aPropsInfoTable[] = { 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 ), 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( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( @@ -124,46 +124,46 @@ uno::Sequence< ucb::CommandInfo > FTPContent::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< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 485647775af9..4da4819c3fdc 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::lang; FTPContentIdentifier::FTPContentIdentifier( - const rtl::OUString& ident + const OUString& ident ) : m_ident(ident) { @@ -112,7 +112,7 @@ FTPContentIdentifier::getTypes( } -rtl::OUString SAL_CALL +OUString SAL_CALL FTPContentIdentifier::getContentIdentifier( ) throw ( @@ -123,14 +123,14 @@ FTPContentIdentifier::getContentIdentifier( } -rtl::OUString SAL_CALL +OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) throw ( com::sun::star::uno::RuntimeException ) { - return rtl::OUString("ftp"); + return OUString("ftp"); } diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 7ea7ed5b22bb..f4d1c443b128 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -46,7 +46,7 @@ namespace ftp { { public: - FTPContentIdentifier(const rtl::OUString& ident); + FTPContentIdentifier(const OUString& ident); ~FTPContentIdentifier(); @@ -80,14 +80,14 @@ namespace ftp { // XContentIdentifier - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentIdentifier( ) throw ( com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentProviderScheme( ) throw ( @@ -97,7 +97,7 @@ namespace ftp { private: - rtl::OUString m_ident; + OUString m_ident; }; } diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 0f28bcb3bc4e..c31482409edc 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -95,8 +95,8 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider, XSERVICEINFO_IMPL_1_CTX( FTPContentProvider, - rtl::OUString("com.sun.star.comp.FTPContentProvider"), - rtl::OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME)); + OUString("com.sun.star.comp.FTPContentProvider"), + OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME)); //========================================================================= // @@ -150,7 +150,7 @@ FTPContentProvider::queryContent( this); if(!m_pProxyDecider->shouldUseProxy( - rtl::OUString("ftp"), + OUString("ftp"), aURL.host(), aURL.port().toInt32())) { @@ -190,11 +190,11 @@ CURL* FTPContentProvider::handle() { bool FTPContentProvider::forHost( - const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account) + const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account) { osl::MutexGuard aGuard(m_aMutex); for(unsigned int i = 0; i < m_ServerInfo.size(); ++i) @@ -212,11 +212,11 @@ bool FTPContentProvider::forHost( bool FTPContentProvider::setHost( - const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account) + const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account) { ServerInfo inf; inf.host = host; diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 5f47640a146b..3ec371cd3998 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -79,25 +79,25 @@ namespace ftp { virtual CURL* handle(); - virtual bool forHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account); + virtual bool forHost(const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account); - virtual bool setHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account); + virtual bool setHost(const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account); struct ServerInfo { - rtl::OUString host; - rtl::OUString port; - rtl::OUString username; - rtl::OUString password; - rtl::OUString account; + OUString host; + OUString port; + OUString username; + OUString password; + OUString account; }; private: diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index 3f98ca13ef19..2e6bece679a9 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -29,7 +29,6 @@ using namespace ftp; -using ::rtl::OUString; typedef sal_uInt32 ULONG; diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index d371d889b2fe..68dc11879c0b 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -85,8 +85,8 @@ namespace ftp { struct FTPDirentry { - rtl::OUString m_aURL; - rtl::OUString m_aName; + OUString m_aURL; + OUString m_aName; DateTime m_aDate; sal_uInt32 m_nMode; sal_uInt32 m_nSize; @@ -97,7 +97,7 @@ namespace ftp { m_nSize((sal_uInt32)(-1)) { } void clear() { - m_aURL = m_aName = rtl::OUString(); + m_aURL = m_aName = OUString(); m_aDate = DateTime(0,0,0,0,0,0,0); m_nMode = INETCOREFTP_FILEMODE_UNKNOWN; m_nSize = sal_uInt32(-1); @@ -169,7 +169,7 @@ namespace ftp { sal_uInt16 nYear); static sal_Bool setPath ( - rtl::OUString& rPath, + OUString& rPath, const sal_Char *value, sal_Int32 length = -1); }; diff --git a/ucb/source/ucp/ftp/ftphandleprovider.hxx b/ucb/source/ucp/ftp/ftphandleprovider.hxx index 5fccaf2198c2..380dc76e38cd 100644 --- a/ucb/source/ucp/ftp/ftphandleprovider.hxx +++ b/ucb/source/ucp/ftp/ftphandleprovider.hxx @@ -31,17 +31,17 @@ namespace ftp { /** host is in the form host:port. */ - virtual bool forHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account) = 0; - - virtual bool setHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account) = 0; + virtual bool forHost(const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account) = 0; + + virtual bool setHost(const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account) = 0; protected: ~FTPHandleProvider() {} diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 966e332a146a..ec88b897c532 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -144,7 +144,7 @@ void SAL_CALL XInteractionDisapproveImpl::select() // XInteractionRequestImpl -XInteractionRequestImpl::XInteractionRequestImpl(const rtl::OUString& aName) +XInteractionRequestImpl::XInteractionRequestImpl(const OUString& aName) : p1( new XInteractionApproveImpl ), p2( new XInteractionDisapproveImpl ), m_aName(aName), diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 95704b666a7d..00fbc5d7c9d9 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -121,7 +121,7 @@ namespace ftp { { public: - XInteractionRequestImpl(const rtl::OUString& aName); + XInteractionRequestImpl(const OUString& aName); virtual com::sun::star::uno::Any SAL_CALL queryInterface( @@ -160,7 +160,7 @@ namespace ftp { XInteractionApproveImpl* p1; XInteractionDisapproveImpl* p2; - rtl::OUString m_aName; + OUString m_aName; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx index e812fc139521..3bac7bb066e4 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx @@ -59,10 +59,10 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>& rxContext, new ucbhelper::PropertyValueSet(rxContext); for( int i = 0; i < seqProp.getLength(); ++i) { - const rtl::OUString& Name = seqProp[i].Name; + const OUString& Name = seqProp[i].Name; if(Name.compareToAscii("ContentType") == 0 ) xRow->appendString(seqProp[i], - rtl::OUString( "application/ftp" )); + OUString( "application/ftp" )); else if(Name.compareToAscii("Title") == 0) xRow->appendString(seqProp[i],dirvec[n].m_aName); else if(Name.compareToAscii("IsReadOnly") == 0) diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 3323f30f71b2..589f7aabe285 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -382,7 +382,7 @@ ResultSetBase::close( } -rtl::OUString SAL_CALL +OUString SAL_CALL ResultSetBase::queryContentIdentifierString( void ) throw( uno::RuntimeException ) @@ -390,7 +390,7 @@ ResultSetBase::queryContentIdentifierString( if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aPath[m_nRow]; else - return rtl::OUString(); + return OUString(); } @@ -405,7 +405,7 @@ ResultSetBase::queryContentIdentifier( if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) { if(!m_aIdents[m_nRow].is()) { - rtl::OUString url = queryContentIdentifierString(); + OUString url = queryContentIdentifierString(); if(!url.isEmpty() ) m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >( @@ -470,7 +470,7 @@ public: return m_aSeq; } - beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException) { @@ -480,7 +480,7 @@ public: throw beans::UnknownPropertyException(); } - sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw( uno::RuntimeException ) { for( int i = 0; i < m_aSeq.getLength(); ++i ) @@ -502,12 +502,12 @@ ResultSetBase::getPropertySetInfo() throw( uno::RuntimeException) { uno::Sequence< beans::Property > seq(2); - seq[0].Name = rtl::OUString("RowCount"); + seq[0].Name = OUString("RowCount"); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; - seq[1].Name = rtl::OUString("IsRowCountFinal"); + seq[1].Name = OUString("IsRowCountFinal"); seq[1].Handle = -1; seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[1].Attributes = beans::PropertyAttribute::READONLY; @@ -520,15 +520,15 @@ ResultSetBase::getPropertySetInfo() void SAL_CALL ResultSetBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& /*aValue*/ ) + const OUString& aPropertyName, const uno::Any& /*aValue*/ ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") || - aPropertyName == rtl::OUString("RowCount") ) + if( aPropertyName == OUString("IsRowCountFinal") || + aPropertyName == OUString("RowCount") ) return; throw beans::UnknownPropertyException(); @@ -536,18 +536,18 @@ void SAL_CALL ResultSetBase::setPropertyValue( uno::Any SAL_CALL ResultSetBase::getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == rtl::OUString("IsRowCountFinal") ) + if( PropertyName == OUString("IsRowCountFinal") ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == rtl::OUString("RowCount") ) + else if ( PropertyName == OUString("RowCount") ) { uno::Any aAny; sal_Int32 count = m_aItems.size(); @@ -560,13 +560,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( void SAL_CALL ResultSetBase::addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") ) + if( aPropertyName == OUString("IsRowCountFinal") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -575,7 +575,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") ) + else if ( aPropertyName == OUString("RowCount") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -589,19 +589,19 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( void SAL_CALL ResultSetBase::removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") && + if( aPropertyName == OUString("IsRowCountFinal") && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") && + else if ( aPropertyName == OUString("RowCount") && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); @@ -613,7 +613,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( void SAL_CALL ResultSetBase::addVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -623,7 +623,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener( void SAL_CALL ResultSetBase::removeVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 805cbf474b53..0c9803148110 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -110,13 +110,13 @@ namespace ftp { return m_nWasNull; } - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException) { - rtl::OUString ret; + OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) ret = m_aItems[m_nRow]->getString( columnIndex ); @@ -476,7 +476,7 @@ namespace ftp { // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString( void ) throw( com::sun::star::uno::RuntimeException ); @@ -509,7 +509,7 @@ namespace ftp { throw( com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -519,14 +519,14 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -535,7 +535,7 @@ namespace ftp { virtual void SAL_CALL removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -544,7 +544,7 @@ namespace ftp { virtual void SAL_CALL addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -552,7 +552,7 @@ namespace ftp { com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -574,7 +574,7 @@ namespace ftp { com::sun::star::ucb::XContentIdentifier > > IdentSet; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; - typedef std::vector< rtl::OUString > + typedef std::vector< OUString > PathSet; IdentSet m_aIdents; diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index b832b69d9f47..ecee9edbcffe 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -42,13 +42,13 @@ using namespace com::sun::star::io; namespace { -rtl::OUString encodePathSegment(rtl::OUString const & decoded) { +OUString encodePathSegment(OUString const & decoded) { return rtl::Uri::encode( decoded, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); } -rtl::OUString decodePathSegment(rtl::OUString const & encoded) { +OUString decodePathSegment(OUString const & encoded) { return rtl::Uri::decode( encoded, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8); } @@ -121,7 +121,7 @@ FTPURL::FTPURL(const FTPURL& r) } -FTPURL::FTPURL(const rtl::OUString& url, +FTPURL::FTPURL(const OUString& url, FTPHandleProvider* pFCP) throw( malformed_exception @@ -140,17 +140,17 @@ FTPURL::~FTPURL() } -void FTPURL::parse(const rtl::OUString& url) +void FTPURL::parse(const OUString& url) throw( malformed_exception ) { - rtl::OUString aPassword,aAccount; - rtl::OString aIdent(url.getStr(), + OUString aPassword,aAccount; + OString aIdent(url.getStr(), url.getLength(), RTL_TEXTENCODING_UTF8); - rtl::OString lower = aIdent.toAsciiLowerCase(); + OString lower = aIdent.toAsciiLowerCase(); if(lower.getLength() < 6 || strncmp("ftp://",lower.getStr(),6)) throw malformed_exception(); @@ -165,7 +165,7 @@ void FTPURL::parse(const rtl::OUString& url) *p1++ = ch; *p1 = 0; - rtl::OUString aExpr(rtl::OUString(buffer,strlen(buffer), + OUString aExpr(OUString(buffer,strlen(buffer), RTL_TEXTENCODING_UTF8)); sal_Int32 l = aExpr.indexOf(sal_Unicode('@')); @@ -213,7 +213,7 @@ void FTPURL::parse(const rtl::OUString& url) else // This is a legal name. m_aPathSegmentVec.push_back( - rtl::OUString(buffer, + OUString(buffer, strlen(buffer), RTL_TEXTENCODING_UTF8)); } @@ -237,19 +237,19 @@ void FTPURL::parse(const rtl::OUString& url) } -rtl::OUString FTPURL::ident(bool withslash,bool internal) const +OUString FTPURL::ident(bool withslash,bool internal) const { // rebuild the url as one without ellipses, // and more important, as one without username and // password. ( These are set together with the command. ) - rtl::OUStringBuffer bff; + OUStringBuffer bff; bff.appendAscii("ftp://"); if( m_aUsername != "anonymous" ) { bff.append(m_aUsername); - rtl::OUString aPassword,aAccount; + OUString aPassword,aAccount; m_pFCP->forHost(m_aHost, m_aPort, m_aUsername, @@ -286,16 +286,16 @@ rtl::OUString FTPURL::ident(bool withslash,bool internal) const } -rtl::OUString FTPURL::parent(bool internal) const +OUString FTPURL::parent(bool internal) const { - rtl::OUStringBuffer bff; + OUStringBuffer bff; bff.appendAscii("ftp://"); if( m_aUsername != "anonymous" ) { bff.append(m_aUsername); - rtl::OUString aPassword,aAccount; + OUString aPassword,aAccount; m_pFCP->forHost(m_aHost, m_aPort, m_aUsername, @@ -318,7 +318,7 @@ rtl::OUString FTPURL::parent(bool internal) const else bff.append(sal_Unicode('/')); - rtl::OUString last; + OUString last; for(unsigned int i = 0; i < m_aPathSegmentVec.size(); ++i) if(1+i == m_aPathSegmentVec.size()) @@ -338,17 +338,17 @@ rtl::OUString FTPURL::parent(bool internal) const } -void FTPURL::child(const rtl::OUString& title) +void FTPURL::child(const OUString& title) { m_aPathSegmentVec.push_back(encodePathSegment(title)); } -rtl::OUString FTPURL::child() const +OUString FTPURL::child() const { return m_aPathSegmentVec.size() ? - decodePathSegment(m_aPathSegmentVec.back()) : rtl::OUString(); + decodePathSegment(m_aPathSegmentVec.back()) : OUString(); } @@ -382,7 +382,7 @@ namespace ftp { curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data) #define SET_URL(url) \ - rtl::OString urlParAscii(url.getStr(), \ + OString urlParAscii(url.getStr(), \ url.getLength(), \ RTL_TEXTENCODING_UTF8); \ curl_easy_setopt(curl, \ @@ -398,7 +398,7 @@ FILE* FTPURL::open() CURL *curl = m_pFCP->handle(); SET_CONTROL_CONTAINER; - rtl::OUString url(ident(false,true)); + OUString url(ident(false,true)); SET_URL(url); FILE *res = tmpfile(); curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,file_write); @@ -429,7 +429,7 @@ std::vector<FTPDirentry> FTPURL::list( SET_CONTROL_CONTAINER; SET_DATA_CONTAINER; - rtl::OUString url(ident(true,true)); + OUString url(ident(true,true)); SET_URL(url); curl_easy_setopt(curl,CURLOPT_POSTQUOTE,0); @@ -448,7 +448,7 @@ std::vector<FTPDirentry> FTPURL::list( std::vector<FTPDirentry> resvec; FTPDirentry aDirEntry; // ensure slash at the end - rtl::OUString viewurl(ident(true,false)); + OUString viewurl(ident(true,false)); while(true) { while(p2-fwd < int(len) && *p2 != '\n') ++p2; @@ -504,7 +504,7 @@ std::vector<FTPDirentry> FTPURL::list( } -rtl::OUString FTPURL::net_title() const +OUString FTPURL::net_title() const throw(curl_exception) { CURL *curl = m_pFCP->handle(); @@ -518,14 +518,14 @@ rtl::OUString FTPURL::net_title() const bool try_more(true); CURLcode err; - rtl::OUString aNetTitle; + OUString aNetTitle; while(true) { - rtl::OUString url(ident(false,true)); + OUString url(ident(false,true)); if(try_more && 1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); // add end-slash + url += OUString("/"); // add end-slash else if(!try_more && 1+url.lastIndexOf(sal_Unicode('/')) == url.getLength()) url = url.copy(0,url.getLength()-1); // remove end-slash @@ -537,13 +537,13 @@ rtl::OUString FTPURL::net_title() const char* fwd = (char*) control.m_pBuffer; sal_uInt32 len = (sal_uInt32) control.m_nWritePos; - aNetTitle = rtl::OUString(fwd,len,RTL_TEXTENCODING_UTF8); + aNetTitle = OUString(fwd,len,RTL_TEXTENCODING_UTF8); // the buffer now contains the name of the file; // analyze the output: // Format of current working directory: // 257 "/bla/bla" is current directory sal_Int32 index1 = aNetTitle.lastIndexOf( - rtl::OUString("257")); + OUString("257")); index1 = 1+aNetTitle.indexOf(sal_Unicode('"'),index1); sal_Int32 index2 = aNetTitle.indexOf(sal_Unicode('"'),index1); aNetTitle = aNetTitle.copy(index1,index2-index1); @@ -571,7 +571,7 @@ rtl::OUString FTPURL::net_title() const aNetTitle = decodePathSegment(m_aPathSegmentVec.back()); else // must be root - aNetTitle = rtl::OUString("/"); + aNetTitle = OUString("/"); try_more = false; } @@ -589,7 +589,7 @@ rtl::OUString FTPURL::net_title() const FTPDirentry FTPURL::direntry() const throw(curl_exception) { - rtl::OUString nettitle = net_title(); + OUString nettitle = net_title(); FTPDirentry aDirentry; aDirentry.m_aName = nettitle; // init aDirentry @@ -653,7 +653,7 @@ void FTPURL::insert(bool replaceExisting,void* stream) const curl_easy_setopt(curl,CURLOPT_READDATA,stream); curl_easy_setopt(curl, CURLOPT_UPLOAD,1); - rtl::OUString url(ident(false,true)); + OUString url(ident(false,true)); SET_URL(url); CURLcode err = curl_easy_perform(curl); @@ -668,20 +668,20 @@ void FTPURL::insert(bool replaceExisting,void* stream) const void FTPURL::mkdir(bool ReplaceExisting) const throw(curl_exception) { - rtl::OString title; + OString title; if(!m_aPathSegmentVec.empty()) { - rtl::OUString titleOU = m_aPathSegmentVec.back(); + OUString titleOU = m_aPathSegmentVec.back(); titleOU = decodePathSegment(titleOU); - title = rtl::OString(titleOU.getStr(), + title = OString(titleOU.getStr(), titleOU.getLength(), RTL_TEXTENCODING_UTF8); } else // will give an error - title = rtl::OString("/"); + title = OString("/"); - rtl::OString aDel("del "); aDel += title; - rtl::OString mkd("mkd "); mkd += title; + OString aDel("del "); aDel += title; + OString mkd("mkd "); mkd += title; struct curl_slist *slist = 0; @@ -703,9 +703,9 @@ void FTPURL::mkdir(bool ReplaceExisting) const // post request curl_easy_setopt(curl,CURLOPT_POSTQUOTE,slist); - rtl::OUString url(parent(true)); + OUString url(parent(true)); if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); + url += OUString("/"); SET_URL(url); CURLcode err = curl_easy_perform(curl); @@ -715,22 +715,22 @@ void FTPURL::mkdir(bool ReplaceExisting) const } -rtl::OUString FTPURL::ren(const rtl::OUString& NewTitle) +OUString FTPURL::ren(const OUString& NewTitle) throw(curl_exception) { CURL *curl = m_pFCP->handle(); // post request - rtl::OString renamefrom("RNFR "); - rtl::OUString OldTitle = net_title(); + OString renamefrom("RNFR "); + OUString OldTitle = net_title(); renamefrom += - rtl::OString(OldTitle.getStr(), + OString(OldTitle.getStr(), OldTitle.getLength(), RTL_TEXTENCODING_UTF8); - rtl::OString renameto("RNTO "); + OString renameto("RNTO "); renameto += - rtl::OString(NewTitle.getStr(), + OString(NewTitle.getStr(), NewTitle.getLength(), RTL_TEXTENCODING_UTF8); @@ -743,9 +743,9 @@ rtl::OUString FTPURL::ren(const rtl::OUString& NewTitle) curl_easy_setopt(curl,CURLOPT_NOBODY,true); // no data => no transfer curl_easy_setopt(curl,CURLOPT_QUOTE,0); - rtl::OUString url(parent(true)); + OUString url(parent(true)); if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); + url += OUString("/"); SET_URL(url); CURLcode err = curl_easy_perform(curl); @@ -764,7 +764,7 @@ void FTPURL::del() const { FTPDirentry aDirentry(direntry()); - rtl::OString dele(aDirentry.m_aName.getStr(), + OString dele(aDirentry.m_aName.getStr(), aDirentry.m_aName.getLength(), RTL_TEXTENCODING_UTF8); @@ -776,10 +776,10 @@ void FTPURL::del() const url.del(); } catch(const curl_exception&) { } - dele = rtl::OString("RMD ") + dele; + dele = OString("RMD ") + dele; } else if(aDirentry.m_nMode != INETCOREFTP_FILEMODE_UNKNOWN) - dele = rtl::OString("DELE ") + dele; + dele = OString("DELE ") + dele; else return; @@ -793,9 +793,9 @@ void FTPURL::del() const curl_easy_setopt(curl,CURLOPT_NOBODY,true); // no data => no transfer curl_easy_setopt(curl,CURLOPT_QUOTE,0); - rtl::OUString url(parent(true)); + OUString url(parent(true)); if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); + url += OUString("/"); SET_URL(url); CURLcode err = curl_easy_perform(curl); diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx index b1d8b1375934..76603d2d9d82 100644 --- a/ucb/source/ucp/ftp/ftpurl.hxx +++ b/ucb/source/ucp/ftp/ftpurl.hxx @@ -85,7 +85,7 @@ namespace ftp { public: FTPURL( - const rtl::OUString& aIdent, + const OUString& aIdent, FTPHandleProvider* pFCP = 0 ) throw( @@ -96,28 +96,28 @@ namespace ftp { ~FTPURL(); - rtl::OUString host() const { return m_aHost; } + OUString host() const { return m_aHost; } - rtl::OUString port() const { return m_aPort; } + OUString port() const { return m_aPort; } - rtl::OUString username() const { return m_aUsername; } + OUString username() const { return m_aUsername; } /** This returns the URL, but cleaned from * unnessary ellipses. */ - rtl::OUString ident(bool withslash,bool internal) const; + OUString ident(bool withslash,bool internal) const; /** returns the parent url. */ - rtl::OUString parent(bool internal = false) const; + OUString parent(bool internal = false) const; /** sets the unencoded title */ - void child(const rtl::OUString& title); + void child(const OUString& title); /** returns the unencoded title */ - rtl::OUString child(void) const; + OUString child(void) const; std::vector<FTPDirentry> list(sal_Int16 nMode) const throw(curl_exception); @@ -134,7 +134,7 @@ namespace ftp { void mkdir(bool ReplaceExisting) const throw(curl_exception); - rtl::OUString ren(const rtl::OUString& NewTitle) + OUString ren(const OUString& NewTitle) throw(curl_exception); void del() const @@ -147,22 +147,22 @@ namespace ftp { FTPHandleProvider *m_pFCP; - mutable rtl::OUString m_aUsername; + mutable OUString m_aUsername; bool m_bShowPassword; - mutable rtl::OUString m_aHost; - mutable rtl::OUString m_aPort; - mutable rtl::OUString m_aType; + mutable OUString m_aHost; + mutable OUString m_aPort; + mutable OUString m_aType; /** Contains the encoded pathsegments of the url. */ - std::vector<rtl::OUString> m_aPathSegmentVec; + std::vector<OUString> m_aPathSegmentVec; - void parse(const rtl::OUString& url) + void parse(const OUString& url) throw( malformed_exception ); - rtl::OUString net_title() const throw(curl_exception); + OUString net_title() const throw(curl_exception); }; } diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index d37ce9069386..bbc99cae9849 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -26,11 +26,11 @@ #include <vector> struct ServerInfo { - rtl::OUString host; - rtl::OUString port; - rtl::OUString username; - rtl::OUString password; - rtl::OUString account; + OUString host; + OUString port; + OUString username; + OUString password; + OUString account; }; @@ -51,11 +51,11 @@ public: return p->handle(); } - bool forHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account) + bool forHost(const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account) { for(unsigned int i = 0; i < m_ServerInfo.size(); ++i) if(host == m_ServerInfo[i].host && @@ -69,11 +69,11 @@ public: return false; } - virtual bool setHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account) + virtual bool setHost(const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account) { ServerInfo inf; inf.host = host; @@ -110,7 +110,7 @@ private: #define TESTURL \ { \ -ftp::FTPURL url(rtl::OUString::createFromAscii(ascii),&prov); \ +ftp::FTPURL url(OUString::createFromAscii(ascii),&prov); \ if(!url.username().equalsAscii(n)) {\ ++number_of_errors; \ err_msg("wrong username: ",url.username()); \ @@ -147,7 +147,7 @@ int test_ftplist(void) { FTPHandleProviderI provider; ftp::FTPURL url( - rtl::OUString( "ftp://abi:psswd@abi-1/dir"), + OUString( "ftp://abi:psswd@abi-1/dir"), &provider); std::vector<ftp::FTPDirentry> vec = @@ -169,7 +169,7 @@ int test_ftplist(void) { #define TESTPARENT \ { \ - ftp::FTPURL url(rtl::OUString::createFromAscii(ascii),&prov); \ + ftp::FTPURL url(OUString::createFromAscii(ascii),&prov); \ urlStr = url.parent(); \ if(!urlStr.equalsAscii(expect)) \ ++number_of_errors; \ @@ -181,7 +181,7 @@ int test_ftpparent(void) { const char* name = "test_ftpparent"; FTPHandleProviderI prov; - rtl::OUString urlStr; + OUString urlStr; char *ascii,*expect; ascii = "ftp://abi:psswd@abi-1/file"; @@ -217,7 +217,7 @@ int test_ftpproperties(void) { FTPHandleProviderI provider; ftp::FTPURL url( - rtl::OUString( "ftp://abi:psswd@abi-1/file"), + OUString( "ftp://abi:psswd@abi-1/file"), &provider); ftp::FTPDirentry ade(url.direntry()); @@ -240,7 +240,7 @@ int test_ftpopen(void) FTPHandleProviderI provider; ftp::FTPURL url( - rtl::OUString( "ftp://abi:psswd@abi-1/file"), + OUString( "ftp://abi:psswd@abi-1/file"), &provider); FILE* file = url.open(); diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx index 83dc96aefd08..d7b42bd5a8ff 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.cxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx @@ -62,7 +62,7 @@ void SAL_CALL Test_MultiServiceFactory::release( void ) throw() Reference< XInterface > SAL_CALL Test_MultiServiceFactory::createInstance( - const ::rtl::OUString& aServiceSpecifier + const OUString& aServiceSpecifier ) throw ( Exception, @@ -77,7 +77,7 @@ Test_MultiServiceFactory::createInstance( Reference< XInterface > SAL_CALL Test_MultiServiceFactory::createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const Sequence < Any >& Arguments ) @@ -90,14 +90,14 @@ Test_MultiServiceFactory::createInstanceWithArguments( XInterface >(0); } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL Test_MultiServiceFactory::getAvailableServiceNames( ) throw ( RuntimeException ) { - return Sequence< ::rtl::OUString >(0); + return Sequence< OUString >(0); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/test_multiservicefac.hxx b/ucb/source/ucp/ftp/test_multiservicefac.hxx index eb21b626e232..c767ba824a1d 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.hxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.hxx @@ -54,7 +54,7 @@ namespace test_ftp { virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( - const ::rtl::OUString& aServiceSpecifier + const OUString& aServiceSpecifier ) throw ( ::com::sun::star::uno::Exception, @@ -65,7 +65,7 @@ namespace test_ftp { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Any >& Arguments ) @@ -74,7 +74,7 @@ namespace test_ftp { ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw ( diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 4b7c3042646a..06e3920d10c8 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -88,7 +88,7 @@ Content::Content( m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(false) { #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "New Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "New Content ('%s')\n", OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif } @@ -102,7 +102,7 @@ Content::Content( m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true) { #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "Create Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "Create Content ('%s')\n", OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif mpInfo = g_file_info_new(); g_file_info_set_file_type(mpInfo, bIsFolder ? G_FILE_TYPE_DIRECTORY : G_FILE_TYPE_REGULAR); @@ -114,14 +114,14 @@ Content::~Content() if (mpFile) g_object_unref(mpFile); } -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { - rtl::OUString sURL; + OUString sURL; if (GFile* pFile = g_file_get_parent(getGFile())) { char* pPath = g_file_get_uri(pFile); g_object_unref(pFile); - sURL = rtl::OUString::createFromAscii(pPath); + sURL = OUString::createFromAscii(pPath); g_free(pPath); } return sURL; @@ -135,11 +135,11 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //it throughout the g_file_* calls } -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( GIO_FOLDER_TYPE ) - : rtl::OUString( GIO_FILE_TYPE ); + ? OUString( GIO_FOLDER_TYPE ) + : OUString( GIO_FILE_TYPE ); } #define EXCEPT(aExcept) \ @@ -153,11 +153,11 @@ uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterfac uno::Any aRet; gint eCode = pError->code; - rtl::OUString sMessage(pError->message, strlen(pError->message), RTL_TEXTENCODING_UTF8); + OUString sMessage(pError->message, strlen(pError->message), RTL_TEXTENCODING_UTF8); g_error_free(pError); - rtl::OUString sName; - rtl::OUString sHost; + OUString sName; + OUString sHost; uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= sName; @@ -293,7 +293,7 @@ uno::Any Content::mapGIOError( GError *pError ) uno::Any Content::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException( - rtl::OUString("Wrong argument type!"), + OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1) ); } @@ -362,7 +362,7 @@ GFileInfo* Content::getGFileInfo(const uno::Reference< ucb::XCommandEnvironment GFile* Content::getGFile() { if (!mpFile) - mpFile = g_file_new_for_uri(rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + mpFile = g_file_new_for_uri(OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); return mpFile; } @@ -423,7 +423,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * if (pInfo != 0 && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME)) { const char *pName = g_file_info_get_display_name(pInfo); - xRow->appendString( rProp, rtl::OUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8) ); + xRow->appendString( rProp, OUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8) ); } else xRow->appendVoid(rProp); @@ -512,7 +512,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( static lang::IllegalAccessException getReadOnlyException( const uno::Reference< uno::XInterface >& rContext ) { - return lang::IllegalAccessException ( rtl::OUString("Property is read-only!"), rContext ); + return lang::IllegalAccessException ( OUString("Property is read-only!"), rContext ); } void Content::queryChildren( ContentRefList& rChildren ) @@ -524,11 +524,11 @@ void Content::queryChildren( ContentRefList& rChildren ) ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Int32 nLen = aURL.getLength(); @@ -538,7 +538,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? if ( ( aChildURL.getLength() > nLen ) && ( aChildURL.compareTo( aURL, nLen ) == 0 ) ) @@ -569,7 +569,7 @@ sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifie return sal_False; } - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); // Exchange own identitity. if ( exchange( xNewId ) ) @@ -587,8 +587,8 @@ sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifie // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL = aOldChildURL.replaceAt( + OUString aOldChildURL = xOldChildId->getContentIdentifier(); + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), xNewId->getContentIdentifier() ); uno::Reference< ucb::XContentIdentifier > xNewChildId @@ -643,7 +643,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { const beans::PropertyValue& rValue = pValues[ n ]; #if OSL_DEBUG_LEVEL > 1 - g_warning("Set prop '%s'", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); + g_warning("Set prop '%s'", OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); #endif if ( rValue.Name == "ContentType" || rValue.Name == "MediaType" || @@ -656,11 +656,11 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } 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; } @@ -668,13 +668,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues( 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; } - rtl::OString sNewTitle = OUStringToOString(aNewTitle, RTL_TEXTENCODING_UTF8); + OString sNewTitle = OUStringToOString(aNewTitle, RTL_TEXTENCODING_UTF8); newName = sNewTitle.getStr(); const char *oldName = g_file_info_get_name( pInfo); @@ -684,9 +684,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( g_warning ("Set new name to '%s'", newName); #endif - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); if (oldName) - aEvent.OldValue = uno::makeAny(rtl::OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8)); + aEvent.OldValue = uno::makeAny(OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8)); aEvent.NewValue = uno::makeAny(aNewTitle); aChanges.getArray()[ nChanged ] = aEvent; nTitlePos = nChanged++; @@ -697,7 +697,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { #ifdef DEBUG - fprintf(stderr, "Unknown property %s\n", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "Unknown property %s\n", OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); #endif aRet[ n ] <<= getReadOnlyException( static_cast< cppu::OWeakObject * >(this) ); //TODO @@ -720,15 +720,15 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { if (nTitlePos > -1) { - rtl::OUString aNewURL = getParentURL(); - aNewURL += rtl::OUString( newName, strlen(newName), RTL_TEXTENCODING_UTF8 ); + OUString aNewURL = getParentURL(); + aNewURL += OUString( newName, strlen(newName), RTL_TEXTENCODING_UTF8 ); uno::Reference< ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); if (!exchangeIdentity( xNewId ) ) { aRet[ nTitlePos ] <<= uno::Exception - ( rtl::OUString("Exchange failed!"), + ( OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -828,7 +828,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, 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) ); @@ -859,7 +859,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, { ucbhelper::cancelCommandExecution( uno::makeAny ( ucb::UnsupportedOpenModeException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rOpenCommand.Mode ) ) ), xEnv ); } @@ -871,12 +871,12 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, // sink is optional... #ifdef DEBUG g_warning ("Failed to load data from '%s'", - rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif ucbhelper::cancelCommandExecution( uno::makeAny (ucb::UnsupportedDataSinkException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), rOpenCommand.Sink ) ), xEnv ); } @@ -895,7 +895,7 @@ uno::Any SAL_CALL Content::execute( uno::RuntimeException ) { #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "Content::execute %s\n", rtl::OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "Content::execute %s\n", OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr()); #endif uno::Any aRet; @@ -974,7 +974,7 @@ uno::Any SAL_CALL Content::execute( ucbhelper::cancelCommandExecution ( uno::makeAny( ucb::UnsupportedCommandException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1025,7 +1025,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream, { ucbhelper::cancelCommandExecution( uno::makeAny ( ucb::MissingInputStreamException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1057,17 +1057,17 @@ const GFileCopyFlags DEFAULT_COPYDATA_FLAGS = void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( uno::Exception ) { - rtl::OUString sDest = m_xIdentifier->getContentIdentifier(); + OUString sDest = m_xIdentifier->getContentIdentifier(); if (!sDest.endsWith("/")) { sDest += "/"; } if (aTransferInfo.NewTitle.getLength()) sDest += aTransferInfo.NewTitle; else - sDest += rtl::OUString::createFromAscii(g_file_get_basename(getGFile())); + sDest += OUString::createFromAscii(g_file_get_basename(getGFile())); - GFile *pDest = g_file_new_for_uri(rtl::OUStringToOString(sDest, RTL_TEXTENCODING_UTF8).getStr()); - GFile *pSource = g_file_new_for_uri(rtl::OUStringToOString(aTransferInfo.SourceURL, RTL_TEXTENCODING_UTF8).getStr()); + GFile *pDest = g_file_new_for_uri(OUStringToOString(sDest, RTL_TEXTENCODING_UTF8).getStr()); + GFile *pSource = g_file_new_for_uri(OUStringToOString(aTransferInfo.SourceURL, RTL_TEXTENCODING_UTF8).getStr()); gboolean bSuccess = false; GError *pError = NULL; @@ -1092,19 +1092,19 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( // 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( GIO_FILE_TYPE ); + seq[0].Type = OUString( GIO_FILE_TYPE ); seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = rtl::OUString( GIO_FOLDER_TYPE ); + seq[1].Type = OUString( GIO_FOLDER_TYPE ); seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; @@ -1136,7 +1136,7 @@ uno::Reference< ucb::XContent > else { #ifdef DEBUG - g_warning( "Failed to create new content '%s'", rtl::OUStringToOString(Info.Type, + g_warning( "Failed to create new content '%s'", OUStringToOString(Info.Type, RTL_TEXTENCODING_UTF8).getStr() ); #endif return uno::Reference< ucb::XContent >(); @@ -1146,13 +1146,13 @@ uno::Reference< ucb::XContent > g_warning( "createNewContent (%d)", (int) create_document ); #endif - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); name = create_document ? "[New_Content]" : "[New_Collection]"; - aURL += rtl::OUString::createFromAscii( name ); + aURL += OUString::createFromAscii( name ); uno::Reference< ucb::XContentIdentifier > xId(new ::ucbhelper::ContentIdentifier(aURL)); @@ -1207,40 +1207,40 @@ uno::Sequence< beans::Property > Content::getProperties( { 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 ), - 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( "IsVolume" ), + beans::Property( OUString( "IsVolume" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsCompactDisc" ), + beans::Property( OUString( "IsCompactDisc" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsRemoveable" ), + beans::Property( OUString( "IsRemoveable" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsHidden" ), + beans::Property( OUString( "IsHidden" ), -1, getCppuBooleanType(), 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 ) }; @@ -1255,35 +1255,35 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc { // 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::InsertCommandArgument * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "open" ), + ( OUString( "open" ), -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 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 ) ) ) }; @@ -1309,16 +1309,16 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno 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.GIOContent"); + return OUString("com.sun.star.comp.GIOContent"); } -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = rtl::OUString("com.sun.star.ucb.GIOContent"); + uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[ 0 ] = OUString("com.sun.star.ucb.GIOContent"); return aSNS; } diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index b1cfe0a56996..bda3c6255a2a 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -144,21 +144,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/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 0c6e40657c9d..e6824e25631b 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -98,11 +98,11 @@ DataSupplier::~DataSupplier() } } -::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { if ( nIndex < maResults.size() ) { - ::rtl::OUString aId = maResults[ nIndex ]->aId; + OUString aId = maResults[ nIndex ]->aId; if ( aId.getLength() ) { // Already cached. @@ -114,16 +114,16 @@ DataSupplier::~DataSupplier() { GFile *pFile = mxContent->getGFile(); char* parent = g_file_get_uri(pFile); - rtl::OUString aId = rtl::OUString::createFromAscii( parent ); + OUString aId = OUString::createFromAscii( parent ); g_free(parent); char *escaped_name = g_uri_escape_string( g_file_info_get_name(maResults[ nIndex ]->pInfo) , NULL, false); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); - aId += rtl::OUString::createFromAscii( escaped_name ); + aId += OUString::createFromAscii( escaped_name ); g_free( escaped_name ); @@ -131,7 +131,7 @@ DataSupplier::~DataSupplier() return aId; } - return ::rtl::OUString(); + return OUString(); } uno::Reference< ucb::XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) @@ -146,7 +146,7 @@ uno::Reference< ucb::XContentIdentifier > DataSupplier::queryContentIdentifier( } } - ::rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( aId.getLength() ) { uno::Reference< ucb::XContentIdentifier > xId = new ucbhelper::ContentIdentifier( aId ); @@ -235,7 +235,7 @@ uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nInde 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/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 34cd04613fbc..3a119a62360c 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -31,7 +31,7 @@ class Content; struct ResultListEntry { - ::rtl::OUString aId; + OUString aId; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > xId; com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent; com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow; @@ -64,7 +64,7 @@ public: const com::sun::star::uno::Reference< Content >& rContent, 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 ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index 638c2ff5820b..b454a6840f3a 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -61,7 +61,7 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw io::NotConnectedException(); if (!g_seekable_can_seek(G_SEEKABLE(mpStream))) - throw io::IOException(rtl::OUString("Seek unsupported"), + throw io::IOException(OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index bd9d2012a258..30c97e29795f 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -75,7 +75,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, return; } - ::rtl::OUString aHostName, aDomain, aUserName, aPassword; + OUString aHostName, aDomain, aUserName, aPassword; ucbhelper::SimpleAuthenticationRequest::EntityType eUserName = (flags & G_ASK_PASSWORD_NEED_USERNAME) @@ -83,18 +83,18 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, : ucbhelper::SimpleAuthenticationRequest::ENTITY_NA; if (default_user) - aUserName = rtl::OUString(default_user, strlen(default_user), RTL_TEXTENCODING_UTF8); + aUserName = OUString(default_user, strlen(default_user), RTL_TEXTENCODING_UTF8); ucbhelper::SimpleAuthenticationRequest::EntityType ePassword = (flags & G_ASK_PASSWORD_NEED_PASSWORD) ? ucbhelper::SimpleAuthenticationRequest::ENTITY_MODIFY : ucbhelper::SimpleAuthenticationRequest::ENTITY_NA; - rtl::OUString aPrevPassword, aPrevUsername; + OUString aPrevPassword, aPrevUsername; if (pThis->m_pPrevUsername) - aPrevUsername = rtl::OUString(pThis->m_pPrevUsername, strlen(pThis->m_pPrevUsername), RTL_TEXTENCODING_UTF8); + aPrevUsername = OUString(pThis->m_pPrevUsername, strlen(pThis->m_pPrevUsername), RTL_TEXTENCODING_UTF8); if (pThis->m_pPrevPassword) - aPrevPassword = rtl::OUString(pThis->m_pPrevPassword, strlen(pThis->m_pPrevPassword), RTL_TEXTENCODING_UTF8); + aPrevPassword = OUString(pThis->m_pPrevPassword, strlen(pThis->m_pPrevPassword), RTL_TEXTENCODING_UTF8); //The damn dialog is stupidly broken, so do like webdav, i.e. "#102871#" if ( aUserName.isEmpty() ) @@ -109,10 +109,10 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, : ucbhelper::SimpleAuthenticationRequest::ENTITY_NA; if (default_domain) - aDomain = rtl::OUString(default_domain, strlen(default_domain), RTL_TEXTENCODING_UTF8); + aDomain = OUString(default_domain, strlen(default_domain), RTL_TEXTENCODING_UTF8); uno::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest - = new ucbhelper::SimpleAuthenticationRequest (rtl::OUString() /* FIXME: provide URL here */, aHostName, eDomain, aDomain, eUserName, aUserName, ePassword, aPassword); + = new ucbhelper::SimpleAuthenticationRequest (OUString() /* FIXME: provide URL here */, aHostName, eDomain, aDomain, eUserName, aUserName, ePassword, aPassword); xIH->handle( xRequest.get() ); @@ -136,13 +136,13 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, aPassword = xSupp->getPassword(); if (flags & G_ASK_PASSWORD_NEED_USERNAME) - g_mount_operation_set_username(op, rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); + g_mount_operation_set_username(op, OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); if (flags & G_ASK_PASSWORD_NEED_PASSWORD) - g_mount_operation_set_password(op, rtl::OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); + g_mount_operation_set_password(op, OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); if (flags & G_ASK_PASSWORD_NEED_DOMAIN) - g_mount_operation_set_domain(op, rtl::OUStringToOString(xSupp->getRealm(), RTL_TEXTENCODING_UTF8).getStr()); + g_mount_operation_set_domain(op, OUStringToOString(xSupp->getRealm(), RTL_TEXTENCODING_UTF8).getStr()); switch (xSupp->getRememberPasswordMode()) { @@ -160,10 +160,10 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, if (pThis->m_pPrevPassword) free(pThis->m_pPrevPassword); - pThis->m_pPrevPassword = strdup(rtl::OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); + pThis->m_pPrevPassword = strdup(OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); if (pThis->m_pPrevUsername) free(pThis->m_pPrevUsername); - pThis->m_pPrevUsername = strdup(rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); + pThis->m_pPrevUsername = strdup(OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED); } diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 93ec2d4d6704..aad78b37afcc 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -38,7 +38,7 @@ ContentProvider::queryContent( { #if OSL_DEBUG_LEVEL > 1 fprintf(stderr, "QueryContent: '%s'", - rtl::OUStringToOString + OUStringToOString (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif @@ -85,8 +85,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.GIOContentProvider" ), - rtl::OUString( "com.sun.star.ucb.GIOContentProvider" ) ); + OUString( "com.sun.star.comp.GIOContentProvider" ), + OUString( "com.sun.star.ucb.GIOContentProvider" ) ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index b3777144b463..70cc2e1abe82 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -46,7 +46,7 @@ void SAL_CALL Seekable::truncate( void ) throw io::NotConnectedException(); if (!g_seekable_can_truncate(mpStream)) - throw io::IOException(rtl::OUString("Truncate unsupported"), + throw io::IOException(OUString("Truncate unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -61,7 +61,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) throw io::NotConnectedException(); if (!g_seekable_can_seek(mpStream)) - throw io::IOException(rtl::OUString("Seek unsupported"), + throw io::IOException(OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -111,7 +111,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc } if (!bOk) - throw io::IOException(rtl::OUString("Getting size unsupported"), + throw io::IOException(OUString("Getting size unsupported"), static_cast< cppu::OWeakObject * >(this)); return nSize; diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 8e7778b3884d..22c9d1aef1e2 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -90,19 +90,19 @@ using namespace com::sun::star; static char * -OUStringToGnome( const rtl::OUString &str ) +OUStringToGnome( const OUString &str ) { - rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ); + OString aTempStr = OUStringToOString( str, RTL_TEXTENCODING_UTF8 ); return g_strdup( aTempStr.getStr() ); } -static rtl::OUString +static OUString GnomeToOUString( const char *utf8_str) { if (!utf8_str) - return rtl::OUString(); + return OUString(); else - return rtl::OUString( utf8_str, strlen( utf8_str ), RTL_TEXTENCODING_UTF8 ); + return OUString( utf8_str, strlen( utf8_str ), RTL_TEXTENCODING_UTF8 ); } @@ -235,17 +235,17 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // XServiceInfo methods. // -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString("com.sun.star.comp.GnomeVFSContent"); + return OUString("com.sun.star.comp.GnomeVFSContent"); } -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = rtl::OUString( "com.sun.star.ucb.GnomeVFSContent" ); + uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[ 0 ] = OUString( "com.sun.star.ucb.GnomeVFSContent" ); return aSNS; } @@ -253,13 +253,13 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() // XContent methods. // -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) ) - return rtl::OUString( GVFS_FOLDER_TYPE ); + return OUString( GVFS_FOLDER_TYPE ); else - return rtl::OUString( GVFS_FILE_TYPE ); + return OUString( GVFS_FILE_TYPE ); } // @@ -269,7 +269,7 @@ rtl::OUString SAL_CALL Content::getContentType() uno::Any Content::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException - ( rtl::OUString("Wrong argument type!"), + ( OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1 ) ); } @@ -346,7 +346,7 @@ uno::Any SAL_CALL Content::execute( == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) { ucbhelper::cancelCommandExecution ( uno::makeAny ( ucb::UnsupportedOpenModeException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( aOpenCommand.Mode ) ) ), xEnv ); @@ -360,7 +360,7 @@ uno::Any SAL_CALL Content::execute( #endif ucbhelper::cancelCommandExecution ( uno::makeAny (ucb::UnsupportedDataSinkException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), aOpenCommand.Sink ) ), xEnv ); @@ -390,7 +390,7 @@ uno::Any SAL_CALL Content::execute( sal_Bool bDeletePhysical = sal_False; aCommand.Argument >>= bDeletePhysical; - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); GnomeVFSResult result = gnome_vfs_unlink (aURI.getStr()); if (result != GNOME_VFS_OK) @@ -413,7 +413,7 @@ uno::Any SAL_CALL Content::execute( #endif ucbhelper::cancelCommandExecution ( uno::makeAny( ucb::UnsupportedCommandException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -443,19 +443,19 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( // 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( GVFS_FILE_TYPE ); + seq[0].Type = OUString( GVFS_FILE_TYPE ); seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = rtl::OUString( GVFS_FOLDER_TYPE ); + seq[1].Type = OUString( GVFS_FOLDER_TYPE ); seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; @@ -496,14 +496,14 @@ Content::createNewContent( const ucb::ContentInfo& Info ) g_warning( "createNewContent (%d)", (int) create_document ); #endif - rtl::OUString aURL = getOUURI(); + OUString aURL = getOUURI(); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); name = create_document ? "[New_Content]" : "[New_Collection]"; // This looks problematic to me cf. webdav - aURL += rtl::OUString::createFromAscii( name ); + aURL += OUString::createFromAscii( name ); uno::Reference< ucb::XContentIdentifier > xId ( new ::ucbhelper::ContentIdentifier( aURL ) ); @@ -515,9 +515,9 @@ Content::createNewContent( const ucb::ContentInfo& Info ) } } -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { - rtl::OUString aParentURL; + OUString aParentURL; // <scheme>:// -> "" // <scheme>://foo -> "" // <scheme>://foo/ -> "" @@ -525,7 +525,7 @@ rtl::OUString Content::getParentURL() // <scheme>://foo/bar/ -> <scheme>://foo/ // <scheme>://foo/bar/abc -> <scheme>://foo/bar/ - rtl::OUString aURL = getOUURI(); + OUString aURL = getOUURI(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) { @@ -538,11 +538,11 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 != -1 ) - aParentURL = rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + aParentURL = OUString( aURL.copy( 0, nPos + 1 ) ); #if OSL_DEBUG_LEVEL > 1 g_warning ("getParentURL '%s' -> '%s'", - getURI(), rtl::OUStringToOString + getURI(), OUStringToOString ( aParentURL, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif @@ -621,7 +621,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new (); - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); gnome_vfs_get_file_info ( aURI.getStr(), fileInfo, GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS ); @@ -691,16 +691,16 @@ static lang::IllegalAccessException getReadOnlyException( Content *ctnt ) { return lang::IllegalAccessException - ( rtl::OUString("Property is read-only!"), + ( OUString("Property is read-only!"), static_cast< cppu::OWeakObject * >( ctnt ) ); } -rtl::OUString +OUString Content::makeNewURL( const char */*newName*/ ) { - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString("/"); + aNewURL += OUString("/"); char *name = gnome_vfs_escape_string( m_info.name ); aNewURL += GnomeToOUString( name ); @@ -719,7 +719,7 @@ Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo, g_assert (!m_bTransient); - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -750,7 +750,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) { - rtl::OUString aNewTitle; + OUString aNewTitle; GnomeVFSFileInfo newInfo; int setMask = GNOME_VFS_SET_FILE_INFO_NONE; @@ -795,7 +795,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( rValue.Value >>= aNewTitle ) { if ( aNewTitle.isEmpty() ) aRet[ n ] <<= lang::IllegalArgumentException - ( rtl::OUString("Empty title not allowed!"), + ( OUString("Empty title not allowed!"), static_cast< cppu::OWeakObject * >( this ), -1 ); else { char *newName = OUStringToGnome( aNewTitle ); @@ -805,7 +805,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( g_warning ("Set new name to '%s'", newName); #endif - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( GnomeToOUString( newInfo.name ) ); aEvent.NewValue = uno::makeAny( aNewTitle ); aChanges.getArray()[ nChanged ] = aEvent; @@ -818,7 +818,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } } else aRet[ n ] <<= beans::IllegalTypeException - ( rtl::OUString("Property value has wrong type!"), + ( OUString("Property value has wrong type!"), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "DateCreated" || rValue.Name == "DateModified" ) { @@ -853,7 +853,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( aGuard.clear(); if (!exchangeIdentity( xNewId ) ) aRet[ nTitlePos ] <<= uno::Exception - ( rtl::OUString("Exchange failed!"), + ( OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -878,11 +878,11 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = getOUURI(); + OUString aURL = getOUURI(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Int32 nLen = aURL.getLength(); @@ -891,7 +891,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? @@ -937,7 +937,7 @@ void Content::insert( if ( m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE && m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) { - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); int perm; perm = ( GNOME_VFS_PERM_USER_ALL | @@ -960,13 +960,13 @@ void Content::insert( ucbhelper::cancelCommandExecution ( uno::makeAny ( ucb::MissingInputStreamException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } GnomeVFSHandle *handle = NULL; - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); result = GNOME_VFS_ERROR_GENERIC; if ( bReplaceExisting ) { @@ -1016,7 +1016,7 @@ void Content::transfer(const ucb::TransferInfo & /*rArgs*/, ucbhelper::cancelCommandExecution ( uno::makeAny ( ucb::InteractiveBadTransferURLException - ( rtl::OUString("Unsupported URL scheme!"), + ( OUString("Unsupported URL scheme!"), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1067,7 +1067,7 @@ sal_Bool Content::exchangeIdentity( return sal_False; } - rtl::OUString aOldURL = getOUURI(); + OUString aOldURL = getOUURI(); // Exchange own identitity. if ( exchange( xNewId ) ) { @@ -1085,9 +1085,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(), @@ -1117,7 +1117,7 @@ Content::getInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) result = GNOME_VFS_OK; else if ( !m_info.valid_fields ) { - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); Authentication aAuth( xEnv ); result = gnome_vfs_get_file_info ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT ); @@ -1146,7 +1146,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite { uno::Any aException; const char *gvfs_message; - rtl::OUString message; + OUString message; uno::Sequence< uno::Any > aArgs( 1 ); #if OSL_DEBUG_LEVEL > 1 @@ -1168,7 +1168,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier(); aException <<= ucb::InteractiveAugmentedIOException - ( rtl::OUString("Not found!"), + ( OUString("Not found!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -1177,7 +1177,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_BAD_PARAMETERS: aException <<= lang::IllegalArgumentException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -1193,14 +1193,14 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite if ( bWrite ) aException <<= ucb::InteractiveNetworkWriteException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); else aException <<= ucb::InteractiveNetworkReadException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1209,7 +1209,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_INVALID_HOST_NAME: aException <<= ucb::InteractiveNetworkResolveNameException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1220,7 +1220,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_NO_MASTER_BROWSER: aException <<= ucb::InteractiveNetworkConnectException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1228,7 +1228,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_FILE_EXISTS: aException <<= ucb::NameClashException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1270,7 +1270,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite #endif default: aException <<= ucb::InteractiveNetworkGeneralException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -1293,45 +1293,45 @@ uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( "ContentType" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "ContentType" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - 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 ), // Optional ... - 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 ), // FIXME: Too expensive for now (?) -// 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::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( "IsReadOnly" ), + beans::Property( OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsVolume" ), + beans::Property( OUString( "IsVolume" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsCompactDisk" ), + beans::Property( OUString( "IsCompactDisk" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsHidden" ), + beans::Property( OUString( "IsHidden" ), -1, getCppuBooleanType(), 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 ) }; @@ -1348,35 +1348,35 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( static ucb::CommandInfo aCommandInfoTable[] = { // 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::InsertCommandArgument * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "open" ), + ( OUString( "open" ), -1, getCppuType( static_cast<ucb::OpenCommandArgument2 * >( 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 ) ) ) }; @@ -1386,17 +1386,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCommandInfoTable, isFolder( xEnv ) ? nProps : nProps - 2 ); } -rtl::OUString +OUString Content::getOUURI () { osl::Guard< osl::Mutex > aGuard( m_aMutex ); return m_xIdentifier->getContentIdentifier(); } -rtl::OString +OString Content::getOURI () { - return rtl::OUStringToOString( getOUURI(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( getOUURI(), RTL_TEXTENCODING_UTF8 ); } char * @@ -1427,7 +1427,7 @@ Content::createTempStream( { GnomeVFSResult result; GnomeVFSHandle *handle = NULL; - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Something badly wrong happened - can't seek => stream to a temporary file @@ -1462,7 +1462,7 @@ Content::createInputStream( osl::Guard< osl::Mutex > aGuard( m_aMutex ); getInfo( xEnv ); - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) ) return createTempStream( xEnv ); @@ -1567,7 +1567,7 @@ extern "C" { ucbhelper::SimpleAuthenticationRequest::EntityType eDomain, eUserName, ePassword; - ::rtl::OUString aHostName, aDomain, aUserName, aPassword; + OUString aHostName, aDomain, aUserName, aPassword; aHostName = GnomeToOUString( in->server ); @@ -1599,7 +1599,7 @@ extern "C" { // the same user/password as was entered last time if // we failed to authenticate - infinite looping / flickering // madness etc. [ nice infrastructure ! ] - static rtl::OUString aLastUserName, aLastPassword; + static OUString aLastUserName, aLastPassword; if (in->flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -1626,7 +1626,7 @@ extern "C" { ucbhelper::InteractionSupplyAuthentication > & xSupp = xRequest->getAuthenticationSupplier(); - ::rtl::OUString aNewDomain, aNewUserName, aNewPassword; + OUString aNewDomain, aNewUserName, aNewPassword; aNewUserName = xSupp->getUserName(); if ( !aNewUserName.isEmpty() ) diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx index 0357987eb4fd..048ea8443636 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.hxx +++ b/ucb/source/ucp/gvfs/gvfs_content.hxx @@ -94,11 +94,11 @@ private: GnomeVFSSetFileInfoMask setMask, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - ::rtl::OUString makeNewURL ( const char *newName ); + OUString makeNewURL ( const char *newName ); // End Internal helpers // For ucbhelper - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); // For ucbhelper virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< @@ -176,8 +176,8 @@ private: public: // Non-interface bits char *getURI (); - rtl::OString getOURI (); - rtl::OUString getOUURI (); + OString getOURI (); + OUString getOUURI (); //========================================================================= // Externals @@ -206,14 +206,14 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + 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 ); diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 9ca0c2382e44..fb02b50ed9f9 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -72,7 +72,7 @@ void DynamicResultSet::initDynamic() struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -144,26 +144,26 @@ 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 ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) // cached return aId; } if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getOUURI(); + OUString aId = m_pImpl->m_xContent->getOUURI(); char *escaped_name; escaped_name = gnome_vfs_escape_string( m_pImpl->m_aResults[ nIndex ]->aInfo.name ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); - aId += rtl::OUString::createFromAscii( escaped_name ); + aId += OUString::createFromAscii( escaped_name ); g_free( escaped_name ); @@ -171,7 +171,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) return aId; } - return rtl::OUString(); + return OUString(); } // virtual @@ -187,7 +187,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) return xId; } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aId ); diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx index e1847b3a470b..37d6aa0c07e4 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.hxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx @@ -59,7 +59,7 @@ public: 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 ); diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index c849b0b17fc8..ec15ae0abee0 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -76,8 +76,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.GnomeVFSContentProvider" ), - rtl::OUString( "com.sun.star.ucb.GnomeVFSContentProvider" ) ); + OUString( "com.sun.star.comp.GnomeVFSContentProvider" ), + OUString( "com.sun.star.ucb.GnomeVFSContentProvider" ) ); //========================================================================= // // Service factory implementation. @@ -101,7 +101,7 @@ ContentProvider::queryContent( { #if OSL_DEBUG_LEVEL > 1 g_warning ("QueryContent: '%s'", - rtl::OUStringToOString (Identifier->getContentIdentifier(), + OUStringToOString (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr() ); #endif diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index 462fde93d9ac..080d484dfb47 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::ucb; using namespace gvfs; -using ::rtl::OUString; Stream::Stream( GnomeVFSHandle *handle, const GnomeVFSFileInfo *aInfo ) : @@ -322,7 +321,7 @@ void Stream::throwOnError( GnomeVFSResult result ) RuntimeException ) { if( result != GNOME_VFS_OK ) { - ::rtl::OUString aMsg = ::rtl::OUString::createFromAscii + OUString aMsg = OUString::createFromAscii ( gnome_vfs_result_to_string( result ) ); g_warning( "Input Stream exceptional result '%s' (%d)", diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 92313ca5c078..c71de2339420 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -285,26 +285,26 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL HierarchyContent::getImplementationName() +OUString SAL_CALL HierarchyContent::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.ucb.HierarchyContent" ); + return OUString( "com.sun.star.comp.ucb.HierarchyContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL HierarchyContent::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); if ( m_eKind == LINK ) - aSNS.getArray()[ 0 ] = rtl::OUString( HIERARCHY_LINK_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( HIERARCHY_LINK_CONTENT_SERVICE_NAME ); else if ( m_eKind == FOLDER ) - aSNS.getArray()[ 0 ] = rtl::OUString( HIERARCHY_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( HIERARCHY_FOLDER_CONTENT_SERVICE_NAME ); else - aSNS.getArray()[ 0 ] = rtl::OUString( HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME ); return aSNS; } @@ -316,7 +316,7 @@ HierarchyContent::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL HierarchyContent::getContentType() +OUString SAL_CALL HierarchyContent::getContentType() throw( uno::RuntimeException ) { return m_aProps.getContentType(); @@ -366,7 +366,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -386,7 +386,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -397,7 +397,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "No properties!" ), + OUString( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -433,7 +433,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -456,7 +456,7 @@ uno::Any SAL_CALL HierarchyContent::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 HierarchyContent::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -494,7 +494,7 @@ uno::Any SAL_CALL HierarchyContent::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 } @@ -515,7 +515,7 @@ uno::Any SAL_CALL HierarchyContent::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 ); @@ -537,7 +537,7 @@ uno::Any SAL_CALL HierarchyContent::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 ); @@ -554,7 +554,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -603,18 +603,18 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) if ( !bCreateFolder && Info.Type != HIERARCHY_LINK_CONTENT_TYPE ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "HierarchyContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); if ( bCreateFolder ) - aURL += rtl::OUString("New_Folder"); + aURL += OUString("New_Folder"); else - aURL += rtl::OUString("New_Link"); + aURL += OUString("New_Link"); uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aURL ); @@ -630,7 +630,7 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString HierarchyContent::getParentURL() +OUString HierarchyContent::getParentURL() { HierarchyUri aUri( m_xIdentifier->getContentIdentifier() ); return aUri.getParentUri(); @@ -643,7 +643,7 @@ sal_Bool HierarchyContent::hasData( HierarchyContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier ) { - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // Am I a root folder? HierarchyUri aUri( aURL ); @@ -665,7 +665,7 @@ sal_Bool HierarchyContent::loadData( const uno::Reference< ucb::XContentIdentifier >& Identifier, HierarchyContentProperties& rProps ) { - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // Am I a root folder? HierarchyUri aUri( aURL ); @@ -745,7 +745,7 @@ bool HierarchyContent::isReadOnly() = m_pProvider->getConfigProvider( aUri.getService() ); if ( xConfigProv.is() ) { - uno::Sequence< rtl::OUString > aNames + uno::Sequence< OUString > aNames = xConfigProv->getAvailableServiceNames(); sal_Int32 nCount = aNames.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -765,14 +765,14 @@ bool HierarchyContent::isReadOnly() //========================================================================= uno::Reference< ucb::XContentIdentifier > -HierarchyContent::makeNewIdentifier( const rtl::OUString& rTitle ) +HierarchyContent::makeNewIdentifier( const OUString& rTitle ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Assemble new content identifier... HierarchyUri aUri( m_xIdentifier->getContentIdentifier() ); - rtl::OUString aNewURL = aUri.getParentUri(); - aNewURL += rtl::OUString("/"); + OUString aNewURL = aUri.getParentUri(); + aNewURL += OUString("/"); aNewURL += ::ucb_impl::urihelper::encodeSegment( rTitle ); return uno::Reference< ucb::XContentIdentifier >( @@ -792,13 +792,13 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -809,7 +809,7 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -863,7 +863,7 @@ sal_Bool HierarchyContent::exchangeIdentity( // Fail, if a content with given id already exists. if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -885,9 +885,9 @@ sal_Bool HierarchyContent::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(), @@ -917,7 +917,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const HierarchyContentProperties& rData, HierarchyContentProvider* pProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1003,28 +1003,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( rtl::OUString("ContentType"), + beans::Property( OUString("ContentType"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); xRow->appendString ( - beans::Property( rtl::OUString("Title"), + beans::Property( OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsDocument"), + beans::Property( OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsFolder"), + beans::Property( OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1033,16 +1033,16 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( if ( rData.getIsDocument() ) xRow->appendString( - beans::Property( rtl::OUString("TargetURL"), + beans::Property( OUString("TargetURL"), -1, getCppuType( - static_cast< const rtl::OUString * >( 0 ) ), + static_cast< const OUString * >( 0 ) ), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTargetURL() ); xRow->appendObject( beans::Property( - rtl::OUString("CreatableContentsInfo"), + OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -1100,8 +1100,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aOldTitle; - rtl::OUString aOldName; + OUString aOldTitle; + OUString aOldName; sal_Int32 nTitlePos = -1; for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1112,28 +1112,28 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Title" ) @@ -1141,12 +1141,12 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( isReadOnly() ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1176,7 +1176,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty title not allowed!" ), + OUString( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1184,7 +1184,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1194,7 +1194,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( isReadOnly() ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1203,7 +1203,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( m_eKind == LINK ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty target URL's! @@ -1226,7 +1226,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty target URL not allowed!" ), + OUString( "Empty target URL not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1234,14 +1234,14 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "TargetURL only supported by links!" ), + OUString( "TargetURL only supported by links!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1295,7 +1295,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1325,18 +1325,18 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( m_aProps.setTitle( aOldTitle ); m_aProps.setName ( aOldName ); - aOldTitle = aOldName = rtl::OUString(); + aOldTitle = aOldName = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString("Exchange failed!"), + OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aOldTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( m_aProps.getTitle() ); @@ -1354,7 +1354,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1363,7 +1363,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot store persistent data!" ), + OUString( "Cannot store persistent data!" ), this ); // Unreachable } @@ -1391,7 +1391,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not supported by root folder!" ), + OUString( "Not supported by root folder!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1400,11 +1400,11 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, // Check, if all required properties were set. if ( m_aProps.getTitle().isEmpty() ) { - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString("Title"); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), xEnv ); @@ -1427,7 +1427,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_aProps.getTitle() ) ), @@ -1448,9 +1448,9 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, do { - rtl::OUString aNewId = xId->getContentIdentifier(); - aNewId += rtl::OUString("_"); - aNewId += rtl::OUString::valueOf( ++nTry ); + OUString aNewId = xId->getContentIdentifier(); + aNewId += OUString("_"); + aNewId += OUString::valueOf( ++nTry ); xId = new ::ucbhelper::ContentIdentifier( aNewId ); } while ( hasData( xId ) && ( nTry < 1000 ) ); @@ -1460,7 +1460,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, 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 ); @@ -1468,9 +1468,9 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, } else { - rtl::OUString aNewTitle( m_aProps.getTitle() ); - aNewTitle += rtl::OUString("_"); - aNewTitle += rtl::OUString::valueOf( nTry ); + OUString aNewTitle( m_aProps.getTitle() ); + aNewTitle += OUString("_"); + aNewTitle += OUString::valueOf( nTry ); m_aProps.setTitle( aNewTitle ); } } @@ -1484,7 +1484,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1502,7 +1502,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1511,7 +1511,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString("Cannot store persistent data!"), + OUString("Cannot store persistent data!"), this ); // Unreachable } @@ -1542,7 +1542,7 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1553,7 +1553,7 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not supported by root folder!" ), + OUString( "Not supported by root folder!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1595,7 +1595,7 @@ void HierarchyContent::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1606,19 +1606,19 @@ void HierarchyContent::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_xIdentifier->getContentIdentifier(); + OUString aId = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aId.lastIndexOf( '/' ); if ( nPos != ( aId.getLength() - 1 ) ) { // No trailing slash found. Append. - aId += rtl::OUString("/"); + aId += OUString("/"); } if ( rInfo.SourceURL.getLength() <= aId.getLength() ) @@ -1628,7 +1628,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1636,7 +1636,7 @@ void HierarchyContent::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 } @@ -1667,7 +1667,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1675,7 +1675,7 @@ void HierarchyContent::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 } @@ -1684,9 +1684,9 @@ void HierarchyContent::transfer( // 1) Create new child content. ////////////////////////////////////////////////////////////////////// - rtl::OUString aType = xSource->isFolder() - ? rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) - : rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ); + OUString aType = xSource->isFolder() + ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) + : OUString( HIERARCHY_LINK_CONTENT_TYPE ); ucb::ContentInfo aContentInfo; aContentInfo.Type = aType; aContentInfo.Attributes = 0; @@ -1700,7 +1700,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -1708,7 +1708,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "XContentCreator::createNewContent failed!" ), + OUString( "XContentCreator::createNewContent failed!" ), this ); // Unreachable } @@ -1799,15 +1799,15 @@ void HierarchyContent::transfer( { const HierarchyEntryData& rResult = *it; - rtl::OUString aChildId = xId->getContentIdentifier(); + OUString aChildId = xId->getContentIdentifier(); if ( ( aChildId.lastIndexOf( '/' ) + 1 ) != aChildId.getLength() ) - aChildId += rtl::OUString("/"); + aChildId += OUString("/"); aChildId += rResult.getName(); ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; - aInfo.NewTitle = rtl::OUString(); + aInfo.NewTitle = OUString(); aInfo.SourceURL = aChildId; aInfo.NameClash = rInfo.NameClash; @@ -1830,7 +1830,7 @@ void HierarchyContent::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( xSource->m_xIdentifier-> @@ -1840,7 +1840,7 @@ void HierarchyContent::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 } @@ -1867,34 +1867,34 @@ HierarchyContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type - = rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ); + = OUString( HIERARCHY_FOLDER_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; uno::Sequence< beans::Property > aFolderProps( 1 ); aFolderProps.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 ); aSeq.getArray()[ 0 ].Properties = aFolderProps; // Link. aSeq.getArray()[ 1 ].Type - = rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ); + = OUString( HIERARCHY_LINK_CONTENT_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_LINK; uno::Sequence< beans::Property > aLinkProps( 2 ); aLinkProps.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 ); aLinkProps.getArray()[ 1 ] = beans::Property( - rtl::OUString("TargetURL"), + OUString("TargetURL"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); aSeq.getArray()[ 1 ].Properties = aLinkProps; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index eb333ee7c98c..92091332a9cc 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -62,28 +62,28 @@ public: HierarchyContentProperties( const HierarchyEntryData::Type & rType ) : m_aData( rType ), m_aContentType( rType == HierarchyEntryData::FOLDER - ? rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) - : rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} + ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) + : OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} HierarchyContentProperties( const HierarchyEntryData & rData ) : m_aData( rData ), m_aContentType( rData.getType() == HierarchyEntryData::FOLDER - ? rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) - : rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} + ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) + : OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} - const rtl::OUString & getName() const { return m_aData.getName(); } - void setName( const rtl::OUString & rName ) { m_aData.setName( rName ); }; + const OUString & getName() const { return m_aData.getName(); } + void setName( const OUString & rName ) { m_aData.setName( rName ); }; - const rtl::OUString & getTitle() const { return m_aData.getTitle(); } - void setTitle( const rtl::OUString & rTitle ) + const OUString & getTitle() const { return m_aData.getTitle(); } + void setTitle( const OUString & rTitle ) { m_aData.setTitle( rTitle ); }; - const rtl::OUString & getTargetURL() const + const OUString & getTargetURL() const { return m_aData.getTargetURL(); } - void setTargetURL( const rtl::OUString & rURL ) + void setTargetURL( const OUString & rURL ) { m_aData.setTargetURL( rURL ); }; - const rtl::OUString & getContentType() const { return m_aContentType; } + const OUString & getContentType() const { return m_aContentType; } sal_Bool getIsFolder() const { return m_aData.getType() == HierarchyEntryData::FOLDER; } @@ -97,7 +97,7 @@ public: private: HierarchyEntryData m_aData; - rtl::OUString m_aContentType; + OUString m_aContentType; }; //========================================================================= @@ -143,7 +143,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 sal_Bool hasData( const com::sun::star::uno::Reference< @@ -178,7 +178,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > - makeNewIdentifier( const rtl::OUString& rTitle ); + makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< HierarchyContent > HierarchyContentRef; typedef std::list< HierarchyContentRef > HierarchyContentRefList; @@ -241,15 +241,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 ); virtual com::sun::star::uno::Reference< @@ -295,7 +295,7 @@ public: ::com::sun::star::beans::Property >& rProperties, const HierarchyContentProperties& rData, HierarchyContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 96aa7dad4faf..f440f6ba0b9a 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -102,30 +102,30 @@ uno::Sequence< beans::Property > HierarchyContent::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 ), @@ -133,14 +133,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "TargetURL" ), + OUString( "TargetURL" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -161,43 +161,43 @@ uno::Sequence< beans::Property > HierarchyContent::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( "TargetURL" ), + OUString( "TargetURL" ), -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< @@ -227,30 +227,30 @@ uno::Sequence< beans::Property > HierarchyContent::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 ), @@ -258,7 +258,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -279,37 +279,37 @@ uno::Sequence< beans::Property > HierarchyContent::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( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -340,30 +340,30 @@ uno::Sequence< beans::Property > HierarchyContent::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 ), @@ -371,7 +371,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -409,23 +409,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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< @@ -449,23 +449,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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< @@ -475,12 +475,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ) @@ -507,23 +507,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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< @@ -533,7 +533,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -552,23 +552,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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< @@ -578,28 +578,28 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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 ) ) ) @@ -626,23 +626,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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< @@ -652,7 +652,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -671,23 +671,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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< @@ -697,18 +697,18 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::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 ) ) ) diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index bac029246a21..05eb221b2ccb 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -51,14 +51,14 @@ struct HierarchyEntry::iterator_Impl HierarchyEntryData entry; uno::Reference< container::XHierarchicalNameAccess > dir; uno::Reference< util::XOfficeInstallationDirectories > officeDirs; - uno::Sequence< rtl::OUString> names; + uno::Sequence< OUString> names; sal_Int32 pos; iterator_Impl() : officeDirs( 0 ), pos( -1 /* before first */ ) {}; }; //========================================================================= -void makeXMLName( const rtl::OUString & rIn, rtl::OUStringBuffer & rBuffer ) +void makeXMLName( const OUString & rIn, OUStringBuffer & rBuffer ) { sal_Int32 nCount = rIn.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -111,7 +111,7 @@ void makeXMLName( const rtl::OUString & rIn, rtl::OUStringBuffer & rBuffer ) HierarchyEntry::HierarchyEntry( const uno::Reference< uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const rtl::OUString& rURL ) + const OUString& rURL ) : m_xContext( rxContext ), m_xOfficeInstDirs( pProvider->getOfficeInstallationDirectories() ), m_bTriedToGetRootReadAccess( sal_False ) @@ -169,8 +169,8 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) if ( xRootReadAccess.is() ) { - rtl::OUString aTitlePath = m_aPath; - aTitlePath += rtl::OUString("/Title"); + OUString aTitlePath = m_aPath; + aTitlePath += OUString("/Title"); // Note: Avoid NoSuchElementExceptions, because exceptions are // relatively 'expensive'. Checking for availability of @@ -179,7 +179,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) if ( !xRootReadAccess->hasByHierarchicalName( aTitlePath ) ) return sal_False; - rtl::OUString aValue; + OUString aValue; // Get Title value. if ( !( xRootReadAccess->getByHierarchicalName( aTitlePath ) @@ -193,8 +193,8 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) rData.setTitle( aValue ); // Get TargetURL value. - rtl::OUString aTargetURLPath = m_aPath; - aTargetURLPath += rtl::OUString("/TargetURL"); + OUString aTargetURLPath = m_aPath; + aTargetURLPath += OUString("/TargetURL"); if ( !( xRootReadAccess->getByHierarchicalName( aTargetURLPath ) >>= aValue ) ) { @@ -212,8 +212,8 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) aValue = m_xOfficeInstDirs->makeAbsoluteURL( aValue ); rData.setTargetURL( aValue ); - rtl::OUString aTypePath = m_aPath; - aTypePath += rtl::OUString("/Type"); + OUString aTypePath = m_aPath; + aTypePath += OUString("/Type"); if ( xRootReadAccess->hasByHierarchicalName( aTypePath ) ) { // Might not be present since it was introduced long after @@ -276,7 +276,7 @@ sal_Bool HierarchyEntry::setData( { // Create parent's key. It must exist! - rtl::OUString aParentPath; + OUString aParentPath; sal_Bool bRoot = sal_True; sal_Int32 nPos = m_aPath.lastIndexOf( '/' ); @@ -295,13 +295,13 @@ sal_Bool HierarchyEntry::setData( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; uno::Reference< util::XChangesBatch > xBatch( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -332,7 +332,7 @@ sal_Bool HierarchyEntry::setData( else { xParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xNameAccess; } @@ -380,7 +380,7 @@ sal_Bool HierarchyEntry::setData( // Append new entry to parents child list, // which is a set of entries. xParentNameAccess->getByName( - rtl::OUString( "Children" ) ) >>= xFac; + OUString( "Children" ) ) >>= xFac; } OSL_ENSURE( xFac.is(), @@ -411,7 +411,7 @@ sal_Bool HierarchyEntry::setData( { // Set Title value. xNameReplace->replaceByName( - rtl::OUString("Title"), + OUString("Title"), uno::makeAny( rData.getTitle() ) ); // Set TargetURL value. @@ -421,20 +421,20 @@ sal_Bool HierarchyEntry::setData( // installation, the path to the office installtion // directory must never be stored directly. Use a // placeholder instead. - rtl::OUString aValue( rData.getTargetURL() ); + OUString aValue( rData.getTargetURL() ); if ( m_xOfficeInstDirs.is() && !aValue.isEmpty() ) aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNameReplace->replaceByName( - rtl::OUString("TargetURL"), + OUString("TargetURL"), uno::makeAny( aValue ) ); // Set Type value. sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNameReplace->replaceByName( - rtl::OUString("Type"), + OUString("Type"), uno::makeAny( nType ) ); if ( xContainer.is() ) @@ -493,11 +493,11 @@ sal_Bool HierarchyEntry::setData( //========================================================================= sal_Bool HierarchyEntry::move( - const rtl::OUString& rNewURL, const HierarchyEntryData& rData ) + const OUString& rNewURL, const HierarchyEntryData& rData ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - rtl::OUString aNewPath = createPathFromHierarchyURL( rNewURL ); + OUString aNewPath = createPathFromHierarchyURL( rNewURL ); if ( aNewPath == m_aPath ) return sal_True; @@ -505,7 +505,7 @@ sal_Bool HierarchyEntry::move( sal_Bool bOldRoot = sal_True; uno::Reference< util::XChangesBatch > xOldParentBatch; - rtl::OUString aNewKey; + OUString aNewKey; sal_Int32 nURLPos = rNewURL.lastIndexOf( '/' ); if ( nURLPos > HIERARCHY_URL_SCHEME_LENGTH ) aNewKey = rNewURL.copy( nURLPos + 1 ); @@ -530,7 +530,7 @@ sal_Bool HierarchyEntry::move( if ( !m_xConfigProvider.is() ) return sal_False; - rtl::OUString aOldParentPath; + OUString aOldParentPath; sal_Int32 nPos = m_aPath.lastIndexOf( '/' ); if ( nPos != -1 ) { @@ -543,7 +543,7 @@ sal_Bool HierarchyEntry::move( bOldRoot = sal_False; } - rtl::OUString aNewParentPath; + OUString aNewParentPath; nPos = aNewPath.lastIndexOf( '/' ); if ( nPos != -1 ) { @@ -559,13 +559,13 @@ sal_Bool HierarchyEntry::move( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aOldParentPath; aArguments[ 0 ] <<= aProperty; xOldParentBatch = uno::Reference< util::XChangesBatch >( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -583,13 +583,13 @@ sal_Bool HierarchyEntry::move( { bDifferentParents = sal_True; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aNewParentPath; aArguments[ 0 ] <<= aProperty; xNewParentBatch = uno::Reference< util::XChangesBatch >( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -640,7 +640,7 @@ sal_Bool HierarchyEntry::move( else { xOldParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xOldNameContainer; } @@ -719,7 +719,7 @@ sal_Bool HierarchyEntry::move( else { xNewParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xNewNameContainer; } } @@ -730,7 +730,7 @@ sal_Bool HierarchyEntry::move( return sal_False; xNewNameReplace->replaceByName( - rtl::OUString("Title"), + OUString("Title"), uno::makeAny( rData.getTitle() ) ); // TargetURL property may contain a reference to the Office @@ -738,15 +738,15 @@ sal_Bool HierarchyEntry::move( // installation, the path to the office installtion // directory must never be stored directly. Use a placeholder // instead. - rtl::OUString aValue( rData.getTargetURL() ); + OUString aValue( rData.getTargetURL() ); if ( m_xOfficeInstDirs.is() && !aValue.isEmpty() ) aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNewNameReplace->replaceByName( - rtl::OUString("TargetURL"), + OUString("TargetURL"), uno::makeAny( aValue ) ); sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNewNameReplace->replaceByName( - rtl::OUString("Type"), + OUString("Type"), uno::makeAny( nType ) ); xNewNameContainer->insertByName( aNewKey, aEntry ); @@ -801,7 +801,7 @@ sal_Bool HierarchyEntry::remove() { // Create parent's key. It must exist! - rtl::OUString aParentPath; + OUString aParentPath; sal_Bool bRoot = sal_True; sal_Int32 nPos = m_aPath.lastIndexOf( '/' ); @@ -820,13 +820,13 @@ sal_Bool HierarchyEntry::remove() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; uno::Reference< util::XChangesBatch > xBatch( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -856,7 +856,7 @@ sal_Bool HierarchyEntry::remove() // Append new entry to parents child list, // which is a set of entries. xParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xContainer; } @@ -920,8 +920,8 @@ sal_Bool HierarchyEntry::first( iterator& it ) if ( !m_aPath.isEmpty() ) { - rtl::OUString aPath = m_aPath; - aPath += rtl::OUString("/Children"); + OUString aPath = m_aPath; + aPath += OUString("/Children"); xRootHierNameAccess->getByHierarchicalName( aPath ) >>= xNameAccess; @@ -986,19 +986,19 @@ sal_Bool HierarchyEntry::next( iterator& it ) } //========================================================================= -rtl::OUString HierarchyEntry::createPathFromHierarchyURL( +OUString HierarchyEntry::createPathFromHierarchyURL( const HierarchyUri& rURI ) { // Transform path.... // folder/subfolder/subsubfolder // --> ['folder']/Children/['subfolder']/Children/['subsubfolder'] - const rtl::OUString aPath = rURI.getPath().copy( 1 ); // skip leading slash. + const OUString aPath = rURI.getPath().copy( 1 ); // skip leading slash. sal_Int32 nLen = aPath.getLength(); if ( nLen ) { - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.appendAscii( "['" ); sal_Int32 nStart = 0; @@ -1009,7 +1009,7 @@ rtl::OUString HierarchyEntry::createPathFromHierarchyURL( if ( nEnd == -1 ) nEnd = nLen; - rtl::OUString aToken = aPath.copy( nStart, nEnd - nStart ); + OUString aToken = aPath.copy( nStart, nEnd - nStart ); makeXMLName( aToken, aNewPath ); if ( nEnd != nLen ) @@ -1059,9 +1059,9 @@ HierarchyEntry::getRootReadAccess() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); - aProperty.Value <<= rtl::OUString(); // root path + aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; m_bTriedToGetRootReadAccess = sal_True; @@ -1069,7 +1069,7 @@ HierarchyEntry::getRootReadAccess() m_xRootReadAccess = uno::Reference< container::XHierarchicalNameAccess >( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READ_SERVICE_NAME ), + OUString( READ_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); } @@ -1118,20 +1118,20 @@ const HierarchyEntryData& HierarchyEntry::iterator::operator*() const { try { - rtl::OUStringBuffer aKey; + OUStringBuffer aKey; aKey.appendAscii( "['" ); makeXMLName( m_pImpl->names.getConstArray()[ m_pImpl->pos ], aKey ); aKey.appendAscii( "']" ); - rtl::OUString aTitle = aKey.makeStringAndClear(); - rtl::OUString aTargetURL = aTitle; - rtl::OUString aType = aTitle; + OUString aTitle = aKey.makeStringAndClear(); + OUString aTargetURL = aTitle; + OUString aType = aTitle; - aTitle += rtl::OUString("/Title"); - aTargetURL += rtl::OUString("/TargetURL"); - aType += rtl::OUString("/Type"); + aTitle += OUString("/Title"); + aTargetURL += OUString("/TargetURL"); + aType += OUString("/Type"); - rtl::OUString aValue; + OUString aValue; m_pImpl->dir->getByHierarchicalName( aTitle ) >>= aValue; m_pImpl->entry.setTitle( aValue ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index 9c93957fb102..e494c08a7b77 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -47,14 +47,14 @@ public: HierarchyEntryData() : m_aType( NONE ) {} HierarchyEntryData( const Type & rType ) : m_aType( rType ) {} - const rtl::OUString & getName() const { return m_aName; } - void setName( const rtl::OUString & rName ) { m_aName = rName; } + const OUString & getName() const { return m_aName; } + void setName( const OUString & rName ) { m_aName = rName; } - const rtl::OUString & getTitle() const { return m_aTitle; } - void setTitle( const rtl::OUString & rTitle ) { m_aTitle = rTitle; } + const OUString & getTitle() const { return m_aTitle; } + void setTitle( const OUString & rTitle ) { m_aTitle = rTitle; } - const rtl::OUString & getTargetURL() const { return m_aTargetURL; } - void setTargetURL( const rtl::OUString & rURL ) { m_aTargetURL = rURL; } + const OUString & getTargetURL() const { return m_aTargetURL; } + void setTargetURL( const OUString & rURL ) { m_aTargetURL = rURL; } Type getType() const { return ( m_aType != NONE ) ? m_aType @@ -64,9 +64,9 @@ public: void setType( const Type & rType ) { m_aType = rType; } private: - rtl::OUString m_aName; // Name (language independent) - rtl::OUString m_aTitle; // Title (language dependent) - rtl::OUString m_aTargetURL; // Target URL ( links only ) + OUString m_aName; // Name (language independent) + OUString m_aTitle; // Title (language dependent) + OUString m_aTargetURL; // Target URL ( links only ) Type m_aType; // Type }; @@ -77,9 +77,9 @@ class HierarchyUri; class HierarchyEntry { - ::rtl::OUString m_aServiceSpecifier; - ::rtl::OUString m_aName; - ::rtl::OUString m_aPath; + OUString m_aServiceSpecifier; + OUString m_aName; + OUString m_aPath; ::osl::Mutex m_aMutex; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; @@ -94,7 +94,7 @@ class HierarchyEntry sal_Bool m_bTriedToGetRootReadAccess; // #82494# private: - ::rtl::OUString createPathFromHierarchyURL( const HierarchyUri & rURI ); + OUString createPathFromHierarchyURL( const HierarchyUri & rURI ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > getRootReadAccess(); @@ -103,7 +103,7 @@ public: HierarchyEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const ::rtl::OUString& rURL ); + const OUString& rURL ); sal_Bool hasData(); @@ -111,7 +111,7 @@ public: sal_Bool setData( const HierarchyEntryData& rData, sal_Bool bCreate ); - sal_Bool move( const ::rtl::OUString& rNewURL, + sal_Bool move( const OUString& rNewURL, const HierarchyEntryData& rData ); sal_Bool remove(); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index a6fd1d376ca1..2f10717cc9ce 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -130,28 +130,28 @@ public: // XHierarchicalNameAccess virtual uno::Any SAL_CALL - getByHierarchicalName( const rtl::OUString & aName ) + getByHierarchicalName( const OUString & aName ) throw ( container::NoSuchElementException, uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByHierarchicalName( const rtl::OUString & aName ) + hasByHierarchicalName( const OUString & aName ) throw ( uno::RuntimeException ); // XNameContainer virtual void SAL_CALL - insertByName( const rtl::OUString & aName, const uno::Any & aElement ) + insertByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ); virtual void SAL_CALL - removeByName( const rtl::OUString & Name ) + removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ); // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL - replaceByName( const rtl::OUString & aName, const uno::Any & aElement ) + replaceByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, @@ -159,15 +159,15 @@ public: // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL - getByName( const rtl::OUString & aName ) + getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ); - virtual uno::Sequence< rtl::OUString > SAL_CALL + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw ( uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString & aName ) + hasByName( const OUString & aName ) throw ( uno::RuntimeException ); // XElementAccess ( base of XNameAccess ) @@ -257,11 +257,11 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource, //========================================================================= XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, - rtl::OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) + OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) { - uno::Sequence< rtl::OUString > aSNS( 2 ); - aSNS[ 0 ] = rtl::OUString( "com.sun.star.ucb.DefaultHierarchyDataSource" ); - aSNS[ 1 ] = rtl::OUString( "com.sun.star.ucb.HierarchyDataSource" ); + uno::Sequence< OUString > aSNS( 2 ); + aSNS[ 0 ] = OUString( "com.sun.star.ucb.DefaultHierarchyDataSource" ); + aSNS[ 1 ] = OUString( "com.sun.star.ucb.HierarchyDataSource" ); return aSNS; } @@ -322,14 +322,14 @@ void SAL_CALL HierarchyDataSource::removeEventListener( // virtual uno::Reference< uno::XInterface > SAL_CALL -HierarchyDataSource::createInstance( const rtl::OUString & aServiceSpecifier ) +HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) throw ( uno::Exception, uno::RuntimeException ) { // Create view to root node. beans::PropertyValue aProp; - aProp.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); - aProp.Value <<= rtl::OUString( CONFIG_DATA_ROOT_KEY ); + aProp.Name = OUString( CFGPROPERTY_NODEPATH ); + aProp.Value <<= OUString( CONFIG_DATA_ROOT_KEY ); uno::Sequence< uno::Any > aArguments( 1 ); aArguments[ 0 ] <<= aProp; @@ -341,7 +341,7 @@ HierarchyDataSource::createInstance( const rtl::OUString & aServiceSpecifier ) // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( - const rtl::OUString & ServiceSpecifier, + const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments ) throw ( uno::Exception, uno::RuntimeException ) { @@ -350,13 +350,13 @@ HierarchyDataSource::createInstanceWithArguments( //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL HierarchyDataSource::getAvailableServiceNames() throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aNames( 2 ); - aNames[ 0 ] = rtl::OUString( READ_SERVICE_NAME ); - aNames[ 1 ] = rtl::OUString( READWRITE_SERVICE_NAME ); + uno::Sequence< OUString > aNames( 2 ); + aNames[ 0 ] = OUString( READ_SERVICE_NAME ); + aNames[ 1 ] = OUString( READWRITE_SERVICE_NAME ); return aNames; } @@ -368,7 +368,7 @@ HierarchyDataSource::getAvailableServiceNames() uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( - const rtl::OUString & ServiceSpecifier, + const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments, bool bCheckArgs ) throw ( uno::Exception, uno::RuntimeException ) @@ -402,13 +402,13 @@ HierarchyDataSource::createInstanceWithArguments( { if ( aProp.Name == CFGPROPERTY_NODEPATH ) { - rtl::OUString aPath; + OUString aPath; if ( aProp.Value >>= aPath ) { bHasNodePath = true; // Create path to data inside the configuration. - rtl::OUString aConfigPath; + OUString aConfigPath; if ( !createConfigPath( aPath, aConfigPath ) ) { OSL_FAIL( "HierarchyDataSource::" @@ -471,7 +471,7 @@ HierarchyDataSource::createInstanceWithArguments( { // Create configuration read-only access object. xConfigAccess = xProv->createInstanceWithArguments( - rtl::OUString( CONFIG_READ_SERVICE_NAME ), + OUString( CONFIG_READ_SERVICE_NAME ), aNewArgs ); } else @@ -483,14 +483,14 @@ HierarchyDataSource::createInstanceWithArguments( aNewArgs.realloc( nLen + 1 ); beans::PropertyValue aProp; - aProp.Name = rtl::OUString( CFGPROPERTY_LAZYWRITE ); + aProp.Name = OUString( CFGPROPERTY_LAZYWRITE ); aProp.Value <<= sal_True; aNewArgs[ nLen ] <<= aProp; } // Create configuration read-write access object. xConfigAccess = xProv->createInstanceWithArguments( - rtl::OUString( CONFIG_READWRITE_SERVICE_NAME ), + OUString( CONFIG_READWRITE_SERVICE_NAME ), aNewArgs ); } } @@ -539,7 +539,7 @@ HierarchyDataSource::getConfigProvider() //========================================================================= bool HierarchyDataSource::createConfigPath( - const rtl::OUString & rInPath, rtl::OUString & rOutPath ) + const OUString & rInPath, OUString & rOutPath ) { if ( !rInPath.isEmpty() ) { @@ -557,14 +557,14 @@ bool HierarchyDataSource::createConfigPath( return false; } - rtl::OUString aOutPath( + OUString aOutPath( CONFIG_DATA_ROOT_KEY "/" ); aOutPath += rInPath; rOutPath = aOutPath; } else { - rOutPath = rtl::OUString( CONFIG_DATA_ROOT_KEY ); + rOutPath = OUString( CONFIG_DATA_ROOT_KEY ); } return true; @@ -726,11 +726,11 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() XSERVICEINFO_NOFACTORY_IMPL_0( HierarchyDataAccess, - rtl::OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) + OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) { - uno::Sequence< rtl::OUString > aSNS( 2 ); - aSNS[ 0 ] = rtl::OUString( READ_SERVICE_NAME ); - aSNS[ 1 ] = rtl::OUString( READWRITE_SERVICE_NAME ); + uno::Sequence< OUString > aSNS( 2 ); + aSNS[ 0 ] = OUString( READ_SERVICE_NAME ); + aSNS[ 1 ] = OUString( READWRITE_SERVICE_NAME ); return aSNS; } @@ -788,7 +788,7 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( - const rtl::OUString & aName ) + const OUString & aName ) throw ( container::NoSuchElementException, uno::RuntimeException ) { uno::Reference< container::XHierarchicalNameAccess > xOrig @@ -803,7 +803,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( //========================================================================= // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( - const rtl::OUString & aName ) + const OUString & aName ) throw ( uno::RuntimeException ) { uno::Reference< container::XHierarchicalNameAccess > xOrig @@ -822,7 +822,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( //========================================================================= // virtual -uno::Any SAL_CALL HierarchyDataAccess::getByName( const rtl::OUString & aName ) +uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -837,7 +837,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const rtl::OUString & aName ) //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL HierarchyDataAccess::getElementNames() +uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() throw ( uno::RuntimeException ) { uno::Reference< container::XNameAccess > xOrig @@ -850,7 +850,7 @@ uno::Sequence< rtl::OUString > SAL_CALL HierarchyDataAccess::getElementNames() //========================================================================= // virtual -sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const rtl::OUString & aName ) +sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) throw ( uno::RuntimeException ) { uno::Reference< container::XNameAccess > xOrig @@ -966,7 +966,7 @@ HierarchyDataAccess::createInstanceWithArguments( // virtual void SAL_CALL -HierarchyDataAccess::insertByName( const rtl::OUString & aName, +HierarchyDataAccess::insertByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, @@ -984,7 +984,7 @@ HierarchyDataAccess::insertByName( const rtl::OUString & aName, //========================================================================= // virtual void SAL_CALL -HierarchyDataAccess::removeByName( const rtl::OUString & Name ) +HierarchyDataAccess::removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1004,7 +1004,7 @@ HierarchyDataAccess::removeByName( const rtl::OUString & Name ) //========================================================================= // virtual -void SAL_CALL HierarchyDataAccess::replaceByName( const rtl::OUString & aName, +void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 65b00d3d6ea4..752e8a659aa0 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -79,17 +79,17 @@ public: // XMultiServiceFactory virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstance( const rtl::OUString & aServiceSpecifier ) + createInstance( const OUString & aServiceSpecifier ) throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const rtl::OUString & ServiceSpecifier, + createInstanceWithArguments( const OUString & ServiceSpecifier, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & Arguments ) throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw ( com::sun::star::uno::RuntimeException ); @@ -98,7 +98,7 @@ public: private: com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const rtl::OUString & ServiceSpecifier, + createInstanceWithArguments( const OUString & ServiceSpecifier, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & Arguments, bool bCheckArgs ) @@ -110,7 +110,7 @@ private: getConfigProvider(); bool - createConfigPath( const rtl::OUString & rInPath, rtl::OUString & rOutPath ); + createConfigPath( const OUString & rInPath, OUString & rOutPath ); }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index f0dd1699ee6c..dcb300bdb479 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -44,7 +44,7 @@ namespace hierarchy_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -131,14 +131,14 @@ HierarchyResultSetDataSupplier::~HierarchyResultSetDataSupplier() //========================================================================= // virtual -rtl::OUString HierarchyResultSetDataSupplier::queryContentIdentifierString( +OUString HierarchyResultSetDataSupplier::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 ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) { // Already cached. @@ -148,18 +148,18 @@ rtl::OUString HierarchyResultSetDataSupplier::queryContentIdentifierString( if ( getResult( nIndex ) ) { - rtl::OUString aId + OUString aId = m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); aId += m_pImpl->m_aResults[ nIndex ]->aData.getName(); m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -180,7 +180,7 @@ HierarchyResultSetDataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index 28c1a5061c46..2b1a5c3f2f76 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -46,7 +46,7 @@ public: sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); virtual ~HierarchyResultSetDataSupplier(); - 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 ); diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 2920d4461dd2..9865d708aab1 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -91,8 +91,8 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider, - rtl::OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), - rtl::OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) ); + OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), + OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= // @@ -162,7 +162,7 @@ void SAL_CALL HierarchyContentProvider::initialize( uno::Reference< lang::XMultiServiceFactory > HierarchyContentProvider::getConfigProvider( - const rtl::OUString & rServiceSpecifier ) + const OUString & rServiceSpecifier ) { osl::MutexGuard aGuard( m_aMutex ); ConfigProviderMap::iterator it = m_aConfigProviderMap.find( @@ -201,7 +201,7 @@ HierarchyContentProvider::getConfigProvider( //========================================================================= uno::Reference< container::XHierarchicalNameAccess > HierarchyContentProvider::getRootConfigReadNameAccess( - const rtl::OUString & rServiceSpecifier ) + const OUString & rServiceSpecifier ) { osl::MutexGuard aGuard( m_aMutex ); ConfigProviderMap::iterator it = m_aConfigProviderMap.find( @@ -226,8 +226,8 @@ HierarchyContentProvider::getRootConfigReadNameAccess( { uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( "nodepath" ); - aProperty.Value <<= rtl::OUString(); // root path + aProperty.Name = OUString( "nodepath" ); + aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; (*it).second.bTriedToGetRootReadAccess = true; @@ -235,7 +235,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( (*it).second.xRootReadAccess = uno::Reference< container::XHierarchicalNameAccess >( xConfigProv->createInstanceWithArguments( - rtl::OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ), + OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ), aArguments ), uno::UNO_QUERY ); } diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index e8e2a5d8f4ab..153651179de6 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -66,7 +66,7 @@ struct ConfigProviderMapEntry struct equalString { bool operator()( - const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const + const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -74,7 +74,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -82,7 +82,7 @@ struct hashString typedef boost::unordered_map < - rtl::OUString, // servcie specifier + OUString, // servcie specifier ConfigProviderMapEntry, hashString, equalString @@ -131,10 +131,10 @@ public: // Non-Interface methods com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - getConfigProvider( const rtl::OUString & rServiceSpecifier ); + getConfigProvider( const OUString & rServiceSpecifier ); com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - getRootConfigReadNameAccess( const rtl::OUString & rServiceSpecifier ); + getRootConfigReadNameAccess( const OUString & rServiceSpecifier ); // Note: may retrun an empty reference. com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index f4cbd0ab37ca..23e5d0d316d8 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -50,18 +50,18 @@ void HierarchyUri::init() const if ( !m_aUri.isEmpty() && m_aPath.isEmpty() ) { // Note: Maybe it's a re-init, setUri only resets m_aPath! - m_aService = m_aParentUri = m_aName = rtl::OUString(); + m_aService = m_aParentUri = m_aName = OUString(); // URI must match at least: <sheme>: if ( ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } // Scheme is case insensitive. - rtl::OUString aScheme + OUString aScheme = m_aUri.copy( 0, HIERARCHY_URL_SCHEME_LENGTH ).toAsciiLowerCase(); if ( aScheme == HIERARCHY_URL_SCHEME ) { @@ -75,8 +75,8 @@ void HierarchyUri::init() const if ( m_aUri.getLength() == HIERARCHY_URL_SCHEME_LENGTH + 1 ) { // root folder URI without path and service specifier. - m_aUri += rtl::OUString( "//" DEFAULT_DATA_SOURCE_SERVICE "/" ); - m_aService = rtl::OUString( DEFAULT_DATA_SOURCE_SERVICE ); + m_aUri += OUString( "//" DEFAULT_DATA_SOURCE_SERVICE "/" ); + m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE ); nPos = m_aUri.getLength() - 1; } @@ -86,8 +86,8 @@ void HierarchyUri::init() const == sal_Unicode( '/' ) ) ) { // root folder URI without service specifier. - m_aUri += rtl::OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ); - m_aService = rtl::OUString( DEFAULT_DATA_SOURCE_SERVICE ); + m_aUri += OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ); + m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE ); nPos = m_aUri.getLength() - 1; } @@ -100,8 +100,8 @@ void HierarchyUri::init() const m_aUri = m_aUri.replaceAt( HIERARCHY_URL_SCHEME_LENGTH + 2, 0, - rtl::OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ) ); - m_aService = rtl::OUString( DEFAULT_DATA_SOURCE_SERVICE ); + OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ) ); + m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE ); nPos = HIERARCHY_URL_SCHEME_LENGTH + 3 + m_aService.getLength(); @@ -118,17 +118,17 @@ void HierarchyUri::init() const if ( nStart == m_aUri.getLength() ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } // Empty path segments? if ( m_aUri.indexOf( - rtl::OUString("//"), + OUString("//"), nStart ) != -1 ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } @@ -138,7 +138,7 @@ void HierarchyUri::init() const if ( nEnd == nStart ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } @@ -146,7 +146,7 @@ void HierarchyUri::init() const { // Trailing slash missing. nEnd = m_aUri.getLength(); - m_aUri += rtl::OUString("/"); + m_aUri += OUString("/"); } m_aService = m_aUri.copy( nStart, nEnd - nStart ); @@ -182,7 +182,7 @@ void HierarchyUri::init() const else { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); } } } diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx index 8f51ef6d1962..d07432c110b6 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx @@ -33,11 +33,11 @@ namespace hierarchy_ucp { class HierarchyUri { - mutable ::rtl::OUString m_aUri; - mutable ::rtl::OUString m_aParentUri; - mutable ::rtl::OUString m_aService; - mutable ::rtl::OUString m_aPath; - mutable ::rtl::OUString m_aName; + mutable OUString m_aUri; + mutable OUString m_aParentUri; + mutable OUString m_aService; + mutable OUString m_aPath; + mutable OUString m_aName; mutable bool m_bValid; private: @@ -45,28 +45,28 @@ private: public: HierarchyUri() : m_bValid( false ) {} - HierarchyUri( const ::rtl::OUString & rUri ) + HierarchyUri( const OUString & rUri ) : m_aUri( rUri ), 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 & rUri ) - { m_aPath = ::rtl::OUString(); m_aUri = rUri; m_bValid = false; } + void setUri( const OUString & rUri ) + { m_aPath = OUString(); m_aUri = rUri; m_bValid = false; } - const ::rtl::OUString & getParentUri() const + const OUString & getParentUri() const { init(); return m_aParentUri; } - const ::rtl::OUString & getService() const + const OUString & getService() const { init(); return m_aService; } - 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; } inline sal_Bool isRootFolder() const; diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx index b39d9ed676e4..1bbe511be5f2 100644 --- a/ucb/source/ucp/inc/urihelper.hxx +++ b/ucb/source/ucp/inc/urihelper.hxx @@ -28,7 +28,7 @@ namespace ucb_impl { namespace urihelper { - inline ::rtl::OUString encodeSegment( const ::rtl::OUString & rSegment ) + inline OUString encodeSegment( const OUString & rSegment ) { return rtl::Uri::encode( rSegment, rtl_UriCharClassPchar, @@ -36,18 +36,18 @@ namespace ucb_impl { namespace urihelper { RTL_TEXTENCODING_UTF8 ); } - inline ::rtl::OUString decodeSegment( const rtl::OUString& rSegment ) + inline OUString decodeSegment( const OUString& rSegment ) { return rtl::Uri::decode( rSegment, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } - inline ::rtl::OUString encodeURI( const ::rtl::OUString & rURI ) + inline OUString encodeURI( const OUString & rURI ) { - rtl::OUString aFragment; - rtl::OUString aParams; - rtl::OUString aURI; + OUString aFragment; + OUString aParams; + OUString aURI; sal_Int32 nFragment = rURI.lastIndexOf( sal_Unicode( '#' ) ); if ( nFragment != -1 ) @@ -81,7 +81,7 @@ namespace ucb_impl { namespace urihelper { rtl_UriEncodeKeepEscapes, /* #i81690# */ RTL_TEXTENCODING_UTF8 ); - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; sal_Int32 nIndex = 0; do { 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; diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 025bdd3a05d7..c08faf683959 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -static ContentType lcl_getContentType( const rtl::OUString & rType ) +static ContentType lcl_getContentType( const OUString & rType ) { if ( rType == TDOC_ROOT_CONTENT_TYPE ) return ROOT; @@ -153,7 +153,7 @@ Content::Content( const uno::Reference< ucb::XContentIdentifier >& Identifier, const ucb::ContentInfo& Info ) : ContentImplHelper( rxContext, pProvider, Identifier ), - m_aProps( lcl_getContentType( Info.Type ), rtl::OUString() ), // no Title (yet) + m_aProps( lcl_getContentType( Info.Type ), OUString() ), // no Title (yet) m_eState( TRANSIENT ), m_pProvider( pProvider ) { @@ -298,29 +298,29 @@ 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.TransientDocumentsContent" ); + return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); if ( m_aProps.getType() == STREAM ) - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_STREAM_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_STREAM_CONTENT_SERVICE_NAME ); else if ( m_aProps.getType() == FOLDER ) - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_FOLDER_CONTENT_SERVICE_NAME ); else if ( m_aProps.getType() == DOCUMENT ) - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_DOCUMENT_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_DOCUMENT_CONTENT_SERVICE_NAME ); else - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_ROOT_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_ROOT_CONTENT_SERVICE_NAME ); return aSNS; } @@ -332,7 +332,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -386,7 +386,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 ); @@ -406,7 +406,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 ); @@ -417,7 +417,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 ); @@ -453,7 +453,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 ); @@ -473,7 +473,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "insert command only supported by " + OUString( "insert command only supported by " "folders and streams!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); @@ -489,7 +489,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "insert command not supported by " + OUString( "insert command not supported by " "streams that are direct children " "of document root!" ), static_cast< cppu::OWeakObject * >( @@ -504,7 +504,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 ); @@ -530,7 +530,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "delete command only supported by " + OUString( "delete command only supported by " "folders and streams!" ), static_cast< cppu::OWeakObject * >( this ) ) ), @@ -549,7 +549,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()), @@ -558,7 +558,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 } @@ -580,7 +580,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "transfer command only supported " + OUString( "transfer command only supported " "by folders and documents!" ), static_cast< cppu::OWeakObject * >( this ) ) ), @@ -595,7 +595,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 ); @@ -618,7 +618,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "createNewContent command only " + OUString( "createNewContent command only " "supported by folders and " "documents!" ), static_cast< cppu::OWeakObject * >( @@ -634,7 +634,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 ); @@ -651,7 +651,7 @@ uno::Any SAL_CALL Content::execute( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -711,18 +711,18 @@ Content::createNewContent( const ucb::ContentInfo& Info ) return uno::Reference< ucb::XContent >(); } - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "Content::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); if ( bCreateFolder ) - 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 ); @@ -738,7 +738,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); Uri aUri( m_xIdentifier->getContentIdentifier() ); @@ -747,13 +747,13 @@ rtl::OUString Content::getParentURL() //========================================================================= uno::Reference< ucb::XContentIdentifier > -Content::makeNewIdentifier( const rtl::OUString& rTitle ) +Content::makeNewIdentifier( const OUString& rTitle ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Assemble new content identifier... Uri aUri( m_xIdentifier->getContentIdentifier() ); - rtl::OUStringBuffer aNewURL = aUri.getParentUri(); + OUStringBuffer aNewURL = aUri.getParentUri(); aNewURL.append( ::ucb_impl::urihelper::encodeSegment( rTitle ) ); return @@ -777,13 +777,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -794,7 +794,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? @@ -849,7 +849,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. if ( !hasData( Uri( xNewId->getContentIdentifier() ) ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -871,9 +871,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(), @@ -902,7 +902,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; if ( loadData( pProvider, rContentId, aData ) ) @@ -934,7 +934,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const ContentProperties& rData, ContentProvider* pProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1035,9 +1035,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( rtl::OUString("ContentType"), + beans::Property( OUString("ContentType"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); @@ -1045,9 +1045,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ContentType eType = rData.getType(); xRow->appendString ( - beans::Property( rtl::OUString("Title"), + beans::Property( OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), // Title is read-only for root and documents. beans::PropertyAttribute::BOUND || ( ( eType == ROOT ) || ( eType == DOCUMENT ) ) @@ -1055,14 +1055,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( : 0 ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsDocument"), + beans::Property( OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsFolder"), + beans::Property( OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1070,7 +1070,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getIsFolder() ); xRow->appendObject( beans::Property( - rtl::OUString("CreatableContentsInfo"), + OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -1081,7 +1081,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Storage is only supported by folders. if ( eType == FOLDER ) xRow->appendObject( - beans::Property( rtl::OUString("Storage"), + beans::Property( OUString("Storage"), -1, getCppuType( static_cast< @@ -1093,7 +1093,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // DocumentModel is only supported by documents. if ( eType == DOCUMENT ) xRow->appendObject( - beans::Property( rtl::OUString("DocumentModel"), + beans::Property( OUString("DocumentModel"), -1, getCppuType( static_cast< @@ -1153,7 +1153,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aOldTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1164,28 +1164,28 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Title" ) @@ -1195,12 +1195,12 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( ( eType == ROOT ) || ( eType == DOCUMENT ) ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1225,7 +1225,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty Title not allowed!" ), + OUString( "Empty Title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1233,7 +1233,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Title Property value has wrong type!" ), + OUString( "Title Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1244,14 +1244,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( eType == FOLDER ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { // Storage is only supported by folders. aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "Storage property only supported by folders" ), + OUString( "Storage property only supported by folders" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1261,14 +1261,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( eType == DOCUMENT ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { // Storage is only supported by folders. aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "DocumentModel property only supported by " + OUString( "DocumentModel property only supported by " "documents" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1322,7 +1322,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1350,18 +1350,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Roll-back. m_aProps.setTitle( aOldTitle ); - aOldTitle = rtl::OUString(); + aOldTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString("Exchange failed!"), + OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aOldTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( m_aProps.getTitle() ); @@ -1379,7 +1379,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1388,7 +1388,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot store persistent data!" ), + OUString( "Cannot store persistent data!" ), this ); // Unreachable } @@ -1433,7 +1433,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 ); @@ -1454,7 +1454,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1465,7 +1465,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 } @@ -1488,7 +1488,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1499,7 +1499,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 } @@ -1548,7 +1548,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1560,7 +1560,7 @@ uno::Any Content::open( ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString( "Got no data stream!" ), + OUString( "Got no data stream!" ), this ); // Unreachable } @@ -1573,7 +1573,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -1630,7 +1630,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1642,7 +1642,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, m_aProps.setTitle( aUri.getDecodedName() ); } - rtl::OUStringBuffer aNewURL = aUri.getParentUri(); + OUStringBuffer aNewURL = aUri.getParentUri(); aNewURL.append( m_aProps.getTitle() ); Uri aNewUri( aNewURL.makeStringAndClear() ); @@ -1655,7 +1655,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_aProps.getTitle() ) ), @@ -1676,9 +1676,9 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, do { - rtl::OUStringBuffer aNew = aNewUri.getUri(); + OUStringBuffer aNew = aNewUri.getUri(); aNew.appendAscii( "_" ); - aNew.append( rtl::OUString::valueOf( ++nTry ) ); + aNew.append( OUString::valueOf( ++nTry ) ); aNewUri.setUri( aNew.makeStringAndClear() ); } while ( hasData( aNewUri ) && ( nTry < 1000 ) ); @@ -1688,7 +1688,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, 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 ); @@ -1696,9 +1696,9 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, } else { - rtl::OUStringBuffer aNewTitle = m_aProps.getTitle(); + OUStringBuffer aNewTitle = m_aProps.getTitle(); aNewTitle.appendAscii( "_" ); - aNewTitle.append( rtl::OUString::valueOf( ++nTry ) ); + aNewTitle.append( OUString::valueOf( ++nTry ) ); m_aProps.setTitle( aNewTitle.makeStringAndClear() ); } } @@ -1712,7 +1712,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1734,7 +1734,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1743,7 +1743,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString("Cannot store persistent data!"), + OUString("Cannot store persistent data!"), this ); // Unreachable } @@ -1781,7 +1781,7 @@ void Content::destroy( sal_Bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1829,12 +1829,12 @@ void Content::notifyDocumentClosed() //========================================================================= uno::Reference< ucb::XContent > -Content::queryChildContent( const rtl::OUString & rRelativeChildUri ) +Content::queryChildContent( const OUString & rRelativeChildUri ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - const rtl::OUString aMyId = getIdentifier()->getContentIdentifier(); - rtl::OUStringBuffer aBuf( aMyId ); + const OUString aMyId = getIdentifier()->getContentIdentifier(); + OUStringBuffer aBuf( aMyId ); if ( aMyId.getStr()[ aMyId.getLength() - 1 ] != sal_Unicode( '/' ) ) aBuf.appendAscii( "/" ); if ( rRelativeChildUri.getStr()[ 0 ] != sal_Unicode( '/' ) ) @@ -1861,7 +1861,7 @@ Content::queryChildContent( const rtl::OUString & rRelativeChildUri ) } //========================================================================= -void Content::notifyChildRemoved( const rtl::OUString & rRelativeChildUri ) +void Content::notifyChildRemoved( const OUString & rRelativeChildUri ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1885,7 +1885,7 @@ void Content::notifyChildRemoved( const rtl::OUString & rRelativeChildUri ) } //========================================================================= -void Content::notifyChildInserted( const rtl::OUString & rRelativeChildUri ) +void Content::notifyChildInserted( const OUString & rRelativeChildUri ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1921,7 +1921,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1934,13 +1934,13 @@ void Content::transfer( // Invaild length (to short). ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable } - rtl::OUString aScheme + OUString aScheme = rInfo.SourceURL.copy( 0, TDOC_URL_SCHEME_LENGTH + 2 ) .toAsciiLowerCase(); if ( aScheme != TDOC_URL_SCHEME ":/" ) @@ -1948,7 +1948,7 @@ void Content::transfer( // Invalid scheme. ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1960,7 +1960,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! Syntax!" ), + OUString( "Invalid source URI! Syntax!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), xEnv ); @@ -1971,7 +1971,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! " + OUString( "Invalid source URI! " "Must describe a folder or stream!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -1980,12 +1980,12 @@ void Content::transfer( } // Is source not a parent of me / not me? - rtl::OUString aId = m_xIdentifier->getContentIdentifier(); + OUString aId = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aId.lastIndexOf( '/' ); if ( nPos != ( aId.getLength() - 1 ) ) { // No trailing slash found. Append. - aId += rtl::OUString("/"); + aId += OUString("/"); } if ( rInfo.SourceURL.getLength() <= aId.getLength() ) @@ -1995,7 +1995,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)); @@ -2003,7 +2003,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 } @@ -2025,7 +2025,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! " + OUString( "Invalid source URI! " "Streams cannot be created as " "children of document root!" ), static_cast< cppu::OWeakObject * >( @@ -2054,7 +2054,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! " + OUString( "Invalid source URI! " "Unabale to determine source type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -2068,7 +2068,7 @@ void Content::transfer( // Copy data. ///////////////////////////////////////////////////////////////////////// - rtl::OUString aNewName( !rInfo.NewTitle.isEmpty() + OUString aNewName( !rInfo.NewTitle.isEmpty() ? rInfo.NewTitle : aSourceUri.getDecodedName() ); @@ -2077,7 +2077,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)); @@ -2085,7 +2085,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot copy data!" ), + OUString( "Cannot copy data!" ), this ); // Unreachable } @@ -2094,9 +2094,9 @@ void Content::transfer( // Copy own and all children's Additional Core Properties. ///////////////////////////////////////////////////////////////////////// - rtl::OUString aTargetUri = m_xIdentifier->getContentIdentifier(); + OUString aTargetUri = m_xIdentifier->getContentIdentifier(); if ( ( aTargetUri.lastIndexOf( '/' ) + 1 ) != aTargetUri.getLength() ) - aTargetUri += rtl::OUString("/"); + aTargetUri += OUString("/"); if ( !rInfo.NewTitle.isEmpty() ) aTargetUri += ::ucb_impl::urihelper::encodeSegment( rInfo.NewTitle ); @@ -2109,7 +2109,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)); @@ -2117,7 +2117,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot copy additional properties!" ), + OUString( "Cannot copy additional properties!" ), this ); // Unreachable } @@ -2147,7 +2147,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( aTargetUri ), beans::PropertyState_DIRECT_VALUE)); @@ -2155,7 +2155,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot instanciate target object!" ), + OUString( "Cannot instanciate target object!" ), this ); // Unreachable } @@ -2189,7 +2189,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)); @@ -2197,7 +2197,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot instanciate target object!" ), + OUString( "Cannot instanciate target object!" ), this ); // Unreachable } @@ -2211,7 +2211,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)); @@ -2219,7 +2219,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 } @@ -2230,7 +2230,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)); @@ -2238,7 +2238,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot remove additional properties of source object!" ), + OUString( "Cannot remove additional properties of source object!" ), this ); // Unreachable } @@ -2388,9 +2388,9 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData, // According to MBA, if no mediatype is set, folder and all // its contents will be lost on save of the document!!! xPropSet->setPropertyValue( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), uno::makeAny( - rtl::OUString( // @@@ better mediatype + OUString( // @@@ better mediatype "application/binary" ) ) ); } catch ( beans::UnknownPropertyException const & ) @@ -2620,7 +2620,7 @@ bool Content::removeData() } //========================================================================= -bool Content::copyData( const Uri & rSourceUri, const rtl::OUString & rNewName ) +bool Content::copyData( const Uri & rSourceUri, const OUString & rNewName ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -2746,8 +2746,8 @@ bool Content::closeOutputStream( } //========================================================================= -static rtl::OUString obtainPassword( - const rtl::OUString & rName, +static OUString obtainPassword( + const OUString & rName, task::PasswordRequestMode eMode, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw ( ucb::CommandFailedException, @@ -2775,7 +2775,7 @@ static rtl::OUString obtainPassword( if ( xAbort.is() ) { throw ucb::CommandFailedException( - rtl::OUString( "Abort requested by Interaction Handler." ), + OUString( "Abort requested by Interaction Handler." ), uno::Reference< uno::XInterface >(), xRequest->getRequest() ); } @@ -2789,7 +2789,7 @@ static rtl::OUString obtainPassword( // Unknown selection. Should never happen. throw ucb::CommandFailedException( - rtl::OUString( "Interaction Handler selected unknown continuation!" ), + OUString( "Interaction Handler selected unknown continuation!" ), uno::Reference< uno::XInterface >(), xRequest->getRequest() ); } @@ -2808,8 +2808,8 @@ uno::Reference< io::XInputStream > Content::getInputStream( throw ( ucb::CommandFailedException, task::DocumentPasswordRequest ) { - rtl::OUString aUri; - rtl::OUString aPassword; + OUString aUri; + OUString aPassword; bool bPasswordRequested = false; { @@ -2845,13 +2845,13 @@ uno::Reference< io::XInputStream > Content::getInputStream( //========================================================================= static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream( - const rtl::OUString & rUri, + const OUString & rUri, ContentProvider * pProvider, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw ( ucb::CommandFailedException, task::DocumentPasswordRequest ) { - rtl::OUString aPassword; + OUString aPassword; bool bPasswordRequested = false; for ( ;; ) { @@ -2901,8 +2901,8 @@ uno::Reference< io::XStream > Content::getStream( OSL_ENSURE( m_aProps.getType() == STREAM, "Content::getStream - content is no stream!" ); - rtl::OUString aUri( Uri( m_xIdentifier->getContentIdentifier() ).getUri() ); - rtl::OUString aPassword; + OUString aUri( Uri( m_xIdentifier->getContentIdentifier() ).getUri() ); + OUString aPassword; bool bPasswordRequested = false; for ( ;; ) { @@ -2941,9 +2941,9 @@ ContentProperties::getCreatableContentsInfo() 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 ); #ifdef NO_STREAM_CREATION_WITHIN_DOCUMENT_ROOT @@ -2954,7 +2954,7 @@ ContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type - = rtl::OUString( TDOC_FOLDER_CONTENT_TYPE ); + = OUString( TDOC_FOLDER_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; aSeq.getArray()[ 0 ].Properties = aProps; @@ -2968,14 +2968,14 @@ ContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type - = rtl::OUString( TDOC_FOLDER_CONTENT_TYPE ); + = OUString( TDOC_FOLDER_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; aSeq.getArray()[ 0 ].Properties = aProps; // Stream. aSeq.getArray()[ 1 ].Type - = rtl::OUString( TDOC_STREAM_CONTENT_TYPE ); + = OUString( TDOC_STREAM_CONTENT_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index a1b25abb043a..640a9f4052cd 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -61,15 +61,15 @@ public: : m_eType( STREAM ) {} - ContentProperties( const ContentType & rType, const rtl::OUString & rTitle ) + ContentProperties( const ContentType & rType, const OUString & rTitle ) : m_eType( rType ), m_aContentType( rType == STREAM - ? rtl::OUString( TDOC_STREAM_CONTENT_TYPE ) + ? OUString( TDOC_STREAM_CONTENT_TYPE ) : rType == FOLDER - ? rtl::OUString( TDOC_FOLDER_CONTENT_TYPE ) + ? OUString( TDOC_FOLDER_CONTENT_TYPE ) : rType == DOCUMENT - ? rtl::OUString( TDOC_DOCUMENT_CONTENT_TYPE ) - : rtl::OUString( TDOC_ROOT_CONTENT_TYPE ) ), + ? OUString( TDOC_DOCUMENT_CONTENT_TYPE ) + : OUString( TDOC_ROOT_CONTENT_TYPE ) ), m_aTitle( rTitle ) {} @@ -77,13 +77,13 @@ public: // Properties - const rtl::OUString & getContentType() const { return m_aContentType; } + const OUString & getContentType() const { return m_aContentType; } bool getIsFolder() const { return m_eType > STREAM; } bool getIsDocument() const { return !getIsFolder(); } - const rtl::OUString & getTitle() const { return m_aTitle; } - void setTitle( const rtl::OUString & rTitle ) { m_aTitle = rTitle; } + const OUString & getTitle() const { return m_aTitle; } + void setTitle( const OUString & rTitle ) { m_aTitle = rTitle; } com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > getCreatableContentsInfo() const; @@ -92,8 +92,8 @@ public: private: ContentType m_eType; - rtl::OUString m_aContentType; - rtl::OUString m_aTitle; + OUString m_aContentType; + OUString m_aTitle; }; //========================================================================= @@ -131,7 +131,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 bool hasData( ContentProvider* pProvider, const Uri & rUri ); bool hasData( const Uri & rUri ) { return hasData( m_pProvider, rUri ); } @@ -151,11 +151,11 @@ private: com::sun::star::ucb::XContentIdentifier >& xNewId ); bool removeData(); - bool copyData( const Uri & rSourceUri, const rtl::OUString & rNewName ); + bool copyData( const Uri & rSourceUri, const OUString & rNewName ); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > - makeNewIdentifier( const rtl::OUString& rTitle ); + makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; @@ -206,7 +206,7 @@ private: ::com::sun::star::beans::Property >& rProperties, const ContentProperties& rData, ContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); static bool commitStorage( @@ -232,7 +232,7 @@ private: ::com::sun::star::task::DocumentPasswordRequest ); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - queryChildContent( const rtl::OUString & rRelativeChildUri ); + queryChildContent( const OUString & rRelativeChildUri ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > getStream( const ::com::sun::star::uno::Reference< @@ -267,15 +267,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 ); virtual com::sun::star::uno::Reference< @@ -320,11 +320,11 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, ContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); void notifyDocumentClosed(); - void notifyChildRemoved( const rtl::OUString & rRelativeChildUri ); - void notifyChildInserted( const rtl::OUString & rRelativeChildUri ); + void notifyChildRemoved( const OUString & rRelativeChildUri ); + void notifyChildInserted( const OUString & rRelativeChildUri ); rtl::Reference< ContentProvider > getContentProvider() const { return rtl::Reference< ContentProvider >( m_pProvider ); } diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 0ebf3729b26a..c361a1cb11cd 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -110,37 +110,37 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory 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( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -168,37 +168,37 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory 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( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -210,7 +210,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "Storage" ), + OUString( "Storage" ), -1, getCppuType( static_cast< const uno::Reference< embed::XStorage > * >( 0 ) ), @@ -234,30 +234,30 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory 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 ), @@ -265,7 +265,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -277,7 +277,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "DocumentModel" ), + OUString( "DocumentModel" ), -1, getCppuType( static_cast< const uno::Reference< frame::XModel > * >( 0 ) ), @@ -303,30 +303,30 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory 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 ), @@ -334,7 +334,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -377,23 +377,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory 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< @@ -403,12 +403,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -432,23 +432,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory 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< @@ -458,17 +458,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 ) ) @@ -493,23 +493,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory 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< @@ -519,28 +519,28 @@ 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 ) ) ) @@ -564,23 +564,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory 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< @@ -590,18 +590,18 @@ 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 ) ) ) @@ -627,23 +627,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory 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< @@ -653,7 +653,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index f356e9927a82..6f7a55fcb279 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -46,12 +46,12 @@ namespace tdoc_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 ) {} }; //========================================================================= @@ -74,7 +74,7 @@ struct DataSupplier_Impl ResultList m_aResults; rtl::Reference< Content > m_xContent; uno::Reference< uno::XComponentContext > m_xContext; - uno::Sequence< rtl::OUString > * m_pNamesOfChildren; + uno::Sequence< OUString > * m_pNamesOfChildren; sal_Int32 m_nOpenMode; bool m_bCountFinal; bool m_bThrowException; @@ -123,14 +123,14 @@ ResultSetDataSupplier::~ResultSetDataSupplier() } // virtual -rtl::OUString +OUString ResultSetDataSupplier::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. @@ -143,7 +143,7 @@ ResultSetDataSupplier::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(); } // virtual @@ -163,7 +163,7 @@ ResultSetDataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -238,7 +238,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) m_pImpl->m_pNamesOfChildren->getLength()); ++n ) { - const rtl::OUString & rName + const OUString & rName = m_pImpl->m_pNamesOfChildren->getConstArray()[ n ]; if ( rName.isEmpty() ) @@ -248,7 +248,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) } // Assemble URL for child. - rtl::OUString aURL = assembleChildURL( rName ); + OUString aURL = assembleChildURL( rName ); m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) ); @@ -297,7 +297,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount() m_pImpl->m_pNamesOfChildren->getLength()); ++n ) { - const rtl::OUString & rName + const OUString & rName = m_pImpl->m_pNamesOfChildren->getConstArray()[ n ]; if ( rName.isEmpty() ) @@ -307,7 +307,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount() } // Assemble URL for child. - rtl::OUString aURL = assembleChildURL( rName ); + OUString aURL = assembleChildURL( rName ); m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) ); } @@ -400,8 +400,8 @@ bool ResultSetDataSupplier::queryNamesOfChildren() if ( m_pImpl->m_pNamesOfChildren == 0 ) { - uno::Sequence< rtl::OUString > * pNamesOfChildren - = new uno::Sequence< rtl::OUString >(); + uno::Sequence< OUString > * pNamesOfChildren + = new uno::Sequence< OUString >(); if ( !m_pImpl->m_xContent->getContentProvider()->queryNamesOfChildren( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(), @@ -420,16 +420,16 @@ bool ResultSetDataSupplier::queryNamesOfChildren() return true; } -::rtl::OUString -ResultSetDataSupplier::assembleChildURL( const ::rtl::OUString& aName ) +OUString +ResultSetDataSupplier::assembleChildURL( const OUString& aName ) { - rtl::OUString aContURL + OUString aContURL = m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(); - rtl::OUString aURL( aContURL ); + OUString aURL( aContURL ); sal_Int32 nUrlEnd = aURL.lastIndexOf( '/' ); if ( nUrlEnd != aURL.getLength() - 1 ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); aURL += aName; return aURL; diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index 93a3f8c52eef..aff926a57cbf 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -35,7 +35,7 @@ class ResultSetDataSupplier : public ::ucbhelper::ResultSetDataSupplier private: bool queryNamesOfChildren(); - ::rtl::OUString assembleChildURL( const ::rtl::OUString& aName ); + OUString assembleChildURL( const OUString& aName ); public: ResultSetDataSupplier( @@ -45,7 +45,7 @@ public: sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); virtual ~ResultSetDataSupplier(); - 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 ); diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 26704485b7d1..621e34f2c1bc 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -76,7 +76,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin { document::EventObject aDocEvent; aDocEvent.Source = Source.Source; - aDocEvent.EventName = rtl::OUString( "OfficeDocumentsListener::notifyClosing" ); + aDocEvent.EventName = OUString( "OfficeDocumentsListener::notifyClosing" ); m_pManager->notifyEvent( aDocEvent ); } @@ -134,10 +134,10 @@ void OfficeDocumentsManager::destroy() } //========================================================================= -static rtl::OUString +static OUString getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) { - rtl::OUString aId; + OUString aId; // Try to get the UID directly from the document. uno::Reference< beans::XPropertySet > xPropSet( xDoc, uno::UNO_QUERY ); @@ -146,7 +146,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) try { uno::Any aValue = xPropSet->getPropertyValue( - rtl::OUString( "RuntimeUID" ) ); + OUString( "RuntimeUID" ) ); aValue >>= aId; } catch ( beans::UnknownPropertyException const & ) @@ -167,7 +167,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) // different IDs uno::Reference< uno::XInterface > xNormalizedIFace( xDoc, uno::UNO_QUERY ); sal_Int64 nId = reinterpret_cast< sal_Int64 >( xNormalizedIFace.get() ); - aId = rtl::OUString::valueOf( nId ); + aId = OUString::valueOf( nId ); } OSL_ENSURE( !aId.isEmpty(), "getDocumentId - Empty id!" ); @@ -275,7 +275,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( if ( m_pDocEventListener ) { - rtl::OUString aDocId( (*it).first ); + OUString aDocId( (*it).first ); m_pDocEventListener->notifyDocumentClosed( aDocId ); } break; @@ -480,8 +480,8 @@ void OfficeDocumentsManager::buildDocumentsList() if ( it == m_aDocs.end() ) { // new document - rtl::OUString aDocId = getDocumentId( xModel ); - rtl::OUString aTitle = DocumentInfo::getDocumentTitle( xModel ); + OUString aDocId = getDocumentId( xModel ); + OUString aTitle = DocumentInfo::getDocumentTitle( xModel ); uno::Reference< document::XStorageBasedDocument > xDoc( xModel, uno::UNO_QUERY ); @@ -516,7 +516,7 @@ void OfficeDocumentsManager::buildDocumentsList() //========================================================================= uno::Reference< embed::XStorage > -OfficeDocumentsManager::queryStorage( const rtl::OUString & rDocId ) +OfficeDocumentsManager::queryStorage( const OUString & rDocId ) { osl::MutexGuard aGuard( m_aMtx ); @@ -528,7 +528,7 @@ OfficeDocumentsManager::queryStorage( const rtl::OUString & rDocId ) } //========================================================================= -rtl::OUString OfficeDocumentsManager::queryDocumentId( +OUString OfficeDocumentsManager::queryDocumentId( const uno::Reference< frame::XModel > & xModel ) { return getDocumentId( xModel ); @@ -536,7 +536,7 @@ rtl::OUString OfficeDocumentsManager::queryDocumentId( //========================================================================= uno::Reference< frame::XModel > -OfficeDocumentsManager::queryDocumentModel( const rtl::OUString & rDocId ) +OfficeDocumentsManager::queryDocumentModel( const OUString & rDocId ) { osl::MutexGuard aGuard( m_aMtx ); @@ -548,11 +548,11 @@ OfficeDocumentsManager::queryDocumentModel( const rtl::OUString & rDocId ) } //========================================================================= -uno::Sequence< rtl::OUString > OfficeDocumentsManager::queryDocuments() +uno::Sequence< OUString > OfficeDocumentsManager::queryDocuments() { osl::MutexGuard aGuard( m_aMtx ); - uno::Sequence< rtl::OUString > aRet( m_aDocs.size() ); + uno::Sequence< OUString > aRet( m_aDocs.size() ); sal_Int32 nPos = 0; DocumentList::const_iterator it = m_aDocs.begin(); @@ -566,14 +566,14 @@ uno::Sequence< rtl::OUString > OfficeDocumentsManager::queryDocuments() } //========================================================================= -rtl::OUString -OfficeDocumentsManager::queryStorageTitle( const rtl::OUString & rDocId ) +OUString +OfficeDocumentsManager::queryStorageTitle( const OUString & rDocId ) { osl::MutexGuard aGuard( m_aMtx ); DocumentList::const_iterator it = m_aDocs.find( rDocId ); if ( it == m_aDocs.end() ) - return rtl::OUString(); + return OUString(); return (*it).second.aTitle; } @@ -598,7 +598,7 @@ bool OfficeDocumentsManager::isHelpDocument( if ( !xModel.is() ) return false; - ::rtl::OUString sURL( xModel->getURL() ); + OUString sURL( xModel->getURL() ); if ( sURL.match( "vnd.sun.star.help://" ) ) return true; @@ -657,7 +657,7 @@ bool OfficeDocumentsManager::isBasicIDE( if ( m_xModuleMgr.is() ) { - rtl::OUString aModule; + OUString aModule; try { aModule = m_xModuleMgr->identify( xModel ); diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 02046341f1c9..102f0984da68 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -38,8 +38,8 @@ namespace tdoc_ucp { class OfficeDocumentsEventListener { public: - virtual void notifyDocumentOpened( const rtl::OUString & rDocId ) = 0; - virtual void notifyDocumentClosed( const rtl::OUString & rDocId ) = 0; + virtual void notifyDocumentOpened( const OUString & rDocId ) = 0; + virtual void notifyDocumentClosed( const OUString & rDocId ) = 0; protected: ~OfficeDocumentsEventListener() {} @@ -49,7 +49,7 @@ namespace tdoc_ucp { struct StorageInfo { - rtl::OUString aTitle; + OUString aTitle; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; com::sun::star::uno::Reference< @@ -58,7 +58,7 @@ namespace tdoc_ucp { StorageInfo() {}; // needed for STL map only. StorageInfo( - const rtl::OUString & rTitle, + const OUString & rTitle, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & rxStorage, const com::sun::star::uno::Reference< @@ -71,13 +71,13 @@ namespace tdoc_ucp { struct ltref { bool operator()( - const rtl::OUString & r1, const rtl::OUString & r2 ) const + const OUString & r1, const OUString & r2 ) const { return r1 < r2; } }; - typedef std::map< rtl::OUString, StorageInfo, ltref > DocumentList; + typedef std::map< OUString, StorageInfo, ltref > DocumentList; //======================================================================= @@ -132,21 +132,21 @@ namespace tdoc_ucp { // Non-interface com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorage( const rtl::OUString & rDocId ); + queryStorage( const OUString & rDocId ); - rtl::OUString + OUString queryDocumentId( const com::sun::star::uno::Reference< com::sun::star::frame::XModel > & xModel ); com::sun::star::uno::Reference< com::sun::star::frame::XModel > - queryDocumentModel( const rtl::OUString & rDocId ); + queryDocumentModel( const OUString & rDocId ); - com::sun::star::uno::Sequence< rtl::OUString > + com::sun::star::uno::Sequence< OUString > queryDocuments(); - rtl::OUString - queryStorageTitle( const rtl::OUString & rDocId ); + OUString + queryStorageTitle( const OUString & rDocId ); private: void buildDocumentsList(); diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index dca9415f4bd8..cc64ec27a27e 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -58,7 +58,7 @@ DocumentContentFactory::~DocumentContentFactory() //========================================================================= // virtual -::rtl::OUString SAL_CALL DocumentContentFactory::getImplementationName() +OUString SAL_CALL DocumentContentFactory::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_Static(); @@ -67,11 +67,11 @@ DocumentContentFactory::~DocumentContentFactory() //========================================================================= // virtual sal_Bool SAL_CALL -DocumentContentFactory::supportsService( const ::rtl::OUString& ServiceName ) +DocumentContentFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -82,7 +82,7 @@ DocumentContentFactory::supportsService( const ::rtl::OUString& ServiceName ) //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL DocumentContentFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -91,20 +91,20 @@ DocumentContentFactory::getSupportedServiceNames() //========================================================================= // static -rtl::OUString DocumentContentFactory::getImplementationName_Static() +OUString DocumentContentFactory::getImplementationName_Static() { - return rtl::OUString( + return OUString( "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ); } //========================================================================= // static -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > DocumentContentFactory::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString( + = OUString( "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ); return aSNS; } @@ -127,7 +127,7 @@ DocumentContentFactory::createDocumentContent( xDocFac = uno::Reference< frame::XTransientDocumentsDocumentContentFactory >( m_xSMgr->createInstance( - rtl::OUString( + OUString( "com.sun.star.ucb.TransientDocumentsContentProvider" ) ), uno::UNO_QUERY ); @@ -141,7 +141,7 @@ DocumentContentFactory::createDocumentContent( return xDocFac->createDocumentContent( Model ); throw uno::RuntimeException( - rtl::OUString( + OUString( "Unable to obtain document content factory!" ), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index 602b8688682f..6551c7fe46d7 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -39,14 +39,14 @@ public: virtual ~DocumentContentFactory(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) 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 ); @@ -59,9 +59,9 @@ public: com::sun::star::uno::RuntimeException ); // Non-UNO interfaces - static rtl::OUString + static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index b0825d15a956..6c7e4a64af83 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -61,14 +61,14 @@ namespace tdoc_ucp throw ( uno::RuntimeException ); // XInteractionPassword - virtual void SAL_CALL setPassword( const rtl::OUString & aPasswd ) + virtual void SAL_CALL setPassword( const OUString & aPasswd ) throw ( uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getPassword() + virtual OUString SAL_CALL getPassword() throw ( uno::RuntimeException ); private: osl::Mutex m_aMutex; - rtl::OUString m_aPassword; + OUString m_aPassword; }; } // namespace tdoc_ucp @@ -183,7 +183,7 @@ void SAL_CALL InteractionSupplyPassword::select() // virtual void SAL_CALL -InteractionSupplyPassword::setPassword( const ::rtl::OUString& aPasswd ) +InteractionSupplyPassword::setPassword( const OUString& aPasswd ) throw ( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -191,7 +191,7 @@ InteractionSupplyPassword::setPassword( const ::rtl::OUString& aPasswd ) } // virtual -rtl::OUString SAL_CALL InteractionSupplyPassword::getPassword() +OUString SAL_CALL InteractionSupplyPassword::getPassword() throw ( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -208,7 +208,7 @@ rtl::OUString SAL_CALL InteractionSupplyPassword::getPassword() DocumentPasswordRequest::DocumentPasswordRequest( task::PasswordRequestMode eMode, - const rtl::OUString & rDocumentName ) + const OUString & rDocumentName ) { // Fill request... task::DocumentPasswordRequest aRequest; diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx index 3d7445e26572..1757a72fdef1 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx @@ -68,7 +68,7 @@ namespace tdoc_ucp { xSelection.get(), uno::UNO_QUERY ); if ( xPassword.is() ) { - rtl::OUString aPassword = xPassword->getPassword(); + OUString aPassword = xPassword->getPassword(); // @@@ } @@ -83,7 +83,7 @@ namespace tdoc_ucp { public: DocumentPasswordRequest( com::sun::star::task::PasswordRequestMode eMode, - const rtl::OUString & rDocumentName ); + const OUString & rDocumentName ); }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 329426fa2f8d..336d9beef6a7 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -123,7 +123,7 @@ ContentProvider::queryContent( Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) throw ucb::IllegalIdentifierException( - rtl::OUString( "Invalid URL!" ), + OUString( "Invalid URL!" ), Identifier ); // Normalize URI. @@ -161,10 +161,10 @@ ContentProvider::createDocumentContent( // model -> id -> content identifier -> queryContent if ( m_xDocsMgr.is() ) { - rtl::OUString aDocId = m_xDocsMgr->queryDocumentId( Model ); + OUString aDocId = m_xDocsMgr->queryDocumentId( Model ); if ( !aDocId.isEmpty() ) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( TDOC_URL_SCHEME ":/" ); aBuffer.append( aDocId ); @@ -188,7 +188,7 @@ ContentProvider::createDocumentContent( // no content. throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Illegal Content Identifier!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); @@ -196,7 +196,7 @@ ContentProvider::createDocumentContent( else { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Unable to obtain document id from model!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); @@ -205,7 +205,7 @@ ContentProvider::createDocumentContent( else { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "No Document Manager!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); @@ -219,7 +219,7 @@ ContentProvider::createDocumentContent( //========================================================================= // virtual -void ContentProvider::notifyDocumentClosed( const rtl::OUString & rDocId ) +void ContentProvider::notifyDocumentClosed( const OUString & rDocId ) { osl::MutexGuard aGuard( getContentListMutex() ); @@ -282,7 +282,7 @@ void ContentProvider::notifyDocumentClosed( const rtl::OUString & rDocId ) //========================================================================= // virtual -void ContentProvider::notifyDocumentOpened( const rtl::OUString & rDocId ) +void ContentProvider::notifyDocumentOpened( const OUString & rDocId ) { osl::MutexGuard aGuard( getContentListMutex() ); @@ -321,7 +321,7 @@ void ContentProvider::notifyDocumentOpened( const rtl::OUString & rDocId ) //========================================================================= uno::Reference< embed::XStorage > -ContentProvider::queryStorage( const rtl::OUString & rUri, +ContentProvider::queryStorage( const OUString & rUri, StorageAccessMode eMode ) const { if ( m_xStgElemFac.is() ) @@ -353,7 +353,7 @@ ContentProvider::queryStorage( const rtl::OUString & rUri, //========================================================================= uno::Reference< embed::XStorage > -ContentProvider::queryStorageClone( const rtl::OUString & rUri ) const +ContentProvider::queryStorageClone( const OUString & rUri ) const { if ( m_xStgElemFac.is() ) { @@ -393,8 +393,8 @@ ContentProvider::queryStorageClone( const rtl::OUString & rUri ) const //========================================================================= uno::Reference< io::XInputStream > -ContentProvider::queryInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) const +ContentProvider::queryInputStream( const OUString & rUri, + const OUString & rPassword ) const throw ( packages::WrongPasswordException ) { if ( m_xStgElemFac.is() ) @@ -430,8 +430,8 @@ ContentProvider::queryInputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XOutputStream > -ContentProvider::queryOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +ContentProvider::queryOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( packages::WrongPasswordException ) { @@ -470,8 +470,8 @@ ContentProvider::queryOutputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XStream > -ContentProvider::queryStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +ContentProvider::queryStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( packages::WrongPasswordException ) { @@ -509,7 +509,7 @@ ContentProvider::queryStream( const rtl::OUString & rUri, //========================================================================= bool ContentProvider::queryNamesOfChildren( - const rtl::OUString & rUri, uno::Sequence< rtl::OUString > & rNames ) const + const OUString & rUri, uno::Sequence< OUString > & rNames ) const { Uri aUri( rUri ); if ( aUri.isRoot() ) @@ -568,16 +568,16 @@ bool ContentProvider::queryNamesOfChildren( } //========================================================================= -rtl::OUString -ContentProvider::queryStorageTitle( const rtl::OUString & rUri ) const +OUString +ContentProvider::queryStorageTitle( const OUString & rUri ) const { - rtl::OUString aTitle; + OUString aTitle; Uri aUri( rUri ); if ( aUri.isRoot() ) { // always empty. - aTitle = rtl::OUString(); + aTitle = OUString(); } else if ( aUri.isDocument() ) { @@ -599,7 +599,7 @@ ContentProvider::queryStorageTitle( const rtl::OUString & rUri ) const //========================================================================= uno::Reference< frame::XModel > -ContentProvider::queryDocumentModel( const rtl::OUString & rUri ) const +ContentProvider::queryDocumentModel( const OUString & rUri ) const { uno::Reference< frame::XModel > xModel; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index 69bc2b2fed3f..1d656527e937 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -94,41 +94,41 @@ public: // Non-UNO interfaces com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorage( const rtl::OUString & rUri, StorageAccessMode eMode ) const; + queryStorage( const OUString & rUri, StorageAccessMode eMode ) const; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorageClone( const rtl::OUString & rUri ) const; + queryStorageClone( const OUString & rUri ) const; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - queryInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) const + queryInputStream( const OUString & rUri, + const OUString & rPassword ) const throw ( com::sun::star::packages::WrongPasswordException ); com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - queryOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + queryOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( com::sun::star::packages::WrongPasswordException ); com::sun::star::uno::Reference< com::sun::star::io::XStream > - queryStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + queryStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( com::sun::star::packages::WrongPasswordException ); bool queryNamesOfChildren( - const rtl::OUString & rUri, - com::sun::star::uno::Sequence< rtl::OUString > & rNames ) const; + const OUString & rUri, + com::sun::star::uno::Sequence< OUString > & rNames ) const; // storage properties - rtl::OUString queryStorageTitle( const rtl::OUString & rUri ) const; + OUString queryStorageTitle( const OUString & rUri ) const; com::sun::star::uno::Reference< com::sun::star::frame::XModel > - queryDocumentModel( const rtl::OUString & rUri ) const; + queryDocumentModel( const OUString & rUri ) const; // interface OfficeDocumentsEventListener - virtual void notifyDocumentOpened( const rtl::OUString & rDocId ); - virtual void notifyDocumentClosed( const rtl::OUString & rDocId ); + virtual void notifyDocumentOpened( const OUString & rDocId ); + virtual void notifyDocumentClosed( const OUString & rDocId ); private: rtl::Reference< OfficeDocumentsManager > m_xDocsMgr; diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index ea6d12d1ac5d..6c32899b3447 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -46,7 +46,7 @@ using namespace tdoc_ucp; ParentStorageHolder::ParentStorageHolder( const uno::Reference< embed::XStorage > & xParentStorage, - const rtl::OUString & rUri ) + const OUString & rUri ) : m_xParentStorage( xParentStorage ), m_bParentIsRootStorage( false ) { @@ -65,7 +65,7 @@ ParentStorageHolder::ParentStorageHolder( Storage::Storage( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, - const rtl::OUString & rUri, + const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< embed::XStorage > & xStorageToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), @@ -264,7 +264,7 @@ uno::Type SAL_CALL Storage::getElementType() //========================================================================= // virtual -uno::Any SAL_CALL Storage::getByName( const ::rtl::OUString& aName ) +uno::Any SAL_CALL Storage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -274,7 +274,7 @@ uno::Any SAL_CALL Storage::getByName( const ::rtl::OUString& aName ) //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL Storage::getElementNames() +uno::Sequence< OUString > SAL_CALL Storage::getElementNames() throw ( uno::RuntimeException ) { return m_xWrappedStorage->getElementNames(); @@ -282,7 +282,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Storage::getElementNames() //========================================================================= // virtual -::sal_Bool SAL_CALL Storage::hasByName( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { return m_xWrappedStorage->hasByName( aName ); @@ -309,7 +309,7 @@ void SAL_CALL Storage::copyToStorage( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) + const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -323,9 +323,9 @@ uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( - const ::rtl::OUString& aStreamName, + const OUString& aStreamName, sal_Int32 nOpenMode, - const ::rtl::OUString& aPassword ) + const OUString& aPassword ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -341,7 +341,7 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( //========================================================================= // virtual uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( - const ::rtl::OUString& aStorName, sal_Int32 nOpenMode ) + const OUString& aStorName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -354,7 +354,7 @@ uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( - const ::rtl::OUString& aStreamName ) + const OUString& aStreamName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -368,8 +368,8 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement( - const ::rtl::OUString& aStreamName, - const ::rtl::OUString& aPassword ) + const OUString& aStreamName, + const OUString& aPassword ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -398,7 +398,7 @@ void SAL_CALL Storage::copyLastCommitTo( //========================================================================= // virtual void SAL_CALL Storage::copyStorageElementLastCommitTo( - const ::rtl::OUString& aStorName, + const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -412,7 +412,7 @@ void SAL_CALL Storage::copyStorageElementLastCommitTo( //========================================================================= // virtual sal_Bool SAL_CALL Storage::isStreamElement( - const ::rtl::OUString& aElementName ) + const OUString& aElementName ) throw ( container::NoSuchElementException, lang::IllegalArgumentException, embed::InvalidStorageException, @@ -424,7 +424,7 @@ sal_Bool SAL_CALL Storage::isStreamElement( //========================================================================= // virtual sal_Bool SAL_CALL Storage::isStorageElement( - const ::rtl::OUString& aElementName ) + const OUString& aElementName ) throw ( container::NoSuchElementException, lang::IllegalArgumentException, embed::InvalidStorageException, @@ -435,7 +435,7 @@ sal_Bool SAL_CALL Storage::isStorageElement( //========================================================================= // virtual -void SAL_CALL Storage::removeElement( const ::rtl::OUString& aElementName ) +void SAL_CALL Storage::removeElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -448,8 +448,8 @@ void SAL_CALL Storage::removeElement( const ::rtl::OUString& aElementName ) //========================================================================= // virtual -void SAL_CALL Storage::renameElement( const ::rtl::OUString& aEleName, - const ::rtl::OUString& aNewName ) +void SAL_CALL Storage::renameElement( const OUString& aEleName, + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -464,9 +464,9 @@ void SAL_CALL Storage::renameElement( const ::rtl::OUString& aEleName, //========================================================================= // virtual void SAL_CALL Storage::copyElementTo( - const ::rtl::OUString& aElementName, + const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -481,9 +481,9 @@ void SAL_CALL Storage::copyElementTo( //========================================================================= // virtual void SAL_CALL Storage::moveElementTo( - const ::rtl::OUString& aElementName, + const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& rNewName ) + const OUString& rNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -571,7 +571,7 @@ void SAL_CALL Storage::revert() OutputStream::OutputStream( const uno::Reference< uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< io::XOutputStream > & xStreamToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), @@ -763,7 +763,7 @@ OutputStream::removeEventListener( Stream::Stream( const uno::Reference< uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< io::XStream > & xStreamToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index 2d4d23de7420..7ccd6445b195 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -52,7 +52,7 @@ public: ParentStorageHolder( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, - const rtl::OUString & rUri ); + const OUString & rUri ); bool isParentARootStorage() const { return m_bParentIsRootStorage; } @@ -83,7 +83,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, - const rtl::OUString & rUri, + const OUString & rUri, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, const com::sun::star::uno::Reference< @@ -125,15 +125,15 @@ public: // XNameAccess ( one of XStorage bases ) virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw ( com::sun::star::uno::RuntimeException ); // XElementAccess (base of XNameAccess) @@ -154,7 +154,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - openStreamElement( const ::rtl::OUString& aStreamName, + openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -163,9 +163,9 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - openEncryptedStreamElement( const ::rtl::OUString& aStreamName, + openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, - const ::rtl::OUString& aPassword ) + const OUString& aPassword ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::packages::NoEncryptionException, @@ -174,7 +174,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::embed::XStorage > SAL_CALL - openStorageElement( const ::rtl::OUString& aStorName, + openStorageElement( const OUString& aStorName, sal_Int32 nOpenMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -182,7 +182,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - cloneStreamElement( const ::rtl::OUString& aStreamName ) + cloneStreamElement( const OUString& aStreamName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::packages::WrongPasswordException, @@ -190,8 +190,8 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - cloneEncryptedStreamElement( const ::rtl::OUString& aStreamName, - const ::rtl::OUString& aPassword ) + cloneEncryptedStreamElement( const OUString& aStreamName, + const OUString& aPassword ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::packages::NoEncryptionException, @@ -208,7 +208,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - copyStorageElementLastCommitTo( const ::rtl::OUString& aStorName, + copyStorageElementLastCommitTo( const OUString& aStorName, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xTargetStorage ) @@ -218,19 +218,19 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - isStreamElement( const ::rtl::OUString& aElementName ) + isStreamElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - isStorageElement( const ::rtl::OUString& aElementName ) + isStorageElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeElement( const ::rtl::OUString& aElementName ) + removeElement( const OUString& aElementName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -238,8 +238,8 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - renameElement( const ::rtl::OUString& aEleName, - const ::rtl::OUString& aNewName ) + renameElement( const OUString& aEleName, + const OUString& aNewName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -248,10 +248,10 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - copyElementTo( const ::rtl::OUString& aElementName, + copyElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -260,10 +260,10 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - moveElementTo( const ::rtl::OUString& aElementName, + moveElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& rNewName ) + const OUString& rNewName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -317,7 +317,7 @@ public: OutputStream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, const com::sun::star::uno::Reference< @@ -399,7 +399,7 @@ public: Stream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, const com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 5b8abeff2db9..7f250371e59a 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -84,7 +84,7 @@ StorageElementFactory::createTemporaryStorage() //========================================================================= uno::Reference< embed::XStorage > -StorageElementFactory::createStorage( const rtl::OUString & rUri, +StorageElementFactory::createStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -98,7 +98,7 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, ( eMode != READ_WRITE_NOCREATE ) && ( eMode != READ_WRITE_CREATE ) ) throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Invalid open mode!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -107,13 +107,13 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Root never has a storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 1 ) ); } - rtl::OUString aUriKey + OUString aUriKey ( ( rUri.getStr()[ rUri.getLength() - 1 ] == sal_Unicode( '/' ) ) ? rUri.copy( 0, rUri.getLength() - 1 ) : rUri ); @@ -185,7 +185,7 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, aIt = m_aMap.insert( StorageMap::value_type( - std::pair< rtl::OUString, bool >( aUriKey, bWritable ), + std::pair< OUString, bool >( aUriKey, bWritable ), xElement.get() ) ).first; aIt->second->m_aContainerIt = aIt; @@ -238,8 +238,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XInputStream > -StorageElementFactory::createInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) +StorageElementFactory::createInputStream( const OUString & rUri, + const OUString & rPassword ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -267,8 +267,8 @@ StorageElementFactory::createInputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XOutputStream > -StorageElementFactory::createOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +StorageElementFactory::createOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -312,8 +312,8 @@ StorageElementFactory::createOutputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XStream > -StorageElementFactory::createStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +StorageElementFactory::createStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -366,7 +366,7 @@ void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW(()) //========================================================================= uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( - const rtl::OUString & rUri, StorageAccessMode eMode ) + const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -391,7 +391,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( //========================================================================= uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( const uno::Reference< embed::XStorage > & xParentStorage, - const rtl::OUString & rUri, + const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -413,14 +413,14 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { if ( eMode == READ_WRITE_CREATE ) throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Invalid open mode: document storages cannot be " "created!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); else throw embed::InvalidStorageException( - rtl::OUString( "Invalid document id!" ), + OUString( "Invalid document id!" ), uno::Reference< uno::XInterface >() ); } @@ -434,7 +434,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( try { uno::Any aPropValue = xPropSet->getPropertyValue( - rtl::OUString( "OpenMode" ) ); + OUString( "OpenMode" ) ); sal_Int32 nOpenMode = 0; if ( aPropValue >>= nOpenMode ) @@ -446,7 +446,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not readable. throw embed::InvalidStorageException( - rtl::OUString( + OUString( "Storage is open, but not readable!" ), uno::Reference< uno::XInterface >() ); } @@ -459,7 +459,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not writable. throw embed::InvalidStorageException( - rtl::OUString( + OUString( "Storage is open, but not writable!" ), uno::Reference< uno::XInterface >() ); } @@ -473,7 +473,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "Bug! Value of property OpenMode has wrong type!" ); throw uno::RuntimeException( - rtl::OUString( + OUString( "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >() ); } @@ -483,7 +483,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Property OpenMode not supported!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( + OUString( "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); @@ -493,7 +493,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Caught WrappedTargetException!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( + OUString( "WrappedTargetException during getPropertyValue!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); @@ -503,7 +503,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // sub storage - const rtl::OUString & rName = aUri.getDecodedName(); + const OUString & rName = aUri.getDecodedName(); if ( eMode == READ ) { @@ -541,8 +541,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( uno::Reference< io::XStream > StorageElementFactory::queryStream( const uno::Reference< embed::XStorage > & xParentStorage, - const rtl::OUString & rUri, - const rtl::OUString & rPassword, + const OUString & rUri, + const OUString & rPassword, StorageAccessMode eMode, bool bTruncate ) throw ( embed::InvalidStorageException, @@ -557,7 +557,7 @@ StorageElementFactory::queryStream( if ( !xParentStorage.is() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "No parent storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -567,7 +567,7 @@ StorageElementFactory::queryStream( if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Root never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -575,7 +575,7 @@ StorageElementFactory::queryStream( else if ( aUri.isDocument() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "A document never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -613,7 +613,7 @@ StorageElementFactory::queryStream( OSL_FAIL( "StorageElementFactory::queryStream : Unknown open mode!" ); throw embed::InvalidStorageException( - rtl::OUString( + OUString( "Unknown open mode!" ), uno::Reference< uno::XInterface >() ); } @@ -670,7 +670,7 @@ StorageElementFactory::queryStream( if ( !xStream.is() ) { throw embed::InvalidStorageException( - rtl::OUString( + OUString( "No stream!" ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index 9904ab9d62ba..f8ab7b5c68d5 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -55,7 +55,7 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - createStorage( const rtl::OUString & rUri, StorageAccessMode eMode ) + createStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, @@ -63,8 +63,8 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - createInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) + createInputStream( const OUString & rUri, + const OUString & rPassword ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, @@ -73,8 +73,8 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - createOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + createOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -84,8 +84,8 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::io::XStream > - createStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + createStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -100,7 +100,7 @@ namespace tdoc_ucp { void releaseElement( Storage * pElement ) SAL_THROW(()); com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryParentStorage( const rtl::OUString & rUri, + queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -111,7 +111,7 @@ namespace tdoc_ucp { com::sun::star::uno::Reference< com::sun::star::embed::XStorage > queryStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, - const rtl::OUString & rUri, + const OUString & rUri, StorageAccessMode eMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -122,8 +122,8 @@ namespace tdoc_ucp { com::sun::star::uno::Reference< com::sun::star::io::XStream > queryStream( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, - const rtl::OUString & rPassword, - const rtl::OUString & rUri, + const OUString & rPassword, + const OUString & rUri, StorageAccessMode eMode, bool bTruncate /* ignored for read-only streams */ ) throw ( com::sun::star::embed::InvalidStorageException, @@ -136,8 +136,8 @@ namespace tdoc_ucp { struct ltstrbool { bool operator()( - const std::pair< rtl::OUString, bool > & s1, - const std::pair< rtl::OUString, bool > & s2 ) const + const std::pair< OUString, bool > & s1, + const std::pair< OUString, bool > & s2 ) const { if ( s1.first < s2.first ) return true; @@ -150,7 +150,7 @@ namespace tdoc_ucp { // key: pair< storageuri, iswritable > typedef std::map< - std::pair< rtl::OUString, bool >, Storage *, ltstrbool > StorageMap; + std::pair< OUString, bool >, Storage *, ltstrbool > StorageMap; StorageMap m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index 8d5584df2d14..037d4d937cb2 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -54,7 +54,7 @@ void Uri::init() const } // Check for proper scheme. (Scheme is case insensitive.) - rtl::OUString aScheme + OUString aScheme = m_aUri.copy( 0, TDOC_URL_SCHEME_LENGTH ).toAsciiLowerCase(); if ( aScheme != TDOC_URL_SCHEME ) { @@ -116,7 +116,7 @@ void Uri::init() const if ( nSlash != - 1 ) m_aInternalPath = m_aPath.copy( nSlash ); else - m_aInternalPath = rtl::OUString("/"); + m_aInternalPath = OUString("/"); } m_eState = VALID; diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx index bf6d19baf034..4da9166e17dc 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.hxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx @@ -35,13 +35,13 @@ class Uri { enum State { UNKNOWN, INVALID, VALID }; - mutable ::rtl::OUString m_aUri; - mutable ::rtl::OUString m_aParentUri; - mutable ::rtl::OUString m_aPath; - mutable ::rtl::OUString m_aDocId; - mutable ::rtl::OUString m_aInternalPath; - mutable ::rtl::OUString m_aName; - mutable ::rtl::OUString m_aDecodedName; + mutable OUString m_aUri; + mutable OUString m_aParentUri; + mutable OUString m_aPath; + mutable OUString m_aDocId; + mutable OUString m_aInternalPath; + mutable OUString m_aName; + mutable OUString m_aDecodedName; mutable State m_eState; private: @@ -49,7 +49,7 @@ private: public: Uri() : m_eState( UNKNOWN ) {} - Uri( const ::rtl::OUString & rUri ) + Uri( const OUString & rUri ) : m_aUri( rUri ), m_eState( UNKNOWN ) {} bool operator== ( const Uri & rOther ) const @@ -61,27 +61,27 @@ public: sal_Bool isValid() const { init(); return m_eState == VALID; } - const ::rtl::OUString & getUri() const + const OUString & getUri() const { init(); return m_aUri; } - inline void setUri( const ::rtl::OUString & rUri ); + inline void setUri( const OUString & rUri ); - const ::rtl::OUString & getParentUri() const + const OUString & getParentUri() const { init(); return m_aParentUri; } - const ::rtl::OUString & getPath() const + const OUString & getPath() const { init(); return m_aPath; } - const ::rtl::OUString & getDocumentId() const + const OUString & getDocumentId() const { init(); return m_aDocId; } - const ::rtl::OUString & getInternalPath() const + const OUString & getInternalPath() const { init(); return m_aInternalPath; } - const ::rtl::OUString & getName() const + const OUString & getName() const { init(); return m_aName; } - const ::rtl::OUString & getDecodedName() const + const OUString & getDecodedName() const { init(); return m_aDecodedName; } inline sal_Bool isRoot() const; @@ -91,12 +91,12 @@ public: inline sal_Bool isFolder() const; }; -inline void Uri::setUri( const ::rtl::OUString & rUri ) +inline void Uri::setUri( const OUString & rUri ) { m_eState = UNKNOWN; m_aUri = rUri; m_aParentUri = m_aDocId = m_aInternalPath = m_aPath = m_aName - = m_aDecodedName = rtl::OUString(); + = m_aDecodedName = OUString(); } inline sal_Bool Uri::isRoot() const diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index d2f5437abc4d..fcc3c90d2f40 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -103,16 +103,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) NeonUri aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( - rtl::OUString( + OUString( "*** unknown ***" ) ), true ); } @@ -135,24 +135,24 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) //========================================================================= ContentProperties::ContentProperties( - const rtl::OUString & rTitle, sal_Bool bFolder ) + const OUString & rTitle, sal_Bool bFolder ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); - (*m_xProps)[ rtl::OUString("IsFolder") ] + (*m_xProps)[ OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString("IsDocument") ] + (*m_xProps)[ OUString("IsDocument") ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); } //========================================================================= -ContentProperties::ContentProperties( const rtl::OUString & rTitle ) +ContentProperties::ContentProperties( const OUString & rTitle ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); } @@ -174,7 +174,7 @@ ContentProperties::ContentProperties( const ContentProperties & rOther ) } //========================================================================= -bool ContentProperties::contains( const rtl::OUString & rName ) const +bool ContentProperties::contains( const OUString & rName ) const { if ( get( rName ) ) return true; @@ -184,7 +184,7 @@ bool ContentProperties::contains( const rtl::OUString & rName ) const //========================================================================= const uno::Any & ContentProperties::getValue( - const rtl::OUString & rName ) const + const OUString & rName ) const { const PropertyValue * pProp = get( rName ); if ( pProp ) @@ -195,7 +195,7 @@ const uno::Any & ContentProperties::getValue( //========================================================================= const PropertyValue * ContentProperties::get( - const rtl::OUString & rName ) const + const OUString & rName ) const { PropertyValueMap::const_iterator it = m_xProps->find( rName ); const PropertyValueMap::const_iterator end = m_xProps->end(); @@ -220,7 +220,7 @@ const PropertyValue * ContentProperties::get( // static void ContentProperties::UCBNamesToDAVNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -307,7 +307,7 @@ void ContentProperties::UCBNamesToDAVNames( // static void ContentProperties::UCBNamesToHTTPNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -328,17 +328,17 @@ void ContentProperties::UCBNamesToHTTPNames( if ( rProp.Name == "DateModified" ) { propertyNames.push_back( - rtl::OUString("Last-Modified") ); + OUString("Last-Modified") ); } else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( - rtl::OUString("Content-Type") ); + OUString("Content-Type") ); } else if ( rProp.Name == "Size" ) { propertyNames.push_back( - rtl::OUString("Content-Length") ); + OUString("Content-Length") ); } else { @@ -351,14 +351,14 @@ void ContentProperties::UCBNamesToHTTPNames( //========================================================================= bool ContentProperties::containsAllNames( const uno::Sequence< beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { rNamesNotContained.clear(); sal_Int32 nCount = rProps.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProps[ n ].Name; + const OUString & rName = rProps[ n ].Name; if ( !contains( rName ) ) { // Not found. @@ -371,15 +371,15 @@ bool ContentProperties::containsAllNames( //========================================================================= void ContentProperties::addProperties( - const std::vector< rtl::OUString > & rProps, + const std::vector< OUString > & rProps, const ContentProperties & rContentProps ) { - std::vector< rtl::OUString >::const_iterator it = rProps.begin(); - std::vector< rtl::OUString >::const_iterator end = rProps.end(); + std::vector< OUString >::const_iterator it = rProps.begin(); + std::vector< OUString >::const_iterator end = rProps.end(); while ( it != end ) { - const rtl::OUString & rName = (*it); + const OUString & rName = (*it); if ( !contains( rName ) ) // ignore duplicates { @@ -405,19 +405,19 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) } //========================================================================= -void ContentProperties::addProperty( const rtl::OUString & rName, +void ContentProperties::addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName.equals( DAVProperties::CREATIONDATE ) ) { // Map DAV:creationdate to UCP:DateCreated - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString("DateCreated") ] + (*m_xProps)[ OUString("DateCreated") ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -429,10 +429,10 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName.equals( DAVProperties::GETCONTENTLENGTH ) ) { // Map DAV:getcontentlength to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString("Size") ] + (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == "Content-Length" ) @@ -441,16 +441,16 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map Content-Length entity header to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString("Size") ] + (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName.equals( DAVProperties::GETCONTENTTYPE ) ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString("MediaType") ] + (*m_xProps)[ OUString("MediaType") ] = PropertyValue( rValue, true ); } else if ( rName == "Content-Type" ) @@ -459,7 +459,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString("MediaType") ] + (*m_xProps)[ OUString("MediaType") ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -468,12 +468,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName.equals( DAVProperties::GETLASTMODIFIED ) ) { // Map the DAV:getlastmodified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString("DateModified") ] + (*m_xProps)[ OUString("DateModified") ] = PropertyValue( uno::makeAny( aDate ), true ); } else if ( rName == "Last-Modified" ) @@ -482,12 +482,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map the Last-Modified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString("DateModified") ] + (*m_xProps)[ OUString("DateModified") ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -495,20 +495,20 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // } else if ( rName.equals( DAVProperties::RESOURCETYPE ) ) { - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); - (*m_xProps)[ rtl::OUString("IsFolder") ] + (*m_xProps)[ OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString("IsDocument") ] + (*m_xProps)[ OUString("IsDocument") ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); - (*m_xProps)[ rtl::OUString("ContentType") ] + (*m_xProps)[ OUString("ContentType") ] = PropertyValue( uno::makeAny( bFolder - ? rtl::OUString( WEBDAV_COLLECTION_TYPE ) - : rtl::OUString( WEBDAV_CONTENT_TYPE ) ), true ); + ? OUString( WEBDAV_COLLECTION_TYPE ) + : OUString( WEBDAV_CONTENT_TYPE ) ), true ); } // else if ( rName.equals( DAVProperties::SOURCE ) ) // { @@ -531,25 +531,25 @@ void ContentProperties::addProperty( const rtl::OUString & rName, namespace { - bool isCachable( rtl::OUString const & rName, + bool isCachable( OUString const & rName, bool isCaseSensitive ) { - static rtl::OUString aNonCachableProps [] = + static OUString aNonCachableProps [] = { DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( "ETag" ), + OUString( "ETag" ), - rtl::OUString( "DateModified" ), - rtl::OUString( "Last-Modified" ), + OUString( "DateModified" ), + OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( "Size" ), - rtl::OUString( "Content-Length" ), + OUString( "Size" ), + OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( "Date" ) + OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx index 4f64c016823a..6022439364af 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx @@ -49,7 +49,7 @@ struct DAVResource; struct equalString { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -57,7 +57,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -91,7 +91,7 @@ public: typedef boost::unordered_map < - rtl::OUString, + OUString, PropertyValue, hashString, equalString @@ -108,17 +108,17 @@ public: ContentProperties( const DAVResource& rResource ); // Mini props for transient contents. - ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder ); + ContentProperties( const OUString & rTitle, sal_Bool bFolder ); // Micro props for non-existing contents. - ContentProperties( const rtl::OUString & rTitle ); + ContentProperties( const OUString & rTitle ); ContentProperties( const ContentProperties & rOther ); - bool contains( const rtl::OUString & rName ) const; + bool contains( const OUString & rName ) const; const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const; + getValue( const OUString & rName ) const; // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included @@ -130,7 +130,7 @@ public: static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // Maps the UCB property names contained in rProps with their HTTP header @@ -143,7 +143,7 @@ public: static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // return true, if all properties contained in rProps are contained in @@ -152,16 +152,16 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const; + std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in // rContentProps to this instance. In case of duplicates the value // already contained in this will left unchanged. - void addProperties( const std::vector< rtl::OUString > & rProps, + void addProperties( const std::vector< OUString > & rProps, const ContentProperties & rContentProps ); // overwrites probably existing entry. - void addProperty( const rtl::OUString & rName, + void addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ); @@ -170,7 +170,7 @@ public: bool isTrailingSlash() const { return m_bTrailingSlash; } - const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; } + const OUString & getEscapedTitle() const { return m_aEscapedTitle; } // Not good to expose implementation details, but this is actually an // internal class. @@ -178,7 +178,7 @@ public: { return m_xProps; } private: - ::rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; std::auto_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; @@ -186,7 +186,7 @@ private: ContentProperties & operator=( const ContentProperties & ); // n.i. - const PropertyValue * get( const rtl::OUString & rName ) const; + const PropertyValue * get( const OUString & rName ) const; }; class CachableContentProperties @@ -207,11 +207,11 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const + getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } operator const ContentProperties & () const { return m_aProps; } diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx index 7e4a34b56564..1d9e665280a0 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx @@ -41,10 +41,10 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject { public: virtual int authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials ) = 0; }; diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index db5f44655659..7428c358ebd5 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -53,24 +53,24 @@ namespace webdav_ucp DAVAuthListener_Impl( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& xEnv, - const ::rtl::OUString & inURL ) + const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { } - virtual int authenticate( const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + virtual int authenticate( const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials ); private: const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; - const rtl::OUString m_aURL; + const OUString m_aURL; - rtl::OUString m_aPrevPassword; - rtl::OUString m_aPrevUsername; + OUString m_aPrevPassword; + OUString m_aPrevUsername; }; } diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx index 376f7ff337ed..4c3ab54bc930 100644 --- a/ucb/source/ucp/webdav-neon/DAVException.hxx +++ b/ucb/source/ucp/webdav-neon/DAVException.hxx @@ -140,25 +140,25 @@ class DAVException private: ExceptionCode mExceptionCode; - rtl::OUString mData; + OUString mData; sal_uInt16 mStatusCode; public: DAVException( ExceptionCode inExceptionCode ) : mExceptionCode( inExceptionCode ), mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData ) : + const OUString & rData ) : mExceptionCode( inExceptionCode ), mData( rData ), mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData, + const OUString & rData, sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ), mData( rData ), mStatusCode( nStatusCode ) {}; ~DAVException( ) {}; const ExceptionCode & getError() const { return mExceptionCode; } - const rtl::OUString & getData() const { return mData; } + const OUString & getData() const { return mData; } sal_uInt16 getStatus() const { return mStatusCode; } }; diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx index 29e972f231a5..a95aea3482f4 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx @@ -32,28 +32,28 @@ using namespace webdav_ucp; -const ::rtl::OUString DAVProperties::CREATIONDATE("DAV:creationdate"); -const ::rtl::OUString DAVProperties::DISPLAYNAME("DAV:displayname"); -const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage"); -const ::rtl::OUString DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength"); -const ::rtl::OUString DAVProperties::GETCONTENTTYPE("DAV:getcontenttype"); -const ::rtl::OUString DAVProperties::GETETAG("DAV:getetag"); -const ::rtl::OUString DAVProperties::GETLASTMODIFIED("DAV:getlastmodified"); -const ::rtl::OUString DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery"); -const ::rtl::OUString DAVProperties::RESOURCETYPE("DAV:resourcetype"); -const ::rtl::OUString DAVProperties::SOURCE("DAV:source"); -const ::rtl::OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock"); - -const ::rtl::OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable"); - -void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, +const OUString DAVProperties::CREATIONDATE("DAV:creationdate"); +const OUString DAVProperties::DISPLAYNAME("DAV:displayname"); +const OUString DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage"); +const OUString DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength"); +const OUString DAVProperties::GETCONTENTTYPE("DAV:getcontenttype"); +const OUString DAVProperties::GETETAG("DAV:getetag"); +const OUString DAVProperties::GETLASTMODIFIED("DAV:getlastmodified"); +const OUString DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery"); +const OUString DAVProperties::RESOURCETYPE("DAV:resourcetype"); +const OUString DAVProperties::SOURCE("DAV:source"); +const OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock"); + +const OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable"); + +void DAVProperties::createNeonPropName( const OUString & rFullName, NeonPropName & rName ) { if ( rFullName.startsWith( "DAV:" ) ) { rName.nspace = "DAV:"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -61,7 +61,7 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, { rName.nspace = "http://apache.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://apache.org/dav/props/" ) ), @@ -71,7 +71,7 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, { rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://ucb.openoffice.org/dav/props/" ) ), @@ -81,8 +81,8 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, { // Support for 3rd party namespaces/props - rtl::OString aFullName - = rtl::OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); + OString aFullName + = OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); // Format: <prop:the_propname xmlns:prop="the_namespace"> @@ -99,19 +99,19 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, // Add our namespace to our own properties. rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( rFullName, + = strdup( OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ).getStr() ); } } void DAVProperties::createUCBPropName( const char * nspace, const char * name, - rtl::OUString & rFullName ) + OUString & rFullName ) { - rtl::OUString aNameSpace - = rtl::OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aName - = rtl::OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); + OUString aNameSpace + = OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); + OUString aName + = OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); if ( aNameSpace.isEmpty() ) { @@ -130,7 +130,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::SOURCE.matchIgnoreAsciiCase( aName, 4 ) ) - aNameSpace = rtl::OUString( "DAV:" ); + aNameSpace = OUString( "DAV:" ); } // Note: Concatenating strings BEFORE comparing against known namespaces @@ -156,11 +156,11 @@ void DAVProperties::createUCBPropName( const char * nspace, else { // Create property name that encodes, namespace and name ( XML ). - rFullName = rtl::OUString("<prop:"); + rFullName = OUString("<prop:"); rFullName += aName; - rFullName += rtl::OUString( " xmlns:prop=\"" ); + rFullName += OUString( " xmlns:prop=\"" ); rFullName += aNameSpace; - rFullName += rtl::OUString( "\">" ); + rFullName += OUString( "\">" ); } } diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.hxx b/ucb/source/ucp/webdav-neon/DAVProperties.hxx index 2cf049ffa672..dbd967feaf4d 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.hxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.hxx @@ -36,24 +36,24 @@ namespace webdav_ucp struct DAVProperties { - static const ::rtl::OUString CREATIONDATE; - static const ::rtl::OUString DISPLAYNAME; - static const ::rtl::OUString GETCONTENTLANGUAGE; - static const ::rtl::OUString GETCONTENTLENGTH; - static const ::rtl::OUString GETCONTENTTYPE; - static const ::rtl::OUString GETETAG; - static const ::rtl::OUString GETLASTMODIFIED; - static const ::rtl::OUString LOCKDISCOVERY; - static const ::rtl::OUString RESOURCETYPE; - static const ::rtl::OUString SOURCE; - static const ::rtl::OUString SUPPORTEDLOCK; - static const ::rtl::OUString EXECUTABLE; + static const OUString CREATIONDATE; + static const OUString DISPLAYNAME; + static const OUString GETCONTENTLANGUAGE; + static const OUString GETCONTENTLENGTH; + static const OUString GETCONTENTTYPE; + static const OUString GETETAG; + static const OUString GETLASTMODIFIED; + static const OUString LOCKDISCOVERY; + static const OUString RESOURCETYPE; + static const OUString SOURCE; + static const OUString SUPPORTEDLOCK; + static const OUString EXECUTABLE; - static void createNeonPropName( const rtl::OUString & rFullName, + static void createNeonPropName( const OUString & rFullName, NeonPropName & rName ); static void createUCBPropName ( const char * nspace, const char * name, - rtl::OUString & rFullName ); + OUString & rFullName ); static bool isUCBDeadProperty( const NeonPropName & rName ); }; diff --git a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx index 6f3862d376fa..3c435bab51c9 100644 --- a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx @@ -34,19 +34,19 @@ namespace webdav_ucp { - typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader; + typedef std::pair< OUString, OUString > DAVRequestHeader; typedef std::vector< DAVRequestHeader > DAVRequestHeaders; struct DAVRequestEnvironment { - rtl::OUString m_aRequestURI; + OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; // rtl::Reference< DAVStatusListener > m_xStatusListener; // rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; uno::Reference< ucb::XCommandEnvironment > m_xEnv; -DAVRequestEnvironment( const rtl::OUString & rRequestURI, +DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, const uno::Reference< ucb::XCommandEnvironment > & xEnv) diff --git a/ucb/source/ucp/webdav-neon/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx index d12e08e5cca7..eeba4efa5dce 100644 --- a/ucb/source/ucp/webdav-neon/DAVResource.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResource.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp struct DAVPropertyValue { - rtl::OUString Name; + OUString Name; com::sun::star::uno::Any Value; bool IsCaseSensitive; @@ -48,19 +48,19 @@ struct DAVPropertyValue struct DAVResource { - ::rtl::OUString uri; + OUString uri; std::vector< DAVPropertyValue > properties; DAVResource() {} - DAVResource( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResource( const OUString & inUri ) : uri( inUri ) {} }; struct DAVResourceInfo { - ::rtl::OUString uri; - std::vector < ::rtl::OUString > properties; + OUString uri; + std::vector < OUString > properties; - DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResourceInfo( const OUString & inUri ) : uri( inUri ) {} }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 61f4969308d0..a3976b92b871 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -53,10 +53,10 @@ using namespace com::sun::star; //========================================================================= // virtual int DAVAuthListener_Impl::authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials ) { if ( m_xEnv.is() ) @@ -77,7 +77,7 @@ int DAVAuthListener_Impl::authenticate( rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest = new ucbhelper::SimpleAuthenticationRequest( m_aURL, inHostName, inRealm, inoutUserName, - outPassWord, ::rtl::OUString(), + outPassWord, OUString(), true /*bAllowPersistentStoring*/, bCanUseSystemCredentials ); xIH->handle( xRequest.get() ); @@ -106,8 +106,8 @@ int DAVAuthListener_Impl::authenticate( { // This is the (strange) way to tell neon to use // system credentials. - inoutUserName = rtl::OUString(); - outPassWord = rtl::OUString(); + inoutUserName = OUString(); + outPassWord = OUString(); } else { @@ -141,7 +141,7 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ) + const OUString & rURL ) : m_aURL( rURL ), m_xSessionFactory( rSessionFactory ), m_xContext( rxContext ) @@ -194,7 +194,7 @@ void DAVResourceAccess::OPTIONS( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "OPTIONS" ), + OUString( "OPTIONS" ), aHeaders ); m_xSession->OPTIONS( getRequestURI(), @@ -219,7 +219,7 @@ void DAVResourceAccess::OPTIONS( //========================================================================= void DAVResourceAccess::PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -237,7 +237,7 @@ void DAVResourceAccess::PROPFIND( getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPFIND" ), + OUString( "PROPFIND" ), aHeaders ); m_xSession->PROPFIND( getRequestURI(), @@ -279,7 +279,7 @@ void DAVResourceAccess::PROPFIND( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPFIND" ), + OUString( "PROPFIND" ), aHeaders ); m_xSession->PROPFIND( getRequestURI(), @@ -319,7 +319,7 @@ void DAVResourceAccess::PROPPATCH( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPPATCH" ), + OUString( "PROPPATCH" ), aHeaders ); m_xSession->PROPPATCH( getRequestURI(), @@ -342,7 +342,7 @@ void DAVResourceAccess::PROPPATCH( //========================================================================= void DAVResourceAccess::HEAD( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( DAVException ) @@ -359,7 +359,7 @@ void DAVResourceAccess::HEAD( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("HEAD"), + OUString("HEAD"), aHeaders ); m_xSession->HEAD( getRequestURI(), @@ -399,7 +399,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -440,7 +440,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); m_xSession->GET( getRequestURI(), @@ -463,7 +463,7 @@ void DAVResourceAccess::GET( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::GET( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -481,7 +481,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -509,7 +509,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( //========================================================================= void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -526,7 +526,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); m_xSession->GET( getRequestURI(), @@ -611,7 +611,7 @@ void DAVResourceAccess::PUT( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("PUT"), + OUString("PUT"), aHeaders ); m_xSession->PUT( getRequestURI(), @@ -634,8 +634,8 @@ void DAVResourceAccess::PUT( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ) @@ -663,7 +663,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("POST"), + OUString("POST"), aHeaders ); xStream = m_xSession->POST( getRequestURI(), @@ -697,8 +697,8 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( //========================================================================= void DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) @@ -726,7 +726,7 @@ void DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("POST"), + OUString("POST"), aHeaders ); m_xSession->POST( getRequestURI(), @@ -774,7 +774,7 @@ void DAVResourceAccess::MKCOL( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("MKCOL"), + OUString("MKCOL"), aHeaders ); m_xSession->MKCOL( getRequestURI(), @@ -796,8 +796,8 @@ void DAVResourceAccess::MKCOL( //========================================================================= void DAVResourceAccess::COPY( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -814,7 +814,7 @@ void DAVResourceAccess::COPY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("COPY"), + OUString("COPY"), aHeaders ); m_xSession->COPY( rSourcePath, @@ -838,8 +838,8 @@ void DAVResourceAccess::COPY( //========================================================================= void DAVResourceAccess::MOVE( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -856,7 +856,7 @@ void DAVResourceAccess::MOVE( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("MOVE"), + OUString("MOVE"), aHeaders ); m_xSession->MOVE( rSourcePath, @@ -895,7 +895,7 @@ void DAVResourceAccess::DESTROY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "DESTROY" ), + OUString( "DESTROY" ), aHeaders ); m_xSession->DESTROY( getRequestURI(), @@ -934,7 +934,7 @@ void DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("LOCK"), + OUString("LOCK"), aHeaders ); m_xSession->LOCK( getRequestURI(), @@ -976,7 +976,7 @@ sal_Int64 DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("LOCK"), + OUString("LOCK"), aHeaders ); nNewTimeout = m_xSession->LOCK( getRequestURI(), @@ -1018,7 +1018,7 @@ void DAVResourceAccess::UNLOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("UNLOCK"), + OUString("UNLOCK"), aHeaders ); m_xSession->UNLOCK( getRequestURI(), @@ -1047,12 +1047,12 @@ void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFla } //========================================================================= -void DAVResourceAccess::setURL( const rtl::OUString & rNewURL ) +void DAVResourceAccess::setURL( const OUString & rNewURL ) throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; - m_aPath = rtl::OUString(); // Next initialize() will create new session. + m_aPath = OUString(); // Next initialize() will create new session. } //========================================================================= @@ -1064,7 +1064,7 @@ void DAVResourceAccess::initialize() if ( m_aPath.isEmpty() ) { NeonUri aURI( m_aURL ); - rtl::OUString aPath( aURI.GetPath() ); + OUString aPath( aURI.GetPath() ); /* #134089# - Check URI */ if ( aPath.isEmpty() ) @@ -1098,7 +1098,7 @@ void DAVResourceAccess::initialize() } //========================================================================= -const rtl::OUString & DAVResourceAccess::getRequestURI() const +const OUString & DAVResourceAccess::getRequestURI() const { OSL_ENSURE( m_xSession.is(), "DAVResourceAccess::getRequestURI - Not initialized!" ); @@ -1114,8 +1114,8 @@ const rtl::OUString & DAVResourceAccess::getRequestURI() const // static void DAVResourceAccess::getUserRequestHeaders( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ) { if ( xEnv.is() ) @@ -1130,7 +1130,7 @@ void DAVResourceAccess::getUserRequestHeaders( for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n ) { - rtl::OUString aValue; + OUString aValue; sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue; if ( !isString ) @@ -1164,7 +1164,7 @@ void DAVResourceAccess::getUserRequestHeaders( //========================================================================= sal_Bool DAVResourceAccess::detectRedirectCycle( - const rtl::OUString& rRedirectURL ) + const OUString& rRedirectURL ) throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx index 99446236bf69..b4bf18ef53e2 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx @@ -53,8 +53,8 @@ class DAVSessionFactory; class DAVResourceAccess { osl::Mutex m_aMutex; - rtl::OUString m_aURL; - rtl::OUString m_aPath; + OUString m_aURL; + OUString m_aPath; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; @@ -68,7 +68,7 @@ public: com::sun::star::uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ); + const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); @@ -76,12 +76,12 @@ public: void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) throw ( DAVException ); - void setURL( const rtl::OUString & rNewURL ) + void setURL( const OUString & rNewURL ) throw ( DAVException ); void resetUri(); - const rtl::OUString & getURL() const { return m_aURL; } + const OUString & getURL() const { return m_aURL; } rtl::Reference< DAVSessionFactory > getSessionFactory() const { return m_xSessionFactory; } @@ -100,7 +100,7 @@ public: // allprop & named void PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -121,7 +121,7 @@ public: throw ( DAVException ); void - HEAD( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -140,7 +140,7 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -149,7 +149,7 @@ public: void GET( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -163,8 +163,8 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, const com::sun::star::uno::Reference< @@ -172,8 +172,8 @@ public: throw ( DAVException ); void - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, com::sun::star::uno::Reference< @@ -188,16 +188,16 @@ public: throw ( DAVException ); void - COPY( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + COPY( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - MOVE( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + MOVE( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -238,13 +238,13 @@ public: getUserRequestHeaders( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ); private: - const rtl::OUString & getRequestURI() const; - sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) + const OUString & getRequestURI() const; + sal_Bool detectRedirectCycle( const OUString& rRedirectURL ) throw ( DAVException ); sal_Bool handleException( const DAVException & e, int errorCount ) throw ( DAVException ); diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx index 120879d91bf8..b5dad245b356 100644 --- a/ucb/source/ucp/webdav-neon/DAVSession.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx @@ -68,7 +68,7 @@ public: } } - virtual sal_Bool CanUse( const ::rtl::OUString & inPath, + virtual sal_Bool CanUse( const OUString & inPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) = 0; virtual sal_Bool UsesProxy() = 0; @@ -76,81 +76,81 @@ public: // DAV methods // - virtual void OPTIONS( const ::rtl::OUString & inPath, + virtual void OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // allprop & named - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropertyNames, + const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // propnames - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PROPPATCH( const ::rtl::OUString & inPath, + virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + virtual void HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void GET( const ::rtl::OUString & inPath, + virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PUT( const ::rtl::OUString & inPath, + virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + virtual void POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -158,39 +158,39 @@ public: const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void MKCOL( const ::rtl::OUString & inPath, + virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void COPY( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void COPY( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void MOVE( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void MOVE( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // set new lock. - virtual void LOCK( const ::rtl::OUString & inPath, + virtual void LOCK( const OUString & inPath, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inPath, + virtual sal_Int64 LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void UNLOCK( const ::rtl::OUString & inPath, + virtual void UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index 2534af78f628..2f595557bdd0 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -39,7 +39,7 @@ DAVSessionFactory::~DAVSessionFactory() } rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( - const ::rtl::OUString & inUri, + const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags, const uno::Reference< uno::XComponentContext > & rxContext ) throw( DAVException ) diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index c29ec718e86f..b45ce9ffcde3 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -61,14 +61,14 @@ public: ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > - createDAVSession( const ::rtl::OUString & inUri, + createDAVSession( const OUString & inUri, const ::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ::uno::Reference< ::uno::XComponentContext >& rxContext ) throw( DAVException ); ::uno::Reference< ::uno::XComponentContext > getComponentContext() { return m_xContext; } private: - typedef std::map< rtl::OUString, DAVSession * > Map; + typedef std::map< OUString, DAVSession * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx index fcdfc2cda72c..b3da92c0a533 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx @@ -72,11 +72,11 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - rtl::OUString name; + OUString name; com::sun::star::uno::Any value; ProppatchValue( const ProppatchOperation o, - const rtl::OUString & n, + const OUString & n, const com::sun::star::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx index f47e29714880..4bf2ea8f0291 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star::util; using namespace webdav_ucp; -using ::rtl::OUString; -using ::rtl::OString; bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, DateTime& dateTime) diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx index 6964bc620a18..b3166c2ca00c 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx @@ -45,16 +45,16 @@ namespace webdav_ucp class DateTimeHelper { private: - static sal_Int32 convertMonthToInt (const ::rtl::OUString& ); + static sal_Int32 convertMonthToInt (const OUString& ); - static bool ISO8601_To_DateTime (const ::rtl::OUString&, + static bool ISO8601_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); - static bool RFC2068_To_DateTime (const ::rtl::OUString&, + static bool RFC2068_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); public: - static bool convert (const ::rtl::OUString&, + static bool convert (const OUString&, ::com::sun::star::util::DateTime& ); }; diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx index 26c5673eeab8..32fafb4bc7b9 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx @@ -98,13 +98,13 @@ extern "C" int LinkSequence_chardata_callback( { case STATE_DST: pCtx->pLink->Destination - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasDestination = true; break; case STATE_SRC: pCtx->pLink->Source - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasSource = true; break; } @@ -135,7 +135,7 @@ extern "C" int LinkSequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LinkSequence::createFromXML( const rtl::OString & rInData, +bool LinkSequence::createFromXML( const OString & rInData, uno::Sequence< ucb::Link > & rOutData ) { const sal_Int32 TOKEN_LENGTH = 7; // </link> @@ -191,16 +191,16 @@ bool LinkSequence::createFromXML( const rtl::OString & rInData, ////////////////////////////////////////////////////////////////////////// // static bool LinkSequence::toXML( const uno::Sequence< ucb::Link > & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // <link><src>value</src><dst>value</dst></link><link><src>.... sal_Int32 nCount = rInData.getLength(); if ( nCount ) { - rtl::OUString aPre( "<link><src>" ); - rtl::OUString aMid( "</src><dst>" ); - rtl::OUString aEnd( "</dst></link>" ); + OUString aPre( "<link><src>" ); + OUString aMid( "</src><dst>" ); + OUString aEnd( "</dst></link>" ); for ( sal_Int32 n = 0; n < nCount; ++n ) { diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx index 109ea8de33dd..ceec0f347e13 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.hxx @@ -39,12 +39,12 @@ namespace webdav_ucp class LinkSequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::Link > & rOutData ); static bool toXML( const com::sun::star::uno::Sequence< com::sun::star::ucb::Link > & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx index 075af0132ee8..746ca58bd8f2 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx @@ -183,7 +183,7 @@ extern "C" int LockEntrySequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LockEntrySequence::createFromXML( const rtl::OString & rInData, +bool LockEntrySequence::createFromXML( const OString & rInData, uno::Sequence< ucb::LockEntry > & rOutData ) { diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx index 7c91f4e6cf23..62556e11c01b 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp class LockEntrySequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::LockEntry > & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx index 3b31b1f9fa11..06d501fb0c38 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx @@ -178,9 +178,9 @@ extern "C" int LockSequence_chardata_callback( case STATE_OWNER: { // collect raw XML data... (owner contains ANY) - rtl::OUString aValue; + OUString aValue; pCtx->pLock->Owner >>= aValue; - aValue += rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + aValue += OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->pLock->Owner <<= aValue; break; } @@ -207,7 +207,7 @@ extern "C" int LockSequence_chardata_callback( buf, len, "Second-", 7, 7 ) == 0 ) { pCtx->pLock->Timeout - = rtl::OString( buf + 7, len - 7 ).toInt64(); + = OString( buf + 7, len - 7 ).toInt64(); pCtx->hasTimeout = true; } // else if ( rtl_str_shortenedCompareIgnoreCase_WithLength( @@ -229,7 +229,7 @@ extern "C" int LockSequence_chardata_callback( sal_Int32 nPos = pCtx->pLock->LockTokens.getLength(); pCtx->pLock->LockTokens.realloc( nPos + 1 ); pCtx->pLock->LockTokens[ nPos ] - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasHREF = true; break; } @@ -310,7 +310,7 @@ extern "C" int LockSequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LockSequence::createFromXML( const rtl::OString & rInData, +bool LockSequence::createFromXML( const OString & rInData, uno::Sequence< ucb::Lock > & rOutData ) { const sal_Int32 TOKEN_LENGTH = 13; // </activelock> diff --git a/ucb/source/ucp/webdav-neon/LockSequence.hxx b/ucb/source/ucp/webdav-neon/LockSequence.hxx index 746d72176c73..fc9db6679c9f 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp class LockSequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::Lock > & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx index 8763a9b5c32e..5040b690943e 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -38,15 +38,15 @@ namespace { void process_headers( ne_request * req, DAVResource & rResource, - const std::vector< ::rtl::OUString > & rHeaderNames ) + const std::vector< OUString > & rHeaderNames ) { void * cursor = NULL; const char * name, *value; while ( ( cursor = ne_response_header_iterate( req, cursor, &name, &value ) ) != NULL ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) ); - rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) ); + OUString aHeaderName( OUString::createFromAscii( name ) ); + OUString aHeaderValue( OUString::createFromAscii( value ) ); // Note: Empty vector means that all headers are requested. bool bIncludeIt = ( rHeaderNames.empty() ); @@ -54,9 +54,9 @@ void process_headers( ne_request * req, if ( !bIncludeIt ) { // Check whether this header was requested. - std::vector< ::rtl::OUString >::const_iterator it( + std::vector< OUString >::const_iterator it( rHeaderNames.begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( + const std::vector< OUString >::const_iterator end( rHeaderNames.end() ); while ( it != end ) @@ -90,8 +90,8 @@ void process_headers( ne_request * req, extern osl::Mutex aGlobalNeonMutex; NeonHeadRequest::NeonHeadRequest( HttpSession * inSession, - const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & + const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, int & nError ) @@ -103,7 +103,7 @@ NeonHeadRequest::NeonHeadRequest( HttpSession * inSession, // header fields. ne_request * req = ne_request_create( inSession, "HEAD", - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx index b0a9fea47c53..a328418d4db5 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx @@ -41,8 +41,8 @@ class NeonHeadRequest public: // named / allprop NeonHeadRequest( HttpSession* inSession, - const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, int & nError ); ~NeonHeadRequest(); diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 951601fc1e11..04608a63f725 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -145,12 +145,12 @@ void NeonLockStore::registerSession( HttpSession * pHttpSession ) ne_lockstore_register( m_pNeonLockStore, pHttpSession ); } -NeonLock * NeonLockStore::findByUri( rtl::OUString const & rUri ) +NeonLock * NeonLockStore::findByUri( OUString const & rUri ) { osl::MutexGuard aGuard( m_aMutex ); ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( + ne_uri_parse( OUStringToOString( rUri, RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); return ne_lockstore_findbyuri( m_pNeonLockStore, &aUri ); } diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index c8f0f0fcba99..c6bd4f5e48a4 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -78,7 +78,7 @@ public: void registerSession( HttpSession * pHttpSession ); - NeonLock * findByUri( rtl::OUString const & rUri ); + NeonLock * findByUri( OUString const & rUri ); void addLock( NeonLock * pLock, rtl::Reference< NeonSession > const & xSession, diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index 6f05906e8b64..0f10513d5b34 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -43,19 +43,16 @@ using namespace com::sun::star::ucb; using namespace std; using namespace webdav_ucp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; namespace { // strip "DAV:" namespace from XML snippets to avoid // parser error (undeclared namespace) later on. - rtl::OString stripDavNamespace( const rtl::OString & in ) + OString stripDavNamespace( const OString & in ) { - const rtl::OString inXML( in.toAsciiLowerCase() ); + const OString inXML( in.toAsciiLowerCase() ); - rtl::OStringBuffer buf; + OStringBuffer buf; sal_Int32 start = 0; sal_Int32 end = inXML.indexOf( "dav:" ); while ( end != -1 ) @@ -76,7 +73,7 @@ namespace } buf.append( inXML.copy( start ) ); - return rtl::OString( buf.makeStringAndClear() ); + return OString( buf.makeStringAndClear() ); } } diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx index 9febb56faf0c..fd714246c9db 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx @@ -45,7 +45,7 @@ public: NeonPropFindRequest( HttpSession* inSession, const char* inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, int & nError ); // propnames diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 5dcafe634d18..34a193732d5e 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -82,12 +82,12 @@ using namespace webdav_ucp; struct RequestData { // POST - rtl::OUString aContentType; - rtl::OUString aReferer; + OUString aContentType; + OUString aReferer; RequestData() {} - RequestData( const rtl::OUString & rContentType, - const rtl::OUString & rReferer ) + RequestData( const OUString & rContentType, + const OUString & rReferer ) : aContentType( rContentType ), aReferer( rReferer ) {} }; @@ -116,7 +116,7 @@ typedef boost::unordered_map > RequestDataMap; -static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText ) +static sal_uInt16 makeStatusCode( const OUString & rStatusText ) { // Extract status code from session error string. Unfortunately // neon provides no direct access to the status code... @@ -150,7 +150,7 @@ static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags ) std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TNamedValueEqualFunctor(), _1, - rtl::OUString("KeepAlive")))); + OUString("KeepAlive")))); if ( pValue != pAry+nLen && !pValue->Value.get<sal_Bool>() ) return true; @@ -161,7 +161,7 @@ struct NeonRequestContext { uno::Reference< io::XOutputStream > xOutputStream; rtl::Reference< NeonInputStream > xInputStream; - const std::vector< ::rtl::OUString > * pHeaderNames; + const std::vector< OUString > * pHeaderNames; DAVResource * pResource; NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm ) @@ -173,13 +173,13 @@ struct NeonRequestContext pHeaderNames( 0 ), pResource( 0 ) {} NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : xOutputStream( xOutStrm ), xInputStream( 0 ), pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {} NeonRequestContext( const rtl::Reference< NeonInputStream > & xInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : xOutputStream( 0 ), xInputStream( xInStrm ), pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {} @@ -255,8 +255,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, // abort return -1; } - rtl::OUString theUserName; - rtl::OUString thePassWord; + OUString theUserName; + OUString thePassWord; if ( attempt == 0 ) { @@ -266,7 +266,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, try { NeonUri uri( theSession->getRequestEnvironment().m_aRequestURI ); - rtl::OUString aUserInfo( uri.GetUserInfo() ); + OUString aUserInfo( uri.GetUserInfo() ); if ( !aUserInfo.isEmpty() ) { sal_Int32 nPos = aUserInfo.indexOf( '@' ); @@ -290,9 +290,9 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, else { // username buffer is prefilled with user name from last attempt. - theUserName = rtl::OUString::createFromAscii( inoutUserName ); + theUserName = OUString::createFromAscii( inoutUserName ); // @@@ Neon does not initialize password buffer (last checked: 0.22.0). - //thePassWord = rtl::OUString::createFromAscii( inoutPassWord ); + //thePassWord = OUString::createFromAscii( inoutPassWord ); } bool bCanUseSystemCreds = false; @@ -306,14 +306,14 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, #endif int theRetVal = pListener->authenticate( - rtl::OUString::createFromAscii( inRealm ), + OUString::createFromAscii( inRealm ), theSession->getHostName(), theUserName, thePassWord, bCanUseSystemCreds); - rtl::OString aUser( - rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + OString aUser( + OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) ) { OSL_FAIL( @@ -321,8 +321,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, return -1; } - rtl::OString aPass( - rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + OString aPass( + OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); if ( aPass.getLength() > ( NE_ABUFSIZ - 1 ) ) { OSL_FAIL( @@ -331,19 +331,19 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, } strcpy( inoutUserName, // #100211# - checked - rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); strcpy( inoutPassWord, // #100211# - checked - rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); return theRetVal; } namespace { - ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + OUString GetHostnamePart( const OUString& _rRawString ) { - ::rtl::OUString sPart; - ::rtl::OUString sPartId("CN="); + OUString sPart; + OUString sPartId("CN="); sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { @@ -378,7 +378,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, failures = 0; char * dn = ne_ssl_readable_dname( ne_ssl_cert_subject( cert ) ); - rtl::OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 ); + OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 ); ne_free( dn ); @@ -405,7 +405,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, return 1; uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext( - xSEInitializer->createSecurityContext( rtl::OUString() ) ); + xSEInitializer->createSecurityContext( OUString() ) ); uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv( xSecurityContext->getSecurityEnvironment() ); @@ -413,11 +413,11 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, //The end entity certificate char * eeCertB64 = ne_ssl_cert_export( cert ); - rtl::OString sEECertB64( eeCertB64 ); + OString sEECertB64( eeCertB64 ); uno::Reference< security::XCertificate > xEECert( xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) ); + OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) ); ne_free( eeCertB64 ); eeCertB64 = 0; @@ -434,12 +434,12 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, break; char * imCertB64 = ne_ssl_cert_export( issuerCert ); - rtl::OString sInterMediateCertB64( imCertB64 ); + OString sInterMediateCertB64( imCertB64 ); ne_free( imCertB64 ); uno::Reference< security::XCertificate> xImCert( xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( sInterMediateCertB64, RTL_TEXTENCODING_ASCII_US ) ) ); + OStringToOUString( sInterMediateCertB64, RTL_TEXTENCODING_ASCII_US ) ) ); if ( xImCert.is() ) vecCerts.push_back( xImCert ); } @@ -532,8 +532,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, char * pData = headers->data; if ( strstr( pData, "Content-Type:" ) == NULL ) { - rtl::OString aType - = rtl::OUStringToOString( (*it).second.aContentType, + OString aType + = OUStringToOString( (*it).second.aContentType, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, "Content-Type: ", aType.getStr(), EOL, NULL ); @@ -545,8 +545,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, char * pData = headers->data; if ( strstr( pData, "Referer:" ) == NULL ) { - rtl::OString aReferer - = rtl::OUStringToOString( (*it).second.aReferer, + OString aReferer + = OUStringToOString( (*it).second.aReferer, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, "Referer: ", aReferer.getStr(), EOL, NULL ); @@ -562,11 +562,11 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, while ( it1 != end1 ) { - rtl::OString aHeader - = rtl::OUStringToOString( (*it1).first, + OString aHeader + = OUStringToOString( (*it1).first, RTL_TEXTENCODING_UTF8 ); - rtl::OString aValue - = rtl::OUStringToOString( (*it1).second, + OString aValue + = OUStringToOString( (*it1).second, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, aHeader.getStr(), ": ", aValue.getStr(), EOL, NULL ); @@ -588,7 +588,7 @@ NeonLockStore NeonSession::m_aNeonLockStore; NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const uno::Sequence< beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) @@ -704,10 +704,10 @@ void NeonSession::Init() { osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex ); m_pHttpSession = ne_session_create( - rtl::OUStringToOString( m_aScheme, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( m_aScheme, RTL_TEXTENCODING_UTF8 ).getStr(), /* theUri.GetUserInfo(), @@@ for FTP via HTTP proxy, but not supported by Neon */ - rtl::OUStringToOString( m_aHostName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( m_aHostName, RTL_TEXTENCODING_UTF8 ).getStr(), m_nPort ); } @@ -720,7 +720,7 @@ void NeonSession::Init() m_aNeonLockStore.registerSession( m_pHttpSession ); if ( m_aScheme.equalsIgnoreAsciiCase( - rtl::OUString( "https" ) ) ) + OUString( "https" ) ) ) { // Set a failure callback for certificate check ne_ssl_set_verify( @@ -775,7 +775,7 @@ void NeonSession::Init() if ( !m_aProxyName.isEmpty() ) { ne_session_proxy( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), m_nProxyPort ); @@ -799,7 +799,7 @@ void NeonSession::Init() } } -sal_Bool NeonSession::CanUse( const rtl::OUString & inUri, +sal_Bool NeonSession::CanUse( const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags ) { try @@ -824,7 +824,7 @@ sal_Bool NeonSession::UsesProxy() return !m_aProxyName.isEmpty() ; } -void NeonSession::OPTIONS( const rtl::OUString & inPath, +void NeonSession::OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -837,7 +837,7 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath, memset( &servercaps, 0, sizeof( servercaps ) ); int theRetVal = ne_options( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), &servercaps ); @@ -848,9 +848,9 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath, outCapabilities.executable = !!servercaps.dav_executable; } -void NeonSession::PROPFIND( const rtl::OUString & inPath, +void NeonSession::PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -861,7 +861,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, int theRetVal = NE_OK; NeonPropFindRequest theRequest( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), inDepth, inPropNames, @@ -871,7 +871,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PROPFIND( const rtl::OUString & inPath, +void NeonSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) @@ -883,7 +883,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, int theRetVal = NE_OK; NeonPropFindRequest theRequest( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), inDepth, ioResInfo, @@ -892,7 +892,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PROPPATCH( const rtl::OUString & inPath, +void NeonSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -940,7 +940,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, { pItems[ n ].type = ne_propset; - rtl::OUString aStringValue; + OUString aStringValue; if ( DAVProperties::isUCBDeadProperty( *pName ) ) { // DAV dead property added by WebDAV UCP? @@ -984,7 +984,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, } } pItems[ n ].value - = strdup( rtl::OUStringToOString( aStringValue, + = strdup( OUStringToOString( aStringValue, RTL_TEXTENCODING_UTF8 ).getStr() ); } else @@ -1003,7 +1003,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, pItems[ n ].name = 0; theRetVal = ne_proppatch( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), pItems ); } @@ -1020,8 +1020,8 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +void NeonSession::HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -1041,7 +1041,7 @@ void NeonSession::HEAD( const ::rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::GET( const rtl::OUString & inPath, +NeonSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1052,7 +1052,7 @@ NeonSession::GET( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockReader, false, @@ -1063,7 +1063,7 @@ NeonSession::GET( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::GET( const rtl::OUString & inPath, +void NeonSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1074,7 +1074,7 @@ void NeonSession::GET( const rtl::OUString & inPath, NeonRequestContext aCtx( ioOutputStream ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockWriter, false, @@ -1084,8 +1084,8 @@ void NeonSession::GET( const rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +NeonSession::GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1100,7 +1100,7 @@ NeonSession::GET( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream, inHeaderNames, ioResource ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockReader, true, @@ -1111,9 +1111,9 @@ NeonSession::GET( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::GET( const rtl::OUString & inPath, +void NeonSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1127,7 +1127,7 @@ void NeonSession::GET( const rtl::OUString & inPath, NeonRequestContext aCtx( ioOutputStream, inHeaderNames, ioResource ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockWriter, true, @@ -1136,7 +1136,7 @@ void NeonSession::GET( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PUT( const rtl::OUString & inPath, +void NeonSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1150,7 +1150,7 @@ void NeonSession::PUT( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = PUT( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1160,9 +1160,9 @@ void NeonSession::PUT( const rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +NeonSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1178,7 +1178,7 @@ NeonSession::POST( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream ); int theRetVal = POST( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1192,9 +1192,9 @@ NeonSession::POST( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +void NeonSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) @@ -1210,7 +1210,7 @@ void NeonSession::POST( const rtl::OUString & inPath, NeonRequestContext aCtx( oOutputStream ); int theRetVal = POST( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1222,7 +1222,7 @@ void NeonSession::POST( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::MKCOL( const rtl::OUString & inPath, +void NeonSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1231,14 +1231,14 @@ void NeonSession::MKCOL( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = ne_mkcol( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::COPY( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void NeonSession::COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -1253,18 +1253,18 @@ void NeonSession::COPY( const rtl::OUString & inSourceURL, int theRetVal = ne_copy( m_pHttpSession, inOverWrite ? 1 : 0, NE_DEPTH_INFINITE, - rtl::OUStringToOString( + OUStringToOString( theSourceUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( theDestinationUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inSourceURL, rEnv ); } -void NeonSession::MOVE( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void NeonSession::MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -1277,17 +1277,17 @@ void NeonSession::MOVE( const rtl::OUString & inSourceURL, NeonUri theDestinationUri( inDestinationURL ); int theRetVal = ne_move( m_pHttpSession, inOverWrite ? 1 : 0, - rtl::OUStringToOString( + OUStringToOString( theSourceUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( theDestinationUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inSourceURL, rEnv ); } -void NeonSession::DESTROY( const rtl::OUString & inPath, +void NeonSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1296,7 +1296,7 @@ void NeonSession::DESTROY( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = ne_delete( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inPath, rEnv ); @@ -1332,7 +1332,7 @@ namespace } // namespace // Set new lock -void NeonSession::LOCK( const ::rtl::OUString & inPath, +void NeonSession::LOCK( const OUString & inPath, ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1348,7 +1348,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, // Set the lock uri ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( makeAbsoluteURL( inPath ), + ne_uri_parse( OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); theLock->uri = aUri; @@ -1386,10 +1386,10 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, theLock->timeout = (long)rLock.Timeout; // Set the lock owner - rtl::OUString aValue; + OUString aValue; rLock.Owner >>= aValue; theLock->owner = - ne_strdup( rtl::OUStringToOString( aValue, + ne_strdup( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); TimeValue startCall; osl_getSystemTime( &startCall ); @@ -1403,12 +1403,12 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, lastChanceToSendRefreshRequest( startCall, theLock->timeout ) ); - uno::Sequence< rtl::OUString > aTokens( 1 ); - aTokens[ 0 ] = rtl::OUString::createFromAscii( theLock->token ); + uno::Sequence< OUString > aTokens( 1 ); + aTokens[ 0 ] = OUString::createFromAscii( theLock->token ); rLock.LockTokens = aTokens; OSL_TRACE( "NeonSession::LOCK: created lock for %s. token: %s", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); } @@ -1417,7 +1417,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, ne_lock_destroy( theLock ); OSL_TRACE( "NeonSession::LOCK: obtaining lock for %s failed!", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1425,7 +1425,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, } // Refresh existing lock -sal_Int64 NeonSession::LOCK( const ::rtl::OUString & inPath, +sal_Int64 NeonSession::LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1492,7 +1492,7 @@ bool NeonSession::LOCK( NeonLock * pLock, } } -void NeonSession::UNLOCK( const ::rtl::OUString & inPath, +void NeonSession::UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1516,7 +1516,7 @@ void NeonSession::UNLOCK( const ::rtl::OUString & inPath, else { OSL_TRACE( "NeonSession::UNLOCK: unlocking of %s failed.", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1562,7 +1562,7 @@ const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const else { return m_rProxyDecider.getProxy( m_aScheme, - rtl::OUString() /* not used */, + OUString() /* not used */, -1 /* not used */ ); } } @@ -1574,7 +1574,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, { for ( sal_Int32 n = 0; n < rLocks.getLength(); ++n ) { - const uno::Sequence< rtl::OUString > & rTokens + const uno::Sequence< OUString > & rTokens = rLocks[ n ].LockTokens; for ( sal_Int32 m = 0; m < rTokens.getLength(); ++m ) { @@ -1587,7 +1587,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, } // namespace -bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, +bool NeonSession::removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ) { NeonLock * theLock = m_aNeonLockStore.findByUri( inURL ); @@ -1600,7 +1600,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // @@@ Alternative: use ne_lock_discover() => less overhead std::vector< DAVResource > aResources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; aPropNames.push_back( DAVProperties::LOCKDISCOVERY ); PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv ); @@ -1637,7 +1637,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // in propfind result -> not locked OSL_TRACE( "NeonSession::removeExpiredLocktoken: Removing " " expired lock token for %s. token: %s", - rtl::OUStringToOString( inURL, + OUStringToOString( inURL, RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); @@ -1653,7 +1653,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // Common error handler void NeonSession::HandleError( int nError, - const rtl::OUString & inPath, + const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1667,7 +1667,7 @@ void NeonSession::HandleError( int nError, case NE_ERROR: // Generic error { - rtl::OUString aText = rtl::OUString::createFromAscii( + OUString aText = OUString::createFromAscii( ne_get_error( m_pHttpSession ) ); sal_uInt16 code = makeStatusCode( aText ); @@ -1744,7 +1744,7 @@ void NeonSession::HandleError( int nError, { OSL_TRACE( "NeonSession::HandleError : Unknown Neon error code!" ); throw DAVException( DAVException::DAV_HTTP_ERROR, - rtl::OUString::createFromAscii( + OUString::createFromAscii( ne_get_error( m_pHttpSession ) ) ); } } @@ -1755,12 +1755,12 @@ namespace { void runResponseHeaderHandler( void * userdata, const char * value ) { - rtl::OUString aHeader( rtl::OUString::createFromAscii( value ) ); + OUString aHeader( OUString::createFromAscii( value ) ); sal_Int32 nPos = aHeader.indexOf( ':' ); if ( nPos != -1 ) { - rtl::OUString aHeaderName( aHeader.copy( 0, nPos ) ); + OUString aHeaderName( aHeader.copy( 0, nPos ) ); NeonRequestContext * pCtx = static_cast< NeonRequestContext * >( userdata ); @@ -1771,9 +1771,9 @@ void runResponseHeaderHandler( void * userdata, if ( !bIncludeIt ) { // Check whether this header was requested. - std::vector< ::rtl::OUString >::const_iterator it( + std::vector< OUString >::const_iterator it( pCtx->pHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( + const std::vector< OUString >::const_iterator end( pCtx->pHeaderNames->end() ); while ( it != end ) @@ -1881,8 +1881,8 @@ int NeonSession::POST( ne_session * sess, const char * buffer, ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ) + const OUString & rContentType, + const OUString & rReferer ) { ne_request * req = ne_request_create( sess, "POST", uri ); //struct get_context ctx; @@ -2024,9 +2024,9 @@ NeonSession::getDataFromInputStream( } sal_Bool -NeonSession::isDomainMatch( rtl::OUString certHostName ) +NeonSession::isDomainMatch( OUString certHostName ) { - rtl::OUString hostName = getHostName(); + OUString hostName = getHostName(); if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; @@ -2034,7 +2034,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName ) if ( 0 == certHostName.indexOf( '*' ) && hostName.getLength() >= certHostName.getLength() ) { - rtl::OUString cmpStr = certHostName.copy( 1 ); + OUString cmpStr = certHostName.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength() ) ) @@ -2043,7 +2043,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName ) return sal_False; } -rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +OUString NeonSession::makeAbsoluteURL( OUString const & rURL ) const { try { @@ -2051,7 +2051,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const if ( rURL[ 0 ] != sal_Unicode( '/' ) ) { // absolute. - return rtl::OUString( rURL ); + return OUString( rURL ); } else { @@ -2060,7 +2060,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const ne_fill_server_uri( m_pHttpSession, &aUri ); aUri.path - = ne_strdup( rtl::OUStringToOString( + = ne_strdup( OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); NeonUri aNeonUri( &aUri ); ne_uri_free( &aUri ); @@ -2071,7 +2071,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const { } // error. - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 7bad5029cda4..b01ab990711f 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -46,9 +46,9 @@ class NeonSession : public DAVSession { private: osl::Mutex m_aMutex; - rtl::OUString m_aScheme; - rtl::OUString m_aHostName; - rtl::OUString m_aProxyName; + OUString m_aScheme; + OUString m_aHostName; + OUString m_aProxyName; sal_Int32 m_nPort; sal_Int32 m_nProxyPort; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; @@ -71,13 +71,13 @@ protected: public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); // DAVSession methods - virtual sal_Bool CanUse( const ::rtl::OUString & inPath, + virtual sal_Bool CanUse( const OUString & inPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ); virtual sal_Bool UsesProxy(); @@ -86,89 +86,89 @@ public: { return m_aEnv; } virtual void - OPTIONS( const ::rtl::OUString & inPath, + OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // allprop & named virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // propnames virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PROPPATCH( const ::rtl::OUString & inPath, + PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PUT( const ::rtl::OUString & inPath, + PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -177,41 +177,41 @@ public: throw ( DAVException ); virtual void - MKCOL( const ::rtl::OUString & inPath, + MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - COPY( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); virtual void - MOVE( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // set new lock. - virtual void LOCK( const ::rtl::OUString & inURL, + virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inURL, + virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); - virtual void UNLOCK( const ::rtl::OUString & inURL, + virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -219,14 +219,14 @@ public: virtual void abort() throw ( DAVException ); - const rtl::OUString & getHostName() const { return m_aHostName; } + const OUString & getHostName() const { return m_aHostName; } const ::uno::Reference< ::uno::XComponentContext > getComponentContext() { return m_xFactory->getComponentContext(); } const void * getRequestData() const { return m_pRequestData; } - sal_Bool isDomainMatch( rtl::OUString certHostName ); + sal_Bool isDomainMatch( OUString certHostName ); private: friend class NeonLockStore; @@ -239,13 +239,13 @@ private: // ret: true => retry request. void HandleError( int nError, - const rtl::OUString & inPath, + const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const rtl::OUString & inURL, + bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by NeonLockStore::refreshLocks @@ -276,8 +276,8 @@ private: const char * buffer, ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ); + const OUString & rContentType, + const OUString & rReferer ); // Helper: XInputStream -> Sequence< sal_Int8 > static bool getDataFromInputStream( @@ -286,7 +286,7 @@ private: com::sun::star::uno::Sequence< sal_Int8 > & rData, bool bAppendTrailingZeroByte ); - rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + OUString makeAbsoluteURL( OUString const & rURL ) const; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index bd2fa89c1db4..5dba6a2fd7fb 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -90,22 +90,22 @@ NeonUri::NeonUri( const ne_uri * inUri ) if ( uri == 0 ) throw DAVException( DAVException::DAV_INVALID_ARG ); - init( rtl::OString( uri ), inUri ); + init( OString( uri ), inUri ); ne_free( uri ); calculateURI(); } -NeonUri::NeonUri( const rtl::OUString & inUri ) +NeonUri::NeonUri( const OUString & inUri ) throw ( DAVException ) { if ( inUri.isEmpty() ) throw DAVException( DAVException::DAV_INVALID_ARG ); // #i77023# - rtl::OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); + OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); - rtl::OString theInputUri( + OString theInputUri( aEscapedUri.getStr(), aEscapedUri.getLength(), RTL_TEXTENCODING_UTF8 ); ne_uri theUri; @@ -121,7 +121,7 @@ NeonUri::NeonUri( const rtl::OUString & inUri ) calculateURI(); } -void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) +void NeonUri::init( const OString & rUri, const ne_uri * pUri ) { // Complete URI. const ne_uri * pUriDefs @@ -131,31 +131,31 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) &g_sUriDefaultsHTTPS : &g_sUriDefaultsHTTP; - mScheme = rtl::OStringToOUString( + mScheme = OStringToOUString( pUri->scheme ? pUri->scheme : pUriDefs->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = rtl::OStringToOUString( + mUserInfo = OStringToOUString( pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo, RTL_TEXTENCODING_UTF8 ); - mHostName = rtl::OStringToOUString( + mHostName = OStringToOUString( pUri->host ? pUri->host : pUriDefs->host, RTL_TEXTENCODING_UTF8 ); mPort = pUri->port > 0 ? pUri->port : pUriDefs->port; - mPath = rtl::OStringToOUString( + mPath = OStringToOUString( pUri->path ? pUri->path : pUriDefs->path, RTL_TEXTENCODING_UTF8 ); if ( pUri->query ) { - mPath += rtl::OUString("?"); - mPath += rtl::OStringToOUString( + mPath += OUString("?"); + mPath += OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); } if ( pUri->fragment ) { - mPath += rtl::OUString("#"); - mPath += rtl::OStringToOUString( + mPath += OUString("#"); + mPath += OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); } } @@ -166,7 +166,7 @@ NeonUri::~NeonUri( ) void NeonUri::calculateURI () { - rtl::OUStringBuffer aBuf( mScheme ); + OUStringBuffer aBuf( mScheme ); aBuf.appendAscii( "://" ); if ( !mUserInfo.isEmpty() ) { @@ -206,14 +206,14 @@ void NeonUri::calculateURI () if ( bAppendPort ) { aBuf.appendAscii( ":" ); - aBuf.append( rtl::OUString::valueOf( mPort ) ); + aBuf.append( OUString::valueOf( mPort ) ); } aBuf.append( mPath ); mURI = aBuf.makeStringAndClear(); } -::rtl::OUString NeonUri::GetPathBaseName () const +OUString NeonUri::GetPathBaseName () const { sal_Int32 nPos = mPath.lastIndexOf ('/'); sal_Int32 nTrail = 0; @@ -225,7 +225,7 @@ void NeonUri::calculateURI () } if (nPos != -1) { - rtl::OUString aTemp( + OUString aTemp( mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); // query, fragment present? @@ -239,7 +239,7 @@ void NeonUri::calculateURI () return aTemp; } else - return rtl::OUString("/"); + return OUString("/"); } bool NeonUri::operator== ( const NeonUri & rOther ) const @@ -247,22 +247,22 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const return ( mURI == rOther.mURI ); } -::rtl::OUString NeonUri::GetPathBaseNameUnescaped () const +OUString NeonUri::GetPathBaseNameUnescaped () const { return unescape( GetPathBaseName() ); } -void NeonUri::AppendPath (const rtl::OUString& rPath) +void NeonUri::AppendPath (const OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString("/"); + mPath += OUString("/"); mPath += rPath; calculateURI (); }; // static -rtl::OUString NeonUri::escapeSegment( const rtl::OUString& segment ) +OUString NeonUri::escapeSegment( const OUString& segment ) { return rtl::Uri::encode( segment, rtl_UriCharClassPchar, @@ -271,7 +271,7 @@ rtl::OUString NeonUri::escapeSegment( const rtl::OUString& segment ) } // static -rtl::OUString NeonUri::unescape( const rtl::OUString& segment ) +OUString NeonUri::unescape( const OUString& segment ) { return rtl::Uri::decode( segment, rtl_UriDecodeWithCharset, @@ -279,10 +279,10 @@ rtl::OUString NeonUri::unescape( const rtl::OUString& segment ) } // static -rtl::OUString NeonUri::makeConnectionEndPointString( - const rtl::OUString & rHostName, int nPort ) +OUString NeonUri::makeConnectionEndPointString( + const OUString & rHostName, int nPort ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && @@ -300,7 +300,7 @@ rtl::OUString NeonUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.appendAscii( ":" ); - aBuf.append( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); + aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) ); } return aBuf.makeStringAndClear(); } diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx index 6bf446a7ea47..0650a70e45e5 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.hxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx @@ -43,18 +43,18 @@ namespace webdav_ucp class NeonUri { private: - ::rtl::OUString mURI; - ::rtl::OUString mScheme; - ::rtl::OUString mUserInfo; - ::rtl::OUString mHostName; + OUString mURI; + OUString mScheme; + OUString mUserInfo; + OUString mHostName; sal_Int32 mPort; - ::rtl::OUString mPath; + OUString mPath; - void init( const rtl::OString & rUri, const ne_uri * pUri ); + void init( const OString & rUri, const ne_uri * pUri ); void calculateURI (); public: - NeonUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + NeonUri( const OUString & inUri ) throw ( DAVException ); NeonUri( const ne_uri * inUri ) throw ( DAVException ); ~NeonUri( ); @@ -62,36 +62,36 @@ class NeonUri bool operator!= ( const NeonUri & rOther ) const { return !operator==( rOther ); } - const ::rtl::OUString & GetURI( void ) const + const OUString & GetURI( void ) const { return mURI; }; - const ::rtl::OUString & GetScheme( void ) const + const OUString & GetScheme( void ) const { return mScheme; }; - const ::rtl::OUString & GetUserInfo( void ) const + const OUString & GetUserInfo( void ) const { return mUserInfo; }; - const ::rtl::OUString & GetHost( void ) const + const OUString & GetHost( void ) const { return mHostName; }; sal_Int32 GetPort( void ) const { return mPort; }; - const ::rtl::OUString & GetPath( void ) const + const OUString & GetPath( void ) const { return mPath; }; - ::rtl::OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName ( void ) const; - ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped ( void ) const; - void SetScheme (const ::rtl::OUString& scheme) + void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; - void AppendPath (const ::rtl::OUString& rPath); + void AppendPath (const OUString& rPath); - static ::rtl::OUString escapeSegment( const ::rtl::OUString& segment ); - static ::rtl::OUString unescape( const ::rtl::OUString& string ); + static OUString escapeSegment( const OUString& segment ); + static OUString unescape( const OUString& string ); // "host:port", omit ":port" for port 80 and 443 - static rtl::OUString makeConnectionEndPointString( - const rtl::OUString & rHostName, + static OUString makeConnectionEndPointString( + const OUString & rHostName, int nPort ); - rtl::OUString makeConnectionEndPointString() const + OUString makeConnectionEndPointString() const { return makeConnectionEndPointString( GetHost(), GetPort() ); } }; diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 780e45f35461..8a7cdec14cc7 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -40,28 +40,28 @@ using namespace com::sun::star; struct UCBDeadPropertyValueParseContext { - rtl::OUString * pType; - rtl::OUString * pValue; + OUString * pType; + OUString * pValue; UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {} ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } }; // static -const rtl::OUString UCBDeadPropertyValue::aTypeString("string"); -const rtl::OUString UCBDeadPropertyValue::aTypeLong("long"); -const rtl::OUString UCBDeadPropertyValue::aTypeShort("short"); -const rtl::OUString UCBDeadPropertyValue::aTypeBoolean("boolean"); -const rtl::OUString UCBDeadPropertyValue::aTypeChar("char"); -const rtl::OUString UCBDeadPropertyValue::aTypeByte("byte"); -const rtl::OUString UCBDeadPropertyValue::aTypeHyper("hyper"); -const rtl::OUString UCBDeadPropertyValue::aTypeFloat("float"); -const rtl::OUString UCBDeadPropertyValue::aTypeDouble("double"); +const OUString UCBDeadPropertyValue::aTypeString("string"); +const OUString UCBDeadPropertyValue::aTypeLong("long"); +const OUString UCBDeadPropertyValue::aTypeShort("short"); +const OUString UCBDeadPropertyValue::aTypeBoolean("boolean"); +const OUString UCBDeadPropertyValue::aTypeChar("char"); +const OUString UCBDeadPropertyValue::aTypeByte("byte"); +const OUString UCBDeadPropertyValue::aTypeHyper("hyper"); +const OUString UCBDeadPropertyValue::aTypeFloat("float"); +const OUString UCBDeadPropertyValue::aTypeDouble("double"); // static -const rtl::OUString UCBDeadPropertyValue::aXMLPre("<ucbprop><type>"); -const rtl::OUString UCBDeadPropertyValue::aXMLMid("</type><value>"); -const rtl::OUString UCBDeadPropertyValue::aXMLEnd("</value></ucbprop>"); +const OUString UCBDeadPropertyValue::aXMLPre("<ucbprop><type>"); +const OUString UCBDeadPropertyValue::aXMLMid("</type><value>"); +const OUString UCBDeadPropertyValue::aXMLEnd("</value></ucbprop>"); #define STATE_TOP (1) @@ -114,7 +114,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Type already set!" ); pCtx->pType - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; case STATE_VALUE: @@ -122,7 +122,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Value already set!" ); pCtx->pValue - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; } return 0; // zero to continue, non-zero to abort parsing @@ -159,7 +159,7 @@ extern "C" int UCBDeadPropertyValue_endelement_callback( } ////////////////////////////////////////////////////////////////////////// -static rtl::OUString encodeValue( const rtl::OUString & rValue ) +static OUString encodeValue( const OUString & rValue ) { // Note: I do not use the usual & + < + > encoding, because // I want to prevent any XML parser from trying to 'understand' @@ -174,7 +174,7 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) // PROPFIND: // - parser replaces < by > ==> error (not well formed) - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nCount = rValue.getLength(); @@ -195,9 +195,9 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) } ////////////////////////////////////////////////////////////////////////// -static rtl::OUString decodeValue( const rtl::OUString & rValue ) +static OUString decodeValue( const OUString & rValue ) { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nPos = 0; @@ -214,7 +214,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos == nEnd ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } c = pValue[ nPos ]; @@ -226,7 +226,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 4 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 'e' == pValue[ nPos + 1 ] ) @@ -241,7 +241,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'l' == c ) @@ -251,7 +251,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -264,7 +264,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'g' == c ) @@ -274,7 +274,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -287,13 +287,13 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else @@ -309,7 +309,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) // static bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) { - if ( ( rType != getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) ) && ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) && @@ -335,7 +335,7 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) ////////////////////////////////////////////////////////////////////////// // static -bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, +bool UCBDeadPropertyValue::createFromXML( const OString & rInData, uno::Any & rOutData ) { bool success = false; @@ -361,7 +361,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, if ( aCtx.pType && aCtx.pValue ) { // Decode aCtx.pValue! It may contain XML reserved chars. - rtl::OUString aStringValue = decodeValue( *aCtx.pValue ); + OUString aStringValue = decodeValue( *aCtx.pValue ); if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeString ) ) { rOutData <<= aStringValue; @@ -377,7 +377,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) { if ( aStringValue.equalsIgnoreAsciiCase( - rtl::OUString("true") ) ) + OUString("true") ) ) rOutData <<= sal_Bool( sal_True ); else rOutData <<= sal_Bool( sal_False ); @@ -420,17 +420,17 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, ////////////////////////////////////////////////////////////////////////// // static bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // <ucbprop><type>the_type</type><value>the_value</value></ucbprop> // Check property type. Extract type and value as string. const uno::Type& rType = rInData.getValueType(); - rtl::OUString aStringValue; - rtl::OUString aStringType; + OUString aStringValue; + OUString aStringType; - if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) { // string rInData >>= aStringValue; @@ -441,7 +441,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // long sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeLong; } else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) @@ -449,7 +449,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // short sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeShort; } else if ( rType == getCppuBooleanType() ) @@ -457,7 +457,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // boolean sal_Bool bValue = false; rInData >>= bValue; - aStringValue = rtl::OUString::valueOf( bValue ); + aStringValue = OUString::valueOf( bValue ); aStringType = aTypeBoolean; } else if ( rType == getCppuCharType() ) @@ -465,7 +465,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // char sal_Unicode cValue = 0; rInData >>= cValue; - aStringValue = rtl::OUString::valueOf( cValue ); + aStringValue = OUString::valueOf( cValue ); aStringType = aTypeChar; } else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) @@ -473,7 +473,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // byte sal_Int8 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( sal_Unicode( nValue ) ); + aStringValue = OUString::valueOf( sal_Unicode( nValue ) ); aStringType = aTypeByte; } else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) @@ -481,7 +481,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // hyper sal_Int64 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeHyper; } else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) @@ -489,7 +489,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // float float nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeFloat; } else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) @@ -497,7 +497,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // double double nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeDouble; } else diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx index c56a3f93b270..98a36a48471c 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx @@ -38,27 +38,27 @@ namespace webdav_ucp class UCBDeadPropertyValue { private: - static const rtl::OUString aTypeString; - static const rtl::OUString aTypeLong; - static const rtl::OUString aTypeShort; - static const rtl::OUString aTypeBoolean; - static const rtl::OUString aTypeChar; - static const rtl::OUString aTypeByte; - static const rtl::OUString aTypeHyper; - static const rtl::OUString aTypeFloat; - static const rtl::OUString aTypeDouble; + static const OUString aTypeString; + static const OUString aTypeLong; + static const OUString aTypeShort; + static const OUString aTypeBoolean; + static const OUString aTypeChar; + static const OUString aTypeByte; + static const OUString aTypeHyper; + static const OUString aTypeFloat; + static const OUString aTypeDouble; - static const rtl::OUString aXMLPre; - static const rtl::OUString aXMLMid; - static const rtl::OUString aXMLEnd; + static const OUString aXMLPre; + static const OUString aXMLMid; + static const OUString aXMLEnd; public: static bool supportsType( const com::sun::star::uno::Type & rType ); - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Any & rOutData ); static bool toXML( const com::sun::star::uno::Any & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 6a3cb7b2d6cc..4ad76c4727e2 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -332,20 +332,20 @@ 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.WebDAVContent" ); + return OUString( "com.sun.star.comp.ucb.WebDAVContent" ); } //========================================================================= // 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 ); aSNS.getArray()[ 0 ] - = rtl::OUString( WEBDAV_CONTENT_SERVICE_NAME ); + = OUString( WEBDAV_CONTENT_SERVICE_NAME ); return aSNS; } @@ -356,7 +356,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { sal_Bool bFolder = sal_False; @@ -374,9 +374,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString( WEBDAV_COLLECTION_TYPE ); + return OUString( WEBDAV_COLLECTION_TYPE ); - return rtl::OUString( WEBDAV_CONTENT_TYPE ); + return OUString( WEBDAV_CONTENT_TYPE ); } //========================================================================= @@ -411,7 +411,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 ); @@ -431,7 +431,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 ); @@ -442,7 +442,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 ); @@ -482,7 +482,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 ); @@ -516,7 +516,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 ); @@ -579,7 +579,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 ); @@ -599,7 +599,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 ); @@ -635,7 +635,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 ); @@ -659,7 +659,7 @@ uno::Any SAL_CALL Content::execute( } OSL_TRACE( "<<<<< Content::execute: end: command: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); return aRet; @@ -698,7 +698,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //========================================================================= // virtual -void SAL_CALL Content::addProperty( const rtl::OUString& Name, +void SAL_CALL Content::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, @@ -824,7 +824,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, //========================================================================= // virtual -void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) +void SAL_CALL Content::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -933,14 +933,14 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString( WEBDAV_CONTENT_TYPE ); + = OUString( WEBDAV_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( "Title" ), aProp ); + OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -948,7 +948,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString( WEBDAV_COLLECTION_TYPE ); + = OUString( WEBDAV_COLLECTION_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -972,23 +972,23 @@ Content::createNewContent( const ucb::ContentInfo& Info ) if ( ( Info.Type != WEBDAV_COLLECTION_TYPE ) && ( Info.Type != WEBDAV_CONTENT_TYPE ) ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "WebdavContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Bool isCollection; if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { - aURL += rtl::OUString("New_Collection"); + aURL += OUString("New_Collection"); isCollection = sal_True; } else { - aURL += rtl::OUString("New_Content"); + aURL += OUString("New_Content"); isCollection = sal_False; } @@ -1012,7 +1012,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { // <scheme>:// -> "" // <scheme>://foo -> "" @@ -1021,7 +1021,7 @@ rtl::OUString Content::getParentURL() // <scheme>://foo/bar/ -> <scheme>://foo/ // <scheme>://foo/bar/abc -> <scheme>://foo/bar/ - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) @@ -1035,9 +1035,9 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 == -1 ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + return OUString( aURL.copy( 0, nPos + 1 ) ); } //========================================================================= @@ -1052,7 +1052,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, 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". @@ -1142,7 +1142,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::auto_ptr< ContentProperties > xCachedProps; std::auto_ptr< DAVResourceAccess > xResAccess; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aUnescapedTitle; + OUString aUnescapedTitle; bool bHasAll = false; uno::Reference< ucb::XContentIdentifier > xIdentifier; rtl::Reference< ::ucbhelper::ContentProviderImplHelper > xProvider; @@ -1160,7 +1160,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { // All properties are already in cache! No server access needed. @@ -1192,7 +1192,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { @@ -1208,7 +1208,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( !bHasAll ) { // Only DAV resources support PROPFIND - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( rProperties.getLength() ); @@ -1219,11 +1219,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProperties[ n ].Name; + const OUString & rName = rProperties[ n ].Name; - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = m_aFailedPropNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = m_aFailedPropNames.end(); while ( it != end ) @@ -1289,7 +1289,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( bNetworkAccessAllowed ) { // All properties obtained already? - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( !( xProps.get() && xProps->containsAllNames( rProperties, aMissingProps ) ) @@ -1298,7 +1298,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Possibly the missing props can be obtained using a HEAD // request. - std::vector< rtl::OUString > aHeaderNames; + std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, aHeaderNames, @@ -1358,7 +1358,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1368,16 +1368,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1394,12 +1394,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString rName = rProperties[ n ].Name; + const OUString rName = rProperties[ n ].Name; if ( rName == "BaseURI" ) { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1408,10 +1408,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( "IsFolder" ) ) + OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( "CreatableContentsInfo" ), + OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -1482,8 +1482,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aNewTitle; - rtl::OUString aOldTitle; + OUString aNewTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; uno::Reference< beans::XPropertySetInfo > xInfo; @@ -1493,7 +1493,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyValue& rValue = pValues[ n ]; - const rtl::OUString & rName = rValue.Name; + const OUString & rName = rValue.Name; beans::Property aTmpProp; xProvider->getProperty( rName, aTmpProp ); @@ -1502,7 +1502,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1515,26 +1515,26 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1562,7 +1562,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Invalid content identifier!" ), + OUString( "Invalid content identifier!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1570,7 +1570,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty title not allowed!" ), + OUString( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1578,7 +1578,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1598,7 +1598,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "Property is unknown!" ), + OUString( "Property is unknown!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1607,21 +1607,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateCreated" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateModified" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "MediaType" ) @@ -1629,14 +1629,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } if ( rName == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1701,7 +1701,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1746,9 +1746,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Assemble new content identifier... - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString("/"); + aNewURL += OUString("/"); aNewURL += NeonUri::escapeSegment( aNewTitle ); @@ -1787,18 +1787,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 ) ); } } catch ( DAVException const & e ) { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= MapDAVException( e, sal_True ); @@ -1809,7 +1809,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1858,7 +1858,7 @@ uno::Any Content::open( { // Error: Not a folder! - rtl::OUStringBuffer aMsg; + OUStringBuffer aMsg; if ( getResourceType( xEnv ) == FTP ) { // #114653# @@ -1893,7 +1893,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); @@ -1920,7 +1920,7 @@ uno::Any Content::open( xResAccess->setFlags( rArg.OpeningFlags ); DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -1969,7 +1969,7 @@ uno::Any Content::open( // fill inputsream sync; return if all data present DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; uno::Reference< io::XInputStream > xIn = xResAccess->GET( aHeaders, aResource, xEnv ); @@ -2006,7 +2006,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2097,7 +2097,7 @@ void Content::post( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2116,13 +2116,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -2133,7 +2133,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? @@ -2165,7 +2165,7 @@ void Content::insert( throw( uno::Exception ) { sal_Bool bTransient, bCollection; - rtl::OUString aEscapedTitle; + OUString aEscapedTitle; SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< DAVResourceAccess > xResAccess; SAL_WNODEPRECATED_DECLARATIONS_POP @@ -2185,11 +2185,11 @@ void Content::insert( { OSL_FAIL( "Content::insert - Title missing!" ); - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString("Title"); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -2217,7 +2217,7 @@ void Content::insert( if ( !bTransient || ( bTransient && !bCollection ) ) { ucb::UnsupportedNameClashException aEx( - rtl::OUString( "Unable to write without overwrite!" ), + OUString( "Unable to write without overwrite!" ), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2254,7 +2254,7 @@ void Content::insert( case ucbhelper::CONTINUATION_DISAPPROVE: // Abort. throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2263,7 +2263,7 @@ void Content::insert( OSL_FAIL( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString( "Unknown interaction selection!" ), + OUString( "Unknown interaction selection!" ), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2280,9 +2280,9 @@ void Content::insert( if ( bTransient ) { // Assemble new content identifier... - rtl::OUString aURL = getParentURL(); + OUString aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); aURL += aEscapedTitle; @@ -2332,7 +2332,7 @@ void Content::insert( } else { - rtl::OUString aTitle; + OUString aTitle; try { NeonUri aURI( aURL ); @@ -2345,7 +2345,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTitle ) ), @@ -2378,7 +2378,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2421,7 +2421,7 @@ void Content::transfer( xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - rtl::OUString aTargetURI; + OUString aTargetURI; try { NeonUri sourceURI( rArgs.SourceURL ); @@ -2430,21 +2430,21 @@ void Content::transfer( // Check source's and target's URL scheme // - const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTPS_URL_SCHEME ) ); + OUString( HTTPS_URL_SCHEME ) ); } else { @@ -2453,7 +2453,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString( "Unsupported URL scheme!" ), + OUString( "Unsupported URL scheme!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2462,10 +2462,10 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2478,13 +2478,13 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString( "Different hosts!" ), + OUString( "Different hosts!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable } - rtl::OUString aTitle = rArgs.NewTitle; + OUString aTitle = rArgs.NewTitle; if ( aTitle.isEmpty() ) aTitle = sourceURI.GetPathBaseNameUnescaped(); @@ -2492,15 +2492,15 @@ void Content::transfer( if ( aTitle == "/" ) { // kso: ??? - aTitle = rtl::OUString(); + aTitle = OUString(); } targetURI.AppendPath( aTitle ); - rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); + OUString aTargetURL = xIdentifier->getContentIdentifier(); if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) != aTargetURL.getLength() ) - aTargetURL += rtl::OUString("/"); + aTargetURL += OUString("/"); aTargetURL += aTitle; @@ -2599,7 +2599,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTargetURI ) ), @@ -2618,7 +2618,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArgs.NameClash ) ), Environment ); @@ -2706,7 +2706,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString("http://ucb.openoffice.org"); + <<= OUString("http://ucb.openoffice.org"); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2715,7 +2715,7 @@ void Content::lock( aOwnerAny, 180, // lock timeout in secs //-1, // infinite lock - uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString >() ); xResAccess->LOCK( aLock, Environment ); @@ -2783,7 +2783,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. // if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -2803,9 +2803,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(), @@ -2840,7 +2840,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString("IsFolder"); + aProperties[ 0 ].Name = OUString("IsFolder"); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2863,12 +2863,12 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) // Map DAVException... uno::Any aException; - rtl::OUString aURL; + OUString aURL; if ( m_bTransient ) { aURL = getParentURL(); if ( aURL.lastIndexOf('/') != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString(static_cast<sal_Unicode>('/')); + aURL += OUString(static_cast<sal_Unicode>('/')); aURL += m_aEscapedTitle; } @@ -2883,13 +2883,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString("Not found!"), + OUString("Not found!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -2924,7 +2924,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_LOOKUP: aException <<= ucb::InteractiveNetworkResolveNameException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2941,7 +2941,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_CONNECT: aException <<= ucb::InteractiveNetworkConnectException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2962,7 +2962,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_INVALID_ARG: aException <<= lang::IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -2970,7 +2970,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString("Locked!"), + OUString("Locked!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -2980,7 +2980,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString("Locked (self!)"), + OUString("Locked (self!)"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -2990,7 +2990,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString("Not locked!"), + OUString("Not locked!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -2999,7 +2999,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString("Lock expired!"), + OUString("Lock expired!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3008,7 +3008,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) default: aException <<= ucb::InteractiveNetworkGeneralException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -3044,7 +3044,7 @@ void Content::cancelCommandExecution( //========================================================================= SAL_WNODEPRECATED_DECLARATIONS_PUSH -const rtl::OUString +const OUString Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -3052,8 +3052,8 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) // First, try to obtain value of response header "Content-Location". if ( m_xCachedProps.get() ) { - rtl::OUString aLocation; - m_xCachedProps->getValue( rtl::OUString( "Content-Location" ) ) >>= aLocation; + OUString aLocation; + m_xCachedProps->getValue( OUString( "Content-Location" ) ) >>= aLocation; if ( !aLocation.isEmpty() ) { try @@ -3070,7 +3070,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) } } - return rtl::OUString( rResAccess->getURL() ); + return OUString( rResAccess->getURL() ); } //========================================================================= @@ -3089,8 +3089,8 @@ Content::ResourceType Content::getResourceType( ResourceType eResourceType = UNKNOWN; - const rtl::OUString & rURL = rResAccess->getURL(); - const rtl::OUString aScheme( + const OUString & rURL = rResAccess->getURL(); + const OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); if ( aScheme == FTP_URL_SCHEME ) @@ -3105,12 +3105,12 @@ Content::ResourceType Content::getResourceType( // used when loading documents... along with identifying whether // this is a DAV resource. std::vector< DAVResource > resources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( 5 ); - aProperties[ 0 ].Name = rtl::OUString("IsFolder"); - aProperties[ 1 ].Name = rtl::OUString("IsDocument"); - aProperties[ 2 ].Name = rtl::OUString("IsReadOnly"); - aProperties[ 3 ].Name = rtl::OUString("MediaType"); + aProperties[ 0 ].Name = OUString("IsFolder"); + aProperties[ 1 ].Name = OUString("IsDocument"); + aProperties[ 2 ].Name = OUString("IsReadOnly"); + aProperties[ 3 ].Name = OUString("MediaType"); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; ContentProperties::UCBNamesToDAVNames( aProperties, aPropNames ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 83afb3f8f5c2..ca97b6d01cbe 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -85,13 +85,13 @@ class Content : public ::ucbhelper::ContentImplHelper, std::auto_ptr< DAVResourceAccess > m_xResAccess; std::auto_ptr< CachableContentProperties > m_xCachedProps; // locally cached props - rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; ResourceType m_eResourceType; ContentProvider* m_pProvider; // No need for a ref, base class holds object bool m_bTransient; bool m_bCollection; bool m_bDidGetOrHead; - std::vector< rtl::OUString > m_aFailedPropNames; + std::vector< OUString > m_aFailedPropNames; private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > @@ -100,7 +100,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(); sal_Bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -129,7 +129,7 @@ private: ::com::sun::star::ucb::XContentIdentifier >& xNewId ); SAL_WNODEPRECATED_DECLARATIONS_PUSH - const rtl::OUString + const OUString getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -228,16 +228,16 @@ 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 ); @@ -256,7 +256,7 @@ public: // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -265,7 +265,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -299,7 +299,7 @@ public: const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 0c3cd9ac6456..92a5721371ee 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -62,7 +62,7 @@ using namespace webdav_ucp; //========================================================================= bool ContentProvider::getProperty( - const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp, bool bStrict ) { if ( !m_pProps ) { @@ -78,15 +78,15 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( 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 ) ); m_pProps->insert( beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -94,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -102,16 +102,16 @@ bool ContentProvider::getProperty( m_pProps->insert( 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 UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -119,7 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "DateModified" ), + OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -127,15 +127,15 @@ bool ContentProvider::getProperty( m_pProps->insert( 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::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -143,15 +143,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -165,7 +165,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::CREATIONDATE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -173,14 +173,14 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::DISPLAYNAME, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); m_pProps->insert( beans::Property( DAVProperties::GETCONTENTLANGUAGE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -188,7 +188,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTLENGTH, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -196,7 +196,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTTYPE , -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -204,7 +204,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETETAG, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -212,7 +212,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETLASTMODIFIED, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -229,7 +229,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::RESOURCETYPE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -255,7 +255,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::EXECUTABLE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); } } @@ -280,7 +280,7 @@ bool ContentProvider::getProperty( rProp = beans::Property( rPropName, - 1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); } @@ -315,7 +315,7 @@ uno::Sequence< beans::Property > Content::getProperties( xProvider.set( m_pProvider ); } - typedef std::set< rtl::OUString > StringSet; + typedef std::set< OUString > StringSet; StringSet aPropSet; // No server access for just created (not yet committed) objects. @@ -356,8 +356,8 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Bool bHasCreatableInfos = sal_False; { - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); - std::set< rtl::OUString >::const_iterator end = aPropSet.end(); + std::set< OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator end = aPropSet.end(); while ( it != end ) { if ( !bHasCreationDate && @@ -427,21 +427,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( "ContentType" ) ); + OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "Title" ) ); + OUString( "Title" ) ); } // Add optional properties. @@ -450,34 +450,34 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "BaseURI" ) ); + OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( "DateCreated" ) ); + OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( "DateModified" ) ); + OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( "MediaType" ) ); + OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( "Size" ) ); + OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( + OUString( "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) { - const std::set< rtl::OUString >::const_iterator set_end + const std::set< OUString >::const_iterator set_end = aPropSet.end(); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -501,7 +501,7 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Int32 nCount = aPropSet.size(); uno::Sequence< beans::Property > aProperties( nCount ); - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator it = aPropSet.begin(); beans::Property aProp; for ( sal_Int32 n = 0; n < nCount; ++n, ++it ) @@ -528,23 +528,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -555,18 +555,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -577,7 +577,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( "post" ), + OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -610,13 +610,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); @@ -631,13 +631,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "lock" ), + OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "unlock" ), + OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index c33be5174602..e84faf900146 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -58,7 +58,7 @@ namespace webdav_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -127,13 +127,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 ].aId; + OUString aId = m_pImpl->m_aResults[ nIndex ].aId; if ( !aId.isEmpty() ) { // Already cached. @@ -143,23 +143,23 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); + OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); const ContentProperties& props = *( m_pImpl->m_aResults[ nIndex ].pData ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); aId += props.getEscapedTitle(); if ( props.isTrailingSlash() ) - aId += rtl::OUString("/"); + aId += OUString("/"); m_pImpl->m_aResults[ nIndex ].aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -180,7 +180,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -343,7 +343,7 @@ sal_Bool DataSupplier::getData() if ( !m_pImpl->m_bCountFinal ) { - std::vector< rtl::OUString > propertyNames; + std::vector< OUString > propertyNames; ContentProperties::UCBNamesToDAVNames( getResultSet()->getProperties(), propertyNames ); @@ -351,9 +351,9 @@ sal_Bool DataSupplier::getData() // needed to get a valid ContentProperties::pIsFolder value, which // is needed for OpenMode handling. - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = propertyNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = propertyNames.end(); while ( it != end ) @@ -390,7 +390,7 @@ sal_Bool DataSupplier::getData() { NeonUri aURI( m_pImpl->m_xContent->getResourceAccess().getURL() ); - rtl::OUString aPath = aURI.GetPath(); + OUString aPath = aURI.GetPath(); if ( aPath.getStr()[ aPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -410,7 +410,7 @@ sal_Bool DataSupplier::getData() try { NeonUri aCurrURI( rRes.uri ); - rtl::OUString aCurrPath = aCurrURI.GetPath(); + OUString aCurrPath = aCurrURI.GetPath(); if ( aCurrPath.getStr()[ aCurrPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -444,7 +444,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); rValue >>= bFolder; if ( !bFolder ) @@ -459,7 +459,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); rValue >>= bDocument; if ( !bDocument ) diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index 5e97a71f03ec..6d9be6b8056b 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -54,7 +54,7 @@ public: 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 ); diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index 01b919cc71f0..389b0c5d466f 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -94,8 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.WebDAVContentProvider" ), - rtl::OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); + OUString( "com.sun.star.comp.WebDAVContentProvider" ), + OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= // @@ -121,14 +121,14 @@ ContentProvider::queryContent( { // Check URL scheme... - const rtl::OUString aScheme + const OUString aScheme = Identifier->getContentProviderScheme().toAsciiLowerCase(); if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME && aScheme != DAV_URL_SCHEME && aScheme != DAVS_URL_SCHEME && aScheme != FTP_URL_SCHEME ) throw ucb::IllegalIdentifierException(); // Normalize URL and create new Id, if nessacary. - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // At least: <scheme> + "://" if ( aURL.getLength() < ( aScheme.getLength() + 3 ) ) @@ -146,21 +146,21 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); bNewId = true; } else if ( aScheme == DAV_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); bNewId = true; } else if ( aScheme == DAVS_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, - rtl::OUString( HTTPS_URL_SCHEME ) ); + OUString( HTTPS_URL_SCHEME ) ); bNewId = true; } @@ -175,7 +175,7 @@ ContentProvider::queryContent( nPos = aURL.indexOf( '/', nPos + 1 ); if ( nPos == -1 ) { - aURL += rtl::OUString("/"); + aURL += OUString("/"); bNewId = true; } } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 3793868d2b45..1e4b273c8770 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -115,7 +115,7 @@ public: rtl::Reference< DAVSessionFactory > getDAVSessionFactory() { return m_xDAVSessionFactory; } - bool getProperty( const ::rtl::OUString & rPropName, + bool getProperty( const OUString & rPropName, ::com::sun::star::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 4c6e217ac39f..0ca32557aeec 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -88,16 +88,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) SerfUri aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( - rtl::OUString( "*** unknown ***" ) ), + OUString( "*** unknown ***" ) ), true ); } @@ -119,24 +119,24 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) //========================================================================= ContentProperties::ContentProperties( - const rtl::OUString & rTitle, sal_Bool bFolder ) + const OUString & rTitle, sal_Bool bFolder ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( rTitle ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsFolder" ) ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsDocument" ) ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); } //========================================================================= -ContentProperties::ContentProperties( const rtl::OUString & rTitle ) +ContentProperties::ContentProperties( const OUString & rTitle ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( rTitle ), true ); } @@ -158,7 +158,7 @@ ContentProperties::ContentProperties( const ContentProperties & rOther ) } //========================================================================= -bool ContentProperties::contains( const rtl::OUString & rName ) const +bool ContentProperties::contains( const OUString & rName ) const { if ( get( rName ) ) return true; @@ -168,7 +168,7 @@ bool ContentProperties::contains( const rtl::OUString & rName ) const //========================================================================= const uno::Any & ContentProperties::getValue( - const rtl::OUString & rName ) const + const OUString & rName ) const { const PropertyValue * pProp = get( rName ); if ( pProp ) @@ -179,7 +179,7 @@ const uno::Any & ContentProperties::getValue( //========================================================================= const PropertyValue * ContentProperties::get( - const rtl::OUString & rName ) const + const OUString & rName ) const { PropertyValueMap::const_iterator it = m_xProps->find( rName ); const PropertyValueMap::const_iterator end = m_xProps->end(); @@ -204,7 +204,7 @@ const PropertyValue * ContentProperties::get( // static void ContentProperties::UCBNamesToDAVNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -298,7 +298,7 @@ void ContentProperties::UCBNamesToDAVNames( // static void ContentProperties::UCBNamesToHTTPNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -319,17 +319,17 @@ void ContentProperties::UCBNamesToHTTPNames( if ( rProp.Name == "DateModified" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Last-Modified" ) ); + OUString::createFromAscii( "Last-Modified" ) ); } else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Content-Type" ) ); + OUString::createFromAscii( "Content-Type" ) ); } else if ( rProp.Name == "Size" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Content-Length" ) ); + OUString::createFromAscii( "Content-Length" ) ); } else { @@ -342,14 +342,14 @@ void ContentProperties::UCBNamesToHTTPNames( //========================================================================= bool ContentProperties::containsAllNames( const uno::Sequence< beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { rNamesNotContained.clear(); sal_Int32 nCount = rProps.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProps[ n ].Name; + const OUString & rName = rProps[ n ].Name; if ( !contains( rName ) ) { // Not found. @@ -362,15 +362,15 @@ bool ContentProperties::containsAllNames( //========================================================================= void ContentProperties::addProperties( - const std::vector< rtl::OUString > & rProps, + const std::vector< OUString > & rProps, const ContentProperties & rContentProps ) { - std::vector< rtl::OUString >::const_iterator it = rProps.begin(); - std::vector< rtl::OUString >::const_iterator end = rProps.end(); + std::vector< OUString >::const_iterator it = rProps.begin(); + std::vector< OUString >::const_iterator end = rProps.end(); while ( it != end ) { - const rtl::OUString & rName = (*it); + const OUString & rName = (*it); if ( !contains( rName ) ) // ignore duplicates { @@ -424,19 +424,19 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) } //========================================================================= -void ContentProperties::addProperty( const rtl::OUString & rName, +void ContentProperties::addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName == DAVProperties::CREATIONDATE ) ) { // Map DAV:creationdate to UCP:DateCreated - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateCreated" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateCreated" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -448,10 +448,10 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName == DAVProperties::GETCONTENTLENGTH ) ) { // Map DAV:getcontentlength to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + (*m_xProps)[ OUString::createFromAscii( "Size" ) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == "Content-Length" ) @@ -460,16 +460,16 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map Content-Length entity header to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + (*m_xProps)[ OUString::createFromAscii( "Size" ) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == DAVProperties::GETCONTENTTYPE ) ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + (*m_xProps)[ OUString::createFromAscii( "MediaType" ) ] = PropertyValue( rValue, true ); } else if ( rName == "Content-Type" ) @@ -478,7 +478,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + (*m_xProps)[ OUString::createFromAscii( "MediaType" ) ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -487,12 +487,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName == DAVProperties::GETLASTMODIFIED ) { // Map the DAV:getlastmodified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateModified" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } else if ( rName == "Last-Modified" ) @@ -501,12 +501,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map the Last-Modified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateModified" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -514,21 +514,21 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // } else if ( rName == DAVProperties::RESOURCETYPE ) ) { - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsFolder" ) ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsDocument" ) ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "ContentType" ) ] + (*m_xProps)[ OUString::createFromAscii( "ContentType" ) ] = PropertyValue( uno::makeAny( bFolder - ? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) - : rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); + ? OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) + : OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); } // else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) ) // { @@ -548,25 +548,25 @@ void ContentProperties::addProperty( const rtl::OUString & rName, namespace { - bool isCachable( rtl::OUString const & rName, + bool isCachable( OUString const & rName, bool isCaseSensitive ) { - static rtl::OUString aNonCachableProps [] = + static OUString aNonCachableProps [] = { DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( "ETag" ), + OUString( "ETag" ), - rtl::OUString( "DateModified" ), - rtl::OUString( "Last-Modified" ), + OUString( "DateModified" ), + OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( "Size" ), - rtl::OUString( "Content-Length" ), + OUString( "Size" ), + OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( "Date" ) + OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 6105879f1dda..b9e075c1854b 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -42,7 +42,7 @@ struct DAVResource; struct equalString { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -50,7 +50,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -84,7 +84,7 @@ public: typedef std::hash_map < - rtl::OUString, + OUString, PropertyValue, hashString, equalString @@ -101,17 +101,17 @@ public: ContentProperties( const DAVResource& rResource ); // Mini props for transient contents. - ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder ); + ContentProperties( const OUString & rTitle, sal_Bool bFolder ); // Micro props for non-existing contents. - ContentProperties( const rtl::OUString & rTitle ); + ContentProperties( const OUString & rTitle ); ContentProperties( const ContentProperties & rOther ); - bool contains( const rtl::OUString & rName ) const; + bool contains( const OUString & rName ) const; const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const; + getValue( const OUString & rName ) const; // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included @@ -123,7 +123,7 @@ public: static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // Maps the UCB property names contained in rProps with their HTTP header @@ -136,7 +136,7 @@ public: static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // return true, if all properties contained in rProps are contained in @@ -145,12 +145,12 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const; + std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in // rContentProps to this instance. In case of duplicates the value // already contained in this will left unchanged. - void addProperties( const std::vector< rtl::OUString > & rProps, + void addProperties( const std::vector< OUString > & rProps, const ContentProperties & rContentProps ); // overwrites probably existing entries. @@ -160,7 +160,7 @@ public: void addProperties( const std::vector< DAVPropertyValue > & rProps ); // overwrites probably existing entry. - void addProperty( const rtl::OUString & rName, + void addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ); @@ -169,7 +169,7 @@ public: bool isTrailingSlash() const { return m_bTrailingSlash; } - const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; } + const OUString & getEscapedTitle() const { return m_aEscapedTitle; } // Not good to expose implementation details, but this is actually an // internal class. @@ -177,7 +177,7 @@ public: { return m_xProps; } private: - ::rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; std::auto_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; @@ -185,7 +185,7 @@ private: ContentProperties & operator=( const ContentProperties & ); // n.i. - const PropertyValue * get( const rtl::OUString & rName ) const; + const PropertyValue * get( const OUString & rName ) const; }; class CachableContentProperties @@ -206,11 +206,11 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const + getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } operator const ContentProperties & () const { return m_aProps; } diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx index baa27bdc19ba..005079b26de5 100644 --- a/ucb/source/ucp/webdav/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx @@ -34,10 +34,10 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject { public: virtual int authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials = sal_True ) = 0; }; diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 9ffe92255ef7..82822239da40 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -46,25 +46,25 @@ namespace http_dav_ucp DAVAuthListener_Impl( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& xEnv, - const ::rtl::OUString & inURL ) + const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { } - virtual int authenticate( const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + virtual int authenticate( const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials = sal_True ); private: const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; - const rtl::OUString m_aURL; + const OUString m_aURL; - rtl::OUString m_aPrevPassword; - rtl::OUString m_aPrevUsername; + OUString m_aPrevPassword; + OUString m_aPrevUsername; }; } diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx index dc0dc2fd57f2..54b85003c82e 100644 --- a/ucb/source/ucp/webdav/DAVException.hxx +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -135,7 +135,7 @@ class DAVException private: ExceptionCode mExceptionCode; - rtl::OUString mData; + OUString mData; sal_uInt16 mStatusCode; public: @@ -145,13 +145,13 @@ class DAVException , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData ) + const OUString & rData ) : mExceptionCode( inExceptionCode ) , mData( rData ) , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData, + const OUString & rData, sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ) , mData( rData ) @@ -160,7 +160,7 @@ class DAVException ~DAVException( ) {}; const ExceptionCode & getError() const { return mExceptionCode; } - const rtl::OUString & getData() const { return mData; } + const OUString & getData() const { return mData; } sal_uInt16 getStatus() const { return mStatusCode; } }; diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 5b018b6e6344..7340dbe6a35c 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -22,41 +22,41 @@ using namespace http_dav_ucp; -const ::rtl::OUString DAVProperties::CREATIONDATE = - ::rtl::OUString::createFromAscii( "DAV:creationdate" ); -const ::rtl::OUString DAVProperties::DISPLAYNAME = - ::rtl::OUString::createFromAscii( "DAV:displayname" ); -const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE = - ::rtl::OUString::createFromAscii( "DAV:getcontentlanguage" ); -const ::rtl::OUString DAVProperties::GETCONTENTLENGTH = - ::rtl::OUString::createFromAscii( "DAV:getcontentlength" ); -const ::rtl::OUString DAVProperties::GETCONTENTTYPE = - ::rtl::OUString::createFromAscii( "DAV:getcontenttype" ); -const ::rtl::OUString DAVProperties::GETETAG = - ::rtl::OUString::createFromAscii( "DAV:getetag" ); -const ::rtl::OUString DAVProperties::GETLASTMODIFIED = - ::rtl::OUString::createFromAscii( "DAV:getlastmodified" ); -const ::rtl::OUString DAVProperties::LOCKDISCOVERY = - ::rtl::OUString::createFromAscii( "DAV:lockdiscovery" ); -const ::rtl::OUString DAVProperties::RESOURCETYPE = - ::rtl::OUString::createFromAscii( "DAV:resourcetype" ); -const ::rtl::OUString DAVProperties::SUPPORTEDLOCK = - ::rtl::OUString::createFromAscii( "DAV:supportedlock" ); - -const ::rtl::OUString DAVProperties::EXECUTABLE = - ::rtl::OUString::createFromAscii( +const OUString DAVProperties::CREATIONDATE = + OUString::createFromAscii( "DAV:creationdate" ); +const OUString DAVProperties::DISPLAYNAME = + OUString::createFromAscii( "DAV:displayname" ); +const OUString DAVProperties::GETCONTENTLANGUAGE = + OUString::createFromAscii( "DAV:getcontentlanguage" ); +const OUString DAVProperties::GETCONTENTLENGTH = + OUString::createFromAscii( "DAV:getcontentlength" ); +const OUString DAVProperties::GETCONTENTTYPE = + OUString::createFromAscii( "DAV:getcontenttype" ); +const OUString DAVProperties::GETETAG = + OUString::createFromAscii( "DAV:getetag" ); +const OUString DAVProperties::GETLASTMODIFIED = + OUString::createFromAscii( "DAV:getlastmodified" ); +const OUString DAVProperties::LOCKDISCOVERY = + OUString::createFromAscii( "DAV:lockdiscovery" ); +const OUString DAVProperties::RESOURCETYPE = + OUString::createFromAscii( "DAV:resourcetype" ); +const OUString DAVProperties::SUPPORTEDLOCK = + OUString::createFromAscii( "DAV:supportedlock" ); + +const OUString DAVProperties::EXECUTABLE = + OUString::createFromAscii( "http://apache.org/dav/props/executable" ); // ------------------------------------------------------------------- // static -void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, +void DAVProperties::createSerfPropName( const OUString & rFullName, SerfPropName & rName ) { if ( rFullName.startsWith( "DAV:" ) ) { rName.nspace = "DAV:"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), RTL_TEXTENCODING_UTF8 ) ); } @@ -64,7 +64,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { rName.nspace = "http://apache.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://apache.org/dav/props/" ) ), @@ -74,7 +74,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://ucb.openoffice.org/dav/props/" ) ), @@ -84,8 +84,8 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { // Support for 3rd party namespaces/props - rtl::OString aFullName - = rtl::OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); + OString aFullName + = OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); // Format: <prop:the_propname xmlns:prop="the_namespace"> @@ -102,7 +102,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, // Add our namespace to our own properties. rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( rFullName, + = strdup( OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ) ); } } @@ -111,12 +111,12 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, // static void DAVProperties::createUCBPropName( const char * nspace, const char * name, - rtl::OUString & rFullName ) + OUString & rFullName ) { - rtl::OUString aNameSpace - = rtl::OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aName - = rtl::OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); + OUString aNameSpace + = OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); + OUString aName + = OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); if ( !aNameSpace.getLength() ) { @@ -135,7 +135,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ) { - aNameSpace = rtl::OUString( "DAV:" ); + aNameSpace = OUString( "DAV:" ); } } @@ -162,11 +162,11 @@ void DAVProperties::createUCBPropName( const char * nspace, else { // Create property name that encodes, namespace and name ( XML ). - rFullName = rtl::OUString::createFromAscii( "<prop:" ); + rFullName = OUString::createFromAscii( "<prop:" ); rFullName += aName; - rFullName += rtl::OUString::createFromAscii( " xmlns:prop=\"" ); + rFullName += OUString::createFromAscii( " xmlns:prop=\"" ); rFullName += aNameSpace; - rFullName += rtl::OUString::createFromAscii( "\">" ); + rFullName += OUString::createFromAscii( "\">" ); } } diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx index 0434ef3cc7e5..1906c7fb264d 100644 --- a/ucb/source/ucp/webdav/DAVProperties.hxx +++ b/ucb/source/ucp/webdav/DAVProperties.hxx @@ -29,23 +29,23 @@ namespace http_dav_ucp struct DAVProperties { - static const ::rtl::OUString CREATIONDATE; - static const ::rtl::OUString DISPLAYNAME; - static const ::rtl::OUString GETCONTENTLANGUAGE; - static const ::rtl::OUString GETCONTENTLENGTH; - static const ::rtl::OUString GETCONTENTTYPE; - static const ::rtl::OUString GETETAG; - static const ::rtl::OUString GETLASTMODIFIED; - static const ::rtl::OUString LOCKDISCOVERY; - static const ::rtl::OUString RESOURCETYPE; - static const ::rtl::OUString SUPPORTEDLOCK; - static const ::rtl::OUString EXECUTABLE; - - static void createSerfPropName( const rtl::OUString & rFullName, + static const OUString CREATIONDATE; + static const OUString DISPLAYNAME; + static const OUString GETCONTENTLANGUAGE; + static const OUString GETCONTENTLENGTH; + static const OUString GETCONTENTTYPE; + static const OUString GETETAG; + static const OUString GETLASTMODIFIED; + static const OUString LOCKDISCOVERY; + static const OUString RESOURCETYPE; + static const OUString SUPPORTEDLOCK; + static const OUString EXECUTABLE; + + static void createSerfPropName( const OUString & rFullName, SerfPropName & rName ); static void createUCBPropName ( const char * nspace, const char * name, - rtl::OUString & rFullName ); + OUString & rFullName ); static bool isUCBDeadProperty( const SerfPropName & rName ); }; diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx index e609273968f5..ea63b9efe514 100644 --- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx @@ -27,19 +27,19 @@ namespace http_dav_ucp { - typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader; + typedef std::pair< OUString, OUString > DAVRequestHeader; typedef std::vector< DAVRequestHeader > DAVRequestHeaders; struct DAVRequestEnvironment { - rtl::OUString m_aRequestURI; + OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; // rtl::Reference< DAVStatusListener > m_xStatusListener; // rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; -DAVRequestEnvironment( const rtl::OUString & rRequestURI, +DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv) diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 6e9fa1b259e5..9e43a135973c 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -32,7 +32,7 @@ namespace http_dav_ucp struct DAVPropertyValue { - rtl::OUString Name; + OUString Name; com::sun::star::uno::Any Value; bool IsCaseSensitive; @@ -41,19 +41,19 @@ struct DAVPropertyValue struct DAVResource { - ::rtl::OUString uri; + OUString uri; std::vector< DAVPropertyValue > properties; DAVResource() {} - DAVResource( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResource( const OUString & inUri ) : uri( inUri ) {} }; struct DAVResourceInfo { - ::rtl::OUString uri; - std::vector < ::rtl::OUString > properties; + OUString uri; + std::vector < OUString > properties; - DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResourceInfo( const OUString & inUri ) : uri( inUri ) {} }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 8c495610a8d7..ee713eae1183 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -42,10 +42,10 @@ using namespace com::sun::star; //========================================================================= // virtual int DAVAuthListener_Impl::authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials ) { @@ -69,7 +69,7 @@ int DAVAuthListener_Impl::authenticate( rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest = new ucbhelper::SimpleAuthenticationRequest( m_aURL, inHostName, inRealm, inoutUserName, - outPassWord, ::rtl::OUString(), + outPassWord, OUString(), true /*bAllowPersistentStoring*/, bCanUseSystemCredentials ); xIH->handle( xRequest.get() ); @@ -98,8 +98,8 @@ int DAVAuthListener_Impl::authenticate( { // This is the (strange) way to tell neon to use // system credentials. - inoutUserName = rtl::OUString(); - outPassWord = rtl::OUString(); + inoutUserName = OUString(); + outPassWord = OUString(); } else { @@ -133,7 +133,7 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( const uno::Reference< lang::XMultiServiceFactory > & rSMgr, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ) + const OUString & rURL ) : m_aURL( rURL ), m_xSessionFactory( rSessionFactory ), m_xSMgr( rSMgr ) @@ -168,7 +168,7 @@ DAVResourceAccess & DAVResourceAccess::operator=( //========================================================================= void DAVResourceAccess::PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -186,7 +186,7 @@ void DAVResourceAccess::PROPFIND( getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPFIND" ), aHeaders ); @@ -229,7 +229,7 @@ void DAVResourceAccess::PROPFIND( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPFIND" ), aHeaders ); @@ -270,7 +270,7 @@ void DAVResourceAccess::PROPPATCH( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPPATCH" ), aHeaders ); @@ -294,7 +294,7 @@ void DAVResourceAccess::PROPPATCH( //========================================================================= void DAVResourceAccess::HEAD( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( DAVException ) @@ -311,7 +311,7 @@ void DAVResourceAccess::HEAD( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "HEAD" ), + OUString::createFromAscii( "HEAD" ), aHeaders ); m_xSession->HEAD( getRequestURI(), @@ -351,7 +351,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -392,7 +392,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); m_xSession->GET( getRequestURI(), @@ -415,7 +415,7 @@ void DAVResourceAccess::GET( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::GET( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -433,7 +433,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -461,7 +461,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( //========================================================================= void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -478,7 +478,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); m_xSession->GET( getRequestURI(), @@ -565,7 +565,7 @@ void DAVResourceAccess::PUT( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "PUT" ), + OUString::createFromAscii( "PUT" ), aHeaders ); m_xSession->PUT( getRequestURI(), @@ -588,8 +588,8 @@ void DAVResourceAccess::PUT( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ) @@ -617,7 +617,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "POST" ), + OUString::createFromAscii( "POST" ), aHeaders ); xStream = m_xSession->POST( getRequestURI(), @@ -651,8 +651,8 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( //========================================================================= void DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) @@ -680,7 +680,7 @@ void DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "POST" ), + OUString::createFromAscii( "POST" ), aHeaders ); m_xSession->POST( getRequestURI(), @@ -728,7 +728,7 @@ void DAVResourceAccess::MKCOL( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "MKCOL" ), + OUString::createFromAscii( "MKCOL" ), aHeaders ); m_xSession->MKCOL( getRequestURI(), @@ -750,8 +750,8 @@ void DAVResourceAccess::MKCOL( //========================================================================= void DAVResourceAccess::COPY( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -768,7 +768,7 @@ void DAVResourceAccess::COPY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "COPY" ), + OUString::createFromAscii( "COPY" ), aHeaders ); m_xSession->COPY( rSourcePath, @@ -792,8 +792,8 @@ void DAVResourceAccess::COPY( //========================================================================= void DAVResourceAccess::MOVE( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -810,7 +810,7 @@ void DAVResourceAccess::MOVE( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "MOVE" ), + OUString::createFromAscii( "MOVE" ), aHeaders ); m_xSession->MOVE( rSourcePath, @@ -849,7 +849,7 @@ void DAVResourceAccess::DESTROY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "DESTROY" ), aHeaders ); @@ -889,7 +889,7 @@ void DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "LOCK" ), + OUString::createFromAscii( "LOCK" ), aHeaders ); m_xSession->LOCK( getRequestURI(), @@ -931,7 +931,7 @@ sal_Int64 DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "LOCK" ), + OUString::createFromAscii( "LOCK" ), aHeaders ); nNewTimeout = m_xSession->LOCK( getRequestURI(), @@ -973,7 +973,7 @@ void DAVResourceAccess::UNLOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "UNLOCK" ), + OUString::createFromAscii( "UNLOCK" ), aHeaders ); m_xSession->UNLOCK( getRequestURI(), @@ -994,12 +994,12 @@ void DAVResourceAccess::UNLOCK( } //========================================================================= -void DAVResourceAccess::setURL( const rtl::OUString & rNewURL ) +void DAVResourceAccess::setURL( const OUString & rNewURL ) throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; - m_aPath = rtl::OUString(); // Next initialize() will create new session. + m_aPath = OUString(); // Next initialize() will create new session. } //========================================================================= @@ -1011,7 +1011,7 @@ void DAVResourceAccess::initialize() if ( m_aPath.isEmpty() ) { SerfUri aURI( m_aURL ); - rtl::OUString aPath( aURI.GetPath() ); + OUString aPath( aURI.GetPath() ); /* #134089# - Check URI */ if ( aPath.isEmpty() ) @@ -1045,7 +1045,7 @@ void DAVResourceAccess::initialize() } //========================================================================= -const rtl::OUString & DAVResourceAccess::getRequestURI() const +const OUString & DAVResourceAccess::getRequestURI() const { OSL_ENSURE( m_xSession.is(), "DAVResourceAccess::getRequestURI - Not initialized!" ); @@ -1061,8 +1061,8 @@ const rtl::OUString & DAVResourceAccess::getRequestURI() const // static void DAVResourceAccess::getUserRequestHeaders( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ) { if ( xEnv.is() ) @@ -1077,7 +1077,7 @@ void DAVResourceAccess::getUserRequestHeaders( for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n ) { - rtl::OUString aValue; + OUString aValue; sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue; if ( !isString ) @@ -1096,7 +1096,7 @@ void DAVResourceAccess::getUserRequestHeaders( //========================================================================= sal_Bool DAVResourceAccess::detectRedirectCycle( - const rtl::OUString& rRedirectURL ) + const OUString& rRedirectURL ) throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 792a85a354e0..a6d562321e75 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -45,8 +45,8 @@ class DAVSessionFactory; class DAVResourceAccess { osl::Mutex m_aMutex; - rtl::OUString m_aURL; - rtl::OUString m_aPath; + OUString m_aURL; + OUString m_aPath; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; com::sun::star::uno::Reference< @@ -59,17 +59,17 @@ public: com::sun::star::lang::XMultiServiceFactory > & rSMgr, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ); + const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); - void setURL( const rtl::OUString & rNewURL ) + void setURL( const OUString & rNewURL ) throw ( DAVException ); void resetUri(); - const rtl::OUString & getURL() const { return m_aURL; } + const OUString & getURL() const { return m_aURL; } rtl::Reference< DAVSessionFactory > getSessionFactory() const { return m_xSessionFactory; } @@ -80,7 +80,7 @@ public: // allprop & named void PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -101,7 +101,7 @@ public: throw ( DAVException ); void - HEAD( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -120,7 +120,7 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -129,7 +129,7 @@ public: void GET( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -143,8 +143,8 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, const com::sun::star::uno::Reference< @@ -152,8 +152,8 @@ public: throw ( DAVException ); void - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, com::sun::star::uno::Reference< @@ -168,16 +168,16 @@ public: throw ( DAVException ); void - COPY( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + COPY( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - MOVE( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + MOVE( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -218,13 +218,13 @@ public: getUserRequestHeaders( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ); private: - const rtl::OUString & getRequestURI() const; - sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) + const OUString & getRequestURI() const; + sal_Bool detectRedirectCycle( const OUString& rRedirectURL ) throw ( DAVException ); sal_Bool handleException( DAVException & e, int errorCount ) throw ( DAVException ); diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index ebb7fd2162e2..e02ff46a1e77 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -59,7 +59,7 @@ public: } } - virtual sal_Bool CanUse( const ::rtl::OUString & inPath ) = 0; + virtual sal_Bool CanUse( const OUString & inPath ) = 0; virtual sal_Bool UsesProxy() = 0; @@ -68,82 +68,82 @@ public: // NOT USED /* - virtual void OPTIONS( const ::rtl::OUString & inPath, + virtual void OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; */ // allprop & named - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropertyNames, + const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // propnames - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PROPPATCH( const ::rtl::OUString & inPath, + virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + virtual void HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void GET( const ::rtl::OUString & inPath, + virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PUT( const ::rtl::OUString & inPath, + virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + virtual void POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -151,39 +151,39 @@ public: const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void MKCOL( const ::rtl::OUString & inPath, + virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void COPY( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void COPY( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void MOVE( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void MOVE( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // set new lock. - virtual void LOCK( const ::rtl::OUString & inPath, + virtual void LOCK( const OUString & inPath, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inPath, + virtual sal_Int64 LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void UNLOCK( const ::rtl::OUString & inPath, + virtual void UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index 231a7fe6c10f..77bb317fdb01 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -30,7 +30,7 @@ DAVSessionFactory::~DAVSessionFactory() } rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( - const ::rtl::OUString & inUri, + const OUString & inUri, const uno::Reference< lang::XMultiServiceFactory > & rxSMgr ) throw( DAVException ) { diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 403a70fff10e..27f58ef72731 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -50,7 +50,7 @@ public: ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > - createDAVSession( const ::rtl::OUString & inUri, + createDAVSession( const OUString & inUri, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr ) @@ -58,7 +58,7 @@ public: ::uno::Reference< ::lang::XMultiServiceFactory > getServiceFactory() { return m_xMSF; } private: - typedef std::map< rtl::OUString, DAVSession * > Map; + typedef std::map< OUString, DAVSession * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index a32aee65e697..85255d4dbd67 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -65,11 +65,11 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - rtl::OUString name; + OUString name; com::sun::star::uno::Any value; ProppatchValue( const ProppatchOperation o, - const rtl::OUString & n, + const OUString & n, const com::sun::star::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index ba2be763eb74..25425a289231 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -38,16 +38,16 @@ namespace http_dav_ucp class DateTimeHelper { private: - static sal_Int32 convertMonthToInt (const ::rtl::OUString& ); + static sal_Int32 convertMonthToInt (const OUString& ); - static bool ISO8601_To_DateTime (const ::rtl::OUString&, + static bool ISO8601_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); - static bool RFC2068_To_DateTime (const ::rtl::OUString&, + static bool RFC2068_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); public: - static bool convert (const ::rtl::OUString&, + static bool convert (const OUString&, ::com::sun::star::util::DateTime& ); }; diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx index b5791a3c1fb4..3632853c542f 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -38,7 +38,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream( xioInStrm ) @@ -62,7 +62,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream() @@ -139,7 +139,7 @@ void SerfGetReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponse void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + OUString aHeaderName( OUString::createFromAscii( inHeaderName ) ); bool bStoreHeaderField = false; @@ -151,8 +151,8 @@ void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, else { // store only header fields which are requested - std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + std::vector< OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< OUString >::const_iterator end( mpHeaderNames->end() ); while ( it != end ) { @@ -174,7 +174,7 @@ void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, DAVPropertyValue thePropertyValue; thePropertyValue.IsCaseSensitive = false; thePropertyValue.Name = aHeaderName; - thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + thePropertyValue.Value <<= OUString::createFromAscii( inHeaderValue ); mpResource->properties.push_back( thePropertyValue ); } } diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx index 6497ecba2715..dd02be1639c4 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -42,7 +42,7 @@ public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); SerfGetReqProcImpl( const char* inPath, @@ -52,7 +52,7 @@ public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); virtual ~SerfGetReqProcImpl(); @@ -73,7 +73,7 @@ protected: private: com::sun::star::uno::Reference< SerfInputStream > xInputStream; com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; - const std::vector< ::rtl::OUString > * mpHeaderNames; + const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx index fe4171164241..e48a1a0b04e2 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx @@ -26,7 +26,7 @@ namespace http_dav_ucp SerfHeadReqProcImpl::SerfHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpHeaderNames( &inHeaderNames ) @@ -93,7 +93,7 @@ void SerfHeadReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfRespons void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + OUString aHeaderName( OUString::createFromAscii( inHeaderName ) ); bool bStoreHeaderField = false; @@ -105,8 +105,8 @@ void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, else { // store only header fields which are requested - std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + std::vector< OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< OUString >::const_iterator end( mpHeaderNames->end() ); while ( it != end ) { @@ -128,7 +128,7 @@ void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, DAVPropertyValue thePropertyValue; thePropertyValue.IsCaseSensitive = false; thePropertyValue.Name = aHeaderName; - thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + thePropertyValue.Value <<= OUString::createFromAscii( inHeaderValue ); mpResource->properties.push_back( thePropertyValue ); } } diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx index 46039f130b49..404175617631 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx @@ -37,7 +37,7 @@ class SerfHeadReqProcImpl : public SerfRequestProcessorImpl public: SerfHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); virtual ~SerfHeadReqProcImpl(); @@ -56,7 +56,7 @@ protected: void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); private: - const std::vector< ::rtl::OUString > * mpHeaderNames; + const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx index ec53fc57f6b2..27ed897bb8f8 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.cxx +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -142,12 +142,12 @@ void SerfLockStore::registerSession( HttpSession * pHttpSession ) } // ------------------------------------------------------------------- -SerfLock * SerfLockStore::findByUri( rtl::OUString const & rUri ) +SerfLock * SerfLockStore::findByUri( OUString const & rUri ) { osl::MutexGuard aGuard( m_aMutex ); ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( + ne_uri_parse( OUStringToOString( rUri, RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); return ne_lockstore_findbyuri( m_pSerfLockStore, &aUri ); } diff --git a/ucb/source/ucp/webdav/SerfLockStore.hxx b/ucb/source/ucp/webdav/SerfLockStore.hxx index cc11af5e4011..ac3e951a79f6 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.hxx +++ b/ucb/source/ucp/webdav/SerfLockStore.hxx @@ -70,7 +70,7 @@ public: void registerSession( HttpSession * pHttpSession ); - SerfLock * findByUri( rtl::OUString const & rUri ); + SerfLock * findByUri( OUString const & rUri ); void addLock( SerfLock * pLock, rtl::Reference< SerfSession > const & xSession, diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 725f91d01ec5..50accc4252f0 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -99,7 +99,7 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); } serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); } if ( mpContentType != 0 ) { diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx index 4dca188f32c1..5fb7680fc55b 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -32,7 +32,7 @@ namespace http_dav_ucp SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mDepthStr( 0 ) @@ -89,7 +89,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t // body bucket - certain properties OR all properties OR only property names serf_bucket_t* body_bkt = 0; - rtl::OUString aBodyText; + OUString aBodyText; { // create and fill body bucket with requested properties const int nPropCount = ( !mbOnlyPropertyNames && mpPropNames ) @@ -105,33 +105,33 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t thePropName ); /* <*propname* xmlns="*propns*" /> */ - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); - aBodyText += rtl::OUString::createFromAscii( "\"/>" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( " xmlnx=\"" ); + aBodyText += OUString::createFromAscii( thePropName.nspace ); + aBodyText += OUString::createFromAscii( "\"/>" ); } - aBodyText = rtl::OUString::createFromAscii( "<prop>" ) + + aBodyText = OUString::createFromAscii( "<prop>" ) + aBodyText + - rtl::OUString::createFromAscii( "</prop>" ); + OUString::createFromAscii( "</prop>" ); } else { if ( mbOnlyPropertyNames ) { - aBodyText = rtl::OUString::createFromAscii( "<propname/>" ); + aBodyText = OUString::createFromAscii( "<propname/>" ); } else { - aBodyText = rtl::OUString::createFromAscii( "<allprop/>" ); + aBodyText = OUString::createFromAscii( "<allprop/>" ); } } - aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) + + aBodyText = OUString::createFromAscii( PROPFIND_HEADER ) + aBodyText + - rtl::OUString::createFromAscii( PROPFIND_TRAILER ); - body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + OUString::createFromAscii( PROPFIND_TRAILER ); + body_bkt = SERF_BUCKET_SIMPLE_STRING( OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); if ( useChunkedEncoding() ) { @@ -161,7 +161,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t } serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx index 92ea5a7fed91..35503ba0f812 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -38,7 +38,7 @@ public: SerfPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ); SerfPropFindReqProcImpl( const char* inPath, @@ -62,7 +62,7 @@ private: void init( const Depth inDepth ); const char* mDepthStr; - const std::vector< ::rtl::OUString > * mpPropNames; + const std::vector< OUString > * mpPropNames; std::vector< DAVResource > * mpResources; std::vector< DAVResourceInfo > * mpResInfo; diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx index 39f1c8d637d7..9b2583a53f6f 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -48,7 +48,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ // body bucket serf_bucket_t* body_bkt = 0; - rtl::OUString aBodyText; + OUString aBodyText; { // create and fill body bucket with properties to be set or removed static const char* OpCodes[2] = { "set", "remove" }; @@ -59,9 +59,9 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ { // <*operation code*><prop> ProppatchOperation lastOp = (*mpProperties)[ 0 ].operation; - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( "><prop>" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( "><prop>" ); SerfPropName thePropName; for ( int n = 0; n < nPropCount; ++n ) @@ -74,26 +74,26 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ if ( rProperty.operation != lastOp ) { // </prop></*last operation code*><*operation code><prop> - aBodyText += rtl::OUString::createFromAscii( "</prop></" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( "><" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[rProperty.operation] ); - aBodyText += rtl::OUString::createFromAscii( "><prop>" ); + aBodyText += OUString::createFromAscii( "</prop></" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( "><" ); + aBodyText += OUString::createFromAscii( OpCodes[rProperty.operation] ); + aBodyText += OUString::createFromAscii( "><prop>" ); } // <*propname* xmlns="*propns*" - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( " xmlns=\"" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); - aBodyText += rtl::OUString::createFromAscii( "\"" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( " xmlns=\"" ); + aBodyText += OUString::createFromAscii( thePropName.nspace ); + aBodyText += OUString::createFromAscii( "\"" ); if ( rProperty.operation == PROPSET ) { // >*property value*</*propname*> - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( ">" ); - rtl::OUString aStringValue; + OUString aStringValue; if ( DAVProperties::isUCBDeadProperty( thePropName ) ) { UCBDeadPropertyValue::toXML( rProperty.value, @@ -104,31 +104,31 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ rProperty.value >>= aStringValue; } aBodyText += aStringValue; - aBodyText += rtl::OUString::createFromAscii( "</" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( "</" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( ">" ); } else { // /> - aBodyText += rtl::OUString::createFromAscii( "/>" ); + aBodyText += OUString::createFromAscii( "/>" ); } lastOp = rProperty.operation; } // </prop></*last operation code*> - aBodyText += rtl::OUString::createFromAscii( "</prop></" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( "</prop></" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( ">" ); // add PropPatch xml header in front - aBodyText = rtl::OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; + aBodyText = OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; // add PropPatch xml trailer at end - aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER ); + aBodyText += OUString::createFromAscii( PROPPATCH_TRAILER ); - body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + body_bkt = SERF_BUCKET_SIMPLE_STRING( OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); if ( useChunkedEncoding() ) { @@ -158,7 +158,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ } serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index 56519e99de66..2b83dcf21147 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -75,7 +75,7 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); } serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); } diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index f73766f6df0b..db4c5ac4ec3c 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -29,7 +29,7 @@ namespace http_dav_ucp { SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, - const rtl::OUString & inPath, + const OUString & inPath, const bool bUseChunkedEncoding ) : mrSerfSession( rSerfSession ) , mPathStr( 0 ) @@ -50,7 +50,7 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, , mbHandleSerfResponseCalled( false ) { mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); } SerfRequestProcessor::~SerfRequestProcessor() @@ -64,8 +64,8 @@ void SerfRequestProcessor::prepareProcessor() delete mpDAVException; mpDAVException = 0; mnHTTPStatusCode = SC_NONE; - mHTTPStatusCodeText = rtl::OUString(); - mRedirectLocation = rtl::OUString(); + mHTTPStatusCodeText = OUString(); + mRedirectLocation = OUString(); mnSuccessfulCredentialAttempts = 0; mbInputOfCredentialsAborted = false; @@ -76,7 +76,7 @@ void SerfRequestProcessor::prepareProcessor() // PROPFIND - allprop & named bool SerfRequestProcessor::processPropFind( const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, apr_status_t& outSerfStatus ) { @@ -130,7 +130,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser // GET inclusive header fields bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -158,7 +158,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com // GET inclusive header fields bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -173,7 +173,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com } // HEAD -bool SerfRequestProcessor::processHead( const std::vector< ::rtl::OUString > & inHeaderNames, +bool SerfRequestProcessor::processHead( const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -203,15 +203,15 @@ bool SerfRequestProcessor::processPut( const char* inData, // POST bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -227,15 +227,15 @@ bool SerfRequestProcessor::processPost( const char* inData, // POST bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -269,12 +269,12 @@ bool SerfRequestProcessor::processMkCol( apr_status_t& outSerfStatus ) } // COPY -bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, +bool SerfRequestProcessor::processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createCopyReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -285,12 +285,12 @@ bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, } // MOVE -bool SerfRequestProcessor::processMove( const rtl::OUString & inDestinationPath, +bool SerfRequestProcessor::processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createMoveReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -501,7 +501,7 @@ apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRe : SC_NONE; if ( sl.reason ) { - mHTTPStatusCodeText = ::rtl::OUString::createFromAscii( sl.reason ); + mHTTPStatusCodeText = OUString::createFromAscii( sl.reason ); } if ( ( sl.version == 0 || sl.code < 0 ) || mnHTTPStatusCode >= 300 ) @@ -516,7 +516,7 @@ apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRe const char* location = serf_bucket_headers_get( headers, "Location" ); if ( location ) { - mRedirectLocation = rtl::OUString::createFromAscii( location ); + mRedirectLocation = OUString::createFromAscii( location ); } mbProcessingDone = true; return APR_EGENERAL; diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx index 8b7fcaded928..734cd07bb601 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -43,13 +43,13 @@ class SerfRequestProcessor { public: SerfRequestProcessor( SerfSession& rSerfSession, - const rtl::OUString & inPath, + const OUString & inPath, const bool bUseChunkedEncoding ); ~SerfRequestProcessor(); // PROPFIND - allprop & named bool processPropFind( const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, apr_status_t& outSerfStatus ); @@ -68,7 +68,7 @@ public: // GET inclusive header fields bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -78,12 +78,12 @@ public: // GET inclusive header fields bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); // HEAD - bool processHead( const std::vector< ::rtl::OUString > & inHeaderNames, + bool processHead( const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -95,16 +95,16 @@ public: // POST bool processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // POST bool processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); @@ -115,12 +115,12 @@ public: bool processMkCol( apr_status_t& outSerfStatus ); // COPY - bool processCopy( const rtl::OUString & inDestinationPath, + bool processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ); // MOVE - bool processMove( const rtl::OUString & inDestinationPath, + bool processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ); @@ -165,8 +165,8 @@ public: DAVException* mpDAVException; sal_uInt16 mnHTTPStatusCode; - rtl::OUString mHTTPStatusCodeText; - rtl::OUString mRedirectLocation; + OUString mHTTPStatusCodeText; + OUString mRedirectLocation; sal_uInt8 mnSuccessfulCredentialAttempts; bool mbInputOfCredentialsAborted; diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx index d27064c60ab7..7637684f3425 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx @@ -56,9 +56,9 @@ void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeader while ( aHeaderIter != aEnd ) { - const rtl::OString aHeader = rtl::OUStringToOString( (*aHeaderIter).first, + const OString aHeader = OUStringToOString( (*aHeaderIter).first, RTL_TEXTENCODING_UTF8 ); - const rtl::OString aValue = rtl::OUStringToOString( (*aHeaderIter).second, + const OString aValue = OUStringToOString( (*aHeaderIter).second, RTL_TEXTENCODING_UTF8 ); serf_bucket_headers_set( inoutSerfHeaderBucket, diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx index 33e79223845e..3abf5a7ec37b 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx @@ -34,7 +34,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfPropFindReqProcImpl( inPath, @@ -80,7 +80,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, @@ -104,7 +104,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, @@ -117,7 +117,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfHeadReqProcImpl( inPath, diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx index ee6d5b540953..083287ed7c13 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx @@ -34,7 +34,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ); SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, @@ -53,7 +53,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, @@ -63,12 +63,12 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createPutReqProcImpl( const char* inPath, diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 40641676df02..33c54281fb10 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -59,7 +59,7 @@ using namespace http_dav_ucp; // ------------------------------------------------------------------- SerfSession::SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) : DAVSession( rSessionFactory ) @@ -159,7 +159,7 @@ void SerfSession::Init() { apr_sockaddr_t *proxy_address = NULL; const apr_status_t status = apr_sockaddr_info_get( &proxy_address, - rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), + OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), APR_UNSPEC, static_cast<apr_port_t>(m_nProxyPort), 0, getAprPool() ); @@ -207,7 +207,7 @@ bool SerfSession::isHeadRequestInProgress() bool SerfSession::isSSLNeeded() { - return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( "https" ) ); + return m_aUri.GetScheme().equalsIgnoreAsciiCase( OUString( "https" ) ); } char* SerfSession::getHostinfo() @@ -218,7 +218,7 @@ char* SerfSession::getHostinfo() // ------------------------------------------------------------------- // virtual -sal_Bool SerfSession::CanUse( const rtl::OUString & inUri ) +sal_Bool SerfSession::CanUse( const OUString & inUri ) { try { @@ -296,12 +296,12 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA return SERF_ERROR_AUTHN_FAILED; } - rtl::OUString theUserName; - rtl::OUString thePassWord; + OUString theUserName; + OUString thePassWord; try { SerfUri uri( getRequestEnvironment().m_aRequestURI ); - rtl::OUString aUserInfo( uri.GetUserInfo() ); + OUString aUserInfo( uri.GetUserInfo() ); if ( aUserInfo.getLength() ) { sal_Int32 nPos = aUserInfo.indexOf( '@' ); @@ -325,7 +325,7 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA const bool bCanUseSystemCreds = ( ( strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || ( strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); - int theRetVal = pListener->authenticate( rtl::OUString::createFromAscii( inRealm ), + int theRetVal = pListener->authenticate( OUString::createFromAscii( inRealm ), getHostName(), theUserName, thePassWord, @@ -334,8 +334,8 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA if ( theRetVal == 0 ) { - *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); - *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + *outUsername = apr_pstrdup( inAprPool, OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + *outPassword = apr_pstrdup( inAprPool, OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); } return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS; @@ -344,10 +344,10 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA namespace { // ------------------------------------------------------------------- // Helper function - ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + OUString GetHostnamePart( const OUString& _rRawString ) { - ::rtl::OUString sPart; - ::rtl::OUString sPartId = ::rtl::OUString::createFromAscii( "CN=" ); + OUString sPart; + OUString sPartId = OUString::createFromAscii( "CN=" ); sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { @@ -387,10 +387,10 @@ apr_status_t SerfSession::verifySerfCertificateChain ( xSEInitializer = uno::Reference< xml::crypto::XSEInitializer >( getMSF()->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), + OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), uno::UNO_QUERY_THROW); - xSecurityContext = xSEInitializer->createSecurityContext( rtl::OUString() ); + xSecurityContext = xSEInitializer->createSecurityContext( OUString() ); if (xSecurityContext.is()) xSecurityEnv = xSecurityContext->getSecurityEnvironment(); @@ -408,16 +408,16 @@ apr_status_t SerfSession::verifySerfCertificateChain ( // Decode the server certificate. uno::Reference< security::XCertificate > xServerCertificate( xSecurityEnv->createCertificateFromAscii( - rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); + OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); if ( ! xServerCertificate.is()) return SERF_SSL_CERT_UNKNOWN_FAILURE; // Get the subject from the server certificate. - ::rtl::OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); + OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); sal_Int32 nIndex = 0; while (nIndex >= 0) { - const ::rtl::OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); + const OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); if (sToken.startsWith("CN=")) { sServerCertificateSubject = sToken.copy(3); @@ -451,7 +451,7 @@ apr_status_t SerfSession::verifySerfCertificateChain ( { uno::Reference< security::XCertificate > xCertificate( xSecurityEnv->createCertificateFromAscii( - rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); + OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); if ( ! xCertificate.is()) return SERF_SSL_CERT_UNKNOWN_FAILURE; aChain.push_back(xCertificate); @@ -559,7 +559,7 @@ serf_bucket_t* SerfSession::acceptSerfResponse( serf_request_t * inSerfRequest, return responseBkt; } -SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) +SerfRequestProcessor* SerfSession::createReqProc( const OUString & inPath ) { return new SerfRequestProcessor( *this, inPath, @@ -569,9 +569,9 @@ SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) // ------------------------------------------------------------------- // PROPFIND - allprop & named // ------------------------------------------------------------------- -void SerfSession::PROPFIND( const rtl::OUString & inPath, +void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -600,7 +600,7 @@ void SerfSession::PROPFIND( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PROPFIND - propnames // ------------------------------------------------------------------- -void SerfSession::PROPFIND( const rtl::OUString & inPath, +void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) @@ -629,7 +629,7 @@ void SerfSession::PROPFIND( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PROPPATCH // ------------------------------------------------------------------- -void SerfSession::PROPPATCH( const rtl::OUString & inPath, +void SerfSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -649,8 +649,8 @@ void SerfSession::PROPPATCH( const rtl::OUString & inPath, // ------------------------------------------------------------------- // HEAD // ------------------------------------------------------------------- -void SerfSession::HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +void SerfSession::HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -678,7 +678,7 @@ void SerfSession::HEAD( const ::rtl::OUString & inPath, // GET // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::GET( const rtl::OUString & inPath, +SerfSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -700,7 +700,7 @@ SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -void SerfSession::GET( const rtl::OUString & inPath, +void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -721,8 +721,8 @@ void SerfSession::GET( const rtl::OUString & inPath, // GET // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +SerfSession::GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -750,9 +750,9 @@ SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -void SerfSession::GET( const rtl::OUString & inPath, +void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -776,7 +776,7 @@ void SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PUT // ------------------------------------------------------------------- -void SerfSession::PUT( const rtl::OUString & inPath, +void SerfSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -801,9 +801,9 @@ void SerfSession::PUT( const rtl::OUString & inPath, // POST // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +SerfSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -835,9 +835,9 @@ SerfSession::POST( const rtl::OUString & inPath, // ------------------------------------------------------------------- // POST // ------------------------------------------------------------------- -void SerfSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +void SerfSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) @@ -868,7 +868,7 @@ void SerfSession::POST( const rtl::OUString & inPath, // ------------------------------------------------------------------- // MKCOL // ------------------------------------------------------------------- -void SerfSession::MKCOL( const rtl::OUString & inPath, +void SerfSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -886,8 +886,8 @@ void SerfSession::MKCOL( const rtl::OUString & inPath, // ------------------------------------------------------------------- // COPY // ------------------------------------------------------------------- -void SerfSession::COPY( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void SerfSession::COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -909,8 +909,8 @@ void SerfSession::COPY( const rtl::OUString & inSourceURL, // ------------------------------------------------------------------- // MOVE // ------------------------------------------------------------------- -void SerfSession::MOVE( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void SerfSession::MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -932,7 +932,7 @@ void SerfSession::MOVE( const rtl::OUString & inSourceURL, // ------------------------------------------------------------------- // DESTROY // ------------------------------------------------------------------- -void SerfSession::DESTROY( const rtl::OUString & inPath, +void SerfSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -981,7 +981,7 @@ namespace // ------------------------------------------------------------------- // LOCK (set new lock) // ------------------------------------------------------------------- -void SerfSession::LOCK( const ::rtl::OUString & inPath, +void SerfSession::LOCK( const OUString & inPath, ucb::Lock & /*rLock*/, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1000,7 +1000,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, // Set the lock uri ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( makeAbsoluteURL( inPath ), + ne_uri_parse( OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); theLock->uri = aUri; @@ -1038,10 +1038,10 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, theLock->timeout = (long)rLock.Timeout; // Set the lock owner - rtl::OUString aValue; + OUString aValue; rLock.Owner >>= aValue; theLock->owner = - ne_strdup( rtl::OUStringToOString( aValue, + ne_strdup( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); TimeValue startCall; osl_getSystemTime( &startCall ); @@ -1055,12 +1055,12 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, lastChanceToSendRefreshRequest( startCall, theLock->timeout ) ); - uno::Sequence< rtl::OUString > aTokens( 1 ); - aTokens[ 0 ] = rtl::OUString::createFromAscii( theLock->token ); + uno::Sequence< OUString > aTokens( 1 ); + aTokens[ 0 ] = OUString::createFromAscii( theLock->token ); rLock.LockTokens = aTokens; OSL_TRACE( "SerfSession::LOCK: created lock for %s. token: %s", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); } @@ -1069,7 +1069,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, ne_lock_destroy( theLock ); OSL_TRACE( "SerfSession::LOCK: obtaining lock for %s failed!", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1080,7 +1080,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, // ------------------------------------------------------------------- // LOCK (refresh existing lock) // ------------------------------------------------------------------- -sal_Int64 SerfSession::LOCK( const ::rtl::OUString & /*inPath*/, +sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, sal_Int64 nTimeout, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) @@ -1152,7 +1152,7 @@ bool SerfSession::LOCK( SerfLock * /*pLock*/, // ------------------------------------------------------------------- // UNLOCK // ------------------------------------------------------------------- -void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, +void SerfSession::UNLOCK( const OUString & /*inPath*/, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) { @@ -1177,7 +1177,7 @@ void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, else { OSL_TRACE( "SerfSession::UNLOCK: unlocking of %s failed.", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1232,7 +1232,7 @@ const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const { // TODO: figure out, if this case can occur return m_rProxyDecider.getProxy( m_aUri.GetScheme(), - rtl::OUString() /* not used */, + OUString() /* not used */, -1 /* not used */ ); } } @@ -1246,7 +1246,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, { for ( sal_Int32 n = 0; n < rLocks.getLength(); ++n ) { - const uno::Sequence< rtl::OUString > & rTokens + const uno::Sequence< OUString > & rTokens = rLocks[ n ].LockTokens; for ( sal_Int32 m = 0; m < rTokens.getLength(); ++m ) { @@ -1261,7 +1261,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, */ // ------------------------------------------------------------------- -bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, +bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/, const DAVRequestEnvironment & /*rEnv*/ ) { return true; @@ -1276,7 +1276,7 @@ bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, // @@@ Alternative: use ne_lock_discover() => less overhead std::vector< DAVResource > aResources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; aPropNames.push_back( DAVProperties::LOCKDISCOVERY ); PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv ); @@ -1313,7 +1313,7 @@ bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, // in propfind result -> not locked OSL_TRACE( "SerfSession::removeExpiredLocktoken: Removing " " expired lock token for %s. token: %s", - rtl::OUStringToOString( inURL, + OUStringToOString( inURL, RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); @@ -1364,7 +1364,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc case NE_ERROR: // Generic error { - rtl::OUString aText = rtl::OUString::createFromAscii( + OUString aText = OUString::createFromAscii( ne_get_error( m_pHttpSession ) ); sal_uInt16 code = makeStatusCode( aText ); @@ -1441,7 +1441,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc { OSL_TRACE( "SerfSession::HandleError : Unknown Serf error code!" ); throw DAVException( DAVException::DAV_HTTP_ERROR, - rtl::OUString::createFromAscii( + OUString::createFromAscii( ne_get_error( m_pHttpSession ) ) ); } } @@ -1540,17 +1540,17 @@ SerfSession::getDataFromInputStream( // --------------------------------------------------------------------- sal_Bool -SerfSession::isDomainMatch( rtl::OUString certHostName ) +SerfSession::isDomainMatch( OUString certHostName ) { - rtl::OUString hostName = getHostName(); + OUString hostName = getHostName(); if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; - if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) && + if ( 0 == certHostName.indexOf( OUString::createFromAscii( "*" ) ) && hostName.getLength() >= certHostName.getLength() ) { - rtl::OUString cmpStr = certHostName.copy( 1 ); + OUString cmpStr = certHostName.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength() ) ) @@ -1561,7 +1561,7 @@ SerfSession::isDomainMatch( rtl::OUString certHostName ) /* // --------------------------------------------------------------------- -rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +OUString SerfSession::makeAbsoluteURL( OUString const & rURL ) const { try { @@ -1569,7 +1569,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const if ( rURL[ 0 ] != sal_Unicode( '/' ) ) { // absolute. - return rtl::OUString( rURL ); + return OUString( rURL ); } else { @@ -1578,7 +1578,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const ne_fill_server_uri( m_pHttpSession, &aUri ); aUri.path - = ne_strdup( rtl::OUStringToOString( + = ne_strdup( OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); SerfUri aSerfUri( &aUri ); ne_uri_free( &aUri ); @@ -1589,7 +1589,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const { } // error. - return rtl::OUString(); + return OUString(); } */ diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index 73a44021cddd..585a28a2064f 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -50,7 +50,7 @@ private: SerfUri m_aUri; - rtl::OUString m_aProxyName; + OUString m_aProxyName; sal_Int32 m_nProxyPort; SerfConnection* m_pSerfConnection; @@ -69,14 +69,14 @@ private: char* getHostinfo(); bool isSSLNeeded(); - SerfRequestProcessor* createReqProc( const rtl::OUString & inPath ); + SerfRequestProcessor* createReqProc( const OUString & inPath ); protected: virtual ~SerfSession(); public: SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); @@ -111,7 +111,7 @@ public: SerfConnection* getSerfConnection(); // DAVSession methods - virtual sal_Bool CanUse( const ::rtl::OUString & inUri ); + virtual sal_Bool CanUse( const OUString & inUri ); virtual sal_Bool UsesProxy(); @@ -120,30 +120,30 @@ public: // allprop & named virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // propnames virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PROPPATCH( const ::rtl::OUString & inPath, + PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -151,53 +151,53 @@ public: bool isHeadRequestInProgress(); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PUT( const ::rtl::OUString & inPath, + PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -206,41 +206,41 @@ public: throw ( DAVException ); virtual void - MKCOL( const ::rtl::OUString & inPath, + MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - COPY( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); virtual void - MOVE( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // set new lock. - virtual void LOCK( const ::rtl::OUString & inURL, + virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inURL, + virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); - virtual void UNLOCK( const ::rtl::OUString & inURL, + virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -248,13 +248,13 @@ public: virtual void abort() throw ( DAVException ); - const rtl::OUString & getHostName() const { return m_aUri.GetHost(); } + const OUString & getHostName() const { return m_aUri.GetHost(); } int getPort() const { return m_aUri.GetPort(); } const ::uno::Reference< ::lang::XMultiServiceFactory > getMSF() { return m_xFactory->getServiceFactory(); } - sal_Bool isDomainMatch( rtl::OUString certHostName ); + sal_Bool isDomainMatch( OUString certHostName ); private: friend class SerfLockStore; @@ -270,7 +270,7 @@ private: const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const rtl::OUString & inURL, + bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by SerfLockStore::refreshLocks @@ -302,8 +302,8 @@ private: const char * buffer, //ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ); + const OUString & rContentType, + const OUString & rReferer ); */ // Helper: XInputStream -> Sequence< sal_Int8 > @@ -314,7 +314,7 @@ private: bool bAppendTrailingZeroByte ); /* - rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + OUString makeAbsoluteURL( OUString const & rURL ) const; */ }; diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index 550524f965ae..a82418c0f175 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -39,7 +39,7 @@ using namespace http_dav_ucp; namespace { -inline bool matchIgnoreAsciiCase(rtl::OString const & rStr1, +inline bool matchIgnoreAsciiCase(OString const & rStr1, sal_Char const * pStr2, sal_Int32 nStr2Len) SAL_THROW(()) { @@ -74,7 +74,7 @@ SerfUri::SerfUri( const apr_uri_t * inUri ) calculateURI(); } -SerfUri::SerfUri( const rtl::OUString & inUri ) +SerfUri::SerfUri( const OUString & inUri ) throw ( DAVException ) : mAprUri() , mURI() @@ -88,9 +88,9 @@ SerfUri::SerfUri( const rtl::OUString & inUri ) throw DAVException( DAVException::DAV_INVALID_ARG ); // #i77023# - rtl::OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); + OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); - rtl::OString theInputUri( + OString theInputUri( aEscapedUri.getStr(), aEscapedUri.getLength(), RTL_TEXTENCODING_UTF8 ); if ( apr_uri_parse( apr_environment::AprEnv::getAprEnv()->getAprPool(), @@ -114,22 +114,22 @@ SerfUri::SerfUri( const rtl::OUString & inUri ) void SerfUri::init( const apr_uri_t * pUri ) { - mScheme = rtl::OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = rtl::OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); - mHostName = rtl::OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); + mScheme = OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); + mUserInfo = OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); + mHostName = OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); mPort = pUri->port; - mPath = rtl::OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); + mPath = OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); if ( pUri->query ) { - mPath += rtl::OUString::createFromAscii( "?" ); - mPath += rtl::OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); + mPath += OUString::createFromAscii( "?" ); + mPath += OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); } if ( pUri->fragment ) { - mPath += rtl::OUString::createFromAscii( "#" ); - mPath += rtl::OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); + mPath += OUString::createFromAscii( "#" ); + mPath += OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); } } @@ -139,7 +139,7 @@ SerfUri::~SerfUri( ) void SerfUri::calculateURI () { - rtl::OUStringBuffer aBuf( mScheme ); + OUStringBuffer aBuf( mScheme ); aBuf.append( "://" ); if ( mUserInfo.getLength() > 0 ) { @@ -174,14 +174,14 @@ void SerfUri::calculateURI () if ( bAppendPort ) { aBuf.append( ":" ); - aBuf.append( rtl::OUString::valueOf( mPort ) ); + aBuf.append( OUString::valueOf( mPort ) ); } aBuf.append( mPath ); mURI = aBuf.makeStringAndClear(); } -::rtl::OUString SerfUri::GetPathBaseName () const +OUString SerfUri::GetPathBaseName () const { sal_Int32 nPos = mPath.lastIndexOf ('/'); sal_Int32 nTrail = 0; @@ -193,7 +193,7 @@ void SerfUri::calculateURI () } if (nPos != -1) { - rtl::OUString aTemp( + OUString aTemp( mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); // query, fragment present? @@ -207,7 +207,7 @@ void SerfUri::calculateURI () return aTemp; } else - return rtl::OUString::createFromAscii ("/"); + return OUString::createFromAscii ("/"); } bool SerfUri::operator== ( const SerfUri & rOther ) const @@ -215,22 +215,22 @@ bool SerfUri::operator== ( const SerfUri & rOther ) const return ( mURI == rOther.mURI ); } -::rtl::OUString SerfUri::GetPathBaseNameUnescaped () const +OUString SerfUri::GetPathBaseNameUnescaped () const { return unescape( GetPathBaseName() ); } -void SerfUri::AppendPath (const rtl::OUString& rPath) +void SerfUri::AppendPath (const OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString::createFromAscii ("/"); + mPath += OUString::createFromAscii ("/"); mPath += rPath; calculateURI (); }; // static -rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) +OUString SerfUri::escapeSegment( const OUString& segment ) { return rtl::Uri::encode( segment, rtl_UriCharClassPchar, @@ -239,7 +239,7 @@ rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) } // static -rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) +OUString SerfUri::unescape( const OUString& segment ) { return rtl::Uri::decode( segment, rtl_UriDecodeWithCharset, @@ -247,10 +247,10 @@ rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) } // static -rtl::OUString SerfUri::makeConnectionEndPointString( - const rtl::OUString & rHostName, int nPort ) +OUString SerfUri::makeConnectionEndPointString( + const OUString & rHostName, int nPort ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && @@ -268,7 +268,7 @@ rtl::OUString SerfUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.append( ":" ); - aBuf.append( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); + aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) ); } return aBuf.makeStringAndClear(); } diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx index 89298c09b2bb..15b0a6be60fb 100644 --- a/ucb/source/ucp/webdav/SerfUri.hxx +++ b/ucb/source/ucp/webdav/SerfUri.hxx @@ -39,18 +39,18 @@ class SerfUri { private: apr_uri_t mAprUri; - ::rtl::OUString mURI; - ::rtl::OUString mScheme; - ::rtl::OUString mUserInfo; - ::rtl::OUString mHostName; + OUString mURI; + OUString mScheme; + OUString mUserInfo; + OUString mHostName; sal_Int32 mPort; - ::rtl::OUString mPath; + OUString mPath; void init( const apr_uri_t * pUri ); void calculateURI (); public: - SerfUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + SerfUri( const OUString & inUri ) throw ( DAVException ); SerfUri( const apr_uri_t * inUri ) throw ( DAVException ); ~SerfUri( ); @@ -62,36 +62,36 @@ class SerfUri { return &mAprUri; } - const ::rtl::OUString & GetURI( void ) const + const OUString & GetURI( void ) const { return mURI; }; - const ::rtl::OUString & GetScheme( void ) const + const OUString & GetScheme( void ) const { return mScheme; }; - const ::rtl::OUString & GetUserInfo( void ) const + const OUString & GetUserInfo( void ) const { return mUserInfo; }; - const ::rtl::OUString & GetHost( void ) const + const OUString & GetHost( void ) const { return mHostName; }; sal_Int32 GetPort( void ) const { return mPort; }; - const ::rtl::OUString & GetPath( void ) const + const OUString & GetPath( void ) const { return mPath; }; - ::rtl::OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName ( void ) const; - ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped ( void ) const; - void SetScheme (const ::rtl::OUString& scheme) + void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; - void AppendPath (const ::rtl::OUString& rPath); + void AppendPath (const OUString& rPath); - static ::rtl::OUString escapeSegment( const ::rtl::OUString& segment ); - static ::rtl::OUString unescape( const ::rtl::OUString& string ); + static OUString escapeSegment( const OUString& segment ); + static OUString unescape( const OUString& string ); // "host:port", omit ":port" for port 80 and 443 - static rtl::OUString makeConnectionEndPointString( - const rtl::OUString & rHostName, + static OUString makeConnectionEndPointString( + const OUString & rHostName, int nPort ); - rtl::OUString makeConnectionEndPointString() const + OUString makeConnectionEndPointString() const { return makeConnectionEndPointString( GetHost(), GetPort() ); } }; diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index 828cb42d11bc..3a953d2e55ef 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -29,40 +29,40 @@ using namespace com::sun::star; struct UCBDeadPropertyValueParseContext { - rtl::OUString * pType; - rtl::OUString * pValue; + OUString * pType; + OUString * pValue; UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {} ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } }; // static -const rtl::OUString UCBDeadPropertyValue::aTypeString - = rtl::OUString::createFromAscii( "string" ); -const rtl::OUString UCBDeadPropertyValue::aTypeLong - = rtl::OUString::createFromAscii( "long" ); -const rtl::OUString UCBDeadPropertyValue::aTypeShort - = rtl::OUString::createFromAscii( "short" ); -const rtl::OUString UCBDeadPropertyValue::aTypeBoolean - = rtl::OUString::createFromAscii( "boolean" ); -const rtl::OUString UCBDeadPropertyValue::aTypeChar - = rtl::OUString::createFromAscii( "char" ); -const rtl::OUString UCBDeadPropertyValue::aTypeByte - = rtl::OUString::createFromAscii( "byte" ); -const rtl::OUString UCBDeadPropertyValue::aTypeHyper - = rtl::OUString::createFromAscii( "hyper" ); -const rtl::OUString UCBDeadPropertyValue::aTypeFloat - = rtl::OUString::createFromAscii( "float" ); -const rtl::OUString UCBDeadPropertyValue::aTypeDouble - = rtl::OUString::createFromAscii( "double" ); +const OUString UCBDeadPropertyValue::aTypeString + = OUString::createFromAscii( "string" ); +const OUString UCBDeadPropertyValue::aTypeLong + = OUString::createFromAscii( "long" ); +const OUString UCBDeadPropertyValue::aTypeShort + = OUString::createFromAscii( "short" ); +const OUString UCBDeadPropertyValue::aTypeBoolean + = OUString::createFromAscii( "boolean" ); +const OUString UCBDeadPropertyValue::aTypeChar + = OUString::createFromAscii( "char" ); +const OUString UCBDeadPropertyValue::aTypeByte + = OUString::createFromAscii( "byte" ); +const OUString UCBDeadPropertyValue::aTypeHyper + = OUString::createFromAscii( "hyper" ); +const OUString UCBDeadPropertyValue::aTypeFloat + = OUString::createFromAscii( "float" ); +const OUString UCBDeadPropertyValue::aTypeDouble + = OUString::createFromAscii( "double" ); // static -const rtl::OUString UCBDeadPropertyValue::aXMLPre - = rtl::OUString::createFromAscii( "<ucbprop><type>" ); -const rtl::OUString UCBDeadPropertyValue::aXMLMid - = rtl::OUString::createFromAscii( "</type><value>" ); -const rtl::OUString UCBDeadPropertyValue::aXMLEnd - = rtl::OUString::createFromAscii( "</value></ucbprop>" ); +const OUString UCBDeadPropertyValue::aXMLPre + = OUString::createFromAscii( "<ucbprop><type>" ); +const OUString UCBDeadPropertyValue::aXMLMid + = OUString::createFromAscii( "</type><value>" ); +const OUString UCBDeadPropertyValue::aXMLEnd + = OUString::createFromAscii( "</value></ucbprop>" ); #define STATE_TOP (1) @@ -116,7 +116,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Type already set!" ); pCtx->pType - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; case STATE_VALUE: @@ -124,7 +124,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Value already set!" ); pCtx->pValue - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; } return 0; // zero to continue, non-zero to abort parsing @@ -162,7 +162,7 @@ extern "C" int UCBDeadPropertyValue_endelement_callback( */ ////////////////////////////////////////////////////////////////////////// -static rtl::OUString encodeValue( const rtl::OUString & rValue ) +static OUString encodeValue( const OUString & rValue ) { // Note: I do not use the usual & + < + > encoding, because // I want to prevent any XML parser from trying to 'understand' @@ -177,7 +177,7 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) // PROPFIND: // - parser replaces < by > ==> error (not well formed) - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nCount = rValue.getLength(); @@ -194,14 +194,14 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) else aResult.append( c ); } - return rtl::OUString( aResult ); + return OUString( aResult ); } /* ////////////////////////////////////////////////////////////////////////// -static rtl::OUString decodeValue( const rtl::OUString & rValue ) +static OUString decodeValue( const OUString & rValue ) { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nPos = 0; @@ -219,7 +219,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } c = pValue[ nPos ]; @@ -232,7 +232,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 'e' == pValue[ nPos + 1 ] ) @@ -248,7 +248,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'l' == c ) @@ -259,7 +259,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -273,7 +273,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'g' == c ) @@ -284,7 +284,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -298,14 +298,14 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else @@ -314,7 +314,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) nPos++; } - return rtl::OUString( aResult ); + return OUString( aResult ); } */ @@ -322,7 +322,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) // static bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) { - if ( ( rType != getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) ) && ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) && @@ -348,7 +348,7 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) ////////////////////////////////////////////////////////////////////////// // static -bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, +bool UCBDeadPropertyValue::createFromXML( const OString & /*rInData*/, uno::Any & /*rOutData*/ ) { bool success = false; @@ -375,7 +375,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, if ( aCtx.pType && aCtx.pValue ) { // Decode aCtx.pValue! It may contain XML reserved chars. - rtl::OUString aStringValue = decodeValue( *aCtx.pValue ); + OUString aStringValue = decodeValue( *aCtx.pValue ); if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeString ) ) { rOutData <<= aStringValue; @@ -391,7 +391,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) { if ( aStringValue.equalsIgnoreAsciiCase( - rtl::OUString::createFromAscii( "true" ) ) ) + OUString::createFromAscii( "true" ) ) ) rOutData <<= sal_Bool( sal_True ); else rOutData <<= sal_Bool( sal_False ); @@ -435,17 +435,17 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, ////////////////////////////////////////////////////////////////////////// // static bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // <ucbprop><type>the_type</type><value>the_value</value></ucbprop> // Check property type. Extract type and value as string. const uno::Type& rType = rInData.getValueType(); - rtl::OUString aStringValue; - rtl::OUString aStringType; + OUString aStringValue; + OUString aStringType; - if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) { // string rInData >>= aStringValue; @@ -456,7 +456,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // long sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeLong; } else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) @@ -464,7 +464,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // short sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeShort; } else if ( rType == getCppuBooleanType() ) @@ -472,7 +472,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // boolean sal_Bool bValue = false; rInData >>= bValue; - aStringValue = rtl::OUString::valueOf( bValue ); + aStringValue = OUString::valueOf( bValue ); aStringType = aTypeBoolean; } else if ( rType == getCppuCharType() ) @@ -480,7 +480,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // char sal_Unicode cValue = 0; rInData >>= cValue; - aStringValue = rtl::OUString::valueOf( cValue ); + aStringValue = OUString::valueOf( cValue ); aStringType = aTypeChar; } else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) @@ -488,7 +488,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // byte sal_Int8 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( sal_Unicode( nValue ) ); + aStringValue = OUString::valueOf( sal_Unicode( nValue ) ); aStringType = aTypeByte; } else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) @@ -496,7 +496,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // hyper sal_Int64 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeHyper; } else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) @@ -504,7 +504,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // float float nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeFloat; } else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) @@ -512,7 +512,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // double double nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeDouble; } else diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index 7ed138fa7c86..be752b28cb69 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -31,27 +31,27 @@ namespace http_dav_ucp class UCBDeadPropertyValue { private: - static const rtl::OUString aTypeString; - static const rtl::OUString aTypeLong; - static const rtl::OUString aTypeShort; - static const rtl::OUString aTypeBoolean; - static const rtl::OUString aTypeChar; - static const rtl::OUString aTypeByte; - static const rtl::OUString aTypeHyper; - static const rtl::OUString aTypeFloat; - static const rtl::OUString aTypeDouble; - - static const rtl::OUString aXMLPre; - static const rtl::OUString aXMLMid; - static const rtl::OUString aXMLEnd; + static const OUString aTypeString; + static const OUString aTypeLong; + static const OUString aTypeShort; + static const OUString aTypeBoolean; + static const OUString aTypeChar; + static const OUString aTypeByte; + static const OUString aTypeHyper; + static const OUString aTypeFloat; + static const OUString aTypeDouble; + + static const OUString aXMLPre; + static const OUString aXMLMid; + static const OUString aXMLEnd; public: static bool supportsType( const com::sun::star::uno::Type & rType ); - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Any & rOutData ); static bool toXML( const com::sun::star::uno::Any & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index ed7d56cfe6f3..d2fad399f4ad 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,7 +188,7 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) m_xSMgr, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xCtx; xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), + OUString( "DefaultContext" ) ), uno::UNO_QUERY_THROW ); uno::Reference< task::XInteractionHandler > xIH( @@ -323,21 +323,21 @@ 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::createFromAscii( + return OUString::createFromAscii( "com.sun.star.comp.ucb.WebDAVContent" ); } //========================================================================= // 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 ); aSNS.getArray()[ 0 ] - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); + = OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); return aSNS; } @@ -348,7 +348,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { sal_Bool bFolder = sal_False; @@ -366,9 +366,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + return OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); - return rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + return OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); } //========================================================================= @@ -387,7 +387,7 @@ uno::Any SAL_CALL Content::execute( uno::RuntimeException ) { OSL_TRACE( ">>>>> Content::execute: start: command: %s, env: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr(), Environment.is() ? "present" : "missing" ); @@ -404,7 +404,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -425,7 +425,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -437,7 +437,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -477,7 +477,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -498,7 +498,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -560,7 +560,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -581,7 +581,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -621,7 +621,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -646,7 +646,7 @@ uno::Any SAL_CALL Content::execute( } OSL_TRACE( "<<<<< Content::execute: end: command: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); return aRet; @@ -683,7 +683,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //========================================================================= // virtual -void SAL_CALL Content::addProperty( const rtl::OUString& Name, +void SAL_CALL Content::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, @@ -810,7 +810,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, //========================================================================= // virtual -void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) +void SAL_CALL Content::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -940,14 +940,14 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + = OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( "Title" ), aProp ); + OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -955,7 +955,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + = OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -981,23 +981,23 @@ Content::createNewContent( const ucb::ContentInfo& Info ) ( Info.Type != WEBDAV_CONTENT_TYPE ) ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "WebdavContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); sal_Bool isCollection; if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { - aURL += rtl::OUString::createFromAscii( "New_Collection" ); + aURL += OUString::createFromAscii( "New_Collection" ); isCollection = sal_True; } else { - aURL += rtl::OUString::createFromAscii( "New_Content" ); + aURL += OUString::createFromAscii( "New_Content" ); isCollection = sal_False; } @@ -1021,7 +1021,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { // <scheme>:// -> "" // <scheme>://foo -> "" @@ -1030,7 +1030,7 @@ rtl::OUString Content::getParentURL() // <scheme>://foo/bar/ -> <scheme>://foo/ // <scheme>://foo/bar/abc -> <scheme>://foo/bar/ - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) @@ -1044,9 +1044,9 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 == -1 ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + return OUString( aURL.copy( 0, nPos + 1 ) ); } //========================================================================= @@ -1061,7 +1061,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, 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". @@ -1148,7 +1148,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::auto_ptr< ContentProperties > xProps; std::auto_ptr< ContentProperties > xCachedProps; std::auto_ptr< DAVResourceAccess > xResAccess; - rtl::OUString aUnescapedTitle; + OUString aUnescapedTitle; bool bHasAll = false; uno::Reference< lang::XMultiServiceFactory > xSMgr; uno::Reference< ucb::XContentIdentifier > xIdentifier; @@ -1168,7 +1168,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { // All properties are already in cache! No server access needed. @@ -1200,7 +1200,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { @@ -1216,7 +1216,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( !bHasAll ) { // Only DAV resources support PROPFIND - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( rProperties.getLength() ); @@ -1227,11 +1227,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProperties[ n ].Name; + const OUString & rName = rProperties[ n ].Name; - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = m_aFailedPropNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = m_aFailedPropNames.end(); while ( it != end ) @@ -1297,7 +1297,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( bNetworkAccessAllowed ) { // All properties obtained already? - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( !( xProps.get() && xProps->containsAllNames( rProperties, aMissingProps ) ) @@ -1306,7 +1306,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Possibly the missing props can be obtained using a HEAD // request. - std::vector< rtl::OUString > aHeaderNames; + std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, aHeaderNames, @@ -1366,7 +1366,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1376,16 +1376,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1402,12 +1402,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString rName = rProperties[ n ].Name; + const OUString rName = rProperties[ n ].Name; if ( rName == "BaseURI" ) { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1416,10 +1416,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( "IsFolder" ) ) + OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( "CreatableContentsInfo" ), + OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -1490,8 +1490,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aNewTitle; - rtl::OUString aOldTitle; + OUString aNewTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; uno::Reference< beans::XPropertySetInfo > xInfo; @@ -1501,7 +1501,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyValue& rValue = pValues[ n ]; - const rtl::OUString & rName = rValue.Name; + const OUString & rName = rValue.Name; beans::Property aTmpProp; xProvider->getProperty( rName, aTmpProp ); @@ -1510,7 +1510,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; @@ -1524,7 +1524,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1532,7 +1532,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1540,13 +1540,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1574,7 +1574,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Invalid content identifier!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1583,7 +1583,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1592,7 +1592,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1613,7 +1613,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is unknown!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; @@ -1623,7 +1623,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1631,7 +1631,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1639,7 +1639,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1648,7 +1648,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1656,7 +1656,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1722,7 +1722,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1785,9 +1785,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Assemble new content identifier... - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString::createFromAscii( "/" ); + aNewURL += OUString::createFromAscii( "/" ); aNewURL += SerfUri::escapeSegment( aNewTitle ); @@ -1826,18 +1826,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::createFromAscii( "Exchange failed!" ), + OUString::createFromAscii( "Exchange failed!" ), static_cast< cppu::OWeakObject * >( this ) ); } } catch ( DAVException const & e ) { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= MapDAVException( e, sal_True ); @@ -1848,7 +1848,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" ); + aEvent.PropertyName = OUString::createFromAscii( "Title" ); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1897,7 +1897,7 @@ uno::Any Content::open( { // Error: Not a folder! - rtl::OUStringBuffer aMsg; + OUStringBuffer aMsg; aMsg.appendAscii( "Non-folder resource cannot be " "opened as folder! Wrong Open Mode!" ); @@ -1923,14 +1923,14 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); // Unreachable } - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY ); if ( xOut.is() ) @@ -1948,7 +1948,7 @@ uno::Any Content::open( } DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -1993,7 +1993,7 @@ uno::Any Content::open( // fill inputsream sync; return if all data present DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; uno::Reference< io::XInputStream > xIn = xResAccess->GET( aHeaders, aResource, xEnv ); @@ -2030,7 +2030,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2117,7 +2117,7 @@ void Content::post( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2136,13 +2136,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); } sal_Int32 nLen = aURL.getLength(); @@ -2153,7 +2153,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? @@ -2185,7 +2185,7 @@ void Content::insert( throw( uno::Exception ) { sal_Bool bTransient, bCollection; - rtl::OUString aEscapedTitle; + OUString aEscapedTitle; std::auto_ptr< DAVResourceAccess > xResAccess; { @@ -2203,11 +2203,11 @@ void Content::insert( { OSL_ENSURE( sal_False, "Content::insert - Title missing!" ); - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" ); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString::createFromAscii( "Title" ); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -2236,7 +2236,7 @@ void Content::insert( { #undef ERROR ucb::UnsupportedNameClashException aEx( - rtl::OUString::createFromAscii( "Unable to write without overwrite!" ), + OUString::createFromAscii( "Unable to write without overwrite!" ), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2273,7 +2273,7 @@ void Content::insert( case ucbhelper::CONTINUATION_DISAPPROVE: // Abort. throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2283,7 +2283,7 @@ void Content::insert( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Unknown interaction selection!" ), uno::Reference< uno::XInterface >(), aExAsAny ); @@ -2301,9 +2301,9 @@ void Content::insert( if ( bTransient ) { // Assemble new content identifier... - rtl::OUString aURL = getParentURL(); + OUString aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); aURL += aEscapedTitle; @@ -2353,7 +2353,7 @@ void Content::insert( } else { - rtl::OUString aTitle; + OUString aTitle; try { SerfUri aURI( aURL ); @@ -2366,7 +2366,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTitle ) ), @@ -2400,7 +2400,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2443,7 +2443,7 @@ void Content::transfer( xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - rtl::OUString aTargetURI; + OUString aTargetURI; try { SerfUri sourceURI( rArgs.SourceURL ); @@ -2452,21 +2452,21 @@ void Content::transfer( // Check source's and target's URL scheme // - const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) ); + OUString::createFromAscii( HTTPS_URL_SCHEME ) ); } else { @@ -2475,7 +2475,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Unsupported URL scheme!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); @@ -2485,10 +2485,10 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2501,14 +2501,14 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Different hosts!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable } - rtl::OUString aTitle = rArgs.NewTitle; + OUString aTitle = rArgs.NewTitle; if ( aTitle.isEmpty() ) aTitle = sourceURI.GetPathBaseNameUnescaped(); @@ -2516,15 +2516,15 @@ void Content::transfer( if ( aTitle == "/" ) { // kso: ??? - aTitle = rtl::OUString(); + aTitle = OUString(); } targetURI.AppendPath( aTitle ); - rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); + OUString aTargetURL = xIdentifier->getContentIdentifier(); if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) != aTargetURL.getLength() ) - aTargetURL += rtl::OUString::createFromAscii( "/" ); + aTargetURL += OUString::createFromAscii( "/" ); aTargetURL += aTitle; @@ -2623,7 +2623,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTargetURI ) ), @@ -2642,7 +2642,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArgs.NameClash ) ), Environment ); @@ -2666,7 +2666,7 @@ void Content::destroy( sal_Bool bDeletePhysical ) throw( uno::Exception ) { // @@@ take care about bDeletePhysical -> trashcan support - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); uno::Reference< ucb::XContent > xThis = this; @@ -2730,7 +2730,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString::createFromAscii( "http://ucb.openoffice.org" ); + <<= OUString::createFromAscii( "http://ucb.openoffice.org" ); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2739,7 +2739,7 @@ void Content::lock( aOwnerAny, 180, // lock timeout in secs //-1, // infinite lock - uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString >() ); xResAccess->LOCK( aLock, Environment ); @@ -2805,7 +2805,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. // if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -2825,9 +2825,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(), @@ -2864,7 +2864,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" ); + aProperties[ 0 ].Name = OUString::createFromAscii( "IsFolder" ); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2887,12 +2887,12 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) // Map DAVException... uno::Any aException; - rtl::OUString aURL; + OUString aURL; if ( m_bTransient ) { aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); aURL += m_aEscapedTitle; } @@ -2907,13 +2907,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + OUString::createFromAscii("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Not found!" ), + OUString::createFromAscii( "Not found!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -2948,7 +2948,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_LOOKUP: aException <<= ucb::InteractiveNetworkResolveNameException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2965,7 +2965,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_CONNECT: aException <<= ucb::InteractiveNetworkConnectException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2986,7 +2986,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_INVALID_ARG: aException <<= lang::IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -2995,7 +2995,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) #if 1 aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked!" ), + OUString::createFromAscii( "Locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3004,13 +3004,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + OUString::createFromAscii("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Locked!" ), + OUString::createFromAscii( "Locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_LOCKING_VIOLATION, @@ -3022,7 +3022,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked (self)!" ), + OUString::createFromAscii( "Locked (self)!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3032,7 +3032,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString::createFromAscii( "Not locked!" ), + OUString::createFromAscii( "Not locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3041,7 +3041,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString::createFromAscii( "Lock expired!" ), + OUString::createFromAscii( "Lock expired!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3050,7 +3050,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) default: aException <<= ucb::InteractiveNetworkGeneralException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -3085,7 +3085,7 @@ void Content::cancelCommandExecution( } //========================================================================= -const rtl::OUString +const OUString Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -3093,8 +3093,8 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) // First, try to obtain value of response header "Content-Location". if ( m_xCachedProps.get() ) { - rtl::OUString aLocation; - m_xCachedProps->getValue( rtl::OUString( + OUString aLocation; + m_xCachedProps->getValue( OUString( "Content-Location" ) ) >>= aLocation; if ( aLocation.getLength() ) { @@ -3112,7 +3112,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) } } - return rtl::OUString( rResAccess->getURL() ); + return OUString( rResAccess->getURL() ); } //========================================================================= @@ -3128,8 +3128,8 @@ const Content::ResourceType & Content::getResourceType( ResourceType eResourceType; eResourceType = m_eResourceType; - const rtl::OUString & rURL = rResAccess->getURL(); - const rtl::OUString aScheme( + const OUString & rURL = rResAccess->getURL(); + const OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); try @@ -3138,16 +3138,16 @@ const Content::ResourceType & Content::getResourceType( // used when loading documents... along with identifying whether // this is a DAV resource. std::vector< DAVResource > resources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( 5 ); aProperties[ 0 ].Name - = rtl::OUString::createFromAscii( "IsFolder" ); + = OUString::createFromAscii( "IsFolder" ); aProperties[ 1 ].Name - = rtl::OUString::createFromAscii( "IsDocument" ); + = OUString::createFromAscii( "IsDocument" ); aProperties[ 2 ].Name - = rtl::OUString::createFromAscii( "IsReadOnly" ); + = OUString::createFromAscii( "IsReadOnly" ); aProperties[ 3 ].Name - = rtl::OUString::createFromAscii( "MediaType" ); + = OUString::createFromAscii( "MediaType" ); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 1e649f3071c1..6ffbd222b072 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -77,13 +77,13 @@ class Content : public ::ucbhelper::ContentImplHelper, std::auto_ptr< DAVResourceAccess > m_xResAccess; std::auto_ptr< CachableContentProperties > m_xCachedProps; // locally cached props - rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; ResourceType m_eResourceType; ContentProvider* m_pProvider; // No need for a ref, base class holds object bool m_bTransient; bool m_bCollection; bool m_bDidGetOrHead; - std::vector< rtl::OUString > m_aFailedPropNames; + std::vector< OUString > m_aFailedPropNames; private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > @@ -92,7 +92,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(); sal_Bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -120,7 +120,7 @@ private: exchangeIdentity( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& xNewId ); - const rtl::OUString + const OUString getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); const ResourceType & @@ -215,16 +215,16 @@ 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 ); @@ -243,7 +243,7 @@ public: // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -252,7 +252,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -286,7 +286,7 @@ public: const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 8a0e57ae90a8..f075ba0d6665 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -46,7 +46,7 @@ using namespace http_dav_ucp; //========================================================================= bool ContentProvider::getProperty( - const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp, bool bStrict ) { if ( !m_pProps ) { @@ -62,15 +62,15 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( 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 ) ); m_pProps->insert( beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -78,7 +78,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -86,16 +86,16 @@ bool ContentProvider::getProperty( m_pProps->insert( 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 UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -103,7 +103,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "DateModified" ), + OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -111,15 +111,15 @@ bool ContentProvider::getProperty( m_pProps->insert( 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::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -127,15 +127,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -149,7 +149,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::CREATIONDATE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -157,14 +157,14 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::DISPLAYNAME, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); m_pProps->insert( beans::Property( DAVProperties::GETCONTENTLANGUAGE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -172,7 +172,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTLENGTH, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -180,7 +180,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTTYPE , -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -188,7 +188,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETETAG, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -196,7 +196,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETLASTMODIFIED, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -213,7 +213,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::RESOURCETYPE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -231,7 +231,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::EXECUTABLE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); } } @@ -256,7 +256,7 @@ bool ContentProvider::getProperty( rProp = beans::Property( rPropName, - 1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); } @@ -289,7 +289,7 @@ uno::Sequence< beans::Property > Content::getProperties( xProvider.set( m_pProvider ); } - typedef std::set< rtl::OUString > StringSet; + typedef std::set< OUString > StringSet; StringSet aPropSet; // No server access for just created (not yet committed) objects. @@ -330,8 +330,8 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Bool bHasCreatableInfos = sal_False; { - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); - std::set< rtl::OUString >::const_iterator end = aPropSet.end(); + std::set< OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator end = aPropSet.end(); while ( it != end ) { if ( !bHasCreationDate && @@ -401,21 +401,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( "ContentType" ) ); + OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "Title" ) ); + OUString( "Title" ) ); } // Add optional properties. @@ -424,34 +424,34 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "BaseURI" ) ); + OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( "DateCreated" ) ); + OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( "DateModified" ) ); + OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( "MediaType" ) ); + OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( "Size" ) ); + OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( + OUString( "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) { - const std::set< rtl::OUString >::const_iterator set_end + const std::set< OUString >::const_iterator set_end = aPropSet.end(); const std::auto_ptr< PropertyValueMap > & xProps @@ -473,7 +473,7 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Int32 nCount = aPropSet.size(); uno::Sequence< beans::Property > aProperties( nCount ); - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator it = aPropSet.begin(); beans::Property aProp; for ( sal_Int32 n = 0; n < nCount; ++n, ++it ) @@ -500,23 +500,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -527,18 +527,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -549,7 +549,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( "post" ), + OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -582,13 +582,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); @@ -603,13 +603,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "lock" ), + OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "unlock" ), + OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 1d1523ff84de..a50bb7e312bf 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -43,7 +43,7 @@ namespace http_dav_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -126,13 +126,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 ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( aId.getLength() ) { // Already cached. @@ -142,23 +142,23 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); + OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); const ContentProperties& props = *( m_pImpl->m_aResults[ nIndex ]->pData ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString::createFromAscii( "/" ); + aId += OUString::createFromAscii( "/" ); aId += props.getEscapedTitle(); if ( props.isTrailingSlash() ) - aId += rtl::OUString::createFromAscii( "/" ); + aId += OUString::createFromAscii( "/" ); m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -179,7 +179,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( aId.getLength() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -342,7 +342,7 @@ sal_Bool DataSupplier::getData() if ( !m_pImpl->m_bCountFinal ) { - std::vector< rtl::OUString > propertyNames; + std::vector< OUString > propertyNames; ContentProperties::UCBNamesToDAVNames( getResultSet()->getProperties(), propertyNames ); @@ -350,9 +350,9 @@ sal_Bool DataSupplier::getData() // needed to get a valid ContentProperties::pIsFolder value, which // is needed for OpenMode handling. - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = propertyNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = propertyNames.end(); while ( it != end ) @@ -389,7 +389,7 @@ sal_Bool DataSupplier::getData() { SerfUri aURI( m_pImpl->m_xContent->getResourceAccess().getURL() ); - rtl::OUString aPath = aURI.GetPath(); + OUString aPath = aURI.GetPath(); if ( aPath.getStr()[ aPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -409,7 +409,7 @@ sal_Bool DataSupplier::getData() try { SerfUri aCurrURI( rRes.uri ); - rtl::OUString aCurrPath = aCurrURI.GetPath(); + OUString aCurrPath = aCurrURI.GetPath(); if ( aCurrPath.getStr()[ aCurrPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -443,7 +443,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( + OUString( "IsFolder" ) ); rValue >>= bFolder; @@ -459,7 +459,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( + OUString( "IsDocument" ) ); rValue >>= bDocument; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 32db6aa01f1a..c645c47cae00 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -48,7 +48,7 @@ public: 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 ); diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 21befa3fb5ea..0d4d0916bd9d 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -78,9 +78,9 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString::createFromAscii( + OUString::createFromAscii( "com.sun.star.comp.WebDAVContentProvider" ), - rtl::OUString::createFromAscii( + OUString::createFromAscii( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= @@ -107,7 +107,7 @@ ContentProvider::queryContent( { // Check URL scheme... - const rtl::OUString aScheme + const OUString aScheme = Identifier->getContentProviderScheme().toAsciiLowerCase(); if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME && aScheme != DAV_URL_SCHEME && @@ -115,7 +115,7 @@ ContentProvider::queryContent( throw ucb::IllegalIdentifierException(); // Normalize URL and create new Id, if nessacary. - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // At least: <scheme> + "://" if ( aURL.getLength() < ( aScheme.getLength() + 3 ) ) @@ -133,7 +133,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTP_URL_SCHEME ) ); bNewId = true; } @@ -141,7 +141,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTP_URL_SCHEME ) ); bNewId = true; } @@ -149,7 +149,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTPS_URL_SCHEME ) ); bNewId = true; } @@ -165,7 +165,7 @@ ContentProvider::queryContent( nPos = aURL.indexOf( '/', nPos + 1 ); if ( nPos == -1 ) { - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); bNewId = true; } } diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index a09e420c91b2..ee5169ca0de4 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -104,7 +104,7 @@ public: rtl::Reference< DAVSessionFactory > getDAVSessionFactory() { return m_xDAVSessionFactory; } - bool getProperty( const ::rtl::OUString & rPropName, + bool getProperty( const OUString & rPropName, ::com::sun::star::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 32489d3a6ee4..f61efc81e220 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -48,10 +48,10 @@ namespace WebDAVNamespace_last }; - WebDAVNamespace StrToWebDAVNamespace(const rtl::OUString& rStr) + WebDAVNamespace StrToWebDAVNamespace(const OUString& rStr) { - static ::rtl::OUString aStrDAV(::rtl::OUString::createFromAscii("DAV:")); - static ::rtl::OUString aStrUcbOpenofficeOrgDAVProps(::rtl::OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); + static OUString aStrDAV(OUString::createFromAscii("DAV:")); + static OUString aStrUcbOpenofficeOrgDAVProps(OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); if(rStr.equals(aStrDAV)) { @@ -97,33 +97,33 @@ namespace WebDAVName_last }; - WebDAVName StrToWebDAVName(const rtl::OUString& rStr) + WebDAVName StrToWebDAVName(const OUString& rStr) { - typedef std::hash_map< rtl::OUString, WebDAVName, rtl::OUStringHash > WebDAVNameMapper; - typedef std::pair< rtl::OUString, WebDAVName > WebDAVNameValueType; + typedef std::hash_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper; + typedef std::pair< OUString, WebDAVName > WebDAVNameValueType; static WebDAVNameMapper aWebDAVNameMapperList; if(aWebDAVNameMapperList.empty()) { - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("response"), WebDAVName_response)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("href"), WebDAVName_href)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("propstat"), WebDAVName_propstat)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("prop"), WebDAVName_prop)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("collection"), WebDAVName_collection)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("locktype"), WebDAVName_locktype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("write"), WebDAVName_write)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("shared"), WebDAVName_shared)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("status"), WebDAVName_status)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("response"), WebDAVName_response)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("href"), WebDAVName_href)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("propstat"), WebDAVName_propstat)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("prop"), WebDAVName_prop)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("collection"), WebDAVName_collection)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("locktype"), WebDAVName_locktype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("write"), WebDAVName_write)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("shared"), WebDAVName_shared)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("status"), WebDAVName_status)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); } const WebDAVNameMapper::const_iterator aResult(aWebDAVNameMapperList.find(rStr)); @@ -144,37 +144,37 @@ namespace namespace { - typedef std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap; - typedef std::pair< const ::rtl::OUString, ::rtl::OUString > NamespaceValueType; + typedef std::map< OUString, OUString > NamespaceMap; + typedef std::pair< const OUString, OUString > NamespaceValueType; class WebDAVContext { private: WebDAVContext* mpParent; NamespaceMap maNamespaceMap; - ::rtl::OUString maWhiteSpace; + OUString maWhiteSpace; - ::rtl::OUString maNamespace; - ::rtl::OUString maName; + OUString maNamespace; + OUString maName; WebDAVNamespace maWebDAVNamespace; WebDAVName maWebDAVName; // local helpers void parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs); - ::rtl::OUString mapNamespaceToken(const ::rtl::OUString& rToken) const; - void splitName(const ::rtl::OUString& rSource); + OUString mapNamespaceToken(const OUString& rToken) const; + void splitName(const OUString& rSource); public: - WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); + WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); ~WebDAVContext(); WebDAVContext* getParent() const { return mpParent; } - ::rtl::OUString& getWhiteSpace() { return maWhiteSpace; } - void setWhiteSpace(const ::rtl::OUString& rNew) { maWhiteSpace = rNew; } + OUString& getWhiteSpace() { return maWhiteSpace; } + void setWhiteSpace(const OUString& rNew) { maWhiteSpace = rNew; } - const ::rtl::OUString& getNamespace() const { return maNamespace; } - const ::rtl::OUString& getName() const { return maName; } + const OUString& getNamespace() const { return maNamespace; } + const OUString& getName() const { return maName; } const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; } const WebDAVName getWebDAVName() const { return maWebDAVName; } }; @@ -182,11 +182,11 @@ namespace void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs) { const sal_Int16 nAttributes(xAttribs->getLength()); - static ::rtl::OUString aStrXmlns(::rtl::OUString::createFromAscii("xmlns")); + static OUString aStrXmlns(OUString::createFromAscii("xmlns")); for(sal_Int16 a(0); a < nAttributes; a++) { - const ::rtl::OUString aName(xAttribs->getNameByIndex(a)); + const OUString aName(xAttribs->getNameByIndex(a)); const sal_Int32 nLen(aName.getLength()); if(nLen) @@ -197,7 +197,7 @@ namespace if(-1 != nIndex && nIndex + 1 < nLen) { - const ::rtl::OUString aToken(aName.copy(nIndex + 1)); + const OUString aToken(aName.copy(nIndex + 1)); maNamespaceMap.insert(NamespaceValueType(aToken, xAttribs->getValueByIndex(a))); } @@ -206,7 +206,7 @@ namespace } } - ::rtl::OUString WebDAVContext::mapNamespaceToken(const ::rtl::OUString& rToken) const + OUString WebDAVContext::mapNamespaceToken(const OUString& rToken) const { NamespaceMap::const_iterator iter = maNamespaceMap.find(rToken); @@ -227,7 +227,7 @@ namespace } } - void WebDAVContext::splitName(const ::rtl::OUString& rSource) + void WebDAVContext::splitName(const OUString& rSource) { const sal_Int32 nLen(rSource.getLength()); maNamespace = ""; @@ -245,7 +245,7 @@ namespace } } - WebDAVContext::WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) + WebDAVContext::WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) : mpParent(pParent), maNamespaceMap(), maWhiteSpace(), @@ -293,12 +293,12 @@ namespace std::vector< http_dav_ucp::DAVResourceInfo > maResult_PropName; WebDAVContext* mpContext; - ::rtl::OUString maHref; - ::rtl::OUString maStatus; + OUString maHref; + OUString maStatus; std::vector< http_dav_ucp::DAVPropertyValue > maResponseProperties; std::vector< http_dav_ucp::DAVPropertyValue > maPropStatProperties; - std::vector< ::rtl::OUString > maResponseNames; - std::vector< ::rtl::OUString > maPropStatNames; + std::vector< OUString > maResponseNames; + std::vector< OUString > maPropStatNames; uno::Sequence< ucb::LockEntry > maLockEntries; ucb::LockScope maLockScope; ucb::LockType maLockType; @@ -355,11 +355,11 @@ namespace // Methods XDocumentHandler virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; } @@ -405,7 +405,7 @@ namespace OSL_ENSURE(!mpContext, "Parser end with existing content (!)"); } - void SAL_CALL WebDAVResponseParser::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_Int32 nLen(aName.getLength()); @@ -498,7 +498,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_Int32 nLen(aName.getLength()); OSL_ENSURE(mpContext, "Parser EndElement without content (!)"); @@ -550,7 +550,7 @@ namespace // getlastmodified end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getlastmodified")); + static OUString aStr(OUString::createFromAscii("DAV:getlastmodified")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -564,7 +564,7 @@ namespace // creationdate end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:creationdate")); + static OUString aStr(OUString::createFromAscii("DAV:creationdate")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -587,12 +587,12 @@ namespace // resourcetype end, check for collection if(hasParent(WebDAVName_prop)) { - static rtl::OUString aStrA(rtl::OUString::createFromAscii("DAV:resourcetype")); - static rtl::OUString aStrB(rtl::OUString::createFromAscii("collection")); + static OUString aStrA(OUString::createFromAscii("DAV:resourcetype")); + static OUString aStrB(OUString::createFromAscii("collection")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStrA; - aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : rtl::OUString()); + aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : OUString()); maPropStatProperties.push_back(aDAVPropertyValue); } break; @@ -602,7 +602,7 @@ namespace // getcontentlength end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontentlength")); + static OUString aStr(OUString::createFromAscii("DAV:getcontentlength")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -616,7 +616,7 @@ namespace // getcontenttype end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontenttype")); + static OUString aStr(OUString::createFromAscii("DAV:getcontenttype")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -630,7 +630,7 @@ namespace // supportedlock end if(hasParent(WebDAVName_prop) && maLockEntries.hasElements()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:supportedlock")); + static OUString aStr(OUString::createFromAscii("DAV:supportedlock")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -689,7 +689,7 @@ namespace // propstat end, check status if(maStatus.getLength()) { - static ::rtl::OUString aStrStatusOkay(::rtl::OUString::createFromAscii("HTTP/1.1 200 OK")); + static OUString aStrStatusOkay(OUString::createFromAscii("HTTP/1.1 200 OK")); if(maStatus.equals(aStrStatusOkay)) { @@ -759,7 +759,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { // collect whitespace over evtl. several calls in mpContext OSL_ENSURE(mpContext, "Parser characters without content (!)"); @@ -768,16 +768,16 @@ namespace if(mpContext && nLen) { // remove leading/trailing blanks and CRLF - const ::rtl::OUString aTrimmedChars(aChars.trim()); + const OUString aTrimmedChars(aChars.trim()); if(aTrimmedChars.getLength()) { - ::rtl::OUString aNew(mpContext->getWhiteSpace()); + OUString aNew(mpContext->getWhiteSpace()); if(aNew.getLength()) { // add one char when appending (see html1.1 spec) - aNew += ::rtl::OUString(sal_Unicode(' ')); + aNew += OUString(sal_Unicode(' ')); } aNew += aTrimmedChars; @@ -786,11 +786,11 @@ namespace } } - void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) { } - void SAL_CALL WebDAVResponseParser::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) { } |