[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                           |    3 
 patches/dev300/desktop-application-octet-stream-mime-type.diff |   34 ----------
 2 files changed, 37 deletions(-)

New commits:
commit 302a1f2df278b7dca35c7a1c79518175875844a7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 14:18:28 2011 +0200

    bin obsolete desktop-application-octet-stream-mime-type.diff (i#73301)
    
    solved another way in plain sources (i#84019)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 866042e..2f98770 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -166,9 +166,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
 [ Fixes ]
-# Added support for "application/octet-stream" mime type in package manager
-desktop-application-octet-stream-mime-type.diff, i#73301, flr
-
 # Use the characters after the string to get a better kerning
 # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
diff --git a/patches/dev300/desktop-application-octet-stream-mime-type.diff b/patches/dev300/desktop-application-octet-stream-mime-type.diff
deleted file mode 100644
index 1f699a2..0000000
--- a/patches/dev300/desktop-application-octet-stream-mime-type.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- .../deployment/registry/package/dp_package.cxx     |   16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git desktop/source/deployment/registry/package/dp_package.cxx desktop/source/deployment/registry/package/dp_package.cxx
-index 48de481..1a14354 100644
---- desktop/source/deployment/registry/package/dp_package.cxx
-+++ desktop/source/deployment/registry/package/dp_package.cxx
-@@ -1365,7 +1365,21 @@ void BackendImpl::PackageImpl::scanBundle(
-         if (param != 0 && !platform_fits( param->m_sValue ))
-             continue;
-         const OUString url( makeURL( packageRootURL, fullPath ) );
--        
-+
-+    INetContentTypeParameter const * execParam = params.find(
-+            ByteString("executable") );
-+    if (execParam!=0 && execParam->m_sValue.CompareIgnoreCaseToAscii("true")==COMPARE_EQUAL) {
-+        ::rtl::OUString expandedUrl=expandUnoRcUrl(url);
-+        oslFileError err=osl_setFileAttributes( expandedUrl.pData, osl_File_Attribute_OwnRead | osl_File_Attribute_OwnExe);
-+    }
-+
-+        if (type.EqualsIgnoreCaseAscii("application") &&
-+            subType.EqualsIgnoreCaseAscii(
-+                "octet-stream"))
-+        {
-+        continue;
-+    }
-+
-         // check for bundle description:
-         if (type.EqualsIgnoreCaseAscii("application") &&
-             subType.EqualsIgnoreCaseAscii(
--- 
-1.7.0.1
-