summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-06-11 13:03:47 +0000
committerOliver Bolte <obo@openoffice.org>2007-06-11 13:03:47 +0000
commit59f3dc617cef0ccff2300f2c8889cabf57abbe49 (patch)
treeb6750c58af23e7e0ae6ecb30e57fb13c8a8fd255
parent121b0520a692a73425409837bc5e6adea0c81c9e (diff)
INTEGRATION: CWS oointroaboutbrand (1.12.56); FILE MERGED
2007/03/26 11:32:39 cd 1.12.56.1: i66426# Use more flexibel way to detect and use intro/about bitmaps
-rw-r--r--desktop/source/splash/splash.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 39a983d7da..de6336470a 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: splash.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: obo $ $Date: 2006-10-12 14:18:55 $
+ * last change: $Author: obo $ $Date: 2007-06-11 14:03:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -107,6 +107,7 @@ private:
bool findScreenBitmap();
bool findAppBitmap();
bool findBitmap( const rtl::OUString aBmpFileName );
+ bool loadBitmap( const rtl::OUString &rBmpFileName, const rtl::OUString &rExecutePath, Bitmap &rBmp );
void determineProgressRatioValues( rtl::Bootstrap& rIniFile, double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
static SplashScreen *_pINSTANCE;