rpms/openoffice.org/F-7 openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.1, 1.2 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.2, 1.3

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9690

Modified Files:
	openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 
	openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 
Log Message:
fix up for F-7

openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:

Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	18 Feb 2008 09:41:29 -0000	1.1
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	19 Mar 2008 08:54:13 -0000	1.2
@@ -172,7 +172,7 @@
          buf.append( static_cast<sal_Unicode>('/') );
 -        sourceContent = ::ucbhelper::Content( 
 -            buf.makeStringAndClear(), xCmdEnv );
-+         sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
++        sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
 +    }
 +
 +    bool bLink = false;
@@ -205,7 +205,7 @@
      }
 -    if (! destFolderContent.transferContent(
 -            sourceContent, ::ucbhelper::InsertOperation_COPY,
--            title, NameClash::OVERWRITE ))
+-            OUString(), NameClash::OVERWRITE ))
 -        throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
      
      // write to DB:

openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:

Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	11 Mar 2008 19:10:28 -0000	1.2
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	19 Mar 2008 08:54:13 -0000	1.3
@@ -30,12 +30,12 @@
  #collect all bootstrap variables specified on the command line
  #so that they can be passed as arguments to javaldx later on
  for arg in $@
-@@ -149,5 +172,8 @@
- [ $# -eq 1 -a "oxt" = "`echo $1 | cut -d . -f 2`" -a -n "$DISPLAY" ] && GUI="gui"
+@@ -142,5 +165,8 @@
+ export PATH
  
  # execute binary
--exec "$sd_prog/$sd_binary" $GUI "$@"
-+"$sd_prog/$sd_binary" $GUI "$@"
+-exec "$sd_prog/$sd_binary" "$@"
++"$sd_prog/$sd_binary" "$@"
  
 +if [ -n "$INSTDIR" ]; then
 +   rm -rf $INSTDIR