diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-14 09:41:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-15 18:02:14 +0200 |
| commit | 045a21f08abff10592fe303abf0f311a83777e81 (patch) | |
| tree | 9c5fe8e292d1850737a68836df77bc999d2742a9 | |
| parent | 534d3818aedfa95ad73935235462f5ec2817f5da (diff) | |
loplugin:ostr in ucb
Change-Id: Ic2209e0fbc7035a909eebdbb085d77c9353988cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167655
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
59 files changed, 1110 insertions, 1112 deletions
diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx index a457bc6d2b28..e042fd5c783e 100644 --- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx +++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx @@ -38,56 +38,56 @@ namespace { //try URL decomposition CurlUri aURI(u"http://user%40anothername@server.biz:8040/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0" ); - CPPUNIT_ASSERT_EQUAL( OUString( "http" ), aURI.GetScheme() ); - CPPUNIT_ASSERT_EQUAL( OUString( "server.biz" ), aURI.GetHost() ); - CPPUNIT_ASSERT_EQUAL( OUString( "user%40anothername" ), aURI.GetUser() ); + CPPUNIT_ASSERT_EQUAL( u"http"_ustr, aURI.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( u"server.biz"_ustr, aURI.GetHost() ); + CPPUNIT_ASSERT_EQUAL( u"user%40anothername"_ustr, aURI.GetUser() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16( 8040 ), aURI.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString( "/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0" ), aURI.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( u"/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0"_ustr, aURI.GetRelativeReference() ); CurlUri uri2(aURI.CloneWithRelativeRefPathAbsolute(u"/foo/bar")); - CPPUNIT_ASSERT_EQUAL( OUString("http"), uri2.GetScheme() ); - CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri2.GetHost() ); - CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri2.GetUser() ); + CPPUNIT_ASSERT_EQUAL( u"http"_ustr, uri2.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( u"server.biz"_ustr, uri2.GetHost() ); + CPPUNIT_ASSERT_EQUAL( u"user%40anothername"_ustr, uri2.GetUser() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri2.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() ); - CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/foo/bar"), uri2.GetURI() ); + CPPUNIT_ASSERT_EQUAL( u"/foo/bar"_ustr, uri2.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( u"http://user%40anothername@server.biz:8040/foo/bar"_ustr, uri2.GetURI() ); CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query#fragment")); - CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() ); - CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() ); - CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser() ); + CPPUNIT_ASSERT_EQUAL( u"http"_ustr, uri3.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( u"server.biz"_ustr, uri3.GetHost() ); + CPPUNIT_ASSERT_EQUAL( u"user%40anothername"_ustr, uri3.GetUser() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString("/?query#fragment"), uri3.GetRelativeReference() ); - CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/?query#fragment"), uri3.GetURI() ); + CPPUNIT_ASSERT_EQUAL( u"/?query#fragment"_ustr, uri3.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( u"http://user%40anothername@server.biz:8040/?query#fragment"_ustr, uri3.GetURI() ); } void webdav_local_test::WebdavUriTest2() { CurlUri aURI(u"https://foo:bar@server.biz:8040/aService#aaa" ); - CPPUNIT_ASSERT_EQUAL( OUString("https"), aURI.GetScheme() ); - CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), aURI.GetHost() ); - CPPUNIT_ASSERT_EQUAL( OUString("foo"), aURI.GetUser() ); - CPPUNIT_ASSERT_EQUAL( OUString("bar"), aURI.GetPassword() ); + CPPUNIT_ASSERT_EQUAL( u"https"_ustr, aURI.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( u"server.biz"_ustr, aURI.GetHost() ); + CPPUNIT_ASSERT_EQUAL( u"foo"_ustr, aURI.GetUser() ); + CPPUNIT_ASSERT_EQUAL( u"bar"_ustr, aURI.GetPassword() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16( 8040 ), aURI.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString( "/aService#aaa" ), aURI.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( u"/aService#aaa"_ustr, aURI.GetRelativeReference() ); CurlUri uri2(aURI.CloneWithRelativeRefPathAbsolute(u"/foo/bar")); - CPPUNIT_ASSERT_EQUAL( OUString("https"), uri2.GetScheme() ); - CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri2.GetHost() ); - CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri2.GetUser() ); - CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri2.GetPassword() ); + CPPUNIT_ASSERT_EQUAL( u"https"_ustr, uri2.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( u"server.biz"_ustr, uri2.GetHost() ); + CPPUNIT_ASSERT_EQUAL( u"foo"_ustr, uri2.GetUser() ); + CPPUNIT_ASSERT_EQUAL( u"bar"_ustr, uri2.GetPassword() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16( 8040 ), uri2.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() ); - CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/foo/bar"), uri2.GetURI() ); + CPPUNIT_ASSERT_EQUAL( u"/foo/bar"_ustr, uri2.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( u"https://foo:bar@server.biz:8040/foo/bar"_ustr, uri2.GetURI() ); CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query")); - CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() ); - CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() ); - CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() ); - CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() ); + CPPUNIT_ASSERT_EQUAL( u"https"_ustr, uri3.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( u"server.biz"_ustr, uri3.GetHost() ); + CPPUNIT_ASSERT_EQUAL( u"foo"_ustr, uri3.GetUser() ); + CPPUNIT_ASSERT_EQUAL( u"bar"_ustr, uri3.GetPassword() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() ); - CPPUNIT_ASSERT_EQUAL( OUString("/?query"), uri3.GetRelativeReference() ); - CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/?query"), uri3.GetURI() ); + CPPUNIT_ASSERT_EQUAL( u"/?query"_ustr, uri3.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( u"https://foo:bar@server.biz:8040/?query"_ustr, uri3.GetURI() ); } CPPUNIT_TEST_SUITE_REGISTRATION( webdav_local_test ); diff --git a/ucb/qa/cppunit/webdav/webdav_options.cxx b/ucb/qa/cppunit/webdav/webdav_options.cxx index d8e3d0946c77..e03c9466dfe0 100644 --- a/ucb/qa/cppunit/webdav/webdav_options.cxx +++ b/ucb/qa/cppunit/webdav/webdav_options.cxx @@ -137,7 +137,7 @@ namespace DAVTypesCheckInit( aDavOpt ); //example of allowed method for a Web resource - OUString aAllowedMethods = "POST,OPTIONS,GET,HEAD,TRACE"; + OUString aAllowedMethods = u"POST,OPTIONS,GET,HEAD,TRACE"_ustr; aDavOpt.setAllowedMethods( aAllowedMethods ); // now check... CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isClass1() ); @@ -204,7 +204,7 @@ namespace aDavOpt.setRequestedTimeLife( 0 ); - OUString aHTTPResponseStatusText = "522 Origin Connection Time-out"; + OUString aHTTPResponseStatusText = u"522 Origin Connection Time-out"_ustr; aDavOpt.setHttpResponseStatusCode( 522 ); aDavOpt.setHttpResponseStatusText( aHTTPResponseStatusText ); CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isClass1() ); @@ -223,7 +223,7 @@ namespace aHTTPResponseStatusText.clear(); aDavOpt.setHttpResponseStatusText( aHTTPResponseStatusText ); - OUString aURL = "http://my.server.org/a%20fake%20url/to%20test"; + OUString aURL = u"http://my.server.org/a%20fake%20url/to%20test"_ustr; aDavOpt.setURL( aURL ); CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isClass1() ); CPPUNIT_ASSERT_EQUAL( false, aDavOpt.isClass2() ); @@ -347,14 +347,14 @@ namespace // the returned value to test DAVOptions aDavOptCached; // init the values - OUString aURL = "http://my.server.org/a%20fake%20url/to%20test/another-url"; + OUString aURL = u"http://my.server.org/a%20fake%20url/to%20test/another-url"_ustr; aDavOpt.setURL( aURL ); - aDavOpt.setRedirectedURL( "http://my.server.org/a%20fake%20url/to%20test/another-url/redirected" ); + aDavOpt.setRedirectedURL( u"http://my.server.org/a%20fake%20url/to%20test/another-url/redirected"_ustr ); aDavOpt.setClass1(); aDavOpt.setClass2(); aDavOpt.setClass3(); aDavOpt.setHeadAllowed( false ); - aDavOpt.setAllowedMethods( "OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK" ); + aDavOpt.setAllowedMethods( u"OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK"_ustr ); // add to cache aDAVOptsCache.addDAVOptions( aDavOpt, 30000 ); CPPUNIT_ASSERT_EQUAL( true ,aDAVOptsCache.getDAVOptions( aURL, aDavOptCached ) ); diff --git a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx index da790442e744..7e5bd26ebff1 100644 --- a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx +++ b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx @@ -51,7 +51,7 @@ namespace void webdav_propcache_test::PropfindCacheElemTests( ) { - OUString aTheURL( "http:://server/path/filename.odt" ); + OUString aTheURL( u"http:://server/path/filename.odt"_ustr ); PropertyNames aPropsNames( aTheURL ); CPPUNIT_ASSERT_EQUAL( aTheURL, aPropsNames.getURL() ); @@ -63,15 +63,15 @@ namespace CPPUNIT_ASSERT_EQUAL( maxTime, aPropsNames.getStaleTime() ); std::vector < OUString > properties { - "DAV:lockdiscovery", - "DAV:supportedlock", - "DAV:resourcetype", - "DAV:displayname", - "DAV:getlastmodified", - "DAV:getcontentlength", - "DAV:creationdate", - "DAV:getetag", - "DAV:authticket", + u"DAV:lockdiscovery"_ustr, + u"DAV:supportedlock"_ustr, + u"DAV:resourcetype"_ustr, + u"DAV:displayname"_ustr, + u"DAV:getlastmodified"_ustr, + u"DAV:getcontentlength"_ustr, + u"DAV:creationdate"_ustr, + u"DAV:getetag"_ustr, + u"DAV:authticket"_ustr, }; DAVResourceInfo aSingleInfo { properties }; @@ -90,22 +90,22 @@ namespace void webdav_propcache_test::PropfindCacheTests( ) { PropertyNamesCache PropCache; - OUString aTheURL( "http:://server/path/filename.odt" ); + OUString aTheURL( u"http:://server/path/filename.odt"_ustr ); PropertyNames aPropsNames( aTheURL ); // check cache emptiness CPPUNIT_ASSERT_EQUAL( false, PropCache.getCachedPropertyNames( aTheURL, aPropsNames ) ); std::vector < OUString > properties { - "DAV:lockdiscovery", - "DAV:supportedlock", - "DAV:resourcetype", - "DAV:displayname", - "DAV:getlastmodified", - "DAV:getcontentlength", - "DAV:creationdate", - "DAV:getetag", - "DAV:authticket", + u"DAV:lockdiscovery"_ustr, + u"DAV:supportedlock"_ustr, + u"DAV:resourcetype"_ustr, + u"DAV:displayname"_ustr, + u"DAV:getlastmodified"_ustr, + u"DAV:getcontentlength"_ustr, + u"DAV:creationdate"_ustr, + u"DAV:getetag"_ustr, + u"DAV:authticket"_ustr, }; DAVResourceInfo aSingleInfo { properties }; diff --git a/ucb/qa/cppunit/webdav/webdav_resource_access.cxx b/ucb/qa/cppunit/webdav/webdav_resource_access.cxx index 2379139c04a3..5d161d9f1267 100644 --- a/ucb/qa/cppunit/webdav/webdav_resource_access.cxx +++ b/ucb/qa/cppunit/webdav/webdav_resource_access.cxx @@ -52,17 +52,17 @@ namespace void webdav_resource_access_test::DAVCheckRetries() { // instantiate a resource access class - DAVResourceAccess ResourceAccess(nullptr, nullptr, "http://url"); + DAVResourceAccess ResourceAccess(nullptr, nullptr, u"http://url"_ustr); // first check: all http errors from 100 to 399 should return true, to force a retry for (auto i = SC_CONTINUE; i < SC_BAD_REQUEST; i++) { - const DAVException aTheException(DAVException::DAV_HTTP_ERROR, "http error code", i ); + const DAVException aTheException(DAVException::DAV_HTTP_ERROR, u"http error code"_ustr, i ); CPPUNIT_ASSERT_EQUAL( true , ResourceAccess.handleException( aTheException, 1 ) ); } // http error code from 400 to 499 should NOT force a retry for (auto i = SC_BAD_REQUEST; i < SC_INTERNAL_SERVER_ERROR; i++) { - const DAVException aTheException(DAVException::DAV_HTTP_ERROR, "http error code", i ); + const DAVException aTheException(DAVException::DAV_HTTP_ERROR, u"http error code"_ustr, i ); CPPUNIT_ASSERT_EQUAL( false , ResourceAccess.handleException( aTheException, 1 ) ); } @@ -72,7 +72,7 @@ namespace // RFC poses no limit to the max value of response status code for (auto i = SC_INTERNAL_SERVER_ERROR; i < 2000; i++) { - const DAVException aTheException(DAVException::DAV_HTTP_ERROR, "http error code", i ); + const DAVException aTheException(DAVException::DAV_HTTP_ERROR, u"http error code"_ustr, i ); switch ( i ) { // the HTTP response status codes that can be retried @@ -90,7 +90,7 @@ namespace // check the retry request { - const DAVException aTheException(DAVException::DAV_HTTP_RETRY, "the-host-name", 8080 ); + const DAVException aTheException(DAVException::DAV_HTTP_RETRY, u"the-host-name"_ustr, 8080 ); CPPUNIT_ASSERT_EQUAL( true , ResourceAccess.handleException( aTheException, 1 ) ); } } diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 89552ceca2a0..4ae55da582e8 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -912,7 +912,7 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet OUString SAL_CALL CachedContentResultSet::getImplementationName() { - return "com.sun.star.comp.ucb.CachedContentResultSet"; + return u"com.sun.star.comp.ucb.CachedContentResultSet"_ustr; } sal_Bool SAL_CALL CachedContentResultSet::supportsService( const OUString& ServiceName ) @@ -922,7 +922,7 @@ sal_Bool SAL_CALL CachedContentResultSet::supportsService( const OUString& Servi css::uno::Sequence< OUString > SAL_CALL CachedContentResultSet::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedContentResultSet" }; + return { u"com.sun.star.ucb.CachedContentResultSet"_ustr }; } @@ -1998,7 +1998,7 @@ CachedContentResultSetFactory::~CachedContentResultSetFactory() OUString SAL_CALL CachedContentResultSetFactory::getImplementationName() { - return "com.sun.star.comp.ucb.CachedContentResultSetFactory"; + return u"com.sun.star.comp.ucb.CachedContentResultSetFactory"_ustr; } sal_Bool SAL_CALL CachedContentResultSetFactory::supportsService( const OUString& ServiceName ) { @@ -2006,7 +2006,7 @@ sal_Bool SAL_CALL CachedContentResultSetFactory::supportsService( const OUString } css::uno::Sequence< OUString > SAL_CALL CachedContentResultSetFactory::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedContentResultSetFactory" }; + return { u"com.sun.star.ucb.CachedContentResultSetFactory"_ustr }; } // Service factory implementation. diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 5679d49bb622..6064e7f6ff21 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -42,8 +42,8 @@ CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet > , m_bFirstFetchSizePropagationDone( false ) , m_nLastFetchSize( 1 )//this value is not important at all , m_bLastFetchDirection( true )//this value is not important at all - , m_aPropertyNameForFetchSize( OUString("FetchSize") ) - , m_aPropertyNameForFetchDirection( OUString("FetchDirection") ) + , m_aPropertyNameForFetchSize( u"FetchSize"_ustr ) + , m_aPropertyNameForFetchDirection( u"FetchDirection"_ustr ) { impl_init(); } @@ -163,7 +163,7 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub OUString SAL_CALL CachedContentResultSetStub::getImplementationName() { - return "com.sun.star.comp.ucb.CachedContentResultSetStub"; + return u"com.sun.star.comp.ucb.CachedContentResultSetStub"_ustr; } sal_Bool SAL_CALL CachedContentResultSetStub::supportsService( const OUString& ServiceName ) @@ -173,7 +173,7 @@ sal_Bool SAL_CALL CachedContentResultSetStub::supportsService( const OUString& S css::uno::Sequence< OUString > SAL_CALL CachedContentResultSetStub::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedContentResultSetStub" }; + return { u"com.sun.star.ucb.CachedContentResultSetStub"_ustr }; } @@ -506,7 +506,7 @@ CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory() OUString SAL_CALL CachedContentResultSetStubFactory::getImplementationName() { - return "com.sun.star.comp.ucb.CachedContentResultSetStubFactory"; + return u"com.sun.star.comp.ucb.CachedContentResultSetStubFactory"_ustr; } sal_Bool SAL_CALL CachedContentResultSetStubFactory::supportsService( const OUString& ServiceName ) { @@ -514,7 +514,7 @@ sal_Bool SAL_CALL CachedContentResultSetStubFactory::supportsService( const OUSt } css::uno::Sequence< OUString > SAL_CALL CachedContentResultSetStubFactory::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedContentResultSetStubFactory" }; + return { u"com.sun.star.ucb.CachedContentResultSetStubFactory"_ustr }; } // Service factory implementation. diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 1ec42873dd25..c9f8933b22f6 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -118,7 +118,7 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet OUString SAL_CALL CachedDynamicResultSet::getImplementationName() { - return "com.sun.star.comp.ucb.CachedDynamicResultSet"; + return u"com.sun.star.comp.ucb.CachedDynamicResultSet"_ustr; } sal_Bool SAL_CALL CachedDynamicResultSet::supportsService( const OUString& ServiceName ) @@ -128,7 +128,7 @@ sal_Bool SAL_CALL CachedDynamicResultSet::supportsService( const OUString& Servi css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSet::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedDynamicResultSet" }; + return { u"com.sun.star.ucb.CachedDynamicResultSet"_ustr }; } @@ -160,7 +160,7 @@ CachedDynamicResultSetFactory::~CachedDynamicResultSetFactory() OUString SAL_CALL CachedDynamicResultSetFactory::getImplementationName() { - return "com.sun.star.comp.ucb.CachedDynamicResultSetFactory"; + return u"com.sun.star.comp.ucb.CachedDynamicResultSetFactory"_ustr; } sal_Bool SAL_CALL CachedDynamicResultSetFactory::supportsService( const OUString& ServiceName ) { @@ -168,7 +168,7 @@ sal_Bool SAL_CALL CachedDynamicResultSetFactory::supportsService( const OUString } css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSetFactory::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedDynamicResultSetFactory" }; + return { u"com.sun.star.ucb.CachedDynamicResultSetFactory"_ustr }; } // Service factory implementation. diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index e9f508014f1a..eac5d7db439d 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -120,7 +120,7 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub OUString SAL_CALL CachedDynamicResultSetStub::getImplementationName() { - return "com.sun.star.comp.ucb.CachedDynamicResultSetStub"; + return u"com.sun.star.comp.ucb.CachedDynamicResultSetStub"_ustr; } sal_Bool SAL_CALL CachedDynamicResultSetStub::supportsService( const OUString& ServiceName ) @@ -130,7 +130,7 @@ sal_Bool SAL_CALL CachedDynamicResultSetStub::supportsService( const OUString& S css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSetStub::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedDynamicResultSetStub" }; + return { u"com.sun.star.ucb.CachedDynamicResultSetStub"_ustr }; } @@ -151,7 +151,7 @@ CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory() OUString SAL_CALL CachedDynamicResultSetStubFactory::getImplementationName() { - return "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory"; + return u"com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory"_ustr; } sal_Bool SAL_CALL CachedDynamicResultSetStubFactory::supportsService( const OUString& ServiceName ) { @@ -159,7 +159,7 @@ sal_Bool SAL_CALL CachedDynamicResultSetStubFactory::supportsService( const OUSt } css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSetStubFactory::getSupportedServiceNames() { - return { "com.sun.star.ucb.CachedDynamicResultSetStubFactory" }; + return { u"com.sun.star.ucb.CachedDynamicResultSetStubFactory"_ustr }; } // Service factory implementation. diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 319af18a6c23..ca7752378a9d 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -113,7 +113,7 @@ public: virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) override; OUString SAL_CALL getImplementationName() override - { return "com.sun.star.comp.ucb.SimpleFileAccess"; } + { return u"com.sun.star.comp.ucb.SimpleFileAccess"_ustr; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } @@ -237,7 +237,7 @@ void OFileAccess::transferImpl( const OUString& rSource, { css::uno::Any anyEx = cppu::getCaughtException(); throw css::lang::WrappedTargetRuntimeException( - "OFileAccess::transferrImpl - Unable to obtain destination folder URL!", + u"OFileAccess::transferrImpl - Unable to obtain destination folder URL!"_ustr, getXWeak(), anyEx ); } @@ -246,7 +246,7 @@ void OFileAccess::transferImpl( const OUString& rSource, } throw RuntimeException( - "OFileAccess::transferrImpl - Unable to obtain destination folder URL!", + u"OFileAccess::transferrImpl - Unable to obtain destination folder URL!"_ustr, getXWeak() ); } @@ -286,7 +286,7 @@ void OFileAccess::kill( const OUString& FileURL ) ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() ); try { - aCnt.executeCommand( "delete", Any( true ) ); + aCnt.executeCommand( u"delete"_ustr, Any( true ) ); } catch ( css::ucb::CommandFailedException const & ) { @@ -311,7 +311,7 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL ) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() ); - Any aRetAny = aCnt.getPropertyValue("IsReadOnly"); + Any aRetAny = aCnt.getPropertyValue(u"IsReadOnly"_ustr); bool bRet = false; aRetAny >>= bRet; return bRet; @@ -321,7 +321,7 @@ void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() ); - aCnt.setPropertyValue("IsReadOnly", Any(bReadOnly) ); + aCnt.setPropertyValue(u"IsReadOnly"_ustr, Any(bReadOnly) ); } void OFileAccess::createFolder( const OUString& NewFolderURL ) @@ -365,7 +365,7 @@ void OFileAccess::createFolder( const OUString& NewFolderURL ) ucbhelper::Content aNew; try { - if ( !aCnt.insertNewContent( rCurr.Type, { "Title" }, { Any(aTitle) }, aNew ) ) + if ( !aCnt.insertNewContent( rCurr.Type, { u"Title"_ustr }, { Any(aTitle) }, aNew ) ) continue; // Success. We're done. @@ -387,7 +387,7 @@ sal_Int32 OFileAccess::getSize( const OUString& FileURL ) sal_Int64 nTemp = 0; INetURLObject aObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() ); - aCnt.getPropertyValue( "Size" ) >>= nTemp; + aCnt.getPropertyValue( u"Size"_ustr ) >>= nTemp; nSize = static_cast<sal_Int32>(nTemp); return nSize; } @@ -409,7 +409,7 @@ css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) Reference< XCommandEnvironment > aCmdEnv; ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aCmdEnv, comphelper::getProcessComponentContext() ); - aYoung.getPropertyValue("DateModified") >>= aDateTime; + aYoung.getPropertyValue(u"DateModified"_ustr) >>= aDateTime; return aDateTime; } @@ -524,7 +524,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) try { - aCnt.executeCommand( "open", aCmdArg ); + aCnt.executeCommand( u"open"_ustr, aCmdArg ); } catch ( InteractiveIOException const & e ) { @@ -541,7 +541,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) aInsertArg.ReplaceExisting = false; aCmdArg <<= aInsertArg; - aCnt.executeCommand( "insert", aCmdArg ); + aCnt.executeCommand( u"insert"_ustr, aCmdArg ); // Retry... return openFileReadWrite( FileURL ); @@ -594,7 +594,7 @@ bool OFileAccess::createNewFile( const OUString & rParentURL, { ucbhelper::Content aNew; if ( aParentCnt.insertNewContent( - rCurr.Type, { "Title" }, { Any(rTitle) }, data, aNew ) ) + rCurr.Type, { u"Title"_ustr }, { Any(rTitle) }, data, aNew ) ) return true; // success. else continue; @@ -665,7 +665,7 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL ) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() ); - Any aRetAny = aCnt.getPropertyValue("IsHidden"); + Any aRetAny = aCnt.getPropertyValue(u"IsHidden"_ustr); bool bRet = false; aRetAny >>= bRet; return bRet; @@ -675,7 +675,7 @@ void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden ) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() ); - aCnt.setPropertyValue("IsHidden", Any(bHidden) ); + aCnt.setPropertyValue(u"IsHidden"_ustr, Any(bHidden) ); } diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 9189f0e0f0aa..7fb4ef776566 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -66,7 +66,7 @@ void SAL_CALL UcbCommandEnvironment::initialize( // virtual OUString SAL_CALL UcbCommandEnvironment::getImplementationName() { - return "com.sun.star.comp.ucb.CommandEnvironment"; + return u"com.sun.star.comp.ucb.CommandEnvironment"_ustr; } @@ -82,7 +82,7 @@ UcbCommandEnvironment::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL UcbCommandEnvironment::getSupportedServiceNames() { - return { "com.sun.star.ucb.CommandEnvironment" }; + return { u"com.sun.star.ucb.CommandEnvironment"_ustr }; } diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 68b329e83708..54ba56b33165 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -52,7 +52,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory() OUString SAL_CALL UcbContentProviderProxyFactory::getImplementationName() { - return "com.sun.star.comp.ucb.UcbContentProviderProxyFactory"; + return u"com.sun.star.comp.ucb.UcbContentProviderProxyFactory"_ustr; } sal_Bool SAL_CALL UcbContentProviderProxyFactory::supportsService( const OUString& ServiceName ) { @@ -60,7 +60,7 @@ sal_Bool SAL_CALL UcbContentProviderProxyFactory::supportsService( const OUStrin } css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxyFactory::getSupportedServiceNames() { - return { "com.sun.star.ucb.ContentProviderProxyFactory" }; + return { u"com.sun.star.ucb.ContentProviderProxyFactory"_ustr }; } // Service factory implementation. @@ -177,7 +177,7 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() OUString SAL_CALL UcbContentProviderProxy::getImplementationName() { - return "com.sun.star.comp.ucb.UcbContentProviderProxy"; + return u"com.sun.star.comp.ucb.UcbContentProviderProxy"_ustr; } sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& ServiceName ) @@ -187,7 +187,7 @@ sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& Serv css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedServiceNames() { - return { "com.sun.star.ucb.ContentProviderProxy" }; + return { u"com.sun.star.ucb.ContentProviderProxy"_ustr }; } diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 56dd74bb4d8a..43e5ca0ab096 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -281,7 +281,7 @@ void SAL_CALL UniversalContentBroker::removeEventListener( OUString SAL_CALL UniversalContentBroker::getImplementationName() { - return "com.sun.star.comp.ucb.UniversalContentBroker"; + return u"com.sun.star.comp.ucb.UniversalContentBroker"_ustr; } sal_Bool SAL_CALL UniversalContentBroker::supportsService( const OUString& ServiceName ) { @@ -289,7 +289,7 @@ sal_Bool SAL_CALL UniversalContentBroker::supportsService( const OUString& Servi } css::uno::Sequence< OUString > SAL_CALL UniversalContentBroker::getSupportedServiceNames() { - return { "com.sun.star.ucb.UniversalContentBroker" }; + return { u"com.sun.star.ucb.UniversalContentBroker"_ustr }; } @@ -318,14 +318,14 @@ void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any && m_aArguments[1] == aArguments[1])) { throw IllegalArgumentException( - "UCB reinitialized with different arguments", + u"UCB reinitialized with different arguments"_ustr, getXWeak(), 0); } return; } if (!aArguments.hasElements()) { - m_aArguments = { Any(OUString("Local")), Any(OUString("Office")) }; + m_aArguments = { Any(u"Local"_ustr), Any(u"Office"_ustr) }; } else { @@ -580,7 +580,7 @@ Any SAL_CALL UniversalContentBroker::execute( { ucbhelper::cancelCommandExecution( Any( IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -604,7 +604,7 @@ Any SAL_CALL UniversalContentBroker::execute( { ucbhelper::cancelCommandExecution( Any( IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -794,7 +794,7 @@ bool UniversalContentBroker::getContentProviderData( uno::Reference< uno::XInterface > xInterface( xConfigProv->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", + u"com.sun.star.configuration.ConfigurationAccess"_ustr, aArguments ) ); if ( !m_xNotifier.is() ) diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 5bcfb1f99ff9..64a34df8d70d 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -426,13 +426,13 @@ bool setTitle( { try { - uno::Sequence< beans::PropertyValue > aPropValues{ { /* Name */ "Title", + uno::Sequence< beans::PropertyValue > aPropValues{ { /* Name */ u"Title"_ustr, /* Handle */ -1, /* Value */ uno::Any(rNewTitle), /* State */ {} } }; ucb::Command aSetPropsCommand( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, uno::Any( aPropValues ) ); @@ -492,15 +492,15 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, aArgs, rContext.xOrigEnv, - "Target is no XCommandProcessor!", + u"Target is no XCommandProcessor!"_ustr, rContext.xProcessor ); // Unreachable } - uno::Sequence< beans::Property > aPropsToObtain{ makeProperty("CreatableContentsInfo", -1) }; + uno::Sequence< beans::Property > aPropsToObtain{ makeProperty(u"CreatableContentsInfo"_ustr, -1) }; ucb::Command aGetPropsCommand( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, uno::Any( aPropsToObtain ) ); @@ -539,7 +539,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, aArgs, rContext.xOrigEnv, - "Target is no XContentCreator!", + u"Target is no XContentCreator!"_ustr, rContext.xProcessor ); // Unreachable } @@ -557,7 +557,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, aArgs, rContext.xOrigEnv, - "No types creatable!", + u"No types creatable!"_ustr, rContext.xProcessor ); // Unreachable } @@ -594,7 +594,7 @@ uno::Reference< ucb::XContent > createNew( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Unknown transfer operation!", + u"Unknown transfer operation!"_ustr, rContext.xProcessor, -1 ) ), rContext.xOrigEnv ); @@ -613,7 +613,7 @@ uno::Reference< ucb::XContent > createNew( // First, try it using "CreatabeleContentsInfo" property and // "createNewContent" command -> the "new" way. ucb::Command aCreateNewCommand( - "createNewContent", + u"createNewContent"_ustr, -1, uno::Any( *pTypeInfo ) ); @@ -638,7 +638,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, aArgs, rContext.xOrigEnv, - "createNewContent failed!", + u"createNewContent failed!"_ustr, rContext.xProcessor ); // Unreachable } @@ -654,7 +654,7 @@ void transferProperties( const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorN ) { ucb::Command aGetPropertySetInfoCommand( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, uno::Any() ); @@ -672,7 +672,7 @@ void transferProperties( ucb::IOErrorCode_CANT_READ, aArgs, rContext.xOrigEnv, - "Unable to get propertyset info from source object!", + u"Unable to get propertyset info from source object!"_ustr, rContext.xProcessor ); // Unreachable } @@ -680,7 +680,7 @@ void transferProperties( uno::Sequence< beans::Property > aAllProps = xInfo->getProperties(); ucb::Command aGetPropsCommand1( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, uno::Any( aAllProps ) ); @@ -698,7 +698,7 @@ void transferProperties( ucb::IOErrorCode_CANT_READ, aArgs, rContext.xOrigEnv, - "Unable to get properties from source object!", + u"Unable to get properties from source object!"_ustr, rContext.xProcessor ); // Unreachable } @@ -792,7 +792,7 @@ void transferProperties( // Set properties at new object. ucb::Command aSetPropsCommand( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, uno::Any( aPropValues ) ); @@ -824,7 +824,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused ucb::Command aOpenCommand( - "open", + u"open"_ustr, -1, uno::Any( aArg ) ); @@ -858,7 +858,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); ucb::Command aOpenCommand( - "open", + u"open"_ustr, -1, uno::Any( aArg ) ); @@ -890,11 +890,11 @@ uno::Reference< sdbc::XResultSet > getResultSet( aArg.Mode = ucb::OpenMode::ALL; aArg.Priority = 0; // unused aArg.Sink = nullptr; - aArg.Properties = { makeProperty("IsFolder", -1 /* unknown */), - makeProperty("IsDocument", -1 /* unknown */), - makeProperty("TargetURL", -1 /* unknown */) }; + aArg.Properties = { makeProperty(u"IsFolder"_ustr, -1 /* unknown */), + makeProperty(u"IsDocument"_ustr, -1 /* unknown */), + makeProperty(u"TargetURL"_ustr, -1 /* unknown */) }; - ucb::Command aOpenCommand( "open", + ucb::Command aOpenCommand( u"open"_ustr, -1, uno::Any( aArg ) ); try @@ -930,10 +930,10 @@ void handleNameClashRename( sal_Int32 nTry = 0; // Obtain old title. - uno::Sequence< beans::Property > aProps{ makeProperty("Title", -1) }; + uno::Sequence< beans::Property > aProps{ makeProperty(u"Title"_ustr, -1) }; ucb::Command aGetPropsCommand( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, uno::Any( aProps ) ); @@ -950,7 +950,7 @@ void handleNameClashRename( ucb::IOErrorCode_CANT_READ, aArgs, rContext.xOrigEnv, - "Unable to get properties from new object!", + u"Unable to get properties from new object!"_ustr, rContext.xProcessor ); // Unreachable } @@ -960,7 +960,7 @@ void handleNameClashRename( { ucbhelper::cancelCommandExecution( uno::Any( beans::UnknownPropertyException( - "Unable to get property 'Title' from new object!", + u"Unable to get property 'Title' from new object!"_ustr, rContext.xProcessor ) ), rContext.xOrigEnv ); // Unreachable @@ -1033,7 +1033,7 @@ void handleNameClashRename( ucb::IOErrorCode_CANT_READ, aArgs, rContext.xOrigEnv, - "Got no data stream from source!", + u"Got no data stream from source!"_ustr, rContext.xProcessor ); // Unreachable } @@ -1045,7 +1045,7 @@ void handleNameClashRename( aArg.ReplaceExisting = false; ucb::Command aInsertCommand( - "insert", + u"insert"_ustr, -1, uno::Any( aArg ) ); @@ -1069,7 +1069,7 @@ void handleNameClashRename( ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedNameClashException( - "Unable to resolve name clash!", + u"Unable to resolve name clash!"_ustr, rContext.xProcessor, ucb::NameClash::RENAME ) ), rContext.xOrigEnv ); @@ -1090,7 +1090,7 @@ void globalTransfer_( { ucbhelper::cancelCommandExecution( uno::Any( beans::UnknownPropertyException( - "Unable to get property 'IsFolder' from source object!", + u"Unable to get property 'IsFolder' from source object!"_ustr, rContext.xProcessor ) ), rContext.xOrigEnv ); // Unreachable @@ -1102,7 +1102,7 @@ void globalTransfer_( { ucbhelper::cancelCommandExecution( uno::Any( beans::UnknownPropertyException( - "Unable to get property 'IsDocument' from source object!", + u"Unable to get property 'IsDocument' from source object!"_ustr, rContext.xProcessor ) ), rContext.xOrigEnv ); // Unreachable @@ -1131,7 +1131,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_CREATE, aArgs, rContext.xOrigEnv, - "No matching content type at target!", + u"No matching content type at target!"_ustr, rContext.xProcessor ); // Unreachable } @@ -1145,7 +1145,7 @@ void globalTransfer_( if ( !xCommandProcessorN.is() ) { uno::Any aProps(beans::PropertyValue( - "Uri", + u"Uri"_ustr, -1, uno::Any( xNew->getIdentifier()-> @@ -1155,7 +1155,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - "New content is not a XCommandProcessor!", + u"New content is not a XCommandProcessor!"_ustr, rContext.xProcessor ); // Unreachable } @@ -1174,7 +1174,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, aArgs, rContext.xOrigEnv, - "Source content is not a XCommandProcessor!", + u"Source content is not a XCommandProcessor!"_ustr, rContext.xProcessor ); // Unreachable } @@ -1239,7 +1239,7 @@ void globalTransfer_( try { ucb::Command aInsertCommand( - "insert", + u"insert"_ustr, -1, uno::Any( aArg ) ); @@ -1257,8 +1257,8 @@ void globalTransfer_( // No chance to solve name clashes, because I'm not able to detect // whether there is one. throw ucb::UnsupportedNameClashException( - "Unable to resolve name clashes, no chance to detect " - "that there is one!", + u"Unable to resolve name clashes, no chance to detect " + "that there is one!"_ustr, rContext.xProcessor, rContext.aArg.NameClash ); } @@ -1284,8 +1284,8 @@ void globalTransfer_( ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedNameClashException( - "BUG: insert + replace == true MUST NOT " - "throw NameClashException.", + u"BUG: insert + replace == true MUST NOT " + "throw NameClashException."_ustr, rContext.xProcessor, rContext.aArg.NameClash ) ), rContext.xOrigEnv ); @@ -1331,8 +1331,8 @@ void globalTransfer_( case ABORT: throw ucb::CommandFailedException( - "abort requested via interaction " - "handler", + u"abort requested via interaction " + "handler"_ustr, uno::Reference< uno::XInterface >(), aExc ); // break; @@ -1362,7 +1362,7 @@ void globalTransfer_( { // error setting title. Abort. throw ucb::CommandFailedException( - "error setting Title property!", + u"error setting Title property!"_ustr, uno::Reference< uno::XInterface >(), aExc ); } @@ -1380,8 +1380,8 @@ void globalTransfer_( ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedNameClashException( - "default action, don't know how to " - "handle name clash", + u"default action, don't know how to " + "handle name clash"_ustr, rContext.xProcessor, rContext.aArg.NameClash ) ), rContext.xOrigEnv ); @@ -1409,7 +1409,7 @@ void globalTransfer_( { uno::Any aProps( beans::PropertyValue( - "Uri", + u"Uri"_ustr, -1, uno::Any(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1417,7 +1417,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - "Unable to get properties from children of source!", + u"Unable to get properties from children of source!"_ustr, rContext.xProcessor ); // Unreachable } @@ -1435,7 +1435,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, aArgs, rContext.xOrigEnv, - "Unable to get children of source!", + u"Unable to get children of source!"_ustr, rContext.xProcessor ); // Unreachable } @@ -1493,7 +1493,7 @@ void globalTransfer_( aAny = xcp->execute( ucb::Command( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, uno::Any()), 0, @@ -1571,7 +1571,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Can't instantiate target object!", + u"Can't instantiate target object!"_ustr, this ); // Unreachable } @@ -1591,7 +1591,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Target content is not a XCommandProcessor!", + u"Target content is not a XCommandProcessor!"_ustr, this ); // Unreachable } @@ -1612,7 +1612,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - "transfer", // Name + u"transfer"_ustr, // Name -1, // Handle uno::Any( aTransferArg ) ); // Argument @@ -1649,7 +1649,7 @@ void UniversalContentBroker::globalTransfer( aTransferArg.MimeType ); ucb::Command aCommand1( - "transfer", + u"transfer"_ustr, -1, uno::Any( aTransferArg1 ) ); @@ -1692,8 +1692,8 @@ void UniversalContentBroker::globalTransfer( case ABORT: throw ucb::CommandFailedException( - "abort requested via interaction " - "handler", + u"abort requested via interaction " + "handler"_ustr, uno::Reference< uno::XInterface >(), aExc ); // break; @@ -1749,7 +1749,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Can't instantiate source object!", + u"Can't instantiate source object!"_ustr, this ); // Unreachable } @@ -1766,20 +1766,20 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Source content is not a XCommandProcessor!", + u"Source content is not a XCommandProcessor!"_ustr, this ); // Unreachable } // Obtain interesting property values from source... - uno::Sequence< beans::Property > aProps{ makeProperty("IsFolder", -1 /* unknown */), - makeProperty("IsDocument", -1 /* unknown */), - makeProperty("TargetURL", -1 /* unknown */), - makeProperty("BaseURI", -1 /* unknown */) }; + uno::Sequence< beans::Property > aProps{ makeProperty(u"IsFolder"_ustr, -1 /* unknown */), + makeProperty(u"IsDocument"_ustr, -1 /* unknown */), + makeProperty(u"TargetURL"_ustr, -1 /* unknown */), + makeProperty(u"BaseURI"_ustr, -1 /* unknown */) }; ucb::Command aGetPropsCommand( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, uno::Any( aProps ) ); @@ -1796,7 +1796,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Unable to get properties from source object!", + u"Unable to get properties from source object!"_ustr, this ); // Unreachable } @@ -1828,7 +1828,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - "delete", // Name + u"delete"_ustr, // Name -1, // Handle uno::Any( true ) ); // Argument @@ -1881,7 +1881,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Can't instantiate target object!", + u"Can't instantiate target object!"_ustr, this ); // Unreachable } @@ -1898,7 +1898,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Target content is not a XCommandProcessor!", + u"Target content is not a XCommandProcessor!"_ustr, this ); // Unreachable } @@ -1906,7 +1906,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, try { ucb::Command aCommand( - "checkin", -1, + u"checkin"_ustr, -1, uno::Any( rArg ) ); aRet = xCommandProcessor->execute( aCommand, 0, xLocalEnv ); diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 808923adafd4..aa7bf73f7fbc 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -47,142 +47,142 @@ using namespace com::sun::star::uno; UcbPropertiesManager::UcbPropertiesManager() : m_pProps({ - { "Account", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "AutoUpdateInterval", -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT }, - { "ConfirmEmpty", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "ConnectionLimit", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "ConnectionMode", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "ContentCountLimit", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "ContentType", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "Cookie", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "CrossReferences", -1, + { u"Account"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"AutoUpdateInterval"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT }, + { u"ConfirmEmpty"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"ConnectionLimit"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"ConnectionMode"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"ContentCountLimit"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"Cookie"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"CrossReferences"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::CrossReference>>::get(), ATTR_DEFAULT }, - { "DateCreated", -1, cppu::UnoType<css::util::DateTime>::get(), + { u"DateCreated"_ustr, -1, cppu::UnoType<css::util::DateTime>::get(), ATTR_DEFAULT }, - { "DateModified", -1, cppu::UnoType<css::util::DateTime>::get(), + { u"DateModified"_ustr, -1, cppu::UnoType<css::util::DateTime>::get(), ATTR_DEFAULT }, - { "DeleteOnServer", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "DocumentBody", -1, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), + { u"DeleteOnServer"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"DocumentBody"_ustr, -1, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), ATTR_DEFAULT }, - { "DocumentCount", -1, cppu::UnoType<sal_Int32>::get(), + { u"DocumentCount"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "DocumentCountMarked", -1, cppu::UnoType<sal_Int32>::get(), + { u"DocumentCountMarked"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "DocumentHeader", -1, + { u"DocumentHeader"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::DocumentHeaderField>>::get(), ATTR_DEFAULT }, - { "DocumentStoreMode", -1, + { u"DocumentStoreMode"_ustr, -1, cppu::UnoType<css::ucb::DocumentStoreMode>::get(), ATTR_DEFAULT }, - { "DocumentViewMode", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "FTPAccount", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "Flags", -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT }, - { "FolderCount", -1, cppu::UnoType<sal_Int32>::get(), + { u"DocumentViewMode"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"FTPAccount"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"Flags"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT }, + { u"FolderCount"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "FolderViewMode", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "FreeSpace", -1, cppu::UnoType<sal_Int64>::get(), + { u"FolderViewMode"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"FreeSpace"_ustr, -1, cppu::UnoType<sal_Int64>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "HasDocuments", -1, cppu::UnoType<bool>::get(), + { u"HasDocuments"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "HasFolders", -1, cppu::UnoType<bool>::get(), + { u"HasFolders"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "IsAutoDelete", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsAutoUpdate", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsDocument", -1, cppu::UnoType<bool>::get(), + { u"IsAutoDelete"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsAutoUpdate"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "IsFolder", -1, cppu::UnoType<bool>::get(), + { u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "IsKeepExpired", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsLimitedContentCount", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsMarked", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsRead", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsReadOnly", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsSubscribed", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "IsTimeLimitedStore", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "Keywords", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "LocalBase", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageBCC", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageBody", -1, cppu::UnoType<css::ucb::XDataContainer>::get(), + { u"IsKeepExpired"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsLimitedContentCount"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsMarked"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsRead"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsReadOnly"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsSubscribed"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"IsTimeLimitedStore"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"Keywords"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"LocalBase"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageBCC"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageBody"_ustr, -1, cppu::UnoType<css::ucb::XDataContainer>::get(), ATTR_DEFAULT }, - { "MessageCC", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageFrom", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageId", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageInReplyTo", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageReplyTo", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "MessageTo", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "NewsGroups", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "NoCacheList", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "Origin", -1, cppu::UnoType<OUString>::get(), + { u"MessageCC"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageFrom"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageId"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageInReplyTo"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageReplyTo"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"MessageTo"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"NewsGroups"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"NoCacheList"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"Origin"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "OutgoingMessageRecipients", -1, + { u"OutgoingMessageRecipients"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::RecipientInfo>>::get(), ATTR_DEFAULT }, - { "OutgoingMessageState", -1, + { u"OutgoingMessageState"_ustr, -1, cppu::UnoType<css::ucb::OutgoingMessageState>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "OutgoingMessageViewMode", -1, cppu::UnoType<sal_Int16>::get(), + { u"OutgoingMessageViewMode"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "Password", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "Priority", -1, cppu::UnoType<css::ucb::Priority>::get(), ATTR_DEFAULT }, - { "References", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "Referer", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "Rules", -1, cppu::UnoType<css::ucb::RuleSet>::get(), ATTR_DEFAULT }, - { "SearchCriteria", -1, cppu::UnoType<css::ucb::RuleSet>::get(), + { u"Password"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"Priority"_ustr, -1, cppu::UnoType<css::ucb::Priority>::get(), ATTR_DEFAULT }, + { u"References"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"Referer"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"Rules"_ustr, -1, cppu::UnoType<css::ucb::RuleSet>::get(), ATTR_DEFAULT }, + { u"SearchCriteria"_ustr, -1, cppu::UnoType<css::ucb::RuleSet>::get(), ATTR_DEFAULT }, - { "SearchIndirections", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "SearchLocations", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "SearchRecursive", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "SeenCount", -1, cppu::UnoType<sal_Int32>::get(), + { u"SearchIndirections"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"SearchLocations"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"SearchRecursive"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"SeenCount"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "SendCopyTarget", -1, + { u"SendCopyTarget"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendInfo>>::get(), ATTR_DEFAULT }, - { "SendFormats", -1, + { u"SendFormats"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendMediaTypes>>::get(), ATTR_DEFAULT }, - { "SendFroms", -1, + { u"SendFroms"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendInfo>>::get(), ATTR_DEFAULT }, - { "SendPasswords", -1, + { u"SendPasswords"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendInfo>>::get(), ATTR_DEFAULT }, - { "SendProtocolPrivate", -1, cppu::UnoType<sal_Int16>::get(), + { u"SendProtocolPrivate"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "SendProtocolPublic", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "SendReplyTos", -1, + { u"SendProtocolPublic"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"SendReplyTos"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendInfo>>::get(), ATTR_DEFAULT }, - { "SendServerNames", -1, + { u"SendServerNames"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendInfo>>::get(), ATTR_DEFAULT }, - { "SendUserNames", -1, + { u"SendUserNames"_ustr, -1, cppu::UnoType<css::uno::Sequence<css::ucb::SendInfo>>::get(), ATTR_DEFAULT }, - { "SendVIMPostOfficePath", -1, cppu::UnoType<OUString>::get(), + { u"SendVIMPostOfficePath"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "ServerBase", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "ServerName", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "ServerPort", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "Size", -1, cppu::UnoType<sal_Int64>::get(), + { u"ServerBase"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"ServerName"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"ServerPort"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"Size"_ustr, -1, cppu::UnoType<sal_Int64>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "SizeLimit", -1, cppu::UnoType<sal_Int64>::get(), ATTR_DEFAULT }, - { "SubscribedCount", -1, cppu::UnoType<sal_Int32>::get(), + { u"SizeLimit"_ustr, -1, cppu::UnoType<sal_Int64>::get(), ATTR_DEFAULT }, + { u"SubscribedCount"_ustr, -1, cppu::UnoType<sal_Int32>::get(), ATTR_DEFAULT | PropertyAttribute::READONLY }, - { "SynchronizePolicy", -1, + { u"SynchronizePolicy"_ustr, -1, cppu::UnoType<css::ucb::SynchronizePolicy>::get(), ATTR_DEFAULT }, - { "TargetFrames", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "TargetURL", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "TimeLimitStore", -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, - { "Title", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "UpdateOnOpen", -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "UseOutBoxPrivateProtocolSettings", -1, cppu::UnoType<bool>::get(), + { u"TargetFrames"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"TargetURL"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"TimeLimitStore"_ustr, -1, cppu::UnoType<sal_Int16>::get(), ATTR_DEFAULT }, + { u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"UpdateOnOpen"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, + { u"UseOutBoxPrivateProtocolSettings"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "UseOutBoxPublicProtocolSettings", -1, cppu::UnoType<bool>::get(), + { u"UseOutBoxPublicProtocolSettings"_ustr, -1, cppu::UnoType<bool>::get(), ATTR_DEFAULT }, - { "UserName", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "UserSortCriterium", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "VIMPostOfficePath", -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, - { "VerificationMode", -1, cppu::UnoType<css::ucb::VerificationMode>::get(), + { u"UserName"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"UserSortCriterium"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"VIMPostOfficePath"_ustr, -1, cppu::UnoType<OUString>::get(), ATTR_DEFAULT }, + { u"VerificationMode"_ustr, -1, cppu::UnoType<css::ucb::VerificationMode>::get(), ATTR_DEFAULT }}) { } @@ -197,7 +197,7 @@ UcbPropertiesManager::~UcbPropertiesManager() OUString SAL_CALL UcbPropertiesManager::getImplementationName() { - return "com.sun.star.comp.ucb.UcbPropertiesManager"; + return u"com.sun.star.comp.ucb.UcbPropertiesManager"_ustr; } sal_Bool SAL_CALL UcbPropertiesManager::supportsService( const OUString& ServiceName ) { @@ -205,7 +205,7 @@ sal_Bool SAL_CALL UcbPropertiesManager::supportsService( const OUString& Service } css::uno::Sequence< OUString > SAL_CALL UcbPropertiesManager::getSupportedServiceNames() { - return { "com.sun.star.ucb.PropertiesManager" }; + return { u"com.sun.star.ucb.PropertiesManager"_ustr }; } diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index c57af43642da..7190906b8147 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -139,7 +139,7 @@ UcbStore::~UcbStore() OUString SAL_CALL UcbStore::getImplementationName() { - return "com.sun.star.comp.ucb.UcbStore"; + return u"com.sun.star.comp.ucb.UcbStore"_ustr; } sal_Bool SAL_CALL UcbStore::supportsService( const OUString& ServiceName ) { @@ -147,7 +147,7 @@ sal_Bool SAL_CALL UcbStore::supportsService( const OUString& ServiceName ) } css::uno::Sequence< OUString > SAL_CALL UcbStore::getSupportedServiceNames() { - return { "com.sun.star.ucb.Store" }; + return { u"com.sun.star.ucb.Store"_ustr }; } // Service factory implementation. @@ -218,7 +218,7 @@ PropertySetRegistry::~PropertySetRegistry() OUString SAL_CALL PropertySetRegistry::getImplementationName() { - return "com.sun.star.comp.ucb.PropertySetRegistry"; + return u"com.sun.star.comp.ucb.PropertySetRegistry"_ustr; } sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceName ) @@ -228,7 +228,7 @@ sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceN css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedServiceNames() { - return { "com.sun.star.ucb.PropertySetRegistry" }; + return { u"com.sun.star.ucb.PropertySetRegistry"_ustr }; } @@ -704,28 +704,28 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, Any aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( "Handle", aAny ); + xNewPropNameReplace->replaceByName( u"Handle"_ustr, aAny ); // ... value aNewKey1 = aKey + "/Value"; aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( "Value", aAny ); + xNewPropNameReplace->replaceByName( u"Value"_ustr, aAny ); // ... state aNewKey1 = aKey + "/State"; aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( "State", aAny ); + xNewPropNameReplace->replaceByName( u"State"_ustr, aAny ); // ... attributes aNewKey1 = aKey + "/Attributes"; aAny = xRootHierNameAccess->getByHierarchicalName( aNewKey1 ); - xNewPropNameReplace->replaceByName( "Attributes", aAny ); + xNewPropNameReplace->replaceByName( u"Attributes"_ustr, aAny ); // Insert new item. xNewContainer->insertByName( @@ -885,7 +885,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccessImpl(std::un m_xRootReadAccess = m_xConfigProvider->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", + u"com.sun.star.configuration.ConfigurationAccess"_ustr, aArguments ); if ( m_xRootReadAccess.is() ) @@ -946,7 +946,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccessImpl(std::uniqu m_xRootWriteAccess = m_xConfigProvider->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", + u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr, aArguments ); OSL_ENSURE( m_xRootWriteAccess.is(), @@ -1025,7 +1025,7 @@ PersistentPropertySet::~PersistentPropertySet() OUString SAL_CALL PersistentPropertySet::getImplementationName() { - return "com.sun.star.comp.ucb.PersistentPropertySet"; + return u"com.sun.star.comp.ucb.PersistentPropertySet"_ustr; } sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& ServiceName ) @@ -1035,7 +1035,7 @@ sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& Servic css::uno::Sequence< OUString > SAL_CALL PersistentPropertySet::getSupportedServiceNames() { - return { "com.sun.star.ucb.PersistentPropertySet" }; + return { u"com.sun.star.ucb.PersistentPropertySet"_ustr }; } @@ -1145,11 +1145,11 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty } // Write value - xNameReplace->replaceByName( "Value", aValue ); + xNameReplace->replaceByName( u"Value"_ustr, aValue ); // Write state ( Now it is a directly set value ) xNameReplace->replaceByName( - "State", + u"State"_ustr, Any( sal_Int32( PropertyState_DIRECT_VALUE ) ) ); @@ -1382,24 +1382,24 @@ void SAL_CALL PersistentPropertySet::addProperty( // Set handle xNameReplace->replaceByName( - "Handle", + u"Handle"_ustr, Any( sal_Int32( -1 ) ) ); // Set default value xNameReplace->replaceByName( - "Value", + u"Value"_ustr, DefaultValue ); // Set state ( always "default" ) xNameReplace->replaceByName( - "State", + u"State"_ustr, Any( sal_Int32( PropertyState_DEFAULT_VALUE ) ) ); // Set attributes xNameReplace->replaceByName( - "Attributes", + u"Attributes"_ustr, Any( sal_Int32( Attributes ) ) ); // Insert new item. @@ -1800,7 +1800,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( { // Write handle xNameReplace->replaceByName( - "Handle", + u"Handle"_ustr, Any( rNewValue.Handle ) ); // Save old value @@ -1810,12 +1810,12 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( aValueName ); // Write value xNameReplace->replaceByName( - "Value", + u"Value"_ustr, rNewValue.Value ); // Write state ( Now it is a directly set value ) xNameReplace->replaceByName( - "State", + u"State"_ustr, Any( sal_Int32( PropertyState_DIRECT_VALUE ) ) ); diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index a3bf493a2ba0..b4eefd920cf3 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -76,7 +76,7 @@ SortedDynamicResultSet::~SortedDynamicResultSet() OUString SAL_CALL SortedDynamicResultSet::getImplementationName() { - return "com.sun.star.comp.ucb.SortedDynamicResultSet"; + return u"com.sun.star.comp.ucb.SortedDynamicResultSet"_ustr; } sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& ServiceName ) @@ -86,7 +86,7 @@ sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& Servi css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSet::getSupportedServiceNames() { - return { "com.sun.star.ucb.SortedDynamicResultSet" }; + return { u"com.sun.star.ucb.SortedDynamicResultSet"_ustr }; } // XComponent methods. @@ -263,7 +263,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) Any aRet; try { - aRet = pCurSet->getPropertyValue("IsRowCountFinal"); + aRet = pCurSet->getPropertyValue(u"IsRowCountFinal"_ustr); } catch (const UnknownPropertyException&) {} catch (const WrappedTargetException&) {} @@ -406,7 +406,7 @@ SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory() OUString SAL_CALL SortedDynamicResultSetFactory::getImplementationName() { - return "com.sun.star.comp.ucb.SortedDynamicResultSetFactory"; + return u"com.sun.star.comp.ucb.SortedDynamicResultSetFactory"_ustr; } sal_Bool SAL_CALL SortedDynamicResultSetFactory::supportsService( const OUString& ServiceName ) @@ -416,7 +416,7 @@ sal_Bool SAL_CALL SortedDynamicResultSetFactory::supportsService( const OUString css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSetFactory::getSupportedServiceNames() { - return { "com.sun.star.ucb.SortedDynamicResultSetFactory" }; + return { u"com.sun.star.ucb.SortedDynamicResultSetFactory"_ustr }; } diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 38b3c7583ed0..70052f440a49 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -119,7 +119,7 @@ SortedResultSet::~SortedResultSet() OUString SAL_CALL SortedResultSet::getImplementationName() { - return "com.sun.star.comp.ucb.SortedResultSet"; + return u"com.sun.star.comp.ucb.SortedResultSet"_ustr; } sal_Bool SAL_CALL SortedResultSet::supportsService( const OUString& ServiceName ) @@ -763,7 +763,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName ) if ( bOrgFinal ) { aOrgRet = Reference< XPropertySet >::query(mxOriginal)-> - getPropertyValue("RowCount"); + getPropertyValue(u"RowCount"_ustr); sal_uInt32 nOrgCount = 0; aOrgRet >>= nOrgCount; if ( nOrgCount == maS2O.Count() ) @@ -1266,7 +1266,7 @@ void SortedResultSet::CheckProperties( sal_Int32 nOldCount, bool bWasFinal ) PropertyChanged( aEvt ); - OUString aName = "IsRowCountFinal"; + OUString aName = u"IsRowCountFinal"_ustr; Any aRet = getPropertyValue( aName ); if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal ) { diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx index 2e81cfb23b5e..b2f1b199fb77 100644 --- a/ucb/source/ucp/cmis/auth_provider.cxx +++ b/ucb/source/ucp/cmis/auth_provider.cxx @@ -180,10 +180,10 @@ namespace cmis { rtl::Reference< ucbhelper::AuthenticationFallbackRequest > xRequest = new ucbhelper::AuthenticationFallbackRequest ( - "Open the following link in your browser and " + u"Open the following link in your browser and " "paste the code from the URL you have been redirected to in the " "box below. For example:\n" - "http://localhost/LibreOffice?code=YOUR_CODE", + "http://localhost/LibreOffice?code=YOUR_CODE"_ustr, url_oustr ); xIH->handle( xRequest ); diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index d04816173e40..e4681e29ab04 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -241,17 +241,17 @@ namespace uno::Sequence< uno::Any > generateErrorArguments( const cmis::URL & rURL ) { uno::Sequence< uno::Any > aArguments{ uno::Any(beans::PropertyValue( - "Binding URL", + u"Binding URL"_ustr, - 1, uno::Any( rURL.getBindingUrl() ), beans::PropertyState_DIRECT_VALUE )), uno::Any(beans::PropertyValue( - "Username", + u"Username"_ustr, -1, uno::Any( rURL.getUsername() ), beans::PropertyState_DIRECT_VALUE )), uno::Any(beans::PropertyValue( - "Repository Id", + u"Repository Id"_ustr, -1, uno::Any( rURL.getRepositoryId() ), beans::PropertyState_DIRECT_VALUE )) }; @@ -410,7 +410,7 @@ namespace cmis ucb::IOErrorCode_INVALID_DEVICE, generateErrorArguments(m_aURL), xEnv, - "error accessing a repository"); + u"error accessing a repository"_ustr); } else { @@ -599,7 +599,7 @@ namespace cmis uno::Any Content::getBadArgExcept() { return uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1) ); } @@ -826,7 +826,7 @@ namespace cmis } else if ( rProp.Name == "TargetURL" ) { - xRow->appendString( rProp, "" ); + xRow->appendString( rProp, u""_ustr ); } else if ( rProp.Name == "BaseURI" ) { @@ -1057,7 +1057,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - "Checkin only supported by documents" ); + u"Checkin only supported by documents"_ustr ); } boost::shared_ptr< std::ostream > pOut( new std::ostringstream ( std::ios_base::binary | std::ios_base::in | std::ios_base::out ) ); @@ -1111,7 +1111,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - "Checkout only supported by documents" ); + u"Checkout only supported by documents"_ustr ); } libcmis::DocumentPtr pPwc = pDoc->checkOut( ); @@ -1156,7 +1156,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - "CancelCheckout only supported by documents" ); + u"CancelCheckout only supported by documents"_ustr ); } pPwc->cancelCheckout( ); @@ -1219,7 +1219,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - "Can not get the document" ); + u"Can not get the document"_ustr ); } std::vector< libcmis::DocumentPtr > aCmisVersions = pDoc->getAllVersions( ); uno::Sequence< document::CmisVersion > aVersions( aCmisVersions.size( ) ); @@ -1261,7 +1261,7 @@ namespace cmis ucbhelper::cancelCommandExecution( uno::Any( ucb::InteractiveBadTransferURLException( - "Unsupported URL scheme!", + u"Unsupported URL scheme!"_ustr, getXWeak() ) ), xEnv ); } @@ -1306,7 +1306,7 @@ namespace cmis if ( it == m_pObjectProps.end( ) ) { ucbhelper::cancelCommandExecution( uno::Any - ( uno::RuntimeException( "Missing name property", + ( uno::RuntimeException( u"Missing name property"_ustr, getXWeak() ) ), xEnv ); } @@ -1334,7 +1334,7 @@ namespace cmis if ( object->getBaseType( ) != m_pObjectType->getBaseType( )->getId() ) { ucbhelper::cancelCommandExecution( uno::Any - ( uno::RuntimeException( "Can't change a folder into a document and vice-versa.", + ( uno::RuntimeException( u"Can't change a folder into a document and vice-versa."_ustr, getXWeak() ) ), xEnv ); } @@ -1353,7 +1353,7 @@ namespace cmis catch ( const libcmis::Exception& ) { ucbhelper::cancelCommandExecution( uno::Any - ( uno::RuntimeException( "Error when setting document content", + ( uno::RuntimeException( u"Error when setting document content"_ustr, getXWeak() ) ), xEnv ); } @@ -1375,7 +1375,7 @@ namespace cmis catch ( const libcmis::Exception& ) { ucbhelper::cancelCommandExecution( uno::Any - ( uno::RuntimeException( "Error when creating folder", + ( uno::RuntimeException( u"Error when creating folder"_ustr, getXWeak() ) ), xEnv ); } @@ -1393,7 +1393,7 @@ namespace cmis catch ( const libcmis::Exception& ) { ucbhelper::cancelCommandExecution( uno::Any - ( uno::RuntimeException( "Error when creating document", + ( uno::RuntimeException( u"Error when creating document"_ustr, getXWeak() ) ), xEnv ); } @@ -1468,7 +1468,7 @@ namespace cmis rValue.Name == "Size" || rValue.Name == "CreatableContentsInfo" ) { - lang::IllegalAccessException e ( "Property is read-only!", + lang::IllegalAccessException e ( u"Property is read-only!"_ustr, getXWeak() ); aRetRange[ n ] <<= e; } @@ -1478,7 +1478,7 @@ namespace cmis if (!( rValue.Value >>= aNewTitle )) { aRetRange[ n ] <<= beans::IllegalTypeException - ( "Property value has wrong type!", + ( u"Property value has wrong type!"_ustr, getXWeak() ); continue; } @@ -1486,7 +1486,7 @@ namespace cmis if ( aNewTitle.isEmpty() ) { aRetRange[ n ] <<= lang::IllegalArgumentException - ( "Empty title not allowed!", + ( u"Empty title not allowed!"_ustr, getXWeak(), -1 ); continue; @@ -1498,7 +1498,7 @@ namespace cmis else { SAL_INFO( "ucb.ucp.cmis", "Couldn't set property: " << rValue.Name ); - lang::IllegalAccessException e ( "Property is read-only!", + lang::IllegalAccessException e ( u"Property is read-only!"_ustr, getXWeak() ); aRetRange[ n ] <<= e; } @@ -1574,52 +1574,52 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( "IsDocument", + beans::Property( u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "IsFolder", + beans::Property( u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "Title", + beans::Property( u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( "ObjectId", + beans::Property( u"ObjectId"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( "TitleOnServer", + beans::Property( u"TitleOnServer"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( "IsReadOnly", + beans::Property( u"IsReadOnly"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "DateCreated", + beans::Property( u"DateCreated"_ustr, -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "DateModified", + beans::Property( u"DateModified"_ustr, -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "Size", + beans::Property( u"Size"_ustr, -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "CreatableContentsInfo", + beans::Property( u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "MediaType", + beans::Property( u"MediaType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( "CmisProperties", + beans::Property( u"CmisProperties"_ustr, -1, cppu::UnoType<uno::Sequence< document::CmisProperty>>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( "IsVersionable", + beans::Property( u"IsVersionable"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "CanCheckOut", + beans::Property( u"CanCheckOut"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "CanCancelCheckOut", + beans::Property( u"CanCancelCheckOut"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "CanCheckIn", + beans::Property( u"CanCheckIn"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -1635,46 +1635,46 @@ namespace cmis { // Required commands ucb::CommandInfo - ( "getCommandInfo", + ( u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( "getPropertySetInfo", + ( u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( "getPropertyValues", + ( u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( "setPropertyValues", + ( u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( "delete", + ( u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo - ( "insert", + ( u"insert"_ustr, -1, cppu::UnoType<ucb::InsertCommandArgument2>::get() ), ucb::CommandInfo - ( "open", + ( u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), // Mandatory CMIS-only commands - ucb::CommandInfo ( "checkout", -1, cppu::UnoType<void>::get() ), - ucb::CommandInfo ( "cancelCheckout", -1, cppu::UnoType<void>::get() ), - ucb::CommandInfo ( "checkIn", -1, + ucb::CommandInfo ( u"checkout"_ustr, -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( u"cancelCheckout"_ustr, -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( u"checkIn"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), - ucb::CommandInfo ( "updateProperties", -1, cppu::UnoType<void>::get() ), + ucb::CommandInfo ( u"updateProperties"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( "getAllVersions", + ( u"getAllVersions"_ustr, -1, cppu::UnoType<uno::Sequence< document::CmisVersion >>::get() ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( "transfer", + ( u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo - ( "createNewContent", + ( u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ) }; @@ -1685,7 +1685,7 @@ namespace cmis OUString Content::getParentURL( ) { SAL_INFO( "ucb.ucp.cmis", "Content::getParentURL()" ); - OUString parentUrl = "/"; + OUString parentUrl = u"/"_ustr; if ( m_sObjectPath == "/" ) return parentUrl; else @@ -1722,12 +1722,12 @@ namespace cmis OUString SAL_CALL Content::getImplementationName() { - return "com.sun.star.comp.CmisContent"; + return u"com.sun.star.comp.CmisContent"_ustr; } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { - uno::Sequence<OUString> aSNS { "com.sun.star.ucb.CmisContent" }; + uno::Sequence<OUString> aSNS { u"com.sun.star.ucb.CmisContent"_ustr }; return aSNS; } @@ -1984,7 +1984,7 @@ namespace cmis uno::Sequence< beans::Property > props { { - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 290b9c755629..e3f5cd080cda 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -123,11 +123,11 @@ sal_Bool ContentProvider::supportsService(const OUString& sServiceName) } OUString ContentProvider::getImplementationName() { - return "com.sun.star.comp.CmisContentProvider"; + return u"com.sun.star.comp.CmisContentProvider"_ustr; } css::uno::Sequence< OUString > ContentProvider::getSupportedServiceNames() { - return { "com.sun.star.ucb.CmisContentProvider" }; + return { u"com.sun.star.ucb.CmisContentProvider"_ustr }; } } diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 455df22f8640..d5bd88e75776 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -72,7 +72,7 @@ namespace cmis uno::Any RepoContent::getBadArgExcept() { return uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1) ); } @@ -217,7 +217,7 @@ namespace cmis ucb::IOErrorCode_ABORT, uno::Sequence< uno::Any >( 0 ), xEnv, - "Authentication cancelled" ); + u"Authentication cancelled"_ustr ); } } } @@ -246,16 +246,16 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( "IsDocument", + beans::Property( u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "IsFolder", + beans::Property( u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( "Title", + beans::Property( u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), - beans::Property( "IsReadOnly", + beans::Property( u"IsReadOnly"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -271,21 +271,21 @@ namespace cmis { // Required commands ucb::CommandInfo - ( "getCommandInfo", + ( u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( "getPropertySetInfo", + ( u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo - ( "getPropertyValues", + ( u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo - ( "setPropertyValues", + ( u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), // Optional standard commands ucb::CommandInfo - ( "open", + ( u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), }; @@ -306,12 +306,12 @@ namespace cmis OUString SAL_CALL RepoContent::getImplementationName() { - return "com.sun.star.comp.CmisRepoContent"; + return u"com.sun.star.comp.CmisRepoContent"_ustr; } uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() { - return { "com.sun.star.ucb.Content" }; + return { u"com.sun.star.ucb.Content"_ustr }; } OUString SAL_CALL RepoContent::getContentType() diff --git a/ucb/source/ucp/cmis/std_inputstream.cxx b/ucb/source/ucp/cmis/std_inputstream.cxx index 548e782088c7..ce900178118d 100644 --- a/ucb/source/ucp/cmis/std_inputstream.cxx +++ b/ucb/source/ucp/cmis/std_inputstream.cxx @@ -142,7 +142,7 @@ namespace cmis if ( location < 0 || location > m_nLength ) throw lang::IllegalArgumentException( - "Location can't be negative or greater than the length", + u"Location can't be negative or greater than the length"_ustr, getXWeak(), 0 ); if (!m_pStream) diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 413100bc54f1..46378b6dfebd 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -78,8 +78,8 @@ void ExpandContentProviderImpl::check() const if (m_bDisposed) { throw lang::DisposedException( - "expand content provider instance has " - "already been disposed!", + u"expand content provider instance has " + "already been disposed!"_ustr, const_cast< ExpandContentProviderImpl * >(this)->getXWeak() ); } } @@ -89,7 +89,7 @@ void ExpandContentProviderImpl::check() const OUString ExpandContentProviderImpl::getImplementationName() { check(); - return "com.sun.star.comp.ucb.ExpandContentProvider"; + return u"com.sun.star.comp.ucb.ExpandContentProvider"_ustr; } @@ -97,8 +97,8 @@ uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames() { check(); return { - "com.sun.star.ucb.ExpandContentProvider", - "com.sun.star.ucb.ContentProvider" + u"com.sun.star.ucb.ExpandContentProvider"_ustr, + u"com.sun.star.ucb.ContentProvider"_ustr }; } @@ -114,7 +114,7 @@ OUString ExpandContentProviderImpl::expandUri( if (!uri.startsWithIgnoreAsciiCase("vnd.sun.star.expand:", &uri)) { throw ucb::IllegalIdentifierException( - "expected protocol vnd.sun.star.expand!", + u"expected protocol vnd.sun.star.expand!"_ustr, const_cast< ExpandContentProviderImpl * >(this)->getXWeak() ); } // decode uric class chars diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index ee9966a52b30..a4de29fa6054 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -153,13 +153,13 @@ namespace ucb::ucp::ext OUString SAL_CALL Content::getImplementationName() { - return "org.openoffice.comp.ucp.ext.Content"; + return u"org.openoffice.comp.ucp.ext.Content"_ustr; } Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { - return { "com.sun.star.ucb.Content", "com.sun.star.ucb.ExtensionContent" }; + return { u"com.sun.star.ucb.Content"_ustr, u"com.sun.star.ucb.ExtensionContent"_ustr }; } @@ -245,7 +245,7 @@ namespace ucb::ucp::ext { const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEnvironment, m_xContext ); - aRet = aRequestedContent.executeCommand( "open", Any( aOpenCommand ) ); + aRet = aRequestedContent.executeCommand( u"open"_ustr, Any( aOpenCommand ) ); } } @@ -395,22 +395,22 @@ namespace ucb::ucp::ext else { // Append all Core Properties. - xRow->appendString ( Property( "ContentType", + xRow->appendString ( Property( u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), ContentProvider::getArtificialNodeContentType() ); - xRow->appendString ( Property( "Title", + xRow->appendString ( Property( u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), i_rTitle ); - xRow->appendBoolean( Property( "IsDocument", + xRow->appendBoolean( Property( u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), false ); - xRow->appendBoolean( Property( "IsFolder", + xRow->appendBoolean( Property( u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), @@ -495,7 +495,7 @@ namespace ucb::ucp::ext for ( auto& rRet : asNonConstRange(aRet) ) { // all our properties are read-only ... - rRet <<= IllegalAccessException("property is read-only.", *this ); + rRet <<= IllegalAccessException(u"property is read-only."_ustr, *this ); } return aRet; @@ -509,22 +509,22 @@ namespace ucb::ucp::ext // Mandatory commands CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<Sequence< Property >>::get() ), CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<Sequence< PropertyValue >>::get() ) @@ -532,7 +532,7 @@ namespace ucb::ucp::ext // Optional standard commands , CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<OpenCommandArgument2>::get() ) @@ -547,25 +547,25 @@ namespace ucb::ucp::ext static const Property aProperties[] = { Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND | PropertyAttribute::READONLY @@ -583,7 +583,7 @@ namespace ucb::ucp::ext bool bIsFolder = false; try { - Sequence< Property > aProps{ { /*Name*/ "IsFolder", {}, {}, {} } }; + Sequence< Property > aProps{ { /*Name*/ u"IsFolder"_ustr, {}, {}, {} } }; Reference< XRow > xRow( getPropertyValues( aProps, nullptr ), UNO_SET_THROW ); bIsFolder = xRow->getBoolean(1); } @@ -607,7 +607,7 @@ namespace ucb::ucp::ext try { - Sequence< Property > aProps{ { /*Name*/ "ContentType", {}, {}, {} } }; + Sequence< Property > aProps{ { /*Name*/ u"ContentType"_ustr, {}, {}, {} } }; Reference< XRow > xRow( getPropertyValues( aProps, nullptr ), UNO_SET_THROW ); m_aContentType = xRow->getString(1); } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 9470cdeb4c1e..739a86afa837 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -120,7 +120,7 @@ namespace ucb::ucp::ext ::ucbhelper::Content aWrappedContent( sPackageLocation, getResultSet()->getEnvironment(), m_xContext ); // obtain the properties which our result set is set up for from the wrapped content - Sequence< OUString > aPropertyNames { "Title" }; + Sequence< OUString > aPropertyNames { u"Title"_ustr }; const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 97822af93fa0..6c9dfd9cd85f 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -56,25 +56,25 @@ namespace ucb::ucp::ext OUString SAL_CALL ContentProvider::getImplementationName() { - return "org.openoffice.comp.ucp.ext.ContentProvider"; + return u"org.openoffice.comp.ucp.ext.ContentProvider"_ustr; } Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) { - return { "com.sun.star.ucb.ContentProvider", "com.sun.star.ucb.ExtensionContentProvider" }; + return { u"com.sun.star.ucb.ContentProvider"_ustr, u"com.sun.star.ucb.ExtensionContentProvider"_ustr }; } OUString ContentProvider::getRootURL() { - return "vnd.sun.star.extension://"; + return u"vnd.sun.star.extension://"_ustr; } OUString ContentProvider::getArtificialNodeContentType() { - return "application/vnd.sun.star.extension-content"; + return u"application/vnd.sun.star.extension-content"_ustr; } diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8d66f26fa884..454f6602e685 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -192,7 +192,7 @@ BaseContent::dispose() OUString SAL_CALL BaseContent::getImplementationName() { - return "com.sun.star.comp.ucb.FileContent"; + return u"com.sun.star.comp.ucb.FileContent"_ustr; } sal_Bool SAL_CALL @@ -204,7 +204,7 @@ BaseContent::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL BaseContent::getSupportedServiceNames() { - Sequence<OUString> ret { "com.sun.star.ucb.FileContent" }; + Sequence<OUString> ret { u"com.sun.star.ucb.FileContent"_ustr }; return ret; } @@ -308,7 +308,7 @@ BaseContent::execute( const Command& aCommand, } else if ( aCommand.Name == "getCasePreservingURL" ) { - Reference< sdbc::XRow > xRow = getPropertyValues( CommandId, { { "CasePreservingURL", -1, cppu::UnoType<sal_Bool>::get(), 0 } }); + Reference< sdbc::XRow > xRow = getPropertyValues( CommandId, { { u"CasePreservingURL"_ustr, -1, cppu::UnoType<sal_Bool>::get(), 0 } }); OUString CasePreservingURL = xRow->getString(1); if(!xRow->wasNull()) aAny <<= CasePreservingURL; @@ -406,7 +406,7 @@ BaseContent::getContentType() try { // Who am I ? - Reference< sdbc::XRow > xRow = getPropertyValues( -1, { { "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 } }); + Reference< sdbc::XRow > xRow = getPropertyValues( -1, { { u"IsDocument"_ustr, -1, cppu::UnoType<sal_Bool>::get(), 0 } }); bool IsDocument = xRow->getBoolean( 1 ); if ( !xRow->wasNull() ) @@ -513,7 +513,7 @@ BaseContent::createNewContent( const ContentInfo& Info ) try { - Reference< sdbc::XRow > xRow = getPropertyValues( -1, { { "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 } }); + Reference< sdbc::XRow > xRow = getPropertyValues( -1, { { u"IsDocument"_ustr, -1, cppu::UnoType<sal_Bool>::get(), 0 } }); IsDocument = xRow->getBoolean( 1 ); if ( xRow->wasNull() ) @@ -936,7 +936,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, NewTitle = srcUncPath.copy( 1 + srcUncPath.lastIndexOf( '/' ) ); // Is destination a document or a folder ? - Reference< sdbc::XRow > xRow = getPropertyValues( nMyCommandIdentifier,{ { "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 } } ); + Reference< sdbc::XRow > xRow = getPropertyValues( nMyCommandIdentifier,{ { u"IsDocument"_ustr, -1, cppu::UnoType<sal_Bool>::get(), 0 } } ); bool IsDocument = xRow->getBoolean( 1 ); if( xRow->wasNull() ) { // Destination file type could not be determined @@ -997,7 +997,7 @@ void BaseContent::insert( sal_Int32 nMyCommandIdentifier, // Inserting a document or a file? bool bDocument = false; - Reference< sdbc::XRow > xRow = getPropertyValues( -1, { { "IsDocument", -1, cppu::UnoType<sal_Bool>::get(), 0 } }); + Reference< sdbc::XRow > xRow = getPropertyValues( -1, { { u"IsDocument"_ustr, -1, cppu::UnoType<sal_Bool>::get(), 0 } }); bool contentTypeSet = true; // is set to false, if contentType not set try diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index ef44d7b25320..0d04bd4b2b74 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -122,25 +122,25 @@ namespace { auto pArguments = aArguments.getArray(); sal_Int32 i = 0; pArguments[i++] - <<= PropertyValue("Uri", + <<= PropertyValue(u"Uri"_ustr, -1, Any(rPhysicalUrl), PropertyState_DIRECT_VALUE); if (bResourceName) pArguments[i++] - <<= PropertyValue("ResourceName", + <<= PropertyValue(u"ResourceName"_ustr, -1, Any(aResourceName), PropertyState_DIRECT_VALUE); if (bResourceType) pArguments[i++] - <<= PropertyValue("ResourceType", + <<= PropertyValue(u"ResourceType"_ustr, -1, Any(aResourceType), PropertyState_DIRECT_VALUE); if (bRemoveProperty) pArguments[i++] - <<= PropertyValue("Removable", + <<= PropertyValue(u"Removable"_ustr, -1, Any(bRemovable), PropertyState_DIRECT_VALUE); @@ -365,7 +365,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "an error occurred during file opening", + u"an error occurred during file opening"_ustr, xComProc); } else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING || @@ -418,7 +418,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "an error occurred during opening a directory", + u"an error occurred during opening a directory"_ustr, xComProc); } else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE || @@ -433,7 +433,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "an error occurred writing or reading from a file", + u"an error occurred writing or reading from a file"_ustr, xComProc ); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ) @@ -443,7 +443,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "device full", + u"device full"_ustr, xComProc); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_WRITE || @@ -495,7 +495,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "an error occurred during opening a file", + u"an error occurred during opening a file"_ustr, xComProc); } else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND || @@ -508,7 +508,7 @@ namespace fileaccess { : sContentType }; aAny <<= MissingPropertiesException( - "a property is missing, necessary to create a content", + u"a property is missing, necessary to create a content"_ustr, xComProc, aSeq); cancelCommandExecution(aAny,xEnv); @@ -532,21 +532,21 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "there were problems with the filesize", + u"there were problems with the filesize"_ustr, xComProc); } else if(errorCode == TASKHANDLING_INPUTSTREAM_FOR_WRITE) { aAny <<= MissingInputStreamException( - "the inputstream is missing, necessary to create a content", + u"the inputstream is missing, necessary to create a content"_ustr, xComProc); cancelCommandExecution(aAny,xEnv); } else if( errorCode == TASKHANDLING_NOREPLACE_FOR_WRITE ) // Overwrite = false and file exists { - NameClashException excep("file exists and overwrite forbidden", + NameClashException excep(u"file exists and overwrite forbidden"_ustr, Reference<XInterface>(xComProc, UNO_QUERY), InteractionClassification_ERROR, OUString(getTitle(aUncPath))); cancelCommandExecution( Any(excep), xEnv ); @@ -563,7 +563,7 @@ namespace fileaccess { RTL_TEXTENCODING_UTF8)); prop.Value <<= aClashingName; InteractiveAugmentedIOException excep( - "the name contained invalid characters", Reference<XInterface>(xComProc, UNO_QUERY), + u"the name contained invalid characters"_ustr, Reference<XInterface>(xComProc, UNO_QUERY), InteractionClassification_ERROR, IOErrorCode_INVALID_CHARACTER, { Any(prop) }); if(isHandled) throw excep; @@ -578,7 +578,7 @@ namespace fileaccess { } else if( errorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR ) { - NameClashException excep("folder exists and overwrite forbidden", xComProc, + NameClashException excep(u"folder exists and overwrite forbidden"_ustr, xComProc, InteractionClassification_ERROR, OUString(getTitle(aUncPath))); if(isHandled) throw excep; @@ -614,7 +614,7 @@ namespace fileaccess { generateErrorArguments(getParentName(aUncPath)), //TODO! ok to supply physical URL to getParentName()? xEnv, - "a folder could not be created", + u"a folder could not be created"_ustr, xComProc ); } else if( errorCode == TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE || @@ -665,7 +665,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "a file status object could not be filled", + u"a file status object could not be filled"_ustr, xComProc ); } else if( errorCode == TASKHANDLING_DELETEFILE_FOR_REMOVE || @@ -712,7 +712,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "a file or directory could not be deleted", + u"a file or directory could not be deleted"_ustr, xComProc ); } else if( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE || @@ -762,13 +762,13 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - "accessing the root during transfer", + u"accessing the root during transfer"_ustr, xComProc ); } else if( errorCode == TASKHANDLING_TRANSFER_INVALIDSCHEME ) { aAny <<= InteractiveBadTransferURLException( - "bad transfer url", + u"bad transfer url"_ustr, xComProc); cancelCommandExecution( aAny,xEnv ); } @@ -784,7 +784,7 @@ namespace fileaccess { errorCode == TASKHANDLING_RENAMEMOVE_FOR_COPY ) { OUString aMsg( - "general error during transfer"); + u"general error during transfer"_ustr); switch( minorCode ) { @@ -827,7 +827,7 @@ namespace fileaccess { else if( errorCode == TASKHANDLING_NAMECLASH_FOR_COPY || errorCode == TASKHANDLING_NAMECLASH_FOR_MOVE ) { - NameClashException excep("name clash during copy or move", + NameClashException excep(u"name clash during copy or move"_ustr, Reference<XInterface>(xComProc, UNO_QUERY), InteractionClassification_ERROR, OUString(getTitle(aUncPath))); @@ -837,7 +837,7 @@ namespace fileaccess { errorCode == TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY ) { UnsupportedNameClashException excep( - "name clash value not supported during copy or move", + u"name clash value not supported during copy or move"_ustr, Reference<XInterface>(xComProc, UNO_QUERY), minorCode); cancelCommandExecution(Any(excep), xEnv); diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index eb914e080320..62187c2c696c 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -54,7 +54,7 @@ XInteractionRequestImpl::XInteractionRequestImpl( Any aAny; if(nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) { - NameClashException excep("folder exists and overwrite forbidden", m_xOrigin, + NameClashException excep(u"folder exists and overwrite forbidden"_ustr, m_xOrigin, InteractionClassification_ERROR, aClashingName); aAny <<= excep; } @@ -64,7 +64,7 @@ XInteractionRequestImpl::XInteractionRequestImpl( prop.Name = "ResourceName"; prop.Handle = -1; prop.Value <<= aClashingName; - InteractiveAugmentedIOException excep("the name contained invalid characters", m_xOrigin, + InteractiveAugmentedIOException excep(u"the name contained invalid characters"_ustr, m_xOrigin, InteractionClassification_ERROR, IOErrorCode_INVALID_CHARACTER, { Any(prop) }); aAny <<= excep; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 2990df183bc5..bce0a323af44 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -587,8 +587,8 @@ XResultSet_impl::getPropertySetInfo() uno::Sequence< beans::Property > seq { - { "RowCount", -1, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY }, - { "IsRowCountFinal", -1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY } + { u"RowCount"_ustr, -1, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY }, + { u"IsRowCountFinal"_ustr, -1, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY } }; return new XPropertySetInfo_impl( m_pMyShell, seq ); diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 70c235da7d9b..ab350f290ea1 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -212,7 +212,7 @@ XStream_impl::closeStream() osl::FileBase::RC err = m_aFile.close(); if( err != osl::FileBase::E_None ) { - throw io::IOException("could not close file"); + throw io::IOException(u"could not close file"_ustr); } m_nIsOpen = false; @@ -280,7 +280,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( - "could not synchronize file to disc", + u"could not synchronize file to disc"_ustr, getXWeak()); } } diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 24530fecdfb9..d1b615109dcc 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -139,39 +139,39 @@ TaskManager::TaskManager( const uno::Reference< uno::XComponentContext >& rxCont m_xContext( rxContext ), // Commands m_sCommandInfo{ - { /* Name */ "getCommandInfo", + { /* Name */ u"getCommandInfo"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<void>::get() }, - { /* Name */ "getPropertySetInfo", + { /* Name */ u"getPropertySetInfo"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<void>::get() }, - { /* Name */ "getPropertyValues", + { /* Name */ u"getPropertyValues"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<uno::Sequence< beans::Property >>::get() }, - { /* Name */ "setPropertyValues", + { /* Name */ u"setPropertyValues"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() }, - { /* Name */ "open", + { /* Name */ u"open"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<OpenCommandArgument>::get() }, - { /* Name */ "transfer", + { /* Name */ u"transfer"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<TransferInfo>::get() }, - { /* Name */ "delete", + { /* Name */ u"delete"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<sal_Bool>::get() }, - { /* Name */ "insert", + { /* Name */ u"insert"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<InsertCommandArgument>::get() }, - { /* Name */ "createNewContent", + { /* Name */ u"createNewContent"_ustr, /* Handle */ -1, /* ArgType */ cppu::UnoType<ucb::ContentInfo>::get() } } { @@ -2912,7 +2912,7 @@ uno::Sequence< ucb::ContentInfo > TaskManager::queryCreatableContentsInfo() uno::Sequence< beans::Property > props { - { "Title", -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND } + { u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND } }; return { diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 03cf3e1534e0..4039c955897c 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -90,7 +90,7 @@ FileProvider::initialize( OUString SAL_CALL FileProvider::getImplementationName() { - return "com.sun.star.comp.ucb.FileProvider"; + return u"com.sun.star.comp.ucb.FileProvider"_ustr; } sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName ) @@ -101,7 +101,7 @@ sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName ) Sequence< OUString > SAL_CALL FileProvider::getSupportedServiceNames() { - return { "com.sun.star.ucb.FileContentProvider" }; + return { u"com.sun.star.ucb.FileContentProvider"_ustr }; } // XContent @@ -232,15 +232,15 @@ private: } XPropertySetInfoImpl2::XPropertySetInfoImpl2() - : m_seq{ Property( "HostName", + : m_seq{ Property( u"HostName"_ustr, -1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY ), - Property( "HomeDirectory", + Property( u"HomeDirectory"_ustr, -1, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY ), - Property( "FileSystemNotation", + Property( u"FileSystemNotation"_ustr, -1, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY )} diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 51df5a4e3c07..7a5b910a073e 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -302,7 +302,7 @@ css::uno::Any Content::mapGIOError( GError *pError ) css::uno::Any Content::getBadArgExcept() { return css::uno::Any( css::lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1) ); } @@ -555,7 +555,7 @@ css::uno::Reference< css::sdbc::XRow > Content::getPropertyValues( static css::lang::IllegalAccessException getReadOnlyException( const css::uno::Reference< css::uno::XInterface >& rContext ) { - return css::lang::IllegalAccessException ("Property is read-only!", rContext ); + return css::lang::IllegalAccessException (u"Property is read-only!"_ustr, rContext ); } void Content::queryChildren( ContentRefList& rChildren ) @@ -711,7 +711,7 @@ css::uno::Sequence< css::uno::Any > Content::setPropertyValues( if (!( rValue.Value >>= aNewTitle )) { aRetRange[ n ] <<= css::beans::IllegalTypeException - ( "Property value has wrong type!", + ( u"Property value has wrong type!"_ustr, getXWeak() ); continue; } @@ -719,7 +719,7 @@ css::uno::Sequence< css::uno::Any > Content::setPropertyValues( if ( aNewTitle.isEmpty() ) { aRetRange[ n ] <<= css::lang::IllegalArgumentException - ( "Empty title not allowed!", + ( u"Empty title not allowed!"_ustr, getXWeak(), -1 ); continue; @@ -777,7 +777,7 @@ css::uno::Sequence< css::uno::Any > Content::setPropertyValues( if (!exchangeIdentity( xNewId ) ) { aRetRange[ nTitlePos ] <<= css::uno::Exception - ( "Exchange failed!", + ( u"Exchange failed!"_ustr, getXWeak() ); } } @@ -1132,7 +1132,7 @@ css::uno::Sequence< css::ucb::ContentInfo > Content::queryCreatableContentsInfo( // Minimum set of props we really need css::uno::Sequence< css::beans::Property > props { - { "Title", -1, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID | css::beans::PropertyAttribute::BOUND } + { u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID | css::beans::PropertyAttribute::BOUND } }; return @@ -1229,40 +1229,40 @@ css::uno::Sequence< css::beans::Property > Content::getProperties( { static const css::beans::Property aGenericProperties[] = { - css::beans::Property( "IsDocument", + css::beans::Property( u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "IsFolder", + css::beans::Property( u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "Title", + css::beans::Property( u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ), - css::beans::Property( "IsReadOnly", + css::beans::Property( u"IsReadOnly"_ustr, -1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "DateCreated", + css::beans::Property( u"DateCreated"_ustr, -1, cppu::UnoType<css::util::DateTime>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "DateModified", + css::beans::Property( u"DateModified"_ustr, -1, cppu::UnoType<css::util::DateTime>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "Size", + css::beans::Property( u"Size"_ustr, -1, cppu::UnoType<sal_Int64>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "IsVolume", + css::beans::Property( u"IsVolume"_ustr, 1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "IsCompactDisc", + css::beans::Property( u"IsCompactDisc"_ustr, -1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "IsRemoveable", + css::beans::Property( u"IsRemoveable"_ustr, -1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "IsHidden", + css::beans::Property( u"IsHidden"_ustr, -1, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( "CreatableContentsInfo", + css::beans::Property( u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<css::uno::Sequence< css::ucb::ContentInfo >>::get(), css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ) }; @@ -1277,35 +1277,35 @@ css::uno::Sequence< css::ucb::CommandInfo > Content::getCommands( const css::uno { // Required commands css::ucb::CommandInfo - ( "getCommandInfo", + ( u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), css::ucb::CommandInfo - ( "getPropertySetInfo", + ( u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), css::ucb::CommandInfo - ( "getPropertyValues", + ( u"getPropertyValues"_ustr, -1, cppu::UnoType<css::uno::Sequence< css::beans::Property >>::get() ), css::ucb::CommandInfo - ( "setPropertyValues", + ( u"setPropertyValues"_ustr, -1, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get() ), // Optional standard commands css::ucb::CommandInfo - ( "delete", + ( u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), css::ucb::CommandInfo - ( "insert", + ( u"insert"_ustr, -1, cppu::UnoType<css::ucb::InsertCommandArgument>::get() ), css::ucb::CommandInfo - ( "open", + ( u"open"_ustr, -1, cppu::UnoType<css::ucb::OpenCommandArgument2>::get() ), // Folder Only, omitted if not a folder css::ucb::CommandInfo - ( "transfer", + ( u"transfer"_ustr, -1, cppu::UnoType<css::ucb::TransferInfo>::get() ), css::ucb::CommandInfo - ( "createNewContent", + ( u"createNewContent"_ustr, -1, cppu::UnoType<css::ucb::ContentInfo>::get() ) }; @@ -1333,12 +1333,12 @@ css::uno::Any SAL_CALL Content::queryInterface( const css::uno::Type & rType ) OUString SAL_CALL Content::getImplementationName() { - return "com.sun.star.comp.GIOContent"; + return u"com.sun.star.comp.GIOContent"_ustr; } css::uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { - css::uno::Sequence<OUString> aSNS { "com.sun.star.ucb.GIOContent" }; + css::uno::Sequence<OUString> aSNS { u"com.sun.star.ucb.GIOContent"_ustr }; return aSNS; } diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index b6dd31fbbcf1..d9c081358ba6 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -96,12 +96,12 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, css::uno::Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames() { - return { "com.sun.star.ucb.GIOContentProvider" }; + return { u"com.sun.star.ucb.GIOContentProvider"_ustr }; } OUString SAL_CALL ContentProvider::getImplementationName() { - return "com.sun.star.comp.GIOContentProvider"; + return u"com.sun.star.comp.GIOContentProvider"_ustr; } sal_Bool SAL_CALL ContentProvider::supportsService(const OUString& aServiceName) diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index a04185225603..8b8b94fedf62 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -45,7 +45,7 @@ void SAL_CALL Seekable::truncate() throw css::io::NotConnectedException(); if (!g_seekable_can_truncate(mpStream)) - throw css::io::IOException("Truncate unsupported", + throw css::io::IOException(u"Truncate unsupported"_ustr, getXWeak()); GError *pError=nullptr; @@ -59,7 +59,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) throw css::io::NotConnectedException(); if (!g_seekable_can_seek(mpStream)) - throw css::io::IOException("Seek unsupported", + throw css::io::IOException(u"Seek unsupported"_ustr, getXWeak()); GError *pError=nullptr; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 8d3e5f927e9b..673ef887b54a 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -243,7 +243,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() // virtual OUString SAL_CALL HierarchyContent::getImplementationName() { - return "com.sun.star.comp.ucb.HierarchyContent"; + return u"com.sun.star.comp.ucb.HierarchyContent"_ustr; } @@ -311,7 +311,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -331,7 +331,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -342,7 +342,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "No properties!", + u"No properties!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -378,7 +378,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -401,7 +401,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -435,7 +435,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucb::IOErrorCode_CANT_WRITE, aArgs, Environment, - "Cannot remove persistent data!", + u"Cannot remove persistent data!"_ustr, this ); // Unreachable } @@ -456,7 +456,7 @@ uno::Any SAL_CALL HierarchyContent::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -478,7 +478,7 @@ uno::Any SAL_CALL HierarchyContent::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -913,28 +913,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( "ContentType", + beans::Property( u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); xRow->appendString ( - beans::Property( "Title", + beans::Property( u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( "IsDocument", + beans::Property( u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( "IsFolder", + beans::Property( u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -943,7 +943,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( if ( rData.getIsDocument() ) xRow->appendString( - beans::Property( "TargetURL", + beans::Property( u"TargetURL"_ustr, -1, cppu::UnoType<OUString>::get(), // @@@ Might actually be read-only! @@ -951,7 +951,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( rData.getTargetURL() ); xRow->appendObject( beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -1019,28 +1019,28 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "Title" ) @@ -1048,7 +1048,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( isReadOnly() ) { aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else @@ -1083,7 +1083,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRetRange[ n ] <<= lang::IllegalArgumentException( - "Empty title not allowed!", + u"Empty title not allowed!"_ustr, getXWeak(), -1 ); } @@ -1091,7 +1091,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } @@ -1101,7 +1101,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( isReadOnly() ) { aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else @@ -1131,7 +1131,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRetRange[ n ] <<= lang::IllegalArgumentException( - "Empty target URL not allowed!", + u"Empty target URL not allowed!"_ustr, getXWeak(), -1 ); } @@ -1139,14 +1139,14 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } else { aRetRange[ n ] <<= beans::UnknownPropertyException( - "TargetURL only supported by links!", + u"TargetURL only supported by links!"_ustr, getXWeak() ); } } @@ -1200,7 +1200,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRetRange[ n ] <<= uno::Exception( - "No property set for storing the value!", + u"No property set for storing the value!"_ustr, getXWeak() ); } } @@ -1234,7 +1234,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( // Set error . aRetRange[ nTitlePos ] <<= uno::Exception( - "Exchange failed!", + u"Exchange failed!"_ustr, getXWeak() ); } aGuard.reset(); @@ -1265,7 +1265,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot store persistent data!", + u"Cannot store persistent data!"_ustr, this ); // Unreachable } @@ -1292,7 +1292,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not supported by root folder!", + u"Not supported by root folder!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1301,7 +1301,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, // Check, if all required properties were set. if ( m_aProps.getTitle().isEmpty() ) { - uno::Sequence<OUString> aProps { "Title" }; + uno::Sequence<OUString> aProps { u"Title"_ustr }; ucbhelper::cancelCommandExecution( uno::Any( ucb::MissingPropertiesException( OUString(), @@ -1358,7 +1358,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedNameClashException( - "Unable to resolve name clash!", + u"Unable to resolve name clash!"_ustr, getXWeak(), nNameClashResolve ) ), xEnv ); @@ -1404,7 +1404,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot store persistent data!", + u"Cannot store persistent data!"_ustr, this ); // Unreachable } @@ -1434,7 +1434,7 @@ void HierarchyContent::destroy( bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not persistent!", + u"Not persistent!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1445,7 +1445,7 @@ void HierarchyContent::destroy( bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not supported by root folder!", + u"Not supported by root folder!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1482,7 +1482,7 @@ void HierarchyContent::transfer( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not persistent!", + u"Not persistent!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1520,7 +1520,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_RECURSIVE, aArgs, xEnv, - "Target is equal to or is a child of source!", + u"Target is equal to or is a child of source!"_ustr, this ); // Unreachable } @@ -1557,7 +1557,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Cannot instantiate source object!", + u"Cannot instantiate source object!"_ustr, this ); // Unreachable } @@ -1587,7 +1587,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_CREATE, aArgs, xEnv, - "XContentCreator::createNewContent failed!", + u"XContentCreator::createNewContent failed!"_ustr, this ); // Unreachable } @@ -1715,7 +1715,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot remove persistent data of source object!", + u"Cannot remove persistent data of source object!"_ustr, this ); // Unreachable } @@ -1741,7 +1741,7 @@ HierarchyContentProperties::getCreatableContentsInfo() const uno::Sequence< beans::Property > aFolderProps( 1 ); aFolderProps.getArray()[ 0 ] = beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); @@ -1753,12 +1753,12 @@ HierarchyContentProperties::getCreatableContentsInfo() const uno::Sequence< beans::Property > aLinkProps( 2 ); aLinkProps.getArray()[ 0 ] = beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); aLinkProps.getArray()[ 1 ] = beans::Property( - "TargetURL", + u"TargetURL"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 836a136f62f3..781272f33b69 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -97,28 +97,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -128,14 +128,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - "TargetURL", + u"TargetURL"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -154,28 +154,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -184,13 +184,13 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - "TargetURL", + u"TargetURL"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -217,28 +217,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -248,7 +248,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -267,28 +267,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -297,7 +297,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -325,28 +325,28 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -356,7 +356,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -391,22 +391,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ) @@ -427,22 +427,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -450,12 +450,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<void>::get() ) @@ -481,22 +481,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -504,7 +504,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -522,22 +522,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -545,27 +545,27 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -591,22 +591,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -614,7 +614,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -632,22 +632,22 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -655,17 +655,17 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ) diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 6b7e0d857e54..b610fe971734 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -304,7 +304,7 @@ bool HierarchyEntry::setData( const HierarchyEntryData& rData ) } else { - xParentNameAccess->getByName("Children") >>= xNameAccess; + xParentNameAccess->getByName(u"Children"_ustr) >>= xNameAccess; } if ( xNameAccess->hasByName( m_aName ) ) @@ -346,7 +346,7 @@ bool HierarchyEntry::setData( const HierarchyEntryData& rData ) { // Append new entry to parents child list, // which is a set of entries. - xParentNameAccess->getByName("Children") >>= xFac; + xParentNameAccess->getByName(u"Children"_ustr) >>= xFac; } OSL_ENSURE( xFac.is(), @@ -373,7 +373,7 @@ bool HierarchyEntry::setData( const HierarchyEntryData& rData ) { // Set Title value. xNameReplace->replaceByName( - "Title", + u"Title"_ustr, uno::Any( rData.getTitle() ) ); // Set TargetURL value. @@ -389,14 +389,14 @@ bool HierarchyEntry::setData( const HierarchyEntryData& rData ) = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNameReplace->replaceByName( - "TargetURL", + u"TargetURL"_ustr, uno::Any( aValue ) ); // Set Type value. sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNameReplace->replaceByName( - "Type", + u"Type"_ustr, uno::Any( nType ) ); if ( xContainer.is() ) @@ -592,7 +592,7 @@ bool HierarchyEntry::move( } else { - xOldParentNameAccess->getByName("Children") >>= xOldNameContainer; + xOldParentNameAccess->getByName(u"Children"_ustr) >>= xOldNameContainer; } aEntry = xOldNameContainer->getByName( m_aName ); @@ -665,7 +665,7 @@ bool HierarchyEntry::move( } else { - xNewParentNameAccess->getByName("Children") >>= xNewNameContainer; + xNewParentNameAccess->getByName(u"Children"_ustr) >>= xNewNameContainer; } } else @@ -675,7 +675,7 @@ bool HierarchyEntry::move( return false; xNewNameReplace->replaceByName( - "Title", + u"Title"_ustr, uno::Any( rData.getTitle() ) ); // TargetURL property may contain a reference to the Office @@ -687,11 +687,11 @@ bool HierarchyEntry::move( if ( m_xOfficeInstDirs.is() && !aValue.isEmpty() ) aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNewNameReplace->replaceByName( - "TargetURL", + u"TargetURL"_ustr, uno::Any( aValue ) ); sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNewNameReplace->replaceByName( - "Type", + u"Type"_ustr, uno::Any( nType ) ); xNewNameContainer->insertByName( aNewKey, aEntry ); @@ -796,7 +796,7 @@ bool HierarchyEntry::remove() { // Append new entry to parents child list, // which is a set of entries. - xParentNameAccess->getByName("Children") >>= xContainer; + xParentNameAccess->getByName(u"Children"_ustr) >>= xContainer; } OSL_ENSURE( xContainer.is(), diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 58ec6ce57d78..cb7b52fb119d 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -199,7 +199,7 @@ HierarchyDataSource::~HierarchyDataSource() // XServiceInfo methods. OUString SAL_CALL HierarchyDataSource::getImplementationName() \ { - return "com.sun.star.comp.ucb.HierarchyDataSource"; + return u"com.sun.star.comp.ucb.HierarchyDataSource"_ustr; } sal_Bool SAL_CALL HierarchyDataSource::supportsService( const OUString& ServiceName ) { @@ -207,7 +207,7 @@ sal_Bool SAL_CALL HierarchyDataSource::supportsService( const OUString& ServiceN } css::uno::Sequence< OUString > HierarchyDataSource::getSupportedServiceNames() { - return { "com.sun.star.ucb.DefaultHierarchyDataSource", "com.sun.star.ucb.HierarchyDataSource" }; + return { u"com.sun.star.ucb.DefaultHierarchyDataSource"_ustr, u"com.sun.star.ucb.HierarchyDataSource"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* @@ -378,14 +378,14 @@ HierarchyDataSource::createInstanceWithArguments( { // Create configuration read-only access object. xConfigAccess = xProv->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", + u"com.sun.star.configuration.ConfigurationAccess"_ustr, aNewArgs ); } else { // Create configuration read-write access object. xConfigAccess = xProv->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", + u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr, aNewArgs ); } } @@ -565,7 +565,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() OUString SAL_CALL HierarchyDataAccess::getImplementationName() { - return "com.sun.star.comp.ucb.HierarchyDataAccess"; + return u"com.sun.star.comp.ucb.HierarchyDataAccess"_ustr; } sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName ) diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index ad019732a86a..8837f36111be 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -63,7 +63,7 @@ HierarchyContentProvider::~HierarchyContentProvider() OUString SAL_CALL HierarchyContentProvider::getImplementationName() \ { - return "com.sun.star.comp.ucb.HierarchyContentProvider"; + return u"com.sun.star.comp.ucb.HierarchyContentProvider"_ustr; } sal_Bool SAL_CALL HierarchyContentProvider::supportsService( const OUString& ServiceName ) { @@ -71,7 +71,7 @@ sal_Bool SAL_CALL HierarchyContentProvider::supportsService( const OUString& Ser } css::uno::Sequence< OUString > HierarchyContentProvider::getSupportedServiceNames() { - return { "com.sun.star.ucb.HierarchyContentProvider" }; + return { u"com.sun.star.ucb.HierarchyContentProvider"_ustr }; } // Service factory implementation. @@ -204,7 +204,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( (*it).second.xRootReadAccess.set( xConfigProv->createInstanceWithArguments( - "com.sun.star.ucb.HierarchyDataReadAccess", + u"com.sun.star.ucb.HierarchyDataReadAccess"_ustr, aArguments ), uno::UNO_QUERY ); } diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx index acdb03093449..530db7c24924 100644 --- a/ucb/source/ucp/image/ucpimage.cxx +++ b/ucb/source/ucp/image/ucpimage.cxx @@ -47,7 +47,7 @@ public: private: OUString SAL_CALL getImplementationName() override - { return "com.sun.star.comp.ucb.ImageContentProvider"; } + { return u"com.sun.star.comp.ucb.ImageContentProvider"_ustr; } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } @@ -55,7 +55,7 @@ private: css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{ - "com.sun.star.ucb.ImageContentProvider"}; + u"com.sun.star.ucb.ImageContentProvider"_ustr}; } css::uno::Reference<css::ucb::XContent> SAL_CALL queryContent( diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 2fed02b9209f..ecf91d57bbfd 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -110,7 +110,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); @@ -360,14 +360,14 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() { - return "com.sun.star.comp.ucb.PackageContent"; + return u"com.sun.star.comp.ucb.PackageContent"_ustr; } // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { - return { isFolder()? OUString("com.sun.star.ucb.PackageFolderContent"):OUString("com.sun.star.ucb.PackageStreamContent") } ; + return { isFolder()? u"com.sun.star.ucb.PackageFolderContent"_ustr:u"com.sun.star.ucb.PackageStreamContent"_ustr } ; } @@ -403,7 +403,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -423,7 +423,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -434,7 +434,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "No properties!", + u"No properties!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -472,7 +472,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -492,7 +492,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -525,7 +525,7 @@ uno::Any SAL_CALL Content::execute( ucb::IOErrorCode_CANT_WRITE, aArgs, Environment, - "Cannot remove persistent data!", + u"Cannot remove persistent data!"_ustr, this ); // Unreachable } @@ -545,7 +545,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -567,7 +567,7 @@ uno::Any SAL_CALL Content::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -593,7 +593,7 @@ uno::Any SAL_CALL Content::execute( ucb::IOErrorCode_CANT_WRITE, aArgs, Environment, - "Cannot write file to disk!", + u"Cannot write file to disk!"_ustr, this ); // Unreachable } @@ -833,7 +833,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Core Properties. xRow->appendString ( beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -841,14 +841,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.aContentType ); xRow->appendString( beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -856,7 +856,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsDocument ); xRow->appendBoolean( beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -864,7 +864,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsFolder ); xRow->appendObject( beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -873,7 +873,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); xRow->appendString( beans::Property( - "MediaType", + u"MediaType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), @@ -884,7 +884,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendLong( beans::Property( - "Size", + u"Size"_ustr, -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -893,7 +893,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - "Compressed", + u"Compressed"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), @@ -901,7 +901,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - "Encrypted", + u"Encrypted"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), @@ -914,7 +914,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendBoolean( beans::Property( - "HasEncryptedEntries", + u"HasEncryptedEntries"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -982,28 +982,28 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "Title" ) @@ -1012,7 +1012,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else @@ -1041,7 +1041,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRetRange[ n ] <<= lang::IllegalArgumentException( - "Empty title not allowed!", + u"Empty title not allowed!"_ustr, getXWeak(), -1 ); } @@ -1050,7 +1050,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } @@ -1075,7 +1075,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } @@ -1083,7 +1083,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "Compressed" ) @@ -1109,14 +1109,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } else { aRetRange[ n ] <<= beans::UnknownPropertyException( - "Compressed only supported by streams!", + u"Compressed only supported by streams!"_ustr, getXWeak() ); } } @@ -1143,14 +1143,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } else { aRetRange[ n ] <<= beans::UnknownPropertyException( - "Encrypted only supported by streams!", + u"Encrypted only supported by streams!"_ustr, getXWeak() ); } } @@ -1158,7 +1158,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "EncryptionKey" ) @@ -1188,14 +1188,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } else { aRetRange[ n ] <<= beans::UnknownPropertyException( - "EncryptionKey not supported by non-root folder!", + u"EncryptionKey not supported by non-root folder!"_ustr, getXWeak() ); } } @@ -1248,7 +1248,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= uno::Exception( - "No property set for storing the value!", + u"No property set for storing the value!"_ustr, getXWeak() ); } } @@ -1281,7 +1281,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRetRange[ nTitlePos ] <<= uno::Exception( - "Exchange failed!", + u"Exchange failed!"_ustr, getXWeak() ); } } @@ -1314,7 +1314,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot store persistent data!", + u"Cannot store persistent data!"_ustr, this ); // Unreachable } @@ -1383,7 +1383,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - "Got no data stream!", + u"Got no data stream!"_ustr, this ); // Unreachable } @@ -1438,7 +1438,7 @@ uno::Any Content::open( ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - "Got no data stream!", + u"Got no data stream!"_ustr, this ); // Unreachable } @@ -1548,7 +1548,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedNameClashException( - "Unable to resolve name clash!", + u"Unable to resolve name clash!"_ustr, getXWeak(), nNameClashResolve ) ), xEnv ); @@ -1598,7 +1598,7 @@ void Content::insert( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot store persistent data!", + u"Cannot store persistent data!"_ustr, this ); // Unreachable } @@ -1635,7 +1635,7 @@ void Content::destroy( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not persistent!", + u"Not persistent!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1672,7 +1672,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not persistent!", + u"Not persistent!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1706,7 +1706,7 @@ void Content::transfer( ucb::IOErrorCode_RECURSIVE, aArgs, xEnv, - "Target is equal to or is a child of source!", + u"Target is equal to or is a child of source!"_ustr, this ); // Unreachable } @@ -1743,7 +1743,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Cannot instantiate source object!", + u"Cannot instantiate source object!"_ustr, this ); // Unreachable } @@ -1772,7 +1772,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_CREATE, aArgs, xEnv, - "XContentCreator::createNewContent failed!", + u"XContentCreator::createNewContent failed!"_ustr, this ); // Unreachable } @@ -1927,7 +1927,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot remove persistent data of source object!", + u"Cannot remove persistent data of source object!"_ustr, this ); // Unreachable } @@ -2116,7 +2116,7 @@ bool Content::loadData( try { uno::Any aHasEncryptedEntries - = xPackagePropSet->getPropertyValue( "HasEncryptedEntries" ); + = xPackagePropSet->getPropertyValue( u"HasEncryptedEntries"_ustr ); if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) ) { OSL_FAIL( "Content::loadData - " @@ -2162,7 +2162,7 @@ bool Content::loadData( // MediaType try { - uno::Any aMediaType = xPropSet->getPropertyValue("MediaType"); + uno::Any aMediaType = xPropSet->getPropertyValue(u"MediaType"_ustr); if ( !( aMediaType >>= rProps.aMediaType ) ) { OSL_FAIL( "Content::loadData - Got no MediaType value!" ); @@ -2204,7 +2204,7 @@ bool Content::loadData( // Size ( only available for streams ) try { - uno::Any aSize = xPropSet->getPropertyValue("Size"); + uno::Any aSize = xPropSet->getPropertyValue(u"Size"_ustr); if ( !( aSize >>= rProps.nSize ) ) { OSL_FAIL( "Content::loadData - Got no Size value!" ); @@ -2225,7 +2225,7 @@ bool Content::loadData( // Compressed ( only available for streams ) try { - uno::Any aCompressed = xPropSet->getPropertyValue("Compressed"); + uno::Any aCompressed = xPropSet->getPropertyValue(u"Compressed"_ustr); if ( !( aCompressed >>= rProps.bCompressed ) ) { OSL_FAIL( "Content::loadData - Got no Compressed value!" ); @@ -2246,7 +2246,7 @@ bool Content::loadData( // Encrypted ( only available for streams ) try { - uno::Any aEncrypted = xPropSet->getPropertyValue("Encrypted"); + uno::Any aEncrypted = xPropSet->getPropertyValue(u"Encrypted"_ustr); if ( !( aEncrypted >>= rProps.bEncrypted ) ) { OSL_FAIL( "Content::loadData - Got no Encrypted value!" ); @@ -2336,7 +2336,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) try { xPackagePropSet->setPropertyValue( - "EncryptionKey", + u"EncryptionKey"_ustr, uno::Any( m_aProps.aEncryptionKey ) ); m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED; } @@ -2460,7 +2460,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( m_nModifiedProps & MEDIATYPE_MODIFIED ) { xPropSet->setPropertyValue( - "MediaType", + u"MediaType"_ustr, uno::Any( m_aProps.aMediaType ) ); m_nModifiedProps &= ~MEDIATYPE_MODIFIED; } @@ -2469,7 +2469,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - "Compressed", + u"Compressed"_ustr, uno::Any( m_aProps.bCompressed ) ); m_nModifiedProps &= ~COMPRESSED_MODIFIED; @@ -2479,7 +2479,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - "Encrypted", + u"Encrypted"_ustr, uno::Any( m_aProps.bEncrypted ) ); m_nModifiedProps &= ~ENCRYPTED_MODIFIED; @@ -2489,7 +2489,7 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - "EncryptionKey", + u"EncryptionKey"_ustr, uno::Any( m_aProps.aEncryptionKey ) ); m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED; diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index c01201d10a1e..73ef49f1f2b9 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -98,28 +98,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -129,13 +129,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "MediaType", + u"MediaType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -145,7 +145,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - "HasEncryptedEntries", + u"HasEncryptedEntries"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -167,28 +167,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -197,13 +197,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "MediaType", + u"MediaType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -229,28 +229,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -259,20 +259,20 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "MediaType", + u"MediaType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - "Size", + u"Size"_ustr, -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -282,13 +282,13 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - "Compressed", + u"Compressed"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND ), beans::Property( - "Encrypted", + u"Encrypted"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -320,22 +320,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -343,17 +343,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ), @@ -361,7 +361,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands ucb::CommandInfo( - "flush", + u"flush"_ustr, -1, cppu::UnoType<void>::get() ) @@ -382,22 +382,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -405,27 +405,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ), @@ -433,7 +433,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands ucb::CommandInfo( - "flush", + u"flush"_ustr, -1, cppu::UnoType<void>::get() ) @@ -455,22 +455,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -478,17 +478,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 636ecb3333e3..fd87897960e3 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -143,7 +143,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, OUString ContentProvider::getImplementationName() { - return "com.sun.star.comp.ucb.PackageContentProvider"; + return u"com.sun.star.comp.ucb.PackageContentProvider"_ustr; } sal_Bool @@ -155,7 +155,7 @@ ContentProvider::supportsService(const OUString& s) css::uno::Sequence< OUString > ContentProvider::getSupportedServiceNames() { - return { "com.sun.star.ucb.PackageContentProvider" }; + return { u"com.sun.star.ucb.PackageContentProvider"_ustr }; } @@ -226,7 +226,7 @@ ContentProvider::createPackage( const PackageUri & rURI ) { xNameAccess.set( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.packages.comp.ZipPackage", + u"com.sun.star.packages.comp.ZipPackage"_ustr, aArguments, m_xContext ), css::uno::UNO_QUERY_THROW ); } diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 606bbcdbbce4..935d639460fc 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -264,7 +264,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() { - return "com.sun.star.comp.ucb.TransientDocumentsContent"; + return u"com.sun.star.comp.ucb.TransientDocumentsContent"_ustr; } @@ -339,7 +339,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -359,7 +359,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -370,7 +370,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "No properties!", + u"No properties!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -406,7 +406,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -426,8 +426,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "insert command only supported by " - "folders and streams!", + u"insert command only supported by " + "folders and streams!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -441,9 +441,9 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "insert command not supported by " + u"insert command not supported by " "streams that are direct children " - "of document root!", + "of document root!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -455,7 +455,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -481,8 +481,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "delete command only supported by " - "folders and streams!", + u"delete command only supported by " + "folders and streams!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -504,7 +504,7 @@ uno::Any SAL_CALL Content::execute( ucb::IOErrorCode_CANT_WRITE, aArgs, Environment, - "Cannot remove persistent data!", + u"Cannot remove persistent data!"_ustr, this ); // Unreachable } @@ -526,8 +526,8 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "transfer command only supported " - "by folders and documents!", + u"transfer command only supported " + "by folders and documents!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -540,7 +540,7 @@ uno::Any SAL_CALL Content::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -563,9 +563,9 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "createNewContent command only " + u"createNewContent command only " "supported by folders and " - "documents!", + "documents!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -578,7 +578,7 @@ uno::Any SAL_CALL Content::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -963,7 +963,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( "ContentType", + beans::Property( u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -973,7 +973,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ContentType eType = rData.getType(); xRow->appendString ( - beans::Property( "Title", + beans::Property( u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), // Title is read-only for root and documents. @@ -983,14 +983,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( : 0 ) ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( "IsDocument", + beans::Property( u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( "IsFolder", + beans::Property( u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -998,7 +998,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getIsFolder() ); xRow->appendObject( beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -1009,7 +1009,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( eType == STREAM ) { xRow->appendObject( - beans::Property( "DateModified", + beans::Property( u"DateModified"_ustr, -1, cppu::UnoType<css::util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -1020,7 +1020,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Storage is only supported by folders. if ( eType == FOLDER ) xRow->appendObject( - beans::Property( "Storage", + beans::Property( u"Storage"_ustr, -1, cppu::UnoType<embed::XStorage>::get(), beans::PropertyAttribute::BOUND @@ -1030,7 +1030,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // DocumentModel is only supported by documents. if ( eType == DOCUMENT ) xRow->appendObject( - beans::Property( "DocumentModel", + beans::Property( u"DocumentModel"_ustr, -1, cppu::UnoType<frame::XModel>::get(), beans::PropertyAttribute::BOUND @@ -1098,28 +1098,28 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rValue.Name == "Title" ) @@ -1129,7 +1129,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( ( eType == ROOT ) || ( eType == DOCUMENT ) ) { aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else @@ -1159,7 +1159,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= lang::IllegalArgumentException( - "Empty Title not allowed!", + u"Empty Title not allowed!"_ustr, getXWeak(), -1 ); } @@ -1167,7 +1167,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Title Property value has wrong type!", + u"Title Property value has wrong type!"_ustr, getXWeak() ); } } @@ -1178,14 +1178,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( eType == FOLDER ) { aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else { // Storage is only supported by folders. aRetRange[ n ] <<= beans::UnknownPropertyException( - "Storage property only supported by folders", + u"Storage property only supported by folders"_ustr, getXWeak() ); } } @@ -1195,14 +1195,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( eType == DOCUMENT ) { aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else { // Storage is only supported by folders. aRetRange[ n ] <<= beans::UnknownPropertyException( - "DocumentModel property only supported by documents", + u"DocumentModel property only supported by documents"_ustr, getXWeak() ); } } @@ -1255,7 +1255,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= uno::Exception( - "No property set for storing the value!", + u"No property set for storing the value!"_ustr, getXWeak() ); } } @@ -1286,7 +1286,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRetRange[ nTitlePos ] <<= uno::Exception( - "Exchange failed!", + u"Exchange failed!"_ustr, getXWeak() ); } } @@ -1316,7 +1316,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot store persistent data!", + u"Cannot store persistent data!"_ustr, this ); // Unreachable } @@ -1388,7 +1388,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - "Got no data stream!", + u"Got no data stream!"_ustr, this ); // Unreachable } @@ -1418,7 +1418,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - "Got no data stream!", + u"Got no data stream!"_ustr, this ); // Unreachable } @@ -1475,7 +1475,7 @@ uno::Any Content::open( ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - "Got no data stream!", + u"Got no data stream!"_ustr, this ); // Unreachable } @@ -1595,7 +1595,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedNameClashException( - "Unable to resolve name clash!", + u"Unable to resolve name clash!"_ustr, getXWeak(), nNameClashResolve ) ), xEnv ); @@ -1644,7 +1644,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot store persistent data!", + u"Cannot store persistent data!"_ustr, this ); // Unreachable } @@ -1681,7 +1681,7 @@ void Content::destroy( bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not persistent!", + u"Not persistent!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1816,7 +1816,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( ucb::UnsupportedCommandException( - "Not persistent!", + u"Not persistent!"_ustr, getXWeak() ) ), xEnv ); // Unreachable @@ -1855,7 +1855,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Invalid source URI! Syntax!", + u"Invalid source URI! Syntax!"_ustr, getXWeak(), -1 ) ), xEnv ); @@ -1866,7 +1866,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Invalid source URI! Must describe a folder or stream!", + u"Invalid source URI! Must describe a folder or stream!"_ustr, getXWeak(), -1 ) ), xEnv ); @@ -1894,7 +1894,7 @@ void Content::transfer( ucb::IOErrorCode_RECURSIVE, aArgs, xEnv, - "Target is equal to or is a child of source!", + u"Target is equal to or is a child of source!"_ustr, this ); // Unreachable } @@ -1915,9 +1915,9 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Invalid source URI! " + u"Invalid source URI! " "Streams cannot be created as " - "children of document root!", + "children of document root!"_ustr, getXWeak(), -1 ) ), xEnv ); @@ -1943,7 +1943,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Invalid source URI! Unable to determine source type!", + u"Invalid source URI! Unable to determine source type!"_ustr, getXWeak(), -1 ) ), xEnv ); @@ -1969,7 +1969,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot copy data!", + u"Cannot copy data!"_ustr, this ); // Unreachable } @@ -1997,7 +1997,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot copy additional properties!", + u"Cannot copy additional properties!"_ustr, this ); // Unreachable } @@ -2033,7 +2033,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Cannot instantiate target object!", + u"Cannot instantiate target object!"_ustr, this ); // Unreachable } @@ -2074,7 +2074,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, aArgs, xEnv, - "Cannot instantiate target object!", + u"Cannot instantiate target object!"_ustr, this ); // Unreachable } @@ -2093,7 +2093,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot remove persistent data of source object!", + u"Cannot remove persistent data of source object!"_ustr, this ); // Unreachable } @@ -2110,7 +2110,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, aArgs, xEnv, - "Cannot remove additional properties of source object!", + u"Cannot remove additional properties of source object!"_ustr, this ); // Unreachable } @@ -2250,10 +2250,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( - "MediaType", + u"MediaType"_ustr, uno::Any( - OUString( // @@@ better mediatype - "application/binary" ) ) ); + u"application/binary"_ustr ) ); } catch ( beans::UnknownPropertyException const & ) { @@ -2635,7 +2634,7 @@ static OUString obtainPassword( if ( xAbort.is() ) { throw ucb::CommandFailedException( - "Abort requested by Interaction Handler.", + u"Abort requested by Interaction Handler."_ustr, uno::Reference< uno::XInterface >(), xRequest->getRequest() ); } @@ -2649,7 +2648,7 @@ static OUString obtainPassword( // Unknown selection. Should never happen. throw ucb::CommandFailedException( - "Interaction Handler selected unknown continuation!", + u"Interaction Handler selected unknown continuation!"_ustr, uno::Reference< uno::XInterface >(), xRequest->getRequest() ); } @@ -2788,7 +2787,7 @@ ContentProperties::getCreatableContentsInfo() const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ); diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 384bac2f941f..b9a38a43353b 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -105,28 +105,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -135,14 +135,14 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "DateModified", + u"DateModified"_ustr, -1, cppu::UnoType<css::util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -167,28 +167,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -197,7 +197,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -207,7 +207,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - "Storage", + u"Storage"_ustr, -1, cppu::UnoType<embed::XStorage>::get(), beans::PropertyAttribute::BOUND @@ -229,28 +229,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -260,7 +260,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -270,7 +270,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties beans::Property( - "DocumentModel", + u"DocumentModel"_ustr, -1, cppu::UnoType<frame::XModel>::get(), beans::PropertyAttribute::BOUND @@ -294,28 +294,28 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -325,7 +325,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -364,22 +364,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -387,12 +387,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -413,22 +413,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType< uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -436,17 +436,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) @@ -469,22 +469,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -492,27 +492,27 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ), ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -535,22 +535,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -558,17 +558,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ), ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ), ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ) @@ -593,22 +593,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ), ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ), ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ), @@ -616,7 +616,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ) diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 39fa5bc828b5..b1b3d3665c77 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -127,7 +127,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) { try { - uno::Any aValue = xPropSet->getPropertyValue("RuntimeUID"); + uno::Any aValue = xPropSet->getPropertyValue(u"RuntimeUID"_ustr); aValue >>= aId; } catch ( beans::UnknownPropertyException const & ) @@ -561,7 +561,7 @@ bool OfficeDocumentsManager::isDocumentPreview( if ( !xModel.is() ) return false; - uno::Sequence<beans::PropertyValue> props = xModel->getArgs2( { "Preview" } ); + uno::Sequence<beans::PropertyValue> props = xModel->getArgs2( { u"Preview"_ustr } ); for (const auto & rProp : props) if (rProp.Name == "Preview") { diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 5b45df4bb989..74b29ac6e7f3 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -56,7 +56,7 @@ DocumentContentFactory::~DocumentContentFactory() // virtual OUString SAL_CALL DocumentContentFactory::getImplementationName() { - return "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory"; + return u"com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory"_ustr; } // virtual @@ -70,7 +70,7 @@ DocumentContentFactory::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL DocumentContentFactory::getSupportedServiceNames() { - return { "com.sun.star.frame.TransientDocumentsDocumentContentFactory" }; + return { u"com.sun.star.frame.TransientDocumentsDocumentContentFactory"_ustr }; } @@ -85,7 +85,7 @@ DocumentContentFactory::createDocumentContent( uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac; try { - xDocFac.set( m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.ucb.TransientDocumentsContentProvider", m_xContext), + xDocFac.set( m_xContext->getServiceManager()->createInstanceWithContext(u"com.sun.star.ucb.TransientDocumentsContentProvider"_ustr, m_xContext), uno::UNO_QUERY ); } catch ( uno::Exception const & ) @@ -97,7 +97,7 @@ DocumentContentFactory::createDocumentContent( return xDocFac->createDocumentContent( Model ); throw uno::RuntimeException( - "Unable to obtain document content factory!", + u"Unable to obtain document content factory!"_ustr, getXWeak() ); } diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index f9aaa139547d..1e65ee678aff 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -67,7 +67,7 @@ ContentProvider::~ContentProvider() // XServiceInfo methods. OUString SAL_CALL ContentProvider::getImplementationName() { - return "com.sun.star.comp.ucb.TransientDocumentsContentProvider"; + return u"com.sun.star.comp.ucb.TransientDocumentsContentProvider"_ustr; } sal_Bool SAL_CALL ContentProvider::supportsService( const OUString& ServiceName ) @@ -77,7 +77,7 @@ sal_Bool SAL_CALL ContentProvider::supportsService( const OUString& ServiceName css::uno::Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames() { - return { "com.sun.star.ucb.TransientDocumentsContentProvider" }; + return { u"com.sun.star.ucb.TransientDocumentsContentProvider"_ustr }; } @@ -102,7 +102,7 @@ ContentProvider::queryContent( Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) throw ucb::IllegalIdentifierException( - "Invalid URL!", + u"Invalid URL!"_ustr, Identifier ); // Normalize URI. @@ -136,7 +136,7 @@ ContentProvider::createDocumentContentIdentifier( if ( !m_xDocsMgr.is() ) { throw lang::IllegalArgumentException( - "No Document Manager!", + u"No Document Manager!"_ustr, getXWeak(), 1 ); } @@ -145,7 +145,7 @@ ContentProvider::createDocumentContentIdentifier( if ( aDocId.isEmpty() ) { throw lang::IllegalArgumentException( - "Unable to obtain document id from model!", + u"Unable to obtain document id from model!"_ustr, getXWeak(), 1 ); } @@ -183,7 +183,7 @@ ContentProvider::createDocumentContent( // no content. throw lang::IllegalArgumentException( - "Illegal Content Identifier!", + u"Illegal Content Identifier!"_ustr, getXWeak(), 1 ); } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 858b05784dcc..d8644abf991d 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -88,7 +88,7 @@ StorageElementFactory::createStorage( const OUString & rUri, ( eMode != READ_WRITE_NOCREATE ) && ( eMode != READ_WRITE_CREATE ) ) throw lang::IllegalArgumentException( - "Invalid open mode!", + u"Invalid open mode!"_ustr, uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -96,7 +96,7 @@ StorageElementFactory::createStorage( const OUString & rUri, if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - "Root never has a storage!", + u"Root never has a storage!"_ustr, uno::Reference< uno::XInterface >(), sal_Int16( 1 ) ); } @@ -367,12 +367,12 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { if ( eMode == READ_WRITE_CREATE ) throw lang::IllegalArgumentException( - "Invalid open mode: document storages cannot be created!", + u"Invalid open mode: document storages cannot be created!"_ustr, uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); else throw embed::InvalidStorageException( - "Invalid document id!", + u"Invalid document id!"_ustr, uno::Reference< uno::XInterface >() ); } @@ -385,7 +385,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "No XPropertySet interface!" ); try { - uno::Any aPropValue = xPropSet->getPropertyValue("OpenMode"); + uno::Any aPropValue = xPropSet->getPropertyValue(u"OpenMode"_ustr); sal_Int32 nOpenMode = 0; if ( aPropValue >>= nOpenMode ) @@ -397,7 +397,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not readable. throw embed::InvalidStorageException( - "Storage is open, but not readable!" ); + u"Storage is open, but not readable!"_ustr ); } // storage okay break; @@ -408,7 +408,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not writable. throw embed::InvalidStorageException( - "Storage is open, but not writable!" ); + u"Storage is open, but not writable!"_ustr ); } // storage okay break; @@ -420,7 +420,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "Bug! Value of property OpenMode has wrong type!" ); throw uno::RuntimeException( - "Bug! Value of property OpenMode has wrong type!" ); + u"Bug! Value of property OpenMode has wrong type!"_ustr ); } } catch ( beans::UnknownPropertyException const & ) @@ -429,7 +429,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Property OpenMode not supported!" ); throw embed::StorageWrappedTargetException( - "Bug! Value of property OpenMode has wrong type!", + u"Bug! Value of property OpenMode has wrong type!"_ustr, uno::Reference< uno::XInterface >(), anyEx ); } @@ -439,7 +439,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Caught WrappedTargetException!" ); throw embed::StorageWrappedTargetException( - "WrappedTargetException during getPropertyValue!", + u"WrappedTargetException during getPropertyValue!"_ustr, uno::Reference< uno::XInterface >(), anyEx ); } @@ -496,7 +496,7 @@ StorageElementFactory::queryStream( if ( !xParentStorage.is() ) { throw lang::IllegalArgumentException( - "No parent storage!", + u"No parent storage!"_ustr, uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } @@ -505,14 +505,14 @@ StorageElementFactory::queryStream( if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - "Root never is a stream!", + u"Root never is a stream!"_ustr, uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } else if ( aUri.isDocument() ) { throw lang::IllegalArgumentException( - "A document never is a stream!", + u"A document never is a stream!"_ustr, uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); } @@ -549,7 +549,7 @@ StorageElementFactory::queryStream( OSL_FAIL( "StorageElementFactory::queryStream : Unknown open mode!" ); throw embed::InvalidStorageException( - "Unknown open mode!", + u"Unknown open mode!"_ustr, uno::Reference< uno::XInterface >() ); } @@ -605,7 +605,7 @@ StorageElementFactory::queryStream( if ( !xStream.is() ) { throw embed::InvalidStorageException( - "No stream!", + u"No stream!"_ustr, uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/webdav-curl/ContentProperties.cxx b/ucb/source/ucp/webdav-curl/ContentProperties.cxx index d67929727601..448a5e17f481 100644 --- a/ucb/source/ucp/webdav-curl/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-curl/ContentProperties.cxx @@ -85,16 +85,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) CurlUri const aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ OUString( "Title" ) ] + (*m_xProps)[ u"Title"_ustr ] = PropertyValue( uno::Any( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ OUString( "Title" ) ] + (*m_xProps)[ u"Title"_ustr ] = PropertyValue( uno::Any( - OUString( "*** unknown ***" ) ), + u"*** unknown ***"_ustr ), true ); } @@ -113,11 +113,11 @@ ContentProperties::ContentProperties( : m_xProps( new PropertyValueMap ), m_bTrailingSlash( false ) { - (*m_xProps)[ OUString( "Title" ) ] + (*m_xProps)[ u"Title"_ustr ] = PropertyValue( uno::Any( rTitle ), true ); - (*m_xProps)[ OUString( "IsFolder" ) ] + (*m_xProps)[ u"IsFolder"_ustr ] = PropertyValue( uno::Any( bFolder ), true ); - (*m_xProps)[ OUString( "IsDocument" ) ] + (*m_xProps)[ u"IsDocument"_ustr ] = PropertyValue( uno::Any( bool( !bFolder ) ), true ); } @@ -126,7 +126,7 @@ ContentProperties::ContentProperties( const OUString & rTitle ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( false ) { - (*m_xProps)[ OUString( "Title" ) ] + (*m_xProps)[ u"Title"_ustr ] = PropertyValue( uno::Any( rTitle ), true ); } @@ -383,7 +383,7 @@ void ContentProperties::addProperty( const OUString & rName, util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ OUString( "DateCreated" ) ] + (*m_xProps)[ u"DateCreated"_ustr ] = PropertyValue( uno::Any( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -398,7 +398,7 @@ void ContentProperties::addProperty( const OUString & rName, OUString aValue; rValue >>= aValue; - (*m_xProps)[ OUString( "Size" ) ] + (*m_xProps)[ u"Size"_ustr ] = PropertyValue( uno::Any( aValue.toInt64() ), true ); } else if ( rName.equalsIgnoreAsciiCase( "Content-Length" ) ) @@ -410,13 +410,13 @@ void ContentProperties::addProperty( const OUString & rName, OUString aValue; rValue >>= aValue; - (*m_xProps)[ OUString( "Size" ) ] + (*m_xProps)[ u"Size"_ustr ] = PropertyValue( uno::Any( aValue.toInt64() ), true ); } else if ( rName == DAVProperties::GETCONTENTTYPE ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ OUString( "MediaType" ) ] + (*m_xProps)[ u"MediaType"_ustr ] = PropertyValue( rValue, true ); } else if ( rName.equalsIgnoreAsciiCase( "Content-Type" ) ) @@ -425,7 +425,7 @@ void ContentProperties::addProperty( const OUString & rName, // Only DAV resources have this property. // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ OUString( "MediaType" ) ] + (*m_xProps)[ u"MediaType"_ustr ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -439,7 +439,7 @@ void ContentProperties::addProperty( const OUString & rName, util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ OUString( "DateModified" ) ] + (*m_xProps)[ u"DateModified"_ustr ] = PropertyValue( uno::Any( aDate ), true ); } else if ( rName.equalsIgnoreAsciiCase( "Last-Modified" ) ) @@ -453,7 +453,7 @@ void ContentProperties::addProperty( const OUString & rName, util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ OUString( "DateModified" ) ] + (*m_xProps)[ u"DateModified"_ustr ] = PropertyValue( uno::Any( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -468,11 +468,11 @@ void ContentProperties::addProperty( const OUString & rName, bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); - (*m_xProps)[ OUString( "IsFolder" ) ] + (*m_xProps)[ u"IsFolder"_ustr ] = PropertyValue( uno::Any( bFolder ), true ); - (*m_xProps)[ OUString( "IsDocument" ) ] + (*m_xProps)[ u"IsDocument"_ustr ] = PropertyValue( uno::Any( bool( !bFolder ) ), true ); - (*m_xProps)[ OUString( "ContentType" ) ] + (*m_xProps)[ u"ContentType"_ustr ] = PropertyValue( uno::Any( bFolder ? WEBDAV_COLLECTION_TYPE : WEBDAV_CONTENT_TYPE ), true ); @@ -498,17 +498,17 @@ namespace DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - OUString( "ETag" ), + u"ETag"_ustr, - OUString( "DateModified" ), - OUString( "Last-Modified" ), + u"DateModified"_ustr, + u"Last-Modified"_ustr, DAVProperties::GETLASTMODIFIED, - OUString( "Size" ), - OUString( "Content-Length" ), + u"Size"_ustr, + u"Content-Length"_ustr, DAVProperties::GETCONTENTLENGTH, - OUString( "Date" ) + u"Date"_ustr }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index 4dde0d512e61..9ebe7d8fe306 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -973,7 +973,7 @@ auto CurlProcessor::ProcessRequestImpl( } if (rSession.m_AbortFlag.load()) { // flag was set by abort() -> not sure what exception to throw? - throw DAVException(DAVException::DAV_HTTP_ERROR, "abort() was called", 0); + throw DAVException(DAVException::DAV_HTTP_ERROR, u"abort() was called"_ustr, 0); } } while (nRunning != 0); // there should be exactly 1 CURLMsg now, but the interface is @@ -1047,7 +1047,7 @@ auto CurlProcessor::ProcessRequestImpl( DAVException::DAV_HTTP_TIMEOUT, ConnectionEndPointString(rSession.m_URI.GetHost(), rSession.m_URI.GetPort())); default: // lots of generic errors - throw DAVException(DAVException::DAV_HTTP_ERROR, "", 0); + throw DAVException(DAVException::DAV_HTTP_ERROR, u""_ustr, 0); } } // error handling part 2: HTTP status codes @@ -1175,7 +1175,7 @@ auto CurlProcessor::ProcessRequest( if (HostFilter::isForbidden(rURI.GetHost())) { SAL_WARN("ucb.ucp.webdav.curl", "Access denied to host: " << rURI.GetHost()); - throw uno::RuntimeException("access to host denied"); + throw uno::RuntimeException(u"access to host denied"_ustr); } if (pEnv) @@ -1189,7 +1189,7 @@ auto CurlProcessor::ProcessRequest( curl_slist_append(pRequestHeaderList.release(), utf8Header.getStr())); if (!pRequestHeaderList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } } } @@ -1203,7 +1203,7 @@ auto CurlProcessor::ProcessRequest( auto const len(xSeekable->getLength() - xSeekable->getPosition()); if ((**pxInStream).readBytes(data, len) != len) { - throw uno::RuntimeException("short readBytes"); + throw uno::RuntimeException(u"short readBytes"_ustr); } } else @@ -1456,7 +1456,7 @@ auto CurlProcessor::ProcessRequest( ::std::map<OUString, OUString> const headerMap( ProcessHeaders(headers.HeaderFields.back().first)); // X-MSDAVEXT_Error see [MS-WEBDAVE] 2.2.3.1.9 - auto const it(headerMap.find("x-msdavext_error")); + auto const it(headerMap.find(u"x-msdavext_error"_ustr)); if (it == headerMap.end() || !it->second.startsWith("917656;")) { break; @@ -1472,7 +1472,7 @@ auto CurlProcessor::ProcessRequest( pRequestHeaderList.release(), "X-FORMS_BASED_AUTH_ACCEPTED: f")); if (!pRequestHeaderList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } } [[fallthrough]]; // SP, no cookie, or cookie failed: try NTLM/Negotiate @@ -1558,7 +1558,7 @@ auto CurlProcessor::ProcessRequest( guard.Release(); auto const ret = pEnv->m_xAuthListener->authenticate( - oRealm ? *oRealm : "", + oRealm ? *oRealm : u""_ustr, statusCode != SC_PROXY_AUTHENTICATION_REQUIRED ? rSession.m_URI.GetHost() : rSession.m_Proxy, @@ -1646,15 +1646,15 @@ auto CurlSession::OPTIONS(OUString const& rURIReference, CurlUri const uri(CurlProcessor::URIReferenceToURI(*this, rURIReference)); - ::std::vector<OUString> const headerNames{ "allow", "dav" }; + ::std::vector<OUString> const headerNames{ u"allow"_ustr, u"dav"_ustr }; DAVResource result; ::std::pair<::std::vector<OUString> const&, DAVResource&> const headers(headerNames, result); ::std::vector<CurlOption> const options{ { CURLOPT_CUSTOMREQUEST, "OPTIONS", "CURLOPT_CUSTOMREQUEST" } }; - CurlProcessor::ProcessRequest(*this, uri, "OPTIONS", options, &rEnv, nullptr, nullptr, nullptr, - &headers); + CurlProcessor::ProcessRequest(*this, uri, u"OPTIONS"_ustr, options, &rEnv, nullptr, nullptr, + nullptr, &headers); for (auto const& it : result.properties) { @@ -1715,7 +1715,7 @@ auto CurlProcessor::PropFind( pList.reset(curl_slist_append(pList.release(), "Content-Type: application/xml")); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString depth; switch (nDepth) @@ -1735,7 +1735,7 @@ auto CurlProcessor::PropFind( pList.reset(curl_slist_append(pList.release(), depth.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } uno::Reference<io::XSequenceOutputStream> const xSeqOutStream( @@ -1747,36 +1747,36 @@ auto CurlProcessor::PropFind( xWriter->setOutputStream(xRequestOutStream); xWriter->startDocument(); rtl::Reference<::comphelper::AttributeList> const pAttrList(new ::comphelper::AttributeList); - pAttrList->AddAttribute("xmlns", "DAV:"); - xWriter->startElement("propfind", pAttrList); + pAttrList->AddAttribute(u"xmlns"_ustr, u"DAV:"_ustr); + xWriter->startElement(u"propfind"_ustr, pAttrList); if (o_pResourceInfos) { - xWriter->startElement("propname", nullptr); - xWriter->endElement("propname"); + xWriter->startElement(u"propname"_ustr, nullptr); + xWriter->endElement(u"propname"_ustr); } else { if (::std::get<0>(*o_pRequestedProperties).empty()) { - xWriter->startElement("allprop", nullptr); - xWriter->endElement("allprop"); + xWriter->startElement(u"allprop"_ustr, nullptr); + xWriter->endElement(u"allprop"_ustr); } else { - xWriter->startElement("prop", nullptr); + xWriter->startElement(u"prop"_ustr, nullptr); for (OUString const& rName : ::std::get<0>(*o_pRequestedProperties)) { SerfPropName name; DAVProperties::createSerfPropName(rName, name); pAttrList->Clear(); - pAttrList->AddAttribute("xmlns", OUString::createFromAscii(name.nspace)); + pAttrList->AddAttribute(u"xmlns"_ustr, OUString::createFromAscii(name.nspace)); xWriter->startElement(OUString::createFromAscii(name.name), pAttrList); xWriter->endElement(OUString::createFromAscii(name.name)); } - xWriter->endElement("prop"); + xWriter->endElement(u"prop"_ustr); } } - xWriter->endElement("propfind"); + xWriter->endElement(u"propfind"_ustr); xWriter->endDocument(); uno::Reference<io::XInputStream> const xRequestInStream( @@ -1799,8 +1799,9 @@ auto CurlProcessor::PropFind( assert(xResponseInStream.is()); assert(xResponseOutStream.is()); - CurlProcessor::ProcessRequest(rSession, rURI, "PROPFIND", options, &rEnv, ::std::move(pList), - &xResponseOutStream, &xRequestInStream, nullptr); + CurlProcessor::ProcessRequest(rSession, rURI, u"PROPFIND"_ustr, options, &rEnv, + ::std::move(pList), &xResponseOutStream, &xRequestInStream, + nullptr); if (o_pResourceInfos) { @@ -1876,7 +1877,7 @@ auto CurlSession::PROPPATCH(OUString const& rURIReference, pList.reset(curl_slist_append(pList.release(), "Content-Type: application/xml")); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } // generate XML document for PROPPATCH @@ -1888,19 +1889,18 @@ auto CurlSession::PROPPATCH(OUString const& rURIReference, xWriter->setOutputStream(xRequestOutStream); xWriter->startDocument(); rtl::Reference<::comphelper::AttributeList> const pAttrList(new ::comphelper::AttributeList); - pAttrList->AddAttribute("xmlns", "DAV:"); - xWriter->startElement("propertyupdate", pAttrList); + pAttrList->AddAttribute(u"xmlns"_ustr, u"DAV:"_ustr); + xWriter->startElement(u"propertyupdate"_ustr, pAttrList); for (ProppatchValue const& rPropValue : rValues) { assert(rPropValue.operation == PROPSET || rPropValue.operation == PROPREMOVE); - OUString const operation((rPropValue.operation == PROPSET) ? OUString("set") - : OUString("remove")); + OUString const operation((rPropValue.operation == PROPSET) ? u"set"_ustr : u"remove"_ustr); xWriter->startElement(operation, nullptr); - xWriter->startElement("prop", nullptr); + xWriter->startElement(u"prop"_ustr, nullptr); SerfPropName name; DAVProperties::createSerfPropName(rPropValue.name, name); pAttrList->Clear(); - pAttrList->AddAttribute("xmlns", OUString::createFromAscii(name.nspace)); + pAttrList->AddAttribute(u"xmlns"_ustr, OUString::createFromAscii(name.nspace)); xWriter->startElement(OUString::createFromAscii(name.name), pAttrList); if (rPropValue.operation == PROPSET) { @@ -1910,14 +1910,14 @@ auto CurlSession::PROPPATCH(OUString const& rURIReference, UCBDeadPropertyValue::toXML(rPropValue.value)); if (oProp) { - xWriter->startElement("ucbprop", nullptr); - xWriter->startElement("type", nullptr); + xWriter->startElement(u"ucbprop"_ustr, nullptr); + xWriter->startElement(u"type"_ustr, nullptr); xWriter->characters(oProp->first); - xWriter->endElement("type"); - xWriter->startElement("value", nullptr); + xWriter->endElement(u"type"_ustr); + xWriter->startElement(u"value"_ustr, nullptr); xWriter->characters(oProp->second); - xWriter->endElement("value"); - xWriter->endElement("ucbprop"); + xWriter->endElement(u"value"_ustr); + xWriter->endElement(u"ucbprop"_ustr); } } else @@ -1928,10 +1928,10 @@ auto CurlSession::PROPPATCH(OUString const& rURIReference, } } xWriter->endElement(OUString::createFromAscii(name.name)); - xWriter->endElement("prop"); + xWriter->endElement(u"prop"_ustr); xWriter->endElement(operation); } - xWriter->endElement("propertyupdate"); + xWriter->endElement(u"propertyupdate"_ustr); xWriter->endDocument(); uno::Reference<io::XInputStream> const xRequestInStream( @@ -1948,7 +1948,7 @@ auto CurlSession::PROPPATCH(OUString const& rURIReference, { CURLOPT_INFILESIZE_LARGE, len, nullptr, CurlOption::Type::CurlOffT } }; - CurlProcessor::ProcessRequest(*this, uri, "PROPPATCH", options, &rEnv, ::std::move(pList), + CurlProcessor::ProcessRequest(*this, uri, u"PROPPATCH"_ustr, options, &rEnv, ::std::move(pList), nullptr, &xRequestInStream, nullptr); } @@ -1970,8 +1970,8 @@ auto CurlSession::HEAD(OUString const& rURIReference, ::std::vector<OUString> co ::std::pair<::std::vector<OUString> const&, DAVResource&> const headers(rHeaderNames, io_rResource); - CurlProcessor::ProcessRequest(*this, uri, "HEAD", options, &rEnv, nullptr, nullptr, nullptr, - &headers); + CurlProcessor::ProcessRequest(*this, uri, u"HEAD"_ustr, options, &rEnv, nullptr, nullptr, + nullptr, &headers); } auto CurlSession::GET(OUString const& rURIReference, DAVRequestEnvironment const& rEnv) @@ -1993,8 +1993,8 @@ auto CurlSession::GET(OUString const& rURIReference, DAVRequestEnvironment const ::std::vector<CurlOption> const options{ { CURLOPT_HTTPGET, 1L, nullptr } }; - CurlProcessor::ProcessRequest(*this, uri, "GET", options, &rEnv, nullptr, &xResponseOutStream, - nullptr, nullptr); + CurlProcessor::ProcessRequest(*this, uri, u"GET"_ustr, options, &rEnv, nullptr, + &xResponseOutStream, nullptr, nullptr); uno::Reference<io::XInputStream> const xResponseInStream( io::SequenceInputStream::createStreamFromSequence(m_xContext, @@ -2013,8 +2013,8 @@ auto CurlSession::GET(OUString const& rURIReference, uno::Reference<io::XOutputS ::std::vector<CurlOption> const options{ { CURLOPT_HTTPGET, 1L, nullptr } }; - CurlProcessor::ProcessRequest(*this, uri, "GET", options, &rEnv, nullptr, &rxOutStream, nullptr, - nullptr); + CurlProcessor::ProcessRequest(*this, uri, u"GET"_ustr, options, &rEnv, nullptr, &rxOutStream, + nullptr, nullptr); } auto CurlSession::GET(OUString const& rURIReference, ::std::vector<OUString> const& rHeaderNames, @@ -2035,8 +2035,8 @@ auto CurlSession::GET(OUString const& rURIReference, ::std::vector<OUString> con ::std::pair<::std::vector<OUString> const&, DAVResource&> const headers(rHeaderNames, io_rResource); - CurlProcessor::ProcessRequest(*this, uri, "GET", options, &rEnv, nullptr, &xResponseOutStream, - nullptr, &headers); + CurlProcessor::ProcessRequest(*this, uri, u"GET"_ustr, options, &rEnv, nullptr, + &xResponseOutStream, nullptr, &headers); uno::Reference<io::XInputStream> const xResponseInStream( io::SequenceInputStream::createStreamFromSequence(m_xContext, @@ -2059,8 +2059,8 @@ auto CurlSession::GET(OUString const& rURIReference, uno::Reference<io::XOutputS ::std::pair<::std::vector<OUString> const&, DAVResource&> const headers(rHeaderNames, io_rResource); - CurlProcessor::ProcessRequest(*this, uri, "GET", options, &rEnv, nullptr, &rxOutStream, nullptr, - &headers); + CurlProcessor::ProcessRequest(*this, uri, u"GET"_ustr, options, &rEnv, nullptr, &rxOutStream, + nullptr, &headers); } auto CurlSession::PUT(OUString const& rURIReference, @@ -2075,7 +2075,7 @@ auto CurlSession::PUT(OUString const& rURIReference, uno::Reference<io::XSeekable> const xSeekable(rxInStream, uno::UNO_QUERY); if (!xSeekable.is()) { - throw uno::RuntimeException("TODO: not seekable"); + throw uno::RuntimeException(u"TODO: not seekable"_ustr); } curl_off_t const len(xSeekable->getLength() - xSeekable->getPosition()); @@ -2095,7 +2095,7 @@ auto CurlSession::PUT(OUString const& rURIReference, pList.reset(curl_slist_append(pList.release(), utf8If.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } } @@ -2107,8 +2107,8 @@ auto CurlSession::PUT(OUString const& rURIReference, { CURLOPT_INFILESIZE_LARGE, len, nullptr, CurlOption::Type::CurlOffT } }; - CurlProcessor::ProcessRequest(*this, uri, "PUT", options, &rEnv, ::std::move(pList), nullptr, - &rxInStream, nullptr); + CurlProcessor::ProcessRequest(*this, uri, u"PUT"_ustr, options, &rEnv, ::std::move(pList), + nullptr, &rxInStream, nullptr); } auto CurlSession::POST(OUString const& rURIReference, OUString const& rContentType, @@ -2124,20 +2124,20 @@ auto CurlSession::POST(OUString const& rURIReference, OUString const& rContentTy curl_slist_append(nullptr, "Transfer-Encoding: chunked")); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString const utf8ContentType("Content-Type: " + OUStringToOString(rContentType, RTL_TEXTENCODING_ASCII_US)); pList.reset(curl_slist_append(pList.release(), utf8ContentType.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString const utf8Referer("Referer: " + OUStringToOString(rReferer, RTL_TEXTENCODING_ASCII_US)); pList.reset(curl_slist_append(pList.release(), utf8Referer.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } ::std::vector<CurlOption> const options{ { CURLOPT_POST, 1L, nullptr } }; @@ -2147,7 +2147,7 @@ auto CurlSession::POST(OUString const& rURIReference, OUString const& rContentTy uno::Reference<io::XOutputStream> const xResponseOutStream(xSeqOutStream); assert(xResponseOutStream.is()); - CurlProcessor::ProcessRequest(*this, uri, "POST", options, &rEnv, ::std::move(pList), + CurlProcessor::ProcessRequest(*this, uri, u"POST"_ustr, options, &rEnv, ::std::move(pList), &xResponseOutStream, &rxInStream, nullptr); uno::Reference<io::XInputStream> const xResponseInStream( @@ -2172,25 +2172,25 @@ auto CurlSession::POST(OUString const& rURIReference, OUString const& rContentTy curl_slist_append(nullptr, "Transfer-Encoding: chunked")); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString const utf8ContentType("Content-Type: " + OUStringToOString(rContentType, RTL_TEXTENCODING_ASCII_US)); pList.reset(curl_slist_append(pList.release(), utf8ContentType.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString const utf8Referer("Referer: " + OUStringToOString(rReferer, RTL_TEXTENCODING_ASCII_US)); pList.reset(curl_slist_append(pList.release(), utf8Referer.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } ::std::vector<CurlOption> const options{ { CURLOPT_POST, 1L, nullptr } }; - CurlProcessor::ProcessRequest(*this, uri, "POST", options, &rEnv, ::std::move(pList), + CurlProcessor::ProcessRequest(*this, uri, u"POST"_ustr, options, &rEnv, ::std::move(pList), &rxOutStream, &rxInStream, nullptr); } @@ -2203,8 +2203,8 @@ auto CurlSession::MKCOL(OUString const& rURIReference, DAVRequestEnvironment con ::std::vector<CurlOption> const options{ { CURLOPT_CUSTOMREQUEST, "MKCOL", "CURLOPT_CUSTOMREQUEST" } }; - CurlProcessor::ProcessRequest(*this, uri, "MKCOL", options, &rEnv, nullptr, nullptr, nullptr, - nullptr); + CurlProcessor::ProcessRequest(*this, uri, u"MKCOL"_ustr, options, &rEnv, nullptr, nullptr, + nullptr, nullptr); } auto CurlProcessor::MoveOrCopy(CurlSession& rSession, std::u16string_view rSourceURIReference, @@ -2220,13 +2220,13 @@ auto CurlProcessor::MoveOrCopy(CurlSession& rSession, std::u16string_view rSourc curl_slist_append(nullptr, utf8Destination.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString const utf8Overwrite(OString::Concat("Overwrite: ") + (isOverwrite ? "T" : "F")); pList.reset(curl_slist_append(pList.release(), utf8Overwrite.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } ::std::vector<CurlOption> const options{ { CURLOPT_CUSTOMREQUEST, pMethod, @@ -2263,8 +2263,8 @@ auto CurlSession::DESTROY(OUString const& rURIReference, DAVRequestEnvironment c ::std::vector<CurlOption> const options{ { CURLOPT_CUSTOMREQUEST, "DELETE", "CURLOPT_CUSTOMREQUEST" } }; - CurlProcessor::ProcessRequest(*this, uri, "DESTROY", options, &rEnv, nullptr, nullptr, nullptr, - nullptr); + CurlProcessor::ProcessRequest(*this, uri, u"DESTROY"_ustr, options, &rEnv, nullptr, nullptr, + nullptr, nullptr); } auto CurlProcessor::Lock( @@ -2298,7 +2298,7 @@ auto CurlProcessor::Lock( TimeValue startTime; osl_getSystemTime(&startTime); - CurlProcessor::ProcessRequest(rSession, rURI, "LOCK", options, pEnv, + CurlProcessor::ProcessRequest(rSession, rURI, u"LOCK"_ustr, options, pEnv, ::std::move(pRequestHeaderList), &xResponseOutStream, pxRequestInStream, nullptr); @@ -2362,35 +2362,35 @@ auto CurlSession::LOCK(OUString const& rURIReference, ucb::Lock /*const*/& rLock xWriter->setOutputStream(xRequestOutStream); xWriter->startDocument(); rtl::Reference<::comphelper::AttributeList> const pAttrList(new ::comphelper::AttributeList); - pAttrList->AddAttribute("xmlns", "DAV:"); - xWriter->startElement("lockinfo", pAttrList); - xWriter->startElement("lockscope", nullptr); + pAttrList->AddAttribute(u"xmlns"_ustr, u"DAV:"_ustr); + xWriter->startElement(u"lockinfo"_ustr, pAttrList); + xWriter->startElement(u"lockscope"_ustr, nullptr); switch (rLock.Scope) { case ucb::LockScope_EXCLUSIVE: - xWriter->startElement("exclusive", nullptr); - xWriter->endElement("exclusive"); + xWriter->startElement(u"exclusive"_ustr, nullptr); + xWriter->endElement(u"exclusive"_ustr); break; case ucb::LockScope_SHARED: - xWriter->startElement("shared", nullptr); - xWriter->endElement("shared"); + xWriter->startElement(u"shared"_ustr, nullptr); + xWriter->endElement(u"shared"_ustr); break; default: assert(false); } - xWriter->endElement("lockscope"); - xWriter->startElement("locktype", nullptr); - xWriter->startElement("write", nullptr); - xWriter->endElement("write"); - xWriter->endElement("locktype"); + xWriter->endElement(u"lockscope"_ustr); + xWriter->startElement(u"locktype"_ustr, nullptr); + xWriter->startElement(u"write"_ustr, nullptr); + xWriter->endElement(u"write"_ustr); + xWriter->endElement(u"locktype"_ustr); OUString owner; if ((rLock.Owner >>= owner) && !owner.isEmpty()) { - xWriter->startElement("owner", nullptr); + xWriter->startElement(u"owner"_ustr, nullptr); xWriter->characters(owner); - xWriter->endElement("owner"); + xWriter->endElement(u"owner"_ustr); } - xWriter->endElement("lockinfo"); + xWriter->endElement(u"lockinfo"_ustr); xWriter->endDocument(); uno::Reference<io::XInputStream> const xRequestInStream( @@ -2402,7 +2402,7 @@ auto CurlSession::LOCK(OUString const& rURIReference, ucb::Lock /*const*/& rLock pList.reset(curl_slist_append(pList.release(), "Content-Type: application/xml")); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString depth; switch (rLock.Depth) @@ -2422,7 +2422,7 @@ auto CurlSession::LOCK(OUString const& rURIReference, ucb::Lock /*const*/& rLock pList.reset(curl_slist_append(pList.release(), depth.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } OString timeout; switch (rLock.Timeout) @@ -2441,7 +2441,7 @@ auto CurlSession::LOCK(OUString const& rURIReference, ucb::Lock /*const*/& rLock pList.reset(curl_slist_append(pList.release(), timeout.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } auto const acquiredLocks @@ -2470,13 +2470,13 @@ auto CurlProcessor::Unlock(CurlSession& rSession, CurlUri const& rURI, curl_slist_append(nullptr, utf8LockToken.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } ::std::vector<CurlOption> const options{ { CURLOPT_CUSTOMREQUEST, "UNLOCK", "CURLOPT_CUSTOMREQUEST" } }; - CurlProcessor::ProcessRequest(rSession, rURI, "UNLOCK", options, pEnv, ::std::move(pList), + CurlProcessor::ProcessRequest(rSession, rURI, u"UNLOCK"_ustr, options, pEnv, ::std::move(pList), nullptr, nullptr, nullptr); } @@ -2513,7 +2513,7 @@ auto CurlSession::NonInteractive_LOCK(OUString const& rURI, ::std::u16string_vie pList.reset(curl_slist_append(pList.release(), utf8If.getStr())); if (!pList) { - throw uno::RuntimeException("curl_slist_append failed"); + throw uno::RuntimeException(u"curl_slist_append failed"_ustr); } auto const acquiredLocks diff --git a/ucb/source/ucp/webdav-curl/CurlUri.cxx b/ucb/source/ucp/webdav-curl/CurlUri.cxx index 1b478cce8a45..a88157bf8d22 100644 --- a/ucb/source/ucp/webdav-curl/CurlUri.cxx +++ b/ucb/source/ucp/webdav-curl/CurlUri.cxx @@ -191,7 +191,7 @@ OUString CurlUri::GetPathBaseName() const } if (nPos == -1) { - return "/"; + return u"/"_ustr; } return m_Path.copy(nPos + 1, m_Path.getLength() - nPos - 1 - nTrail); } diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx b/ucb/source/ucp/webdav-curl/webdavcontent.cxx index 527f26e198b2..1b004017b482 100644 --- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx @@ -101,8 +101,8 @@ void lcl_sendPartialGETRequest( bool &bError, DAVResource aResource; DAVRequestHeaders aPartialGet; aPartialGet.emplace_back( - OUString( "Range" ), // see <https://tools.ietf.org/html/rfc7233#section-3.1> - OUString( "bytes=0-0" )); + u"Range"_ustr, // see <https://tools.ietf.org/html/rfc7233#section-3.1> + u"bytes=0-0"_ustr); bool bIsRequestSize = std::any_of(aHeaderNames.begin(), aHeaderNames.end(), [](const OUString& rHeaderName) { return rHeaderName == "Content-Length"; }); @@ -384,7 +384,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() { - return "com.sun.star.comp.ucb.WebDAVContent"; + return u"com.sun.star.comp.ucb.WebDAVContent"_ustr; } @@ -448,7 +448,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -468,7 +468,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -479,7 +479,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "No properties!", + u"No properties!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -519,7 +519,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -549,7 +549,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -613,7 +613,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -633,7 +633,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -683,7 +683,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -699,7 +699,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -731,7 +731,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Wrong argument type!", + u"Wrong argument type!"_ustr, getXWeak(), -1 ) ), Environment ); @@ -809,20 +809,20 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, // check property Name if ( !aProperty.Name.getLength() ) throw lang::IllegalArgumentException( - "\"addProperty\" with empty Property.Name", + u"\"addProperty\" with empty Property.Name"_ustr, getXWeak(), -1 ); // Check property type. if ( !UCBDeadPropertyValue::supportsType( aProperty.Type ) ) throw beans::IllegalTypeException( - "\"addProperty\" unsupported Property.Type", + u"\"addProperty\" unsupported Property.Type"_ustr, getXWeak() ); // check default value if ( aDefaultValue.hasValue() && aDefaultValue.getValueType() != aProperty.Type ) throw beans::IllegalTypeException( - "\"addProperty\" DefaultValue does not match Property.Type", + u"\"addProperty\" DefaultValue does not match Property.Type"_ustr, getXWeak() ); @@ -1081,7 +1081,7 @@ Content::queryCreatableContentsInfo() | ucb::ContentInfoAttribute::KIND_DOCUMENT; beans::Property aProp; - m_pProvider->getProperty( "Title", aProp ); + m_pProvider->getProperty( u"Title"_ustr, aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -1283,7 +1283,7 @@ void GetPropsUsingHeadRequest(DAVResource& resource, if (aDAVOptions.getHttpResponseStatusCode() != SC_GONE && !aDAVOptions.isHeadAllowed()) { - throw DAVException(DAVException::DAV_HTTP_ERROR, "405 Not Implemented", SC_METHOD_NOT_ALLOWED); + throw DAVException(DAVException::DAV_HTTP_ERROR, u"405 Not Implemented"_ustr, SC_METHOD_NOT_ALLOWED); } // if HEAD is enabled on this site // check if there is a relevant HTTP response status code cached @@ -1583,7 +1583,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if (!xProps) xProps.reset(new ContentProperties(aUnescapedTitle)); else - xProps->addProperty("Title", uno::Any(aUnescapedTitle), true); + xProps->addProperty(u"Title"_ustr, uno::Any(aUnescapedTitle), true); } else { @@ -1591,20 +1591,20 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - "Title", + u"Title"_ustr, uno::Any( aUnescapedTitle ), true ); xProps->addProperty( - "IsFolder", + u"IsFolder"_ustr, uno::Any( false ), true ); xProps->addProperty( - "IsDocument", + u"IsDocument"_ustr, uno::Any( true ), true ); xProps->addProperty( - "ContentType", + u"ContentType"_ustr, uno::Any( WEBDAV_CONTENT_TYPE ), true ); } @@ -1669,7 +1669,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Add BaseURI property, if requested. xProps->addProperty( - "BaseURI", + u"BaseURI"_ustr, uno::Any( getBaseURI( xResAccess ) ), true ); } @@ -1677,10 +1677,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Add CreatableContentsInfo property, if requested. bool bFolder = false; - xProps->getValue( "IsFolder" ) + xProps->getValue( u"IsFolder"_ustr ) >>= bFolder; xProps->addProperty( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, uno::Any( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -1769,7 +1769,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); continue; } @@ -1782,21 +1782,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rName == "IsDocument" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rName == "IsFolder" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rName == "Title" ) @@ -1829,7 +1829,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRetRange[ n ] <<= lang::IllegalArgumentException( - "Invalid content identifier!", + u"Invalid content identifier!"_ustr, getXWeak(), -1 ); } @@ -1837,7 +1837,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= lang::IllegalArgumentException( - "Empty title not allowed!", + u"Empty title not allowed!"_ustr, getXWeak(), -1 ); } @@ -1845,7 +1845,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= beans::IllegalTypeException( - "Property value has wrong type!", + u"Property value has wrong type!"_ustr, getXWeak() ); } } @@ -1868,7 +1868,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRetRange[ n ] <<= beans::UnknownPropertyException( - "Property is unknown!", + u"Property is unknown!"_ustr, getXWeak() ); continue; } @@ -1877,21 +1877,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rName == "DateCreated" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rName == "DateModified" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else if ( rName == "MediaType" ) @@ -1899,14 +1899,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } if ( rName == "CreatableContentsInfo" ) { // Read-only property! aRetRange[ n ] <<= lang::IllegalAccessException( - "Property is read-only!", + u"Property is read-only!"_ustr, getXWeak() ); } else @@ -1971,7 +1971,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRetRange[ n ] <<= uno::Exception( - "No property set for storing the value!", + u"No property set for storing the value!"_ustr, getXWeak() ); } } @@ -2082,7 +2082,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Set error . aRetRange[ nTitlePos ] <<= uno::Exception( - "Exchange failed!", + u"Exchange failed!"_ustr, getXWeak() ); } } @@ -2151,7 +2151,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::Any( lang::IllegalArgumentException( - "Non-folder resource cannot be opened as folder! Wrong Open Mode!", + u"Non-folder resource cannot be opened as folder! Wrong Open Mode!"_ustr, getXWeak(), -1 ) ), xEnv ); @@ -2467,7 +2467,7 @@ void Content::insert( { SAL_WARN( "ucb.ucp.webdav", "Content::insert - Title missing!" ); - uno::Sequence<OUString> aProps { "Title" }; + uno::Sequence<OUString> aProps { u"Title"_ustr }; ucbhelper::cancelCommandExecution( uno::Any( ucb::MissingPropertiesException( OUString(), @@ -2499,7 +2499,7 @@ void Content::insert( { #undef ERROR ucb::UnsupportedNameClashException aEx( - "Unable to write without overwrite!", + u"Unable to write without overwrite!"_ustr, getXWeak(), ucb::NameClash::ERROR ); @@ -2546,7 +2546,7 @@ void Content::insert( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - "Unknown interaction selection!", + u"Unknown interaction selection!"_ustr, uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2770,7 +2770,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::Any( ucb::InteractiveBadTransferURLException( - "Unsupported URL scheme!", + u"Unsupported URL scheme!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -2802,7 +2802,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::Any( ucb::InteractiveBadTransferURLException( - "Different hosts!", + u"Different hosts!"_ustr, getXWeak() ) ), Environment ); // Unreachable @@ -3097,7 +3097,7 @@ Content::ResourceType Content::resourceTypeForLocks( // First, check cached properties if (m_xCachedProps) { - if ((m_xCachedProps->getValue("Content-Disposition") >>= sContentDisposition) + if ((m_xCachedProps->getValue(u"Content-Disposition"_ustr) >>= sContentDisposition) && sContentDisposition.startsWithIgnoreAsciiCase("attachment")) { eResourceTypeForLocks = DAV_NOLOCK; @@ -3108,7 +3108,7 @@ Content::ResourceType Content::resourceTypeForLocks( if (sContentDisposition.isEmpty() && !m_bDidGetOrHead) try { DAVResource resource; - GetPropsUsingHeadRequest(resource, rResAccess, {"Content-Disposition"}, Environment); + GetPropsUsingHeadRequest(resource, rResAccess, {u"Content-Disposition"_ustr}, Environment); m_bDidGetOrHead = true; for (const auto& it : resource.properties) { @@ -3276,7 +3276,7 @@ void Content::lock( << m_xIdentifier->getContentIdentifier() << ">"); throw ucb::InteractiveLockingLockedException( - "Locked!", + u"Locked!"_ustr, getXWeak(), task::InteractionClassification_ERROR, aURL, @@ -3300,7 +3300,7 @@ void Content::lock( // since it mostly happens on read/only part of webdav, this appears to be the most correct exception available throw ucb::InteractiveNetworkWriteException( - "Authentication error while trying to lock! Write only WebDAV perhaps?", + u"Authentication error while trying to lock! Write only WebDAV perhaps?"_ustr, getXWeak(), task::InteractionClassification_ERROR, e.getData() ); @@ -3549,11 +3549,11 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case SC_NOT_FOUND: { uno::Sequence<uno::Any> aArgs{ uno::Any(beans::PropertyValue( - "Uri", -1, uno::Any(aURL), beans::PropertyState_DIRECT_VALUE)) }; + u"Uri"_ustr, -1, uno::Any(aURL), beans::PropertyState_DIRECT_VALUE)) }; aException <<= ucb::InteractiveAugmentedIOException( - "Not found!", + u"Not found!"_ustr, getXWeak(), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -3632,7 +3632,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) #if 1 aException <<= ucb::InteractiveLockingLockedException( - "Locked!", + u"Locked!"_ustr, getXWeak(), task::InteractionClassification_ERROR, aURL, @@ -3659,7 +3659,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - "Locked (self)!", + u"Locked (self)!"_ustr, getXWeak(), task::InteractionClassification_ERROR, aURL, @@ -3669,7 +3669,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - "Not locked!", + u"Not locked!"_ustr, getXWeak(), task::InteractionClassification_ERROR, aURL ); @@ -3678,7 +3678,7 @@ uno::Any Content::MapDAVException( const DAVException & e, bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - "Lock expired!", + u"Lock expired!"_ustr, getXWeak(), task::InteractionClassification_ERROR, aURL ); @@ -3733,7 +3733,7 @@ Content::getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess ) if (m_xCachedProps) { OUString aLocation; - m_xCachedProps->getValue( "Content-Location" ) >>= aLocation; + m_xCachedProps->getValue( u"Content-Location"_ustr ) >>= aLocation; if ( aLocation.getLength() ) { try @@ -4243,7 +4243,7 @@ bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommand // if HEAD is successful, set element found. rResAccess->HEAD( aHeaderNames, aResource, xEnv ); rDAVOptions.setHttpResponseStatusCode( 0 ); - rDAVOptions.setHttpResponseStatusText(""); + rDAVOptions.setHttpResponseStatusText(u""_ustr); return true; } catch ( DAVException const & e ) @@ -4264,8 +4264,8 @@ bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommand // support HEAD (or has HEAD disabled) DAVRequestHeaders aPartialGet; aPartialGet.emplace_back( - OUString( "Range" ), - OUString( "bytes=0-0" )); + u"Range"_ustr, + u"bytes=0-0"_ustr); rResAccess->GET0( aPartialGet, aHeaderNames, @@ -4295,7 +4295,7 @@ bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommand } // set SC_NOT_IMPLEMENTED since at a minimum GET must be implemented in a basic Web server rDAVOptions.setHttpResponseStatusCode( SC_NOT_IMPLEMENTED ); - rDAVOptions.setHttpResponseStatusText(""); + rDAVOptions.setHttpResponseStatusText(u""_ustr); return false; } diff --git a/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx index a7e2bb96893b..aa8ee8f8f944 100644 --- a/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx @@ -63,7 +63,7 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - "ContentType", + u"ContentType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -71,7 +71,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "IsDocument", + u"IsDocument"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -79,7 +79,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "IsFolder", + u"IsFolder"_ustr, -1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND @@ -87,7 +87,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "Title", + u"Title"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND ) ); @@ -96,7 +96,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "DateCreated", + u"DateCreated"_ustr, -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -104,7 +104,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "DateModified", + u"DateModified"_ustr, -1, cppu::UnoType<util::DateTime>::get(), beans::PropertyAttribute::BOUND @@ -112,7 +112,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "MediaType", + u"MediaType"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -120,7 +120,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "Size", + u"Size"_ustr, -1, cppu::UnoType<sal_Int64>::get(), beans::PropertyAttribute::BOUND @@ -128,7 +128,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "BaseURI", + u"BaseURI"_ustr, -1, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND @@ -136,7 +136,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - "CreatableContentsInfo", + u"CreatableContentsInfo"_ustr, -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(), beans::PropertyAttribute::BOUND @@ -419,21 +419,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - OUString( "ContentType" ) ); + u"ContentType"_ustr ); if ( !bHasIsDocument ) aPropSet.insert( - OUString( "IsDocument" ) ); + u"IsDocument"_ustr ); if ( !bHasIsFolder ) aPropSet.insert( - OUString( "IsFolder" ) ); + u"IsFolder"_ustr ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - OUString( "Title" ) ); + u"Title"_ustr ); } // Add optional properties. @@ -442,29 +442,28 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - OUString( "BaseURI" ) ); + u"BaseURI"_ustr ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - OUString( "DateCreated" ) ); + u"DateCreated"_ustr ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - OUString( "DateModified" ) ); + u"DateModified"_ustr ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - OUString( "MediaType" ) ); + u"MediaType"_ustr ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - OUString( "Size" ) ); + u"Size"_ustr ); if ( !bHasCreatableInfos ) aPropSet.insert( - OUString( - "CreatableContentsInfo" ) ); + u"CreatableContentsInfo"_ustr ); // Add cached properties, if present and still missing. if (xCachedProps) @@ -509,22 +508,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( pCmdInfo[ 0 ] = ucb::CommandInfo( - "getCommandInfo", + u"getCommandInfo"_ustr, -1, cppu::UnoType<void>::get() ); pCmdInfo[ 1 ] = ucb::CommandInfo( - "getPropertySetInfo", + u"getPropertySetInfo"_ustr, -1, cppu::UnoType<void>::get() ); pCmdInfo[ 2 ] = ucb::CommandInfo( - "getPropertyValues", + u"getPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::Property >>::get()); pCmdInfo[ 3 ] = ucb::CommandInfo( - "setPropertyValues", + u"setPropertyValues"_ustr, -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()); @@ -534,17 +533,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( pCmdInfo[ 4 ] = ucb::CommandInfo( - "delete", + u"delete"_ustr, -1, cppu::UnoType<bool>::get() ); pCmdInfo[ 5 ] = ucb::CommandInfo( - "insert", + u"insert"_ustr, -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ); pCmdInfo[ 6 ] = ucb::CommandInfo( - "open", + u"open"_ustr, -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ); @@ -554,17 +553,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( pCmdInfo[ 7 ] = ucb::CommandInfo( - "post", + u"post"_ustr, -1, cppu::UnoType<ucb::PostCommandArgument2>::get() ); pCmdInfo[ 8 ] = ucb::CommandInfo( - "addProperty", + u"addProperty"_ustr, -1, cppu::UnoType<ucb::PropertyCommandArgument>::get() ); pCmdInfo[ 9 ] = ucb::CommandInfo( - "removeProperty", + u"removeProperty"_ustr, -1, cppu::UnoType<OUString>::get() ); @@ -599,13 +598,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( pCmdInfo[ nPos ] = ucb::CommandInfo( - "transfer", + u"transfer"_ustr, -1, cppu::UnoType<ucb::TransferInfo>::get() ); nPos++; pCmdInfo[ nPos ] = ucb::CommandInfo( - "createNewContent", + u"createNewContent"_ustr, -1, cppu::UnoType<ucb::ContentInfo>::get() ); nPos++; @@ -619,13 +618,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { pCmdInfo[ nPos ] = ucb::CommandInfo( - "lock", + u"lock"_ustr, -1, cppu::UnoType<void>::get() ); nPos++; pCmdInfo[ nPos ] = ucb::CommandInfo( - "unlock", + u"unlock"_ustr, -1, cppu::UnoType<void>::get() ); nPos++; diff --git a/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx index 4b7f7786eb8b..7c1e0b63e7d0 100644 --- a/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx @@ -392,7 +392,7 @@ bool DataSupplier::getData() bool bFolder = false; const uno::Any & rValue - = pContentProperties->getValue( "IsFolder" ); + = pContentProperties->getValue( u"IsFolder"_ustr ); rValue >>= bFolder; if ( !bFolder ) @@ -406,7 +406,7 @@ bool DataSupplier::getData() bool bDocument = false; const uno::Any & rValue - = pContentProperties->getValue( "IsDocument" ); + = pContentProperties->getValue( u"IsDocument"_ustr ); rValue >>= bDocument; if ( !bDocument ) diff --git a/ucb/source/ucp/webdav-curl/webdavprovider.cxx b/ucb/source/ucp/webdav-curl/webdavprovider.cxx index effd6665ad1d..a496c54792fa 100644 --- a/ucb/source/ucp/webdav-curl/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-curl/webdavprovider.cxx @@ -84,7 +84,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, OUString ContentProvider::getImplementationName() { - return "com.sun.star.comp.WebDAVContentProvider"; + return u"com.sun.star.comp.WebDAVContentProvider"_ustr; } css::uno::Sequence< OUString > diff --git a/ucb/source/ucp/webdav-curl/webdavresponseparser.cxx b/ucb/source/ucp/webdav-curl/webdavresponseparser.cxx index 9a0500d01bff..3a1028764a90 100644 --- a/ucb/source/ucp/webdav-curl/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav-curl/webdavresponseparser.cxx @@ -117,34 +117,34 @@ namespace if(aWebDAVNameMapperList.empty()) { - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("activelock"), WebDAVName_activelock)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("lockdiscovery"), WebDAVName_lockdiscovery)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("multistatus"), WebDAVName_multistatus)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("response"), WebDAVName_response)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("href"), WebDAVName_href)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("propstat"), WebDAVName_propstat)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("prop"), WebDAVName_prop)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("resourcetype"), WebDAVName_resourcetype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("collection"), WebDAVName_collection)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("getcontenttype"), WebDAVName_getcontenttype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("supportedlock"), WebDAVName_supportedlock)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("lockentry"), WebDAVName_lockentry)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("lockscope"), WebDAVName_lockscope)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("depth"), WebDAVName_depth)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("locktoken"), WebDAVName_locktoken)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("exclusive"), WebDAVName_exclusive)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("locktype"), WebDAVName_locktype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("owner"), WebDAVName_owner)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("timeout"), WebDAVName_timeout)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("write"), WebDAVName_write)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("shared"), WebDAVName_shared)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("status"), WebDAVName_status)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("getlastmodified"), WebDAVName_getlastmodified)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("creationdate"), WebDAVName_creationdate)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("getcontentlength"), WebDAVName_getcontentlength)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("type"), WebDAVName_type)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("value"), WebDAVName_value)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString("ucbprop"), WebDAVName_ucbprop)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"activelock"_ustr, WebDAVName_activelock)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"lockdiscovery"_ustr, WebDAVName_lockdiscovery)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"multistatus"_ustr, WebDAVName_multistatus)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"response"_ustr, WebDAVName_response)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"href"_ustr, WebDAVName_href)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"propstat"_ustr, WebDAVName_propstat)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"prop"_ustr, WebDAVName_prop)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"resourcetype"_ustr, WebDAVName_resourcetype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"collection"_ustr, WebDAVName_collection)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"getcontenttype"_ustr, WebDAVName_getcontenttype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"supportedlock"_ustr, WebDAVName_supportedlock)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"lockentry"_ustr, WebDAVName_lockentry)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"lockscope"_ustr, WebDAVName_lockscope)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"depth"_ustr, WebDAVName_depth)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"locktoken"_ustr, WebDAVName_locktoken)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"exclusive"_ustr, WebDAVName_exclusive)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"locktype"_ustr, WebDAVName_locktype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"owner"_ustr, WebDAVName_owner)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"timeout"_ustr, WebDAVName_timeout)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"write"_ustr, WebDAVName_write)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"shared"_ustr, WebDAVName_shared)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"status"_ustr, WebDAVName_status)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"getlastmodified"_ustr, WebDAVName_getlastmodified)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"creationdate"_ustr, WebDAVName_creationdate)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"getcontentlength"_ustr, WebDAVName_getcontentlength)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"type"_ustr, WebDAVName_type)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"value"_ustr, WebDAVName_value)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(u"ucbprop"_ustr, WebDAVName_ucbprop)); } const WebDAVNameMapper::const_iterator aResult(aWebDAVNameMapperList.find(rStr)); @@ -628,7 +628,7 @@ namespace http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = "DAV:resourcetype"; - aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? OUString("collection") : OUString()); + aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? u"collection"_ustr : OUString()); maPropStatProperties.push_back(aDAVPropertyValue); } break; |