ucb/qa/cppunit/webdav/webdav_options.cxx | 6 ++---- ucb/source/ucp/cmis/auth_provider.cxx | 13 ++++++------- 2 files changed, 8 insertions(+), 11 deletions(-)
New commits: commit f5aa422422476d4cf944660a3e03e24ffe918f19 Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Jun 5 12:55:56 2020 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Jun 5 16:01:01 2020 +0200 Upcoming loplugin:elidestringvar: ucb Change-Id: I25535b844b6fa12679908427997713dadf819d74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95588 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/ucb/qa/cppunit/webdav/webdav_options.cxx b/ucb/qa/cppunit/webdav/webdav_options.cxx index ef0cc1b969fc..eee94af2a82b 100644 --- a/ucb/qa/cppunit/webdav/webdav_options.cxx +++ b/ucb/qa/cppunit/webdav/webdav_options.cxx @@ -347,16 +347,14 @@ namespace // the returned value to test DAVOptions aDavOptCached; // init the values - OUString aAllowedMethods = "OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK"; OUString aURL = "http://my.server.org/a%20fake%20url/to%20test/another-url";; - OUString aRedirectedURL = "http://my.server.org/a%20fake%20url/to%20test/another-url/redirected";; aDavOpt.setURL( aURL ); - aDavOpt.setRedirectedURL( aRedirectedURL ); + aDavOpt.setRedirectedURL( "http://my.server.org/a%20fake%20url/to%20test/another-url/redirected"; ); aDavOpt.setClass1(); aDavOpt.setClass2(); aDavOpt.setClass3(); aDavOpt.setHeadAllowed( false ); - aDavOpt.setAllowedMethods( aAllowedMethods ); + aDavOpt.setAllowedMethods( "OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK" ); // add to cache aDAVOptsCache.addDAVOptions( aDavOpt, 30000 ); CPPUNIT_ASSERT_EQUAL( true ,aDAVOptsCache.getDAVOptions( aURL, aDavOptCached ) ); diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx index c6d5b28bcb56..f9eb99db2553 100644 --- a/ucb/source/ucp/cmis/auth_provider.cxx +++ b/ucb/source/ucp/cmis/auth_provider.cxx @@ -80,10 +80,6 @@ namespace cmis const char* /*username*/, const char* /*password*/ ) { - OUString instructions = "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" - "https://login.live.com/oauth20_desktop.srf?code=YOUR_CODE&lc=1033";; OUString url_oustr( url, strlen( url ), RTL_TEXTENCODING_UTF8 ); const css::uno::Reference< css::ucb::XCommandEnvironment> xEnv = getXEnv( ); @@ -97,7 +93,11 @@ namespace cmis { rtl::Reference< ucbhelper::AuthenticationFallbackRequest > xRequest = new ucbhelper::AuthenticationFallbackRequest ( - instructions, url_oustr ); + "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" + "https://login.live.com/oauth20_desktop.srf?code=YOUR_CODE&lc=1033";, + url_oustr ); xIH->handle( xRequest.get() ); @@ -125,7 +125,6 @@ namespace cmis const char* /*username*/, const char* /*password*/ ) { - OUString instructions = "PIN:"; const css::uno::Reference< css::ucb::XCommandEnvironment> xEnv = getXEnv( ); @@ -138,7 +137,7 @@ namespace cmis { rtl::Reference< ucbhelper::AuthenticationFallbackRequest > xRequest = new ucbhelper::AuthenticationFallbackRequest ( - instructions, "" ); + "PIN:", "" ); xIH->handle( xRequest.get() ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
