[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/desktop-infilter-option.diff |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6c38dac75530711731d5fee0bcfbe78349a012ed
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jul 30 08:45:23 2010 +0200

    Avoid patching where a context is dependent on platform dependent patches
    
    * patches/dev300/desktop-infilter-option.diff:

diff --git a/patches/dev300/desktop-infilter-option.diff b/patches/dev300/desktop-infilter-option.diff
index c4cf07b..983ea58 100644
--- a/patches/dev300/desktop-infilter-option.diff
+++ b/patches/dev300/desktop-infilter-option.diff
@@ -10,18 +10,18 @@
               aRequest.aViewList.getLength() > 0 ||
 --- desktop/source/app/cmdlineargs.cxx	2010-07-22 15:52:08.000000000 +0530
 +++ desktop/source/app/cmdlineargs.cxx	2010-07-22 16:26:35.000000000 +0530
-@@ -532,6 +532,11 @@ sal_Bool CommandLineArgs::InterpretComma
-         SetBoolParam_Impl( CMD_BOOLPARAM_HELPMATH, sal_True );
+@@ -544,6 +544,11 @@ sal_Bool CommandLineArgs::InterpretComma
          return sal_True;
      }
+     #endif
 +    else if ( aArgStr.Copy(0, 10).EqualsIgnoreCaseAscii( "-infilter=" ))
 +    {
 +        AddStringListParam_Impl( CMD_STRINGPARAM_INFILTER, aArgStr.Copy( 10 ) );
 +        return sal_True;
 +    }
-     #ifdef MACOSX
-     /* #i84053# ignore -psn on Mac
-        Platform dependent #ifdef here is ugly, however this is currently
+     else if ( aArgStr.Copy(0, 8).EqualsIgnoreCaseAscii( "-accept=" ))
+     {
+         AddStringListParam_Impl( CMD_STRINGPARAM_ACCEPT, aArgStr.Copy( 8 ) );
 @@ -949,6 +954,13 @@ sal_Bool CommandLineArgs::GetLanguage( :
      return m_aStrSetParams[ CMD_STRINGPARAM_LANGUAGE ];
  }