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 /vcl/workben | |
| 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 'vcl/workben')
| -rw-r--r-- | vcl/workben/commonfuzzer.hxx | 4 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx index 108bdb49da90..85e772e19468 100644 --- a/vcl/workben/commonfuzzer.hxx +++ b/vcl/workben/commonfuzzer.hxx @@ -66,10 +66,10 @@ namespace OUString sExecDir; osl::FileBase::getSystemPathFromFileURL(execdir, sExecDir); - rtl::OStringBuffer aBuffer("<?xml version=\"1.0\"?>\n<fontconfig><dir>"); + OStringBuffer aBuffer("<?xml version=\"1.0\"?>\n<fontconfig><dir>"); aBuffer.append(OUStringToOString(sExecDir + getExecutableName() + ".fonts", osl_getThreadTextEncoding())); aBuffer.append("</dir><cachedir>/tmp/cache/fontconfig</cachedir></fontconfig>"); - rtl::OString aConf = aBuffer.makeStringAndClear(); + OString aConf = aBuffer.makeStringAndClear(); sal_uInt64 aBytesWritten; aFontConfig.write(aConf.getStr(), aConf.getLength(), aBytesWritten); assert(aBytesWritten == aConf.getLength()); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 39743415594d..59d121b70c28 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1653,7 +1653,7 @@ double DemoRenderer::getAndResetBenchmark(const RenderStyle style) double avgtime = maRenderers[i]->sumTime / maRenderers[i]->countTime; geomean *= avgtime; fprintf(stderr, "%s: %f (iteration: %d*%d*%d)\n", - rtl::OUStringToOString(maRenderers[i]->getName(), + OUStringToOString(maRenderers[i]->getName(), RTL_TEXTENCODING_UTF8).getStr(), avgtime, maRenderers[i]->countTime, maRenderers[i]->getTestRepeatCount(), (style == RENDER_THUMB) ? THUMB_REPEAT_FACTOR : 1); @@ -2170,7 +2170,7 @@ class DemoApp : public Application fprintf(stderr," --show <renderer> - start with a given renderer, options are:\n"); OUString aRenderers(rRenderer.getRendererList()); fprintf(stderr," %s\n", - rtl::OUStringToOString(aRenderers, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aRenderers, RTL_TEXTENCODING_UTF8).getStr()); fprintf(stderr," --test <iterCount> - create benchmark data\n"); fprintf(stderr," --widgets - launch the widget test.\n"); fprintf(stderr," --threads - render from multiple threads.\n"); @@ -2224,7 +2224,7 @@ public: else if (aArg.startsWith("--")) { fprintf(stderr,"Unknown argument '%s'\n", - rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr()); return showHelp(aRenderer); } } |