diff options
| author | Andras Timar <atimar@suse.com> | 2012-01-09 17:47:55 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-01-09 19:12:50 +0100 |
| commit | 11abb04ab0dc926469e0eb8a78cb865d5e75b922 (patch) | |
| tree | 40aba318570fd91070364ce0ce97755b3afdd709 /desktop | |
| parent | ea1ce3c63044394b1e4387808231d535a4118f4e (diff) | |
remove deprecated --bean command line switch
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 10 | ||||
| -rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 50dc7599cb95..855418ae18df 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2660,7 +2660,7 @@ void Desktop::OpenClients() if ( xList->hasElements() || rArgs.IsServer() ) return; - if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || rArgs.IsBean() || Application::AnyInput( VCL_INPUT_APPEVENT ) ) + if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || Application::AnyInput( VCL_INPUT_APPEVENT ) ) // soffice was started as tray icon ... return; { diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index a139020a43b2..9602f7c0365d 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -446,10 +446,6 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& { SetBoolParam_Impl( CMD_BOOLPARAM_NODEFAULT, sal_True ); } - else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bean" )) == sal_True ) - { - SetBoolParam_Impl( CMD_BOOLPARAM_BEAN, sal_True ); - } else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "plugin" )) == sal_True ) { SetBoolParam_Impl( CMD_BOOLPARAM_PLUGIN, sal_True ); @@ -718,12 +714,6 @@ sal_Bool CommandLineArgs::IsNoDefault() const return m_aBoolParams[ CMD_BOOLPARAM_NODEFAULT ]; } -sal_Bool CommandLineArgs::IsBean() const -{ - osl::MutexGuard aMutexGuard( m_aMutex ); - return m_aBoolParams[ CMD_BOOLPARAM_BEAN ]; -} - sal_Bool CommandLineArgs::IsServer() const { osl::MutexGuard aMutexGuard( m_aMutex ); diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 9eb554cb172c..62d00e0641c2 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -44,7 +44,6 @@ class CommandLineArgs CMD_BOOLPARAM_MINIMIZED = 0, CMD_BOOLPARAM_INVISIBLE, CMD_BOOLPARAM_NORESTORE, - CMD_BOOLPARAM_BEAN, CMD_BOOLPARAM_PLUGIN, CMD_BOOLPARAM_SERVER, CMD_BOOLPARAM_HEADLESS, @@ -139,7 +138,6 @@ class CommandLineArgs sal_Bool IsInvisible() const; sal_Bool IsNoRestore() const; sal_Bool IsNoDefault() const; - sal_Bool IsBean() const; sal_Bool IsServer() const; sal_Bool IsHeadless() const; sal_Bool IsQuickstart() const; |