diff options
Diffstat (limited to 'desktop/source/deployment/registry/help/dp_help.cxx')
| -rw-r--r-- | desktop/source/deployment/registry/help/dp_help.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 834f829ad35b..a84bc2809544 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -31,6 +31,7 @@ #include <svl/inettype.hxx> #include <unotools/pathoptions.hxx> #include <cppuhelper/supportsservice.hxx> +#include <o3tl/string_view.hxx> #if HAVE_FEATURE_XMLHELP #include <helpcompiler/compilehelp.hxx> @@ -391,7 +392,7 @@ void BackendImpl::implProcessHelp( "No help folder"; OWeakObject* oWeakThis = this; throw deployment::DeploymentException( OUString(), oWeakThis, - makeAny( uno::Exception( aErrStr, oWeakThis ) ) ); + Any( uno::Exception( aErrStr, oWeakThis ) ) ); } // Scan languages @@ -420,7 +421,7 @@ void BackendImpl::implProcessHelp( &langFolderContent, langFolderDest, xCmdEnv); - static const OUStringLiteral aHelpStr(u"help"); + static constexpr OUString aHelpStr(u"help"_ustr); OUString aJarFile( makeURL(sHelpFolder, langFolderURLSegment + "/" + aHelpStr + ".jar")); @@ -447,9 +448,8 @@ void BackendImpl::implProcessHelp( implCollectXhpFiles( aSubFolderURL, aXhpFileVector ); // Copy to package (later: move?) - OUString aDestPath = aDestBasePath; - OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL ); - aDestPath += aPureFolderName; + std::u16string_view aPureFolderName = aSubFolderURL.subView( nLenLangFolderURL ); + OUString aDestPath = aDestBasePath + aPureFolderName; xSFA->copy( aSubFolderURL, aDestPath ); } @@ -538,7 +538,7 @@ void BackendImpl::implProcessHelp( OWeakObject* oWeakThis = this; throw deployment::DeploymentException( OUString(), oWeakThis, - makeAny( uno::Exception( aErrStr, oWeakThis ) ) ); + Any( uno::Exception( aErrStr, oWeakThis ) ) ); } } } @@ -580,8 +580,8 @@ void BackendImpl::implCollectXhpFiles( const OUString& aDir, sal_Int32 nLastDot = aURL.lastIndexOf( '.' ); if( nLastDot != -1 ) { - OUString aExt = aURL.copy( nLastDot + 1 ); - if( aExt.equalsIgnoreAsciiCase( "xhp" ) ) + std::u16string_view aExt = aURL.subView( nLastDot + 1 ); + if( o3tl::equalsIgnoreAsciiCase( aExt, u"xhp" ) ) o_rXhpFileVector.push_back( aURL ); } } |