diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 08:14:33 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 08:14:33 +0000 |
| commit | 26a99ac58844fd7c60e16f7806d5196774fb1029 (patch) | |
| tree | 8559a37aad9d3f93b393664b8e6b9fdffe99d8ad /desktop/source | |
| parent | 4ea7dff0a4c6aa1d21ca7496a726eb692a745dc6 (diff) | |
INTEGRATION: CWS c06v2_SRC680 (1.192.12); FILE MERGED
2006/05/18 13:03:03 cd 1.192.12.1: #135986# Provide application name to splash screen service
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c09c1413280c..cb14b2463dbe 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -4,9 +4,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.192 $ + * $Revision: 1.193 $ * - * last change: $Author: hr $ $Date: 2006-05-08 14:55:01 $ + * last change: $Author: rt $ $Date: 2006-07-26 09:14:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2870,7 +2870,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) void Desktop::OpenSplashScreen() { - ::rtl::OUString aTmpString; + ::rtl::OUString aTmpString; CommandLineArgs* pCmdLine = GetCommandLineArgs(); sal_Bool bVisible = sal_False; // Show intro only if this is normal start (e.g. no server, no quickstart, no printing ) @@ -2882,9 +2882,29 @@ void Desktop::OpenSplashScreen() !pCmdLine->GetPrintList( aTmpString ) && !pCmdLine->GetPrintToList( aTmpString ) ) { + // Determine application name from command line parameters + OUString aAppName; + if ( pCmdLine->IsWriter() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer" )); + else if ( pCmdLine->IsCalc() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc" )); + else if ( pCmdLine->IsDraw() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw" )); + else if ( pCmdLine->IsImpress() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress" )); + else if ( pCmdLine->IsBase() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "base" )); + else if ( pCmdLine->IsGlobal() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "global" )); + else if ( pCmdLine->IsMath() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "math" )); + else if ( pCmdLine->IsWeb() ) + aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "web" )); + bVisible = sal_True; - Sequence< Any > aSeq( 1 ); + Sequence< Any > aSeq( 2 ); aSeq[0] <<= bVisible; + aSeq[1] <<= aAppName; m_rSplashScreen = Reference<XStatusIndicator>( comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString::createFromAscii("com.sun.star.office.SplashScreen"), |