diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
| commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
| tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /sal/osl/all | |
| parent | 4e729de73f2947155248f8df5897380611b87917 (diff) | |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/osl/all')
| -rw-r--r-- | sal/osl/all/debugbase.cxx | 10 | ||||
| -rw-r--r-- | sal/osl/all/loadmodulerelative.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index fe5affc9d069..209dc55e1e32 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -34,14 +34,14 @@ struct StaticDebugBaseAddressFilter std::vector<OString> operator()() const { std::vector<OString> vec; rtl_uString * pStr = nullptr; - rtl::OUString const name( + OUString const name( "OSL_DEBUGBASE_STORE_ADDRESSES" ); if (osl_getEnvironment( name.pData, &pStr ) == osl_Process_E_None) { - rtl::OUString const str(pStr); + OUString const str(pStr); rtl_uString_release(pStr); sal_Int32 nIndex = 0; do { - vec.push_back( rtl::OUStringToOString( + vec.push_back( OUStringToOString( str.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_ASCII_US ) ); } @@ -51,7 +51,7 @@ struct StaticDebugBaseAddressFilter } }; -bool isSubStr( char const* pStr, rtl::OString const& subStr ) +bool isSubStr( char const* pStr, OString const& subStr ) { return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0; } @@ -85,7 +85,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName ) if (rVec.empty()) return false; // check for "all": - rtl::OString const& rFirst = rVec[0]; + OString const& rFirst = rVec[0]; if ( rFirst == "all" ) return true; auto const iEnd( rVec.cend() ); diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx index 30c7d600674d..242bb6210a76 100644 --- a/sal/osl/all/loadmodulerelative.cxx +++ b/sal/osl/all/loadmodulerelative.cxx @@ -38,12 +38,12 @@ oslModule SAL_CALL osl_loadModuleRelative( oslGenericFunction const baseModule, rtl_uString * const relativePath, sal_Int32 const mode) { - rtl::OUString base; + OUString base; if (!osl::Module::getUrlFromAddress(baseModule, base)) { SAL_INFO("sal.osl","osl::Module::getUrlFromAddress failed"); return nullptr; } - rtl::OUString abs; + OUString abs; try { abs = rtl::Uri::convertRelToAbs(base, relativePath); } catch (const rtl::MalformedUriException & e) { |