rpms/openoffice.org/devel openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.11, 1.12

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28437

Modified Files:
	openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 
Log Message:
fix my patch

openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:
 desktop/source/deployment/manager/dp_manager.cxx                         |   68 +++++++++-
 desktop/source/pkgchk/unopkg/unopkg_app.cxx                              |   12 +
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx                           |   13 +
 desktop/source/pkgchk/unopkg/unopkg_shared.h                             |    1 
 javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java |   10 +
 offapi/com/sun/star/deployment/makefile.mk                               |    1 
 openoffice.org.orig/offapi/com/sun/star/deployment/LinkException.idl     |   66 +++++++++
 7 files changed, 164 insertions(+), 7 deletions(-)

Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	30 Apr 2010 08:40:59 -0000	1.11
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	30 Apr 2010 13:23:12 -0000	1.12
@@ -119,7 +119,7 @@ diff -r 03068afc23c6 desktop/source/depl
  #include "com/sun/star/task/XInteractionApprove.hpp"
  #include "com/sun/star/ucb/UnsupportedCommandException.hpp"
  #include "boost/bind.hpp"
-@@ -502,6 +503,40 @@
+@@ -514,6 +515,40 @@
      return mediaType;
  }
  
@@ -160,27 +160,9 @@ diff -r 03068afc23c6 desktop/source/depl
  //______________________________________________________________________________
  OUString PackageManagerImpl::insertToActivationLayer(
      OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
-@@ -542,19 +577,49 @@
-     {
-         // inflate content:
-         ::rtl::OUStringBuffer buf;
--        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
--        buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
-+        if (!sourceContent.isFolder())
-+        {
-+            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
-+            buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
-                                         rtl_UriCharClassRegName,
-                                         rtl_UriEncodeIgnoreEscapes,
-                                         RTL_TEXTENCODING_UTF8 ) );
-+        }
-+        else
-+            buf.append( sourceContent.getURL() );
-+
-         buf.append( static_cast<sal_Unicode>('/') );
--        sourceContent = ::ucbhelper::Content( 
--            buf.makeStringAndClear(), xCmdEnv );
-+         sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
+@@ -571,10 +606,35 @@
+         sourceContent = ::ucbhelper::Content( 
+             buf.makeStringAndClear(), xCmdEnv );
      }
 -    if (! destFolderContent.transferContent(
 -            sourceContent, ::ucbhelper::InsertOperation_COPY,