From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Oct 2018 12:06:00 +0200 Subject: 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 --- vcl/opengl/program.cxx | 4 ++-- vcl/opengl/x11/X11DeviceInfo.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'vcl/opengl') diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index 5f677f1a5655..4de2c5decac0 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -45,8 +45,8 @@ OpenGLProgram::~OpenGLProgram() bool OpenGLProgram::Load( const OUString& rVertexShader, const OUString& rFragmentShader, - const rtl::OString& preamble, - const rtl::OString& rDigest ) + const OString& preamble, + const OString& rDigest ) { mnId = OpenGLHelper::LoadShaders( rVertexShader, rFragmentShader, preamble, rDigest ); return ( mnId != 0 ); diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index ae0ef85e2a34..577e2c2ad3b2 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -283,8 +283,8 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked() if (mnGLMajorVersion == 1) return true; - CrashReporter::AddKeyValue("AdapterVendorId", rtl::OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8)); - CrashReporter::AddKeyValue("AdapterDeviceId", rtl::OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8)); + CrashReporter::AddKeyValue("AdapterVendorId", OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8)); + CrashReporter::AddKeyValue("AdapterDeviceId", OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8)); SAL_INFO("vcl.opengl", "Vendor: " << maVendor); SAL_INFO("vcl.opengl", "Renderer: " << maRenderer); -- cgit