INTEGRATION: CWS fwkfinal1 (1.3.170); FILE MERGED

2005/03/15 16:26:44 mba 1.3.170.1: #i43920#: new events

1 files changed, 13 insertions, 13 deletions

diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
index 664cda6d7b..4e093ba29b 100644
--- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
+++ b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CheckGlobalEventBroadcaster_writer1.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change:$Date: 2004-11-17 13:33:05 $
+ *  last change:$Date: 2005-03-23 14:23:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,7 +154,7 @@ public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase {
         notifyEvents.clear();
         xTextDoc = wHelper.openEmptyDoc();
         shortWait();
-        expected = new String[] { "OnUnfocus", "OnNew", "OnViewCreated", "OnFocus" };
+        expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" };
 
         assure("Wrong events fired when opening empty doc",
                proveExpectation(expected));
@@ -184,7 +184,7 @@ public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase {
         notifyEvents.clear();
         xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false);
         shortWait();
-        expected = new String[] { "OnUnfocus", "OnNew", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", };
+        expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", };
 
         assure("Wrong events fired when opening an writer doc via Window-New Window",
                proveExpectation(expected));
@@ -199,31 +199,31 @@ public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase {
 
         assure("Wrong events fired when closing Window-New Window",
                proveExpectation(expected));
-           
+
         log.println("... done");
-    
-    log.println("Opening document with label wizard");	
+
+    log.println("Opening document with label wizard");
     xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false);
         shortWait();
         XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit ().getActiveTopWindow ());
         UITools ut = new UITools(m_xMSF,xWindow);
         notifyEvents.clear();
         log.println("pressing button 'New Document'");
-        try{ 
+        try{
             ut.clickButton ("New Document");
         } catch (Exception e) {
-            log.println("Couldn't press Button");            
+            log.println("Couldn't press Button");
         }
         log.println("... done");
         shortWait();
         shortWait();
     shortWait();
-        expected = new String[] { "OnViewClosed", "OnNew", "OnFocus", "OnModifyChanged" };
+        expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" };
 
         assure("Wrong events fired when starting labels wizard",
                proveExpectation(expected));
-           
-        log.println("-- Done Writer --");	       
+
+        log.println("-- Done Writer --");
     }
 
     public void cleanup() {
@@ -263,7 +263,7 @@ public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase {
         }
 
         return !failure;
-    }    
+    }
 
     public class EventListenerImpl implements XEventListener {
         public void disposing(com.sun.star.lang.EventObject eventObject) {