INTEGRATION: CWS dbgmacros1 (1.13.2.2.2); FILE MERGED

2003/04/10 08:33:43 kso 1.13.2.2.2.1: #108413# - debug macro unification.

1 files changed, 42 insertions, 42 deletions

diff --git a/sj2/source/jscpp/sjapplet_impl.cxx b/sj2/source/jscpp/sjapplet_impl.cxx
index 96a41971ca..6935271eb2 100644
--- a/sj2/source/jscpp/sjapplet_impl.cxx
+++ b/sj2/source/jscpp/sjapplet_impl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sjapplet_impl.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 11:21:21 $
+ *  last change: $Author: vg $ $Date: 2003-04-15 16:01:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 #include <tools/debug.hxx>
 
 #include <svtools/ownlist.hxx>
-  
+
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
@@ -90,15 +90,15 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
 
-static void testJavaException(JNIEnv * pEnv)  throw(com::sun::star::uno::RuntimeException) 
+static void testJavaException(JNIEnv * pEnv)  throw(com::sun::star::uno::RuntimeException)
 {
     jthrowable jtThrowable = pEnv->ExceptionOccurred();
     if(jtThrowable) { // is it a java exception ?
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         pEnv->ExceptionDescribe();
 #endif
         pEnv->ExceptionClear();
-            
+
           jclass jcThrowable = pEnv->FindClass("java/lang/Throwable");
           jmethodID jmThrowable_getMessage = pEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;");
 
@@ -123,13 +123,13 @@ struct EmbeddedWindow {
     void dispose(JNIEnv * pEnv);
 };
 
-EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException) 
+EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException)
 {
     jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit");                         testJavaException(pEnv);
     jmethodID jmToolkit_getDefaultToolkit = pEnv->GetStaticMethodID(
                         jcToolkit, "getDefaultToolkit", "()Ljava/awt/Toolkit;" );   testJavaException(pEnv);
     pEnv->CallStaticObjectMethod(jcToolkit, jmToolkit_getDefaultToolkit);           testJavaException(pEnv);
-    
+
     jclass jcMotifAppletViewer = pEnv->FindClass(
                         "sun/plugin/navig/motif/MotifAppletViewer");
     if(pEnv->ExceptionOccurred())
@@ -141,21 +141,21 @@ EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) th
 
     jclass jcClassLoader = pEnv->FindClass("java/lang/ClassLoader");                testJavaException(pEnv);
     jmethodID jmClassLoader_loadLibrary = pEnv->GetStaticMethodID(
-                        jcClassLoader, "loadLibrary", 
+                        jcClassLoader, "loadLibrary",
                         "(Ljava/lang/Class;Ljava/lang/String;Z)V" );                testJavaException(pEnv);
     jstring jsplugin = pEnv->NewStringUTF("javaplugin_jni");                        testJavaException(pEnv);
-    pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary, 
+    pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary,
                         jcMotifAppletViewer, jsplugin, JNI_FALSE);                  testJavaException(pEnv);
-    
+
     jmethodID jmMotifAppletViewer_getWidget = pEnv->GetStaticMethodID(
                         jcMotifAppletViewer, "getWidget", "(IIIII)I" );             testJavaException(pEnv);
-    jint ji_widget = pEnv->CallStaticIntMethod(jcMotifAppletViewer, 
-                        jmMotifAppletViewer_getWidget, pEnvData->aWindow, 
+    jint ji_widget = pEnv->CallStaticIntMethod(jcMotifAppletViewer,
+                        jmMotifAppletViewer_getWidget, pEnvData->aWindow,
                         0, 0, 1, 1);                                                testJavaException(pEnv);
 
     jclass jcFrame  = pEnv->FindClass("sun/awt/motif/MEmbeddedFrame");              testJavaException(pEnv);
     jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "<init>", "(J)V" );        testJavaException(pEnv);
-    
+
     jobject joFrame = pEnv->AllocObject(jcFrame);                                   testJavaException(pEnv);
     pEnv->CallVoidMethod(joFrame, jmFrame_rinit, (jlong)ji_widget);                 testJavaException(pEnv);
 
@@ -173,10 +173,10 @@ void dispose(JNIEnv * pEnv);
 
 
 #ifdef WNT
-EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException) 
+EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException)
 {
 jclass jcFrame = pEnv->FindClass("sun/awt/windows/WEmbeddedFrame");     testJavaException(pEnv);
-jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "<init>", "(I)V"); testJavaException(pEnv);          
+jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "<init>", "(I)V"); testJavaException(pEnv);
 
 jobject joFrame = pEnv->AllocObject(jcFrame);                           testJavaException(pEnv);
 pEnv->CallVoidMethod(joFrame, jmFrame_rinit, (jint)pEnvData->hWnd);     testJavaException(pEnv);
@@ -186,7 +186,7 @@ _joWindow = pEnv->NewGlobalRef(joFrame);
 
 #else
 
-EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException) 
+EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException)
 {
 jclass jcFrame = pEnv->FindClass("java/awt/Frame");                     testJavaException(pEnv);
 jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "<init>", "()V");  testJavaException(pEnv);
@@ -200,7 +200,7 @@ _joWindow = pEnv->NewGlobalRef(joFrame);
 
 #endif
 
-void EmbeddedWindow::dispose(JNIEnv * pEnv) 
+void EmbeddedWindow::dispose(JNIEnv * pEnv)
 {
 jclass jcWindow = pEnv->FindClass("java/awt/Window");                        testJavaException(pEnv);
 jmethodID jmWindow_dispose = pEnv->GetMethodID(jcWindow, "dispose", "()V" ); testJavaException(pEnv);
@@ -226,24 +226,24 @@ if (_joAppletExecutionContext) {
 
     _pEmbeddedWindow->dispose(jenv.pEnv);
     delete _pEmbeddedWindow;
-        
+
     jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
     jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
     }
 }
 
-void SjApplet2_Impl::init(Window * pParentWin, 
-                          const Reference<XMultiServiceFactory> & smgr, 
-                          const INetURLObject & rDocBase, 
-                          const SvCommandList & rCmdList) 
-    throw(com::sun::star::uno::RuntimeException) 
+void SjApplet2_Impl::init(Window * pParentWin,
+                          const Reference<XMultiServiceFactory> & smgr,
+                          const INetURLObject & rDocBase,
+                          const SvCommandList & rCmdList)
+    throw(com::sun::star::uno::RuntimeException)
 {
     _pParentWin = pParentWin;
 
 
     // Java URL erzeugen
     OUString url = rDocBase.GetMainURL(INetURLObject::DECODE_TO_IURI);
-    
+
     if(!url.getLength())
         url = OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
 
@@ -259,7 +259,7 @@ void SjApplet2_Impl::init(Window * pParentWin,
     }
 
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     OString tmp = OUStringToOString(url, RTL_TEXTENCODING_ASCII_US);
     OSL_TRACE("SjApplet2_Impl::init - mainUrl: %s\n", tmp.getStr());
 #endif
@@ -292,49 +292,49 @@ void SjApplet2_Impl::init(Window * pParentWin,
 
     _jcAppletExecutionContext = jenv.pEnv->FindClass("stardiv/applet/AppletExecutionContext");                             testJavaException(jenv.pEnv);
     _jcAppletExecutionContext = (jclass)jenv.pEnv->NewGlobalRef(_jcAppletExecutionContext );                               testJavaException(jenv.pEnv);
-    
+
     jclass jcURL = jenv.pEnv->FindClass("java/net/URL");                                                                   testJavaException(jenv.pEnv);
     jmethodID jmURL_rinit = jenv.pEnv->GetMethodID(jcURL, "<init>", "(Ljava/lang/String;)V");                              testJavaException(jenv.pEnv);
-    jobject joDocBase = jenv.pEnv->AllocObject(jcURL);                                                                     testJavaException(jenv.pEnv);                 
-    jstring jsURL = jenv.pEnv->NewString(url.getStr(), url.getLength());                                                   testJavaException(jenv.pEnv);     
+    jobject joDocBase = jenv.pEnv->AllocObject(jcURL);                                                                     testJavaException(jenv.pEnv);
+    jstring jsURL = jenv.pEnv->NewString(url.getStr(), url.getLength());                                                   testJavaException(jenv.pEnv);
     jenv.pEnv->CallVoidMethod(joDocBase, jmURL_rinit, jsURL);                                                              testJavaException(jenv.pEnv);
-    
+
     jclass jcHashtable = jenv.pEnv->FindClass("java/util/Hashtable");                                                      testJavaException(jenv.pEnv);
     jmethodID jmHashtable_rinit = jenv.pEnv->GetMethodID(jcHashtable, "<init>", "()V");                                    testJavaException(jenv.pEnv);
-    jmethodID jmHashtable_put = jenv.pEnv->GetMethodID(jcHashtable, "put", 
+    jmethodID jmHashtable_put = jenv.pEnv->GetMethodID(jcHashtable, "put",
                                                        "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");        testJavaException(jenv.pEnv);
     jobject joParameters = jenv.pEnv->AllocObject(jcHashtable);                                                            testJavaException(jenv.pEnv);
     jenv.pEnv->CallVoidMethod(joParameters, jmHashtable_rinit);                                                            testJavaException(jenv.pEnv);
-    
+
     for(sal_Int64 i = 0; i < rCmdList.Count(); ++i) {
         const SvCommand & rCmd = rCmdList[i];
         String aCmd = rCmd.GetCommand();
         String aLoweredCmd = aCmd.ToLowerAscii();
-        
-#ifdef DEBUG
+
+#if OSL_DEBUG_LEVEL > 1
         OUString command = aCmd;
         OUString value = rCmd.GetArgument();
         OString cmd_tmp = OUStringToOString(command, RTL_TEXTENCODING_ASCII_US);
         OString value_tmp = OUStringToOString(value, RTL_TEXTENCODING_ASCII_US);
         OSL_TRACE("command: %s=%s", cmd_tmp.getStr(), value_tmp.getStr());
 #endif
-        
+
         jstring jsCommand = jenv.pEnv->NewString(aLoweredCmd.GetBuffer(), aLoweredCmd.Len());                              testJavaException(jenv.pEnv);
         jstring jsArg = jenv.pEnv->NewString(rCmd.GetArgument().GetBuffer(), rCmd.GetArgument().Len());                    testJavaException(jenv.pEnv);
         jenv.pEnv->CallObjectMethod(joParameters, jmHashtable_put, jsCommand, jsArg);                                      testJavaException(jenv.pEnv);
     }
-    
+
     SystemEnvData const * pEnvData  = ((SystemChildWindow *)pParentWin)->GetSystemData();
     _pEmbeddedWindow = new EmbeddedWindow(jenv.pEnv, pEnvData);
-    
-    jmethodID jmAppletExecutionContext_rinit = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "<init>", 
+
+    jmethodID jmAppletExecutionContext_rinit = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "<init>",
                                                           "(Ljava/net/URL;Ljava/util/Hashtable;Ljava/awt/Container;J)V");  testJavaException(jenv.pEnv);
     jmethodID jmAppletExecutionContext_init = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "init", "()V");            testJavaException(jenv.pEnv);
     jmethodID jmAppletExecutionContext_startUp = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "startUp", "()V");      testJavaException(jenv.pEnv);
