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

[Fridrich Strba]

 patches/dev300/apply |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0213655a1f901c5d7079fbb62724b010808359ec
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 4 10:28:23 2010 +0100

    Really fix and defuzz this one
    
    * patches/dev300/apply:
    * patches/dev300/slideshow-effect-rewind-sdext.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c34c01b..5e8249a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -400,6 +400,9 @@ pdfimport-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 sdext-minimizer-docked.diff, thorsten
 
+# Fix from Andre, allows to step back one animation effect
+slideshow-effect-rewind-sdext.diff, i#48179, thorsten
+
 [ Fixes < ooo320-m8 ]
 # gtk quickstarter crashes on disable/exit
 sfx2-qstart-nocrash.diff, i#101245, michael
@@ -3125,10 +3128,6 @@ slideshow-mute-sound.diff, thorsten
 # unresolved Base64 Java classes
 base64.diff, i#100620, hmth
 
-[ ExtensionFixes ]
-# Fix from Andre, allows to step back one animation effect
-slideshow-effect-rewind-sdext.diff, i#48179, thorsten
-
 [ OxygenOfficeDefaultSettings ]
 #Create langpack and full installers
 ooop-langpack-policy.diff
diff --git a/patches/dev300/slideshow-effect-rewind-sdext.diff b/patches/dev300/slideshow-effect-rewind-sdext.diff
index 11c1cb9..2f5f62b 100644
--- a/patches/dev300/slideshow-effect-rewind-sdext.diff
+++ b/patches/dev300/slideshow-effect-rewind-sdext.diff
@@ -58,7 +58,7 @@
 --- sdext/source/presenter/description.xml.old	2010-03-03 18:22:50.000000000 +0100
 +++ sdext/source/presenter/description.xml	2010-03-03 18:23:48.000000000 +0100
 @@ -8,10 +8,10 @@
-   <identifier value="com.sun.PresenterScreen" />
+   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
  
    <dependencies>
 -    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
commit ef24e4317d1de7a607593d523117ad57239d05c9
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 4 09:29:54 2010 +0100

    Revert "Moving the slideshow-effect-rewind-sdext.diff to ExtensionFixes"
    
    This reverts commit 7c4eb68908625daa1c19c42e2d31d266a515353b.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 061c481..c34c01b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -395,18 +395,19 @@ presentation-minimizer-no-license.diff
 apache-commons-build-fix-invalid-chars.diff, kami
 wiki-publisher-no-license.diff
 
+[ ExtensionFixes ]
 pdfimport-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 sdext-minimizer-docked.diff, thorsten
 
-# Fix from Andre, allows to step back one animation effect
-slideshow-effect-rewind.diff, i#48179, thorsten
-
 [ Fixes < ooo320-m8 ]
 # gtk quickstarter crashes on disable/exit
 sfx2-qstart-nocrash.diff, i#101245, michael
 
 [ Fixes ]
+# Fix from Andre, allows to step back one animation effect
+slideshow-effect-rewind.diff, i#48179, thorsten
+
 # correctly set table row height during ppt import
 svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
 
diff --git a/patches/dev300/slideshow-effect-rewind-sdext.diff b/patches/dev300/slideshow-effect-rewind-sdext.diff
index 2f5f62b..11c1cb9 100644
--- a/patches/dev300/slideshow-effect-rewind-sdext.diff
+++ b/patches/dev300/slideshow-effect-rewind-sdext.diff
@@ -58,7 +58,7 @@
 --- sdext/source/presenter/description.xml.old	2010-03-03 18:22:50.000000000 +0100
 +++ sdext/source/presenter/description.xml	2010-03-03 18:23:48.000000000 +0100
 @@ -8,10 +8,10 @@
-   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+   <identifier value="com.sun.PresenterScreen" />
  
    <dependencies>
 -    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>