ooo-build r12613 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue May 20 23:07:43 2008
New Revision: 12613
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12613&view=rev

Log:
quick'n'dirty buildfix

Added:
   trunk/patches/dev300/hack-readd-GetStringParam.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May 20 23:07:43 2008
@@ -612,6 +612,12 @@
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework.diff, i#60696, michael/jholesov
 
+[ QuickStarter >= dev300-m13 ]
+# FIXME: unxsplash-rework needs this function which was removed in m13
+# due to being unused. fix properly.
+hack-readd-GetStringParam.diff
+
+[ QuickStarter ]
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 

Added: trunk/patches/dev300/hack-readd-GetStringParam.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/hack-readd-GetStringParam.diff	Tue May 20 23:07:43 2008
@@ -0,0 +1,28 @@
+--- desktop/source/app/cmdlineargs.hxx-old	2008-05-21 00:01:55.000000000 +0200
++++ desktop/source/app/cmdlineargs.hxx	2008-05-21 00:01:45.000000000 +0200
+@@ -123,6 +123,8 @@
+ 		// generic methods to access parameter
+ 		void					SetBoolParam( BoolParam eParam, sal_Bool bNewValue );
+ 
++		const rtl::OUString&    GetStringParam( StringParam eParam ) const;
++
+ 		// Access to bool parameters
+ 		sal_Bool				IsMinimized() const;
+         sal_Bool				IsInvisible() const;
+--- desktop/source/app/cmdlineargs.cxx-old	2008-05-21 00:02:22.000000000 +0200
++++ desktop/source/app/cmdlineargs.cxx	2008-05-20 23:55:48.000000000 +0200
+@@ -609,6 +609,14 @@
+ 	m_aBoolParams[eParam] = bNewValue;
+ }
+ 
++const rtl::OUString& CommandLineArgs::GetStringParam( StringParam eParam ) const
++{
++       osl::MutexGuard  aMutexGuard( m_aMutex );
++
++       OSL_ASSERT( ( eParam >= 0 && eParam < CMD_STRINGPARAM_COUNT ) );
++       return m_aStrParams[eParam];
++}
++
+ sal_Bool CommandLineArgs::IsMinimized() const
+ {
+ 	osl::MutexGuard  aMutexGuard( m_aMutex );