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

[Petr Mladek]

 patches/dev300/apply                                |    3 ---
 patches/dev300/oooXXXX.partial-revert-ooo95118.diff |   20 --------------------
 2 files changed, 23 deletions(-)

New commits:
commit 6fea11ad70f514db32776bc85f37581df2742295
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 15:45:27 2011 +0200

    bin obsolete oooXXXX.partial-revert-ooo95118.diff
    
    better fixed in git (i#100991)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 10f614a..29f9c31 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -136,9 +136,6 @@ cli-component.diff
 
 [ TemporaryHacks ]
 
-# originally from Fedora
-oooXXXX.partial-revert-ooo95118.diff
-
 # add idl target to toplevel makefile
 makefile-idl-build.diff, noelpwer
 
diff --git a/patches/dev300/oooXXXX.partial-revert-ooo95118.diff b/patches/dev300/oooXXXX.partial-revert-ooo95118.diff
deleted file mode 100644
index ae4110f..0000000
--- a/patches/dev300/oooXXXX.partial-revert-ooo95118.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- scripting/source/pyprov/pythonscript.py |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git scripting/source/pyprov/pythonscript.py scripting/source/pyprov/pythonscript.py
-index 88e0a9e..f9f0408 100644
---- scripting/source/pyprov/pythonscript.py
-+++ scripting/source/pyprov/pythonscript.py
-@@ -817,8 +817,6 @@ def expandUri(  uri ):
-         uri = uri.replace( "vnd.sun.star.expand:", "",1)
-         uri = uno.getComponentContext().getByName(
-                     "/singletons/com.sun.star.util.theMacroExpander" ).expandMacros( uri )
--    if uri.startswith( "file:" ):
--        uri = uno.absolutize("",uri)   # necessary to get rid of .. in uri
-     return uri
-     
- #--------------------------------------------------------------
--- 
-1.7.0.1
-