[Libreoffice-commits] core.git: vcl/workben

[Stephan Bergmann]

 vcl/workben/vcldemo.cxx |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 27b8fd533ac181aabcf1a2bcb2ce8aa82faa64af
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 11 11:54:11 2014 +0100

    Adapt vcldemo code to layer NONE
    
    ...and being run via bin/run, taking care of setting URE_BOOTSTRAP
    
    Change-Id: I6a3e54d244cc534e8526a501a075b3df0cc152d5

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 16574d9..354c4b3 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 );
     }