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

[Tor Lillqvist]

 patches/dev300/apply       |    7 ++++---
 patches/dev300/base64.diff |   29 -----------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

New commits:
commit 8d497066985f0bf37faf2e9d096283e5e9f782d3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 14:14:18 2011 +0300

    I think base64.diff is not needed any more

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a86b2f2..0a743e9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1418,8 +1418,6 @@ sfx2-privateprotectedpublic.diff
 # global application-wide shortcuts also in open dialogs
 vcl-permit-global-shortcuts.diff, i#105676, thorsten
 
-# unresolved Base64 Java classes
-base64.diff, i#100620, hmth
 
 [ OxygenOfficeDefaultSettings ]
 #Create langpack and full installers
diff --git a/patches/dev300/base64.diff b/patches/dev300/base64.diff
deleted file mode 100644
index c8e1ed4..0000000
--- a/patches/dev300/base64.diff
+++ /dev/null
@@ -1,29 +0,0 @@
----
- filter/source/xsltfilter/makefile.mk |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git filter/source/xsltfilter/makefile.mk filter/source/xsltfilter/makefile.mk
-index 1a20572..46f641e 100644
---- filter/source/xsltfilter/makefile.mk
-+++ filter/source/xsltfilter/makefile.mk
-@@ -62,7 +62,7 @@ JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
- CUSTOMMANIFESTFILE = Manifest
- 
- JARCOMPRESS		= TRUE
--JARCLASSDIRS	= XSLTransformer*.class XSLTFilterOLEExtracter*.class
-+JARCLASSDIRS	= XSLTransformer*.class XSLTFilterOLEExtracter*.class Base64*.class
- JARTARGET		= $(TARGET).jar
- 
- .IF "$(SYSTEM_SAXON)" == "YES"
-@@ -72,7 +72,7 @@ JARFILES += saxon9.jar
- .ENDIF
- 
- # --- Files --------------------------------------------------------
--JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class  $(CLASSDIR)$/XSLTFilterOLEExtracter.class
-+JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class  $(CLASSDIR)$/XSLTFilterOLEExtracter.class $(CLASSDIR)$/Base64.class
- .ENDIF
- 
- # --- Targets ------------------------------------------------------
--- 
-1.7.0.1
-
commit cadc51bb83d5b952e0f327a3136eff82bc7819ff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 14:12:00 2011 +0300

    Bypass optional-outplace-ole.diff for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f899ed6..a86b2f2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1409,8 +1409,11 @@ mingw-thread-wait-instead-of-sleep.diff, i#95200, jholesov
 
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
+
 # UI + core to make OLE editing optionally outplace
-optional-outplace-ole.diff, i#98970, thorsten
+# FIXME 2011-04-05: Doesn't apply, not easy to fix
+# optional-outplace-ole.diff, i#98970, thorsten
+
 # let ctrl-<keycode> stuff pass dlg keyboard handling, to permit
 # global application-wide shortcuts also in open dialogs
 vcl-permit-global-shortcuts.diff, i#105676, thorsten