diff options
Diffstat (limited to 'ucb/source/ucp')
-rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 13 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontentprovider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 5 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydata.cxx | 11 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyuri.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgprovider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx | 3 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_provider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavcontent.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavprovider.cxx | 2 |
15 files changed, 32 insertions, 32 deletions
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 932828d919c5..dfe83a00a1c1 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -118,7 +118,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString("com.sun.star.comp.CmisContentProvider"), - OUString("com.sun.star.ucb.CmisContentProvider") ); + "com.sun.star.ucb.CmisContentProvider" ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 54760b826e5a..ac930844121a 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -1121,7 +1121,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // as child dstUncPath = m_aUncPath; - dstUncPath += ( OUString("/") + NewTitle ); + dstUncPath += "/" + NewTitle; sal_Int32 NameClash = aTransferInfo.NameClash; diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 04f3bf725876..d57ffa8aef21 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -202,7 +202,7 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames() css::uno::Sequence< OUString > FTPContent::getSupportedServiceNames_Static() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = OUString( "com.sun.star.ucb.FTPContent"); + aSNS.getArray()[ 0 ] = "com.sun.star.ucb.FTPContent"; return aSNS; } @@ -636,9 +636,9 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, } } -#define FTP_FILE OUString( "application/vnd.sun.staroffice.ftp-file") +#define FTP_FILE "application/vnd.sun.staroffice.ftp-file" -#define FTP_FOLDER OUString( "application/vnd.sun.staroffice.ftp-folder") +#define FTP_FOLDER "application/vnd.sun.staroffice.ftp-folder" Sequence<ContentInfo > SAL_CALL FTPContent::queryCreatableContentsInfo( ) @@ -846,8 +846,8 @@ Reference< XRow > FTPContent::getPropertyValues( if(Name == "ContentType") xRow->appendString(seqProp[i], aDirEntry.m_nMode&INETCOREFTP_FILEMODE_ISDIR - ? FTP_FOLDER - : FTP_FILE ); + ? OUString(FTP_FOLDER) + : OUString(FTP_FILE) ); else if(Name == "IsReadOnly") xRow->appendBoolean(seqProp[i], aDirEntry.m_nMode @@ -906,8 +906,7 @@ Sequence<Any> FTPContent::setPropertyValues( try { OUString OldTitle = m_aFTPURL.ren(Title); evt.realloc(1); - evt[0].PropertyName = - OUString("Title"); + evt[0].PropertyName = "Title"; evt[0].Further = false; evt[0].PropertyHandle = -1; evt[0].OldValue <<= OldTitle; diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 07051ab758e9..a31a4b29b82a 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -148,7 +148,7 @@ FTPContentProvider_CreateInstance( const css::uno::Reference< css::uno::Sequence< OUString > FTPContentProvider::getSupportedServiceNames_Static() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME); + aSNS.getArray()[ 0 ] = FTP_CONTENT_PROVIDER_SERVICE_NAME; return aSNS; } diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 61ecd56855df..8f3b1237204b 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -1323,7 +1323,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( m_aProps.setTitle( aOldTitle ); m_aProps.setName ( aOldName ); - aOldTitle = aOldName = ""; + aOldTitle.clear(); + aOldName.clear(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( @@ -1804,7 +1805,7 @@ void HierarchyContent::transfer( ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; - aInfo.NewTitle = ""; + aInfo.NewTitle.clear(); aInfo.SourceURL = aChildId; aInfo.NameClash = rInfo.NameClash; diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 774a45be8131..0cd59ac93c29 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -292,7 +292,7 @@ bool HierarchyEntry::setData( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; @@ -556,7 +556,7 @@ bool HierarchyEntry::move( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aOldParentPath; aArguments[ 0 ] <<= aProperty; @@ -580,7 +580,7 @@ bool HierarchyEntry::move( { bDifferentParents = true; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aNewParentPath; aArguments[ 0 ] <<= aProperty; @@ -817,7 +817,7 @@ bool HierarchyEntry::remove() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; @@ -1056,8 +1056,7 @@ HierarchyEntry::getRootReadAccess() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( - CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 6355d86d99de..7a107c1e7b29 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -106,7 +106,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider, OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), - OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) ); + HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ); diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index b5964c722053..0c4b25957114 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -50,7 +50,9 @@ 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 = ""; + m_aService.clear(); + m_aParentUri.clear(); + m_aName.clear(); // URI must match at least: <sheme>: if ( ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 ) ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index c91b3d3c0d53..d51af504df8e 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -229,7 +229,7 @@ Content* Content::create( OUString Content::getContentType( const OUString& aScheme, bool bFolder ) { - return ( OUString("application/") + return ( "application/" + aScheme + ( bFolder ? OUString("-folder") @@ -1390,7 +1390,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Do not set new title! - aNewTitle = ""; + aNewTitle.clear(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( @@ -2040,7 +2040,7 @@ void Content::transfer( ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; - aInfo.NewTitle = ""; + aInfo.NewTitle.clear(); aInfo.SourceURL = aChildId; aInfo.NameClash = rInfo.NameClash; diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index c07465810b71..b21f727b5663 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -168,7 +168,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.ucb.PackageContentProvider" ), - OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) ); + PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ); diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 910fe4f694aa..7ddd1545e0b9 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -1345,7 +1345,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Roll-back. m_aProps.setTitle( aOldTitle ); - aOldTitle = ""; + aOldTitle.clear(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index bdda0fa5c96b..2318d3af2ddb 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -96,8 +96,7 @@ DocumentContentFactory::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = OUString( - "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ); + = "com.sun.star.frame.TransientDocumentsDocumentContentFactory"; return aSNS; } diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index a21939ec81b9..cce79c3e7ad0 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -112,7 +112,7 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ), - OUString( TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ); + TDOC_CONTENT_PROVIDER_SERVICE_NAME ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 84e479226d7a..ec74be984cd7 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -1879,7 +1879,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Do not set new title! - aNewTitle = ""; + aNewTitle.clear(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( @@ -1890,7 +1890,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & e ) { // Do not set new title! - aNewTitle = ""; + aNewTitle.clear(); // Set error . aRet[ nTitlePos ] <<= MapDAVException( e, true ); @@ -2572,7 +2572,7 @@ void Content::transfer( if ( aTitle == "/" ) { // kso: ??? - aTitle = ""; + aTitle.clear(); } targetURI.AppendPath( aTitle ); diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index bdaa4d071466..1a8b91be4f17 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -109,7 +109,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.WebDAVContentProvider" ), - OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); + WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ); |