#i10880# fixed pause logo in impress slideshow

2 files changed, 47 insertions, 33 deletions

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 17b2dee417cd..8a49fde7b958 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -33,6 +33,7 @@
 #include <tools/solar.h>
 #include <svl/smplhint.hxx>
 #include <svl/poolitem.hxx>
+#include <vcl/image.hxx>
 #include <tools/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
@@ -316,6 +317,9 @@ public:
     SAL_DLLPRIVATE SfxModule*   GetModule_Impl();
     SAL_DLLPRIVATE ResMgr*      GetOffResManager_Impl();
 //#endif
+
+    /** loads the application logo as used in the about dialog and impress slideshow pause screen */
+    static Image GetApplicationLogo();
 };
 
 #define SFX_APP() SfxGetpApp()
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 66d4146d9e62..4635733b934d 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -109,6 +109,48 @@ static bool impl_loadBitmap(
     return false;
 }
 
+/** loads the application logo as used in the about dialog and impress slideshow pause screen */
+Image SfxApplication::GetApplicationLogo()
+{
+    Image aAppLogo;
+
+    rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) );
+    bool bLoaded = false;
+    sal_Int32 nIndex = 0;
+    do
+    {
+        bLoaded = impl_loadBitmap(
+            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+            aAbouts.getToken( 0, ',', nIndex ), aAppLogo );
+    }
+    while ( !bLoaded && ( nIndex >= 0 ) );
+
+    // fallback to "about.bmp"
+    if ( !bLoaded )
+    {
+        bLoaded = impl_loadBitmap(
+            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
+            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+        if ( !bLoaded )
+            bLoaded = impl_loadBitmap(
+                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
+                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+    }
+
+    if ( !bLoaded )
+    {
+        bLoaded = impl_loadBitmap(
+            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+        if ( !bLoaded )
+            bLoaded = impl_loadBitmap(
+                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+    }
+
+    return aAppLogo;
+}
+
 AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ) :
 
     SfxModalDialog  ( pParent,  rId ),
@@ -145,39 +187,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
     }
 
     // load image from module path
-    rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) );
-    bool bLoaded = false;
-    sal_Int32 nIndex = 0;
-    do
-    {
-        bLoaded = impl_loadBitmap(
-            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
-            aAbouts.getToken( 0, ',', nIndex ), aAppLogo );
-    }
-    while ( !bLoaded && ( nIndex >= 0 ) );
-
-    // fallback to "about.bmp"
-    if ( !bLoaded )
-    {
-        bLoaded = impl_loadBitmap(
-            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
-            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
-        if ( !bLoaded )
-            bLoaded = impl_loadBitmap(
-                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
-                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
-    }
-
-    if ( !bLoaded )
-    {
-        bLoaded = impl_loadBitmap(
-            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
-            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
-        if ( !bLoaded )
-            bLoaded = impl_loadBitmap(
-                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
-                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
-    }
+    aAppLogo = SfxApplication::GetApplicationLogo();
 
     // Transparenter Font
     Font aFont = GetFont();