-    
+
     _joAppletExecutionContext = jenv.pEnv->AllocObject(_jcAppletExecutionContext);                                         testJavaException(jenv.pEnv);
     _joAppletExecutionContext = jenv.pEnv->NewGlobalRef(_joAppletExecutionContext);                                        testJavaException(jenv.pEnv);
-    jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_rinit, 
+    jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_rinit,
                               joDocBase, joParameters, _pEmbeddedWindow->_joWindow, (jlong)0);                             testJavaException(jenv.pEnv);
     jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_init);                                   testJavaException(jenv.pEnv);
     jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_startUp);                                testJavaException(jenv.pEnv);
@@ -348,7 +348,7 @@ void SjApplet2_Impl::setSize(const Size & rSize) throw(com::sun::star::uno::Runt
     _pParentWin->SetSizePixel(rSize);
 
     jmethodID jmAppletExecutionContext_resize = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "appletResize", "(II)V");  testJavaException(jenv.pEnv);
-    jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_resize, (jint)rSize.Width(), 
+    jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_resize, (jint)rSize.Width(),
                               (jint)rSize.Height());	                                                                     testJavaException(jenv.pEnv);
 }
 
@@ -390,7 +390,7 @@ void SjApplet2_Impl::close() throw(com::sun::star::uno::RuntimeException)
 
     jmethodID jmAppletExecutionContext_shutdown  = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "shutdown", "()V"); testJavaException(jenv.pEnv);
     jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_shutdown);	                         testJavaException(jenv.pEnv);
-    
+
     jmethodID jmWaitForDispose= jenv.pEnv->GetMethodID(_jcAppletExecutionContext,"waitForDispose","()V");
     testJavaException(jenv.pEnv);
     //blocks until the applet has destroyed itself and the container was disposed (stardiv.applet.AppletExecutionContext.dispose)