[Libreoffice-commits] .: 3 commits - cui/source desktop/source

[Andras Timar]

 cui/source/dialogs/about.src       |    4 ++--
 desktop/source/app/app.cxx         |    2 +-
 desktop/source/app/cmdlineargs.cxx |   14 --------------
 desktop/source/app/cmdlineargs.hxx |    3 ---
 4 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 1eafe2bb4cdefaa4ea66ede89a513d175874e779
Author: Andras Timar <atimar at suse.com>
Date:   Mon Jan 9 18:57:17 2012 +0100

    bump LibreOffice copyright year to 2012

diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 8db6636..37e5f4d 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -78,11 +78,11 @@ ModalDialog RID_DEFAULTABOUT
     };
     String ABOUT_STR_COPYRIGHT
     {
-        Text[ en-US ] = "LibreOffice is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved.";
+        Text[ en-US ] = "LibreOffice is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights reserved.";
     };
     String ABOUT_STR_COPYRIGHT_DERIVED
     {
-        Text[ en-US ] = "%PRODUCTNAME is derived from LibreOffice. LibreOffice is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved.";
+        Text[ en-US ] = "%PRODUCTNAME is derived from LibreOffice. LibreOffice is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights reserved.";
     };
     String ABOUT_STR_COPYRIGHT_ORACLE_DERIVED
     {
commit ecc0edad478f84d2b26d4a3beefdf485375e807c
Author: Andras Timar <atimar at suse.com>
Date:   Mon Jan 9 17:55:29 2012 +0100

    remove deprecated --plugin command line switch

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 9602f7c..6a5d58a 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( "plugin" )) == sal_True )
-    {
-        SetBoolParam_Impl( CMD_BOOLPARAM_PLUGIN, sal_True );
-    }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "server" )) == sal_True )
     {
         SetBoolParam_Impl( CMD_BOOLPARAM_SERVER, sal_True );
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index 62d00e0..f79efea 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_PLUGIN,
             CMD_BOOLPARAM_SERVER,
             CMD_BOOLPARAM_HEADLESS,
             CMD_BOOLPARAM_QUICKSTART,
commit 11abb04ab0dc926469e0eb8a78cb865d5e75b922
Author: Andras Timar <atimar at suse.com>
Date:   Mon Jan 9 17:47:55 2012 +0100

    remove deprecated --bean command line switch

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 50dc759..855418a 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 a139020..9602f7c 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 9eb554c..62d00e0 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;