openoffice-no-java-vm.patch

   1 diff -uNr jscpp.bak/makefile.mk jscpp/makefile.mk
   2 --- oo_1.0_src/sj2/source/jscpp.bak/makefile.mk Wed Dec  4 00:26:56 2002
   3 +++ oo_1.0_src/sj2/source/jscpp/makefile.mk     Thu Dec  5 18:34:06 2002
   4 @@ -2,9 +2,9 @@
   5  #
   6  #   $RCSfile$
   7  #
   8 -#   $Revision$
   9 +#   $Revision$
  10  #
  11 -#   last change: $Author$ $Date$
  12 +#   last change: $Author$ $Date$
  13  #
  14  #   The Contents of this file are made available subject to the terms of
  15  #   either of the following licenses
  16 @@ -68,10 +68,6 @@
  17
  18  .INCLUDE :  $(PRJ)$/util$/makefile.pmk
  19
  20 -UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
  21 -UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
  22 -UNOUCROUT=$(OUT)$/inc
  23 -
  24  # --- Files --------------------------------------------------------
  25
  26  UNOTYPES= \
  27 diff -uNr jscpp.bak/sjapplet_impl.cxx jscpp/sjapplet_impl.cxx
  28 --- oo_1.0_src/sj2/source/jscpp.bak/sjapplet_impl.cxx   Tue Feb 19 12:36:18 2002
  29 +++ oo_1.0_src/sj2/source/jscpp/sjapplet_impl.cxx       Thu Dec  5 18:34:06 2002
  30 @@ -2,9 +2,9 @@
  31   *
  32   *  $RCSfile$
  33   *
  34 - *  $Revision$
  35 + *  $Revision$
  36   *
  37 - *  last change: $Author$ $Date$
  38 + *  last change: $Author$ $Date$
  39   *
  40   *  The Contents of this file are made available subject to the terms of
  41   *  either of the following licenses
  42 @@ -133,10 +133,10 @@
  43      pEnv->CallStaticObjectMethod(jcToolkit, jmToolkit_getDefaultToolkit);           testJavaException(pEnv);
  44
  45      jclass jcMotifAppletViewer = pEnv->FindClass(
  46 -                        "sun/plugin/navig/motif/MotifAppletViewer");                testJavaException(pEnv);
  47 +                        "sun/plugin/navig/motif/MotifAppletViewer");
  48      if(pEnv->ExceptionOccurred())
  49      {
  50 -        pEnv->ExceptionClear();
  51 +               pEnv->ExceptionClear();
  52          jcMotifAppletViewer = pEnv->FindClass(
  53                          "sun/plugin/viewer/MNetscapePluginContext");                testJavaException(pEnv);
  54      }
  55 @@ -226,11 +226,11 @@
  56  if (_joAppletExecutionContext) {
  57      TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
  58
  59 -               _pEmbeddedWindow->dispose(jenv.pEnv);
  60 -               delete _pEmbeddedWindow;
  61 +    _pEmbeddedWindow->dispose(jenv.pEnv);
  62 +    delete _pEmbeddedWindow;
  63
  64 -               jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
  65 -               jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
  66 +    jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
  67 +    jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
  68         }
  69  }
  70
  71 @@ -244,7 +244,7 @@
  72
  73
  74      // Java URL erzeugen
  75 -       OUString url = rDocBase.GetMainURL();
  76 +       OUString url = rDocBase.GetMainURL(INetURLObject::DECODE_TO_IURI);
  77
  78         if(!url.getLength())
  79                 url = OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
  80 @@ -340,6 +340,7 @@
  81                                                           joDocBase, joParameters, _pEmbeddedWindow->_joWindow, (jlong)0);                             testJavaException(jenv.pEnv);
  82         jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_init);                                   testJavaException(jenv.pEnv);
  83         jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_startUp);                                testJavaException(jenv.pEnv);
  84 +
  85  }
  86
  87  void SjApplet2_Impl::setSize(const Size & rSize) throw(com::sun::star::uno::RuntimeException)
  88 @@ -391,6 +392,11 @@
  89
  90         jmethodID jmAppletExecutionContext_shutdown  = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "shutdown", "()V"); testJavaException(jenv.pEnv);
  91         jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_shutdown);                                 testJavaException(jenv.pEnv);
  92 +
  93 +       jmethodID jmWaitForDispose= jenv.pEnv->GetMethodID(_jcAppletExecutionContext,"waitForDispose","()V");
  94 +    testJavaException(jenv.pEnv);
  95 +    //blocks until the applet has destroyed itself and the container was disposed (stardiv.applet.AppletExecutionContext.dispose)
  96 +       jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmWaitForDispose);
  97
  98         if( _pParentWin )
  99         {