download.lst | 2 external/beanshell/ExternalPackage_beanshell.mk | 2 external/beanshell/bsh-2.0b1-src.patch | 126 ++---------------------- libreofficekit/source/gtk/lokdocview.c | 4 sw/source/uibase/utlui/content.cxx | 8 - 5 files changed, 25 insertions(+), 117 deletions(-)
New commits: commit c5f6fd36b21c233d46a5fe8f8c411366150999c7 Author: Caolán McNamara <[email protected]> Date: Mon Jan 12 11:58:18 2015 +0000 fix for missing G_SOURCE_REMOVE Change-Id: I55b69f153c0656d34a230c4328bc7af4bab40447 diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c index 65fdbfd..8100455 100644 --- a/libreofficekit/source/gtk/lokdocview.c +++ b/libreofficekit/source/gtk/lokdocview.c @@ -14,6 +14,10 @@ #include <LibreOfficeKit/LibreOfficeKitGtk.h> +#ifndef G_SOURCE_REMOVE +#define G_SOURCE_REMOVE FALSE +#endif + static void lok_docview_class_init( LOKDocViewClass* pClass ); static void lok_docview_init( LOKDocView* pDocView ); commit b7d1c05e68e9b8a91332c6b2ad0872ea9e618862 Author: Caolán McNamara <[email protected]> Date: Mon Jan 12 09:53:44 2015 +0000 bsh-2.0b1->bsh-2.0b5 Change-Id: I250a683faf7d201b9fea8eb0fffd9cd49da7f79f diff --git a/download.lst b/download.lst index c60c5ef..ef1af63 100644 --- a/download.lst +++ b/download.lst @@ -16,7 +16,7 @@ export APR_TARBALL := apr-1.4.8.tar.gz export APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3 export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 -export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +export BSH_TARBALL := ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz export CDR_MD5SUM := b33fd0be3befdd1b37777e08ce058bd9 export CDR_TARBALL := libcdr-0.1.1.tar.bz2 diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk index f6e4ad1..6c2d832 100644 --- a/external/beanshell/ExternalPackage_beanshell.mk +++ b/external/beanshell/ExternalPackage_beanshell.mk @@ -11,6 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) $(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) -$(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b1.jar)) +$(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b5.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/beanshell/bsh-2.0b1-src.patch b/external/beanshell/bsh-2.0b1-src.patch index 6162e73..6124f18 100644 --- a/external/beanshell/bsh-2.0b1-src.patch +++ b/external/beanshell/bsh-2.0b1-src.patch @@ -1,16 +1,16 @@ --- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003 +++ misc/build/BeanShell/build.xml Fri Mar 28 15:55:04 2008 -@@ -17,7 +17,7 @@ - up the build dir! It has to be done manually the first time (or put - in the jar file). There must be a way to fix this... +@@ -10,7 +10,7 @@ + - Why can't I nest filesets? This seems like it would be so easy and + useful... --> -<project name="beanshell" default="compile" basedir="."> +<project name="beanshell" default="jarall" basedir="."> <!-- Project Configuration --> -@@ -71,6 +71,9 @@ - value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/> +@@ -65,6 +65,9 @@ + <property name="exclude-engine" value="bsh/engine/**"/> --> + <property name="exclude-bsf" @@ -19,32 +19,19 @@ <!-- Uncomment to build without the ASM class generator code. <property name="exclude-classgen" value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/> -@@ -80,6 +83,9 @@ - <property name="exclude-servlet" +@@ -75,6 +78,9 @@ value="bsh/servlet/*"/> --> -+ + + <property name="exclude-servlet" + value="bsh/servlet/*"/> - ++ <!-- Legacy excludes. Comment this *out* to build these legacy items --> - <property name="legacy-excludes" ---- misc/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Dec 19 17:14:28 2003 -+++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Mar 28 15:55:05 2008 -@@ -34,7 +34,9 @@ - package bsh; - - import bsh.org.objectweb.asm.*; --import java.lang.reflect.*; -+import java.lang.reflect.Constructor; -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; - import java.util.ArrayList; - import java.util.List; - + <property name="excludes-legacy" + value="bsh/JThis.java"/> --- misc/BeanShell/src/bsh/classpath/BshClassPath.java 2003-12-19 17:14:28.000000000 +0100 +++ misc/build/BeanShell/src/bsh/classpath/BshClassPath.java 2014-07-22 21:02:52.000000000 +0200 -@@ -42,6 +42,7 @@ +@@ -36,6 +36,7 @@ import bsh.StringUtil; import bsh.ClassPathException; import java.lang.ref.WeakReference; @@ -52,95 +39,12 @@ import bsh.NameSource; /** -@@ -569,7 +570,7 @@ - // Java deals with relative paths for it's bootstrap loader - // but JARClassLoader doesn't. - urls[i] = new File( -- new File(paths[i]).getCanonicalPath() ).toURL(); -+ new File(paths[i]).getCanonicalPath() ).toURI().toURL(); - } catch ( IOException e ) { - throw new ClassPathException("can't parse class path: "+e); - } -@@ -641,9 +642,11 @@ - { - //String rtjar = System.getProperty("java.home")+"/lib/rt.jar"; - String rtjar = getRTJarPath(); -- URL url = new File( rtjar ).toURL(); -+ URL url = new File( rtjar ).toURI().toURL(); +@@ -659,6 +660,8 @@ + URL url = new File( rtjar ).toURI().toURL(); bootClassPath = new BshClassPath( "Boot Class Path", new URL[] { url } ); -+ } catch ( SecurityException e ) { -+ throw new ClassPathException(" can't access to boot jar: "+e); ++ } catch ( SecurityException e ) { ++ throw new ClassPathException(" can't access to boot jar: "+e); } catch ( MalformedURLException e ) { throw new ClassPathException(" can't find boot jar: "+e); } -@@ -686,7 +689,7 @@ - public static void main( String [] args ) throws Exception { - URL [] urls = new URL [ args.length ]; - for(int i=0; i< args.length; i++) -- urls[i] = new File(args[i]).toURL(); -+ urls[i] = new File(args[i]).toURI().toURL(); - BshClassPath bcp = new BshClassPath( "Test", urls ); - } - ---- misc/BeanShell/src/bsh/util/AWTConsole.java 2003-12-19 17:14:29.000000000 +0100 -+++ misc/build/BeanShell/src/bsh/util/AWTConsole.java 2014-07-23 07:32:12.000000000 +0200 -@@ -325,7 +325,7 @@ - final Frame f = new Frame("Bsh Console"); - f.add(console, "Center"); - f.pack(); -- f.show(); -+ f.setVisible(true); - f.addWindowListener( new WindowAdapter() { - public void windowClosing( WindowEvent e ) { - f.dispose(); ---- misc/BeanShell/src/bsh/util/ClassBrowser.java 2003-12-19 17:14:29.000000000 +0100 -+++ misc/build/BeanShell/src/bsh/util/ClassBrowser.java 2014-07-23 07:32:52.000000000 +0200 -@@ -409,7 +409,7 @@ - f.getContentPane().add( "Center", cb ); - cb.setFrame( f ); - f.pack(); -- f.show(); -+ f.setVisible(true); - } - - public void setFrame( JFrame frame ) { ---- misc/BeanShell/src/bsh/util/Util.java 2003-12-19 17:14:29.000000000 +0100 -+++ misc/build/BeanShell/src/bsh/util/Util.java 2014-07-23 07:33:29.000000000 +0200 -@@ -80,7 +80,7 @@ - try { mt.waitForAll(); } catch ( Exception e ) { } - Graphics gr=can.getBufferedGraphics(); - gr.drawImage(img, 0, 0, can); -- win.show(); -+ win.setVisible(true); - win.toFront(); - splashScreen = win; - } ---- misc/BeanShell/src/bsh/Remote.java 2003-12-19 17:14:29.000000000 +0100 -+++ misc/build/BeanShell/src/bsh/Remote.java 2014-07-23 08:52:39.000000000 +0200 -@@ -137,13 +137,14 @@ - static String doHttp( String postURL, String text ) - { - String returnValue = null; -+ -+ try { - StringBuffer sb = new StringBuffer(); - sb.append( "bsh.client=Remote" ); - sb.append( "&bsh.script=" ); -- sb.append( URLEncoder.encode( text ) ); -+ sb.append( URLEncoder.encode(text,"UTF-8") ); - String formData = sb.toString( ); - -- try { - URL url = new URL( postURL ); - HttpURLConnection urlcon = - (HttpURLConnection) url.openConnection( ); -@@ -172,6 +173,8 @@ - - System.out.println( "Return Value: "+returnValue ); - -+ } catch (UnsupportedEncodingException e) { -+ System.out.println(e); // bad character encoding - } catch (MalformedURLException e) { - System.out.println(e); // bad postURL - } catch (IOException e2) { commit 6a9848426be59fa4e14d1db10f04b9262f426233 Author: Caolán McNamara <[email protected]> Date: Sun Jan 11 21:02:35 2015 +0000 kind of thing coverity will warn about Change-Id: I2681b99c913b15c632dd4c9ec84922fa282692d7 diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 1296264..5c4ee6e 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2276,10 +2276,10 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint) SfxViewEventHint const*const pVEHint( dynamic_cast<SfxViewEventHint const*>(&rHint)); - if (pActiveShell - && pVEHint && pVEHint->GetEventName() == "OnViewClosed" - && dynamic_cast<SwXTextView *>(pVEHint->GetController().get()) - ->GetView() == &pActiveShell->GetView()) + SwXTextView* pDyingShell = NULL; + if (pActiveShell && pVEHint && pVEHint->GetEventName() == "OnViewClosed") + pDyingShell = dynamic_cast<SwXTextView*>(pVEHint->GetController().get()); + if (pDyingShell && pDyingShell->GetView() == &pActiveShell->GetView()) { SetActiveShell(0); // our view is dying, clear our pointers to it }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
