From 5536aea8228778e00b9f1ca8199d858cd03780ad Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Aug 2016 07:43:52 +0200 Subject: Let OUStringLiteral1 take its arg as ctor arg, not template arg ...which makes it more flexible, can now also be used on non-const arguments. The drawback of the argument no longer being a compile-time constant is remedied by making the ctor constexpr. Change-Id: Ia4903a2cc86791fece92eac0cb8406b6659dd19d --- unotools/source/config/bootstrap.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'unotools') diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 8c2ed4fe4445..68868f63e5d9 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -199,7 +199,7 @@ bool implNormalizeURL(OUString & _sURL, osl::DirectoryItem& aDirItem) // #109863# sal/osl returns final slash for file URLs contradicting // the URL/URI RFCs. - if ( !aNormalizedURL.endsWith(OUStringLiteral1()) ) + if ( !aNormalizedURL.endsWith(OUStringLiteral1(cURLSeparator)) ) _sURL = aNormalizedURL; else _sURL = aNormalizedURL.copy( 0, aNormalizedURL.getLength()-1 ); @@ -309,7 +309,7 @@ PathStatus getDerivedPath( // do we have a base path ? if (!_aBaseURL.isEmpty()) { - OSL_PRECOND(!_aBaseURL.endsWith(OUStringLiteral1()), "Unexpected: base URL ends in slash"); + OSL_PRECOND(!_aBaseURL.endsWith(OUStringLiteral1(cURLSeparator)), "Unexpected: base URL ends in slash"); sDerivedURL = OUStringBuffer(_aBaseURL).append(cURLSeparator).append(_sRelativeURL).makeStringAndClear(); -- cgit