ooo-build r12765 - in branches/ooo-build-2-4-1: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Tue Jun  3 16:30:55 2008
New Revision: 12765
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12765&view=rev

Log:
2008-06-03  Chris Cheney  <ccheney ubuntu com>

       * patches/src680/apply: apply patches in FedoraFixes.
       * patches/src680/ooo87071.sd.backgroundfix.diff: add patch from Fedora
         to allow saving background image of slide master.
       * patches/src680/ooo86080.unopkg.bodge.diff: add patch from Fedora to
         workaround unopkg lock file issues.



Added:
   branches/ooo-build-2-4-1/patches/src680/ooo86080.unopkg.bodge.diff
   branches/ooo-build-2-4-1/patches/src680/ooo87071.sd.backgroundfix.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Tue Jun  3 16:30:55 2008
@@ -1902,7 +1902,11 @@
 #FIXME src680: ooo72129.vcl.fontglyphindex.diff
 ooo61812.svx.a11ycrash.diff
 
-ooo85931.inconsistent.getentrypos.diff, ccheney
+ooo85931.inconsistent.getentrypos.diff
+
+ooo86080.unopkg.bodge.diff
+
+ooo87071.sd.backgroundfix.diff
 
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section

Added: branches/ooo-build-2-4-1/patches/src680/ooo86080.unopkg.bodge.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/ooo86080.unopkg.bodge.diff	Tue Jun  3 16:30:55 2008
@@ -0,0 +1,41 @@
+--- desktop/scripts/unopkg.sh	2008-01-14 15:55:26.000000000 +0000
++++ desktop/scripts/unopkg.sh	2008-02-14 10:52:10.000000000 +0000
+@@ -47,6 +47,29 @@
+ sd_prog=`pwd`
+ cd "$sd_cwd"
+ 
++isshared=0
++for arg in $@
++do
++if [ "$arg" == "--shared" ]; then 
++    isshared=1
++fi
++done
++if [ $isshared -eq 1 ]; then
++    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
++    if [ $? -ne 0 ]; then
++        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
++    fi
++    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
++    if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
++        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
++    fi
++    echo $@ | grep -q env:UserInstallation
++    if [ $? -ne 0 ]; then
++        INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX`
++        set -- $@ '-env:UserInstallation=file://'$INSTDIR
++    fi
++fi
++
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
+@@ -76,4 +99,6 @@
+ 
+ # execute binary
+-exec "$sd_prog/$sd_binary" $GUI "$@"
+-
++"$sd_prog/$sd_binary" $GUI "$@"
++if [ -n "$INSTDIR" ]; then
++   rm -rf $INSTDIR
++fi

Added: branches/ooo-build-2-4-1/patches/src680/ooo87071.sd.backgroundfix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/ooo87071.sd.backgroundfix.diff	Tue Jun  3 16:30:55 2008
@@ -0,0 +1,11 @@
+--- sd/source/ui/func/fupage.cxx	26 Nov 2007 17:01:36 -0000	1.29
++++ sd/source/ui/func/fupage.cxx	26 Apr 2008 14:31:03 -0000
+@@ -342,7 +342,7 @@
+ 				pTempSet.reset( new SfxItemSet( mpDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0) );
+ 
+ 				pTempSet->Put( XFillStyleItem( XFILL_BITMAP ) );
+-				pTempSet->Put( XFillBitmapItem( String(), XOBitmap(aGraphic) ) );
++				pTempSet->Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) );
+ 				pTempSet->Put( XFillBmpStretchItem( TRUE ));
+ 				pTempSet->Put( XFillBmpTileItem( FALSE ));
+ 			}