[ooo-build-commit] 2 commits - patches/dev300

[Fridrich Strba]

 patches/dev300/crosswin32-scp2-mingw.diff    |    6 +++---
 patches/dev300/sw-invert-border-spacing.diff |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dc55918168414acf4924b13fb3951072aeda7928
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Mon Jul 6 15:18:09 2009 +0200

    Massage the patch to apply
    
    * patches/dev300/crosswin32-scp2-mingw.diff:

diff --git a/patches/dev300/crosswin32-scp2-mingw.diff b/patches/dev300/crosswin32-scp2-mingw.diff
index ea735b1..fc7c750 100644
--- a/patches/dev300/crosswin32-scp2-mingw.diff
+++ b/patches/dev300/crosswin32-scp2-mingw.diff
@@ -222,10 +222,10 @@ scp2/source/ooo/windowscustomaction_ooo.scp.pristine
  WindowsCustomAction gid_Customaction_MigrateInstallPath
        Name = "MigrateInstallPath";
        Typ = "321";
-@@ -417,3 +422,4 @@
- 	Inbinarytable = 1;
- 	Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
+@@ -464,3 +469,4 @@
+ 	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
  End
+ 
 +#endif /* !__CROSS__ */
 scp2/source/ooo/scpaction_ooo.scp.pristine
 --- scp2/source/ooo/scpaction_ooo.scp.pristine	2008-04-15 16:49:29.000000000 +0200
commit dfd4620e7b95a1712da0a0a83d2bf8ffe452fae6
Author: Florian Reuter <freuter at novell.com>
Date:   Mon Jul 6 15:16:54 2009 +0200

    Fix regression in indentation (bnc#518731)
    
    * patches/dev300/sw-invert-border-spacing.diff:

diff --git a/patches/dev300/sw-invert-border-spacing.diff b/patches/dev300/sw-invert-border-spacing.diff
index 18ed392..4f77171 100644
--- a/patches/dev300/sw-invert-border-spacing.diff
+++ b/patches/dev300/sw-invert-border-spacing.diff
@@ -87,12 +87,12 @@ index 5354200..21fdf63 100644
 +	else
 +	    nRight = CalcRightLine();
 +	
++    }
 +	// for paragraphs, "left" is "before text" and "right" is "after text"
 +	if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
 +	    nRight += rLR.GetLeft();
 +	else
 +	    nRight += rLR.GetRight();
-+    }
  
      // --> OD 2008-01-21 #newlistlevelattrs#
      // correction: retrieve left margin for numbering in R2L-layout
@@ -122,13 +122,13 @@ index 5354200..21fdf63 100644
 +	    nLeft = CalcRightLine();
 +	else
 +	    nLeft = CalcLeftLine();
++    }
 +	
 +	// for paragraphs, "left" is "before text" and "right" is "after text"
 +	if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
 +	    nLeft += rLR.GetRight();
 +	else
 +	    nLeft += rLR.GetLeft();
-+    }
 +    
  
      // --> OD 2008-01-21 #newlistlevelattrs#