diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-18 07:37:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-18 11:26:44 +0200 |
| commit | b946842a744c2b869e5c01adf90335edf07f09ad (patch) | |
| tree | 8a6b21fb1040a0e825856e06f20bd1250fbeaf27 /tools | |
| parent | 35ea75e9c2be75a70298a3f4e7d703c1d0f9497e (diff) | |
Clean up the remaining uses of OUStringConstExpr, and drop it
Change-Id: I30b2ac77b58e2ae1d1e997a0c830c513542b973d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158101
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index ca5a014ecc56..897d1c47ebd1 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -292,7 +292,7 @@ int INetURLObject::SubString::compare(SubString const & rOther, struct INetURLObject::SchemeInfo { - rtl::OUStringConstExpr m_sScheme; + OUString m_sScheme; char const * m_pPrefix; bool m_bAuthority; bool m_bUser; @@ -347,7 +347,7 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme) static constexpr OUStringLiteral SFTP = u"sftp"; static constexpr OUStringLiteral VND_CMIS = u"vnd.libreoffice.cmis"; - static o3tl::enumarray<INetProtocol, SchemeInfo> const map = { + static o3tl::enumarray<INetProtocol, SchemeInfo> constexpr map = { // [-loplugin:redundantfcast]: SchemeInfo{ EMPTY, "", false, false, false, false, false, false, false, false}, @@ -916,7 +916,7 @@ bool INetURLObject::setAbsURIRef(std::u16string_view rTheAbsURIRef, } if (m_eScheme != INetProtocol::Generic) { - aSynScheme = static_cast<const OUString&>(getSchemeInfo().m_sScheme); + aSynScheme = getSchemeInfo().m_sScheme; } m_aScheme.set(m_aAbsURIRef, aSynScheme, m_aAbsURIRef.getLength()); m_aAbsURIRef.append(':'); @@ -1669,7 +1669,7 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef, // is empty ("") in that case, so take the scheme from m_aAbsURIRef if (m_eScheme != INetProtocol::Generic) { - aSynAbsURIRef.append(getSchemeInfo().m_sScheme.asView()); + aSynAbsURIRef.append(getSchemeInfo().m_sScheme); } else { @@ -3546,7 +3546,7 @@ INetURLObject::getAbbreviated( // is empty ("") in that case, so take the scheme from m_aAbsURIRef if (m_eScheme != INetProtocol::Generic) { - aBuffer.append(getSchemeInfo().m_sScheme.asView()); + aBuffer.append(getSchemeInfo().m_sScheme); } else { @@ -3775,7 +3775,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, if (HasError() || m_eScheme == INetProtocol::Generic) return false; m_aAbsURIRef.setLength(0); - m_aAbsURIRef.append(getSchemeInfo().m_sScheme.asView()); + m_aAbsURIRef.append(getSchemeInfo().m_sScheme); m_aAbsURIRef.append(':'); if (getSchemeInfo().m_bAuthority) { |