diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-11 11:54:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-11 11:54:11 +0100 |
| commit | 27b8fd533ac181aabcf1a2bcb2ce8aa82faa64af (patch) | |
| tree | 277b430d1fd52b52c1426d91c1e6053a3b007619 | |
| parent | 2640e8d34384761333a59560bb5d946d40d2b492 (diff) | |
Adapt vcldemo code to layer NONE
...and being run via bin/run, taking care of setting URE_BOOTSTRAP
Change-Id: I6a3e54d244cc534e8526a501a075b3df0cc152d5
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 16574d922754..354c4b3894c0 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <rtl/bootstrap.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -49,22 +48,8 @@ class DemoWin : public DemoBase public: DemoWin() : DemoBase() { - // Needed to find images - OUString aPath; - rtl::Bootstrap::get("SYSBINDIR", aPath); -#ifdef FIXME_THIS_FAILS - rtl::Bootstrap::set("BRAND_BASE_DIR", aPath + "/.."); - if (Application::LoadBrandBitmap("intro", maIntro)) + if (!Application::LoadBrandBitmap("intro", maIntro)) Application::Abort("Failed to load intro image"); -#else - aPath = aPath + "/intro.png"; - SvFileStream aFileStream( aPath, STREAM_READ ); - GraphicFilter aGraphicFilter(false); - Graphic aGraphic; - if (aGraphicFilter.ImportGraphic(aGraphic, aPath, aFileStream) != 0) - Application::Abort("Failed to load intro image: " + aPath); - maIntro = aGraphic.GetBitmapEx(); -#endif maIntroBW = maIntro.GetBitmap(); maIntroBW.Filter( BMP_FILTER_EMBOSS_GREY ); } |