[ooo-build-commit] patches/dev300

[Jan Holesovsky]

 patches/dev300/sd-no-macro-recorder-in-ui.diff             |   28 ++++++-------
 patches/dev300/solenv-really-use-unsinged-char-on-ppc.diff |    6 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 820b6eabc00fbce4df09f39933d2207242437a4f
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Oct 12 11:28:07 2009 +0200

    Fix patches to apply again with ooo320-m1.
    
    * patches/dev300/sd-no-macro-recorder-in-ui.diff: dos2unix.
    * patches/dev300/solenv-really-use-unsinged-char-on-ppc.diff: Update the
      location.

diff --git a/patches/dev300/sd-no-macro-recorder-in-ui.diff b/patches/dev300/sd-no-macro-recorder-in-ui.diff
index 29a422c..5115394 100644
--- a/patches/dev300/sd-no-macro-recorder-in-ui.diff
+++ b/patches/dev300/sd-no-macro-recorder-in-ui.diff
@@ -1,20 +1,20 @@
 --- sd/uiconfig/sdraw/menubar/menubar.xml	2009-10-09 16:08:53.000000000 +0200
 +++ sd/uiconfig/sdraw/menubar/menubar.xml	2009-10-09 16:09:32.000000000 +0200
 @@ -221,7 +221,6 @@
- 			<menu:menuseparator/>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuitem menu:id=".uno:MacroSignature"/>
+ 			<menu:menuseparator/>
+             <menu:menu menu:id=".uno:MacrosMenu">
+                 <menu:menupopup>
+-                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
+                     <menu:menuitem menu:id=".uno:RunMacro"/>
+                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
+                     <menu:menuitem menu:id=".uno:MacroSignature"/>
 --- sd/uiconfig/simpress/menubar/menubar.xml	2009-10-09 16:09:00.000000000 +0200
 +++ sd/uiconfig/simpress/menubar/menubar.xml	2009-10-09 16:09:24.000000000 +0200
 @@ -249,7 +249,6 @@
- 			<menu:menuseparator/>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuitem menu:id=".uno:MacroSignature"/>
+ 			<menu:menuseparator/>
+             <menu:menu menu:id=".uno:MacrosMenu">
+                 <menu:menupopup>
+-                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
+                     <menu:menuitem menu:id=".uno:RunMacro"/>
+                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
+                     <menu:menuitem menu:id=".uno:MacroSignature"/>
diff --git a/patches/dev300/solenv-really-use-unsinged-char-on-ppc.diff b/patches/dev300/solenv-really-use-unsinged-char-on-ppc.diff
index 6256ba2..74e54c7 100644
--- a/patches/dev300/solenv-really-use-unsinged-char-on-ppc.diff
+++ b/patches/dev300/solenv-really-use-unsinged-char-on-ppc.diff
@@ -1,7 +1,7 @@
-Index: unxlngppc.mk
+Index: solenv/inc/unxlngppc.mk
 ===================================================================
---- unxlngppc.mk	(Revision 276754)
-+++ unxlngppc.mk	(Arbeitskopie)
+--- solenv/inc/unxlngppc.mk	(Revision 276754)
++++ solenv/inc/unxlngppc.mk	(Arbeitskopie)
 @@ -35,7 +35,4 @@
  PICSWITCH:=-fPIC
  .INCLUDE : unxlng.mk