Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

3 files changed, 30 insertions, 36 deletions

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index 11283066cc34..fc098c381a15 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -179,7 +179,7 @@ public class LocalOfficeConnection
     public void dispose()
     {
         Iterator itr = mComponents.iterator();
-        while (itr.hasNext() == true) {
+        while (itr.hasNext()) {
             // ignore runtime exceptions in dispose
             try { ((XEventListener)itr.next()).disposing(null); }
             catch ( RuntimeException aExc ) {}
@@ -462,12 +462,12 @@ public class LocalOfficeConnection
                 case ';':
                     idx     -= 1;           // put back the last read character
                     state   = 5;
-                    if (name.equals("path")) {
+                    if (("path").equals(name)) {
                         if (path == null)
                             path    = buffer.toString();
                         else
                             state   = -3;   // error: more then one 'path'
-                    } else if (name.equals("pipe")) {
+                    } else if (("pipe").equals(name)) {
                         if (pipe == null)
                             pipe    = buffer.toString();
                         else
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java
index 69c63e11a91a..74db38d5c81e 100644
--- a/bean/qa/complex/bean/OOoBeanTest.java
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -77,8 +77,7 @@ public class OOoBeanTest
     */
     private int getSleepTime(int time)
     {
-        int ret = time;
-        if (isWindows() == false)
+        if (!isWindows())
         {
             return time * 5;
         }
@@ -146,7 +145,7 @@ public class OOoBeanTest
         try
         {
             f = new WriterFrame(100, 100, 500,500, false, connection.getComponentContext());
-            if (f.checkUnoFramePosition() == false)
+            if (!f.checkUnoFramePosition())
             {
                 fail("Sizing error: Client are of Java frame does not match the UNO window.");
             }
@@ -162,18 +161,18 @@ public class OOoBeanTest
                 capturer.grabOne(f.getClientArea());
                 f.setExtendedState(Frame.ICONIFIED);
                 Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
+                if (!f.checkUnoFramePosition())
                 {
                     fail("Sizing error: Frame was iconified.");
                 }
                 f.setExtendedState(Frame.NORMAL);
                 Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
+                if (!f.checkUnoFramePosition())
                 {
                     fail("Sizing error: Frame size set back to normal after it was iconified.");
                 }
                 capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
+                if (!capturer.compare())
                 {
                     fail("Painting error: Minimize (iconify) frame and back to normal size.");
                     capturer.writeImages();
@@ -187,18 +186,18 @@ public class OOoBeanTest
                 capturer.grabOne(f.getClientArea());
                 f.setExtendedState(Frame.MAXIMIZED_BOTH);
                 Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
+                if (!f.checkUnoFramePosition())
                 {
                     fail("Sizing error: Frame maximized.");
                 }
                 f.setExtendedState(Frame.NORMAL);
                 Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
+                if (!f.checkUnoFramePosition())
                 {
                     fail("Sizing error: Frame set from maximized to normal.");
                 }
                 capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
+                if (!capturer.compare())
                 {
                     fail("Painting error: Maximize frame and back to normal size");
                     capturer.writeImages();
@@ -211,13 +210,13 @@ public class OOoBeanTest
             Rectangle oldPosition = f.getBounds();
             f.setBounds(0, 0, oldPosition.width, oldPosition.height);
             Thread.sleep(getSleepTime(200));
-            if (f.checkUnoFramePosition() == false)
+            if (!f.checkUnoFramePosition())
             {
                 fail("Sizing error: Frame moved.");
             }
 
             capturer.grabTwo(f.getClientArea());
-            if (capturer.compare() == false)
+            if (!capturer.compare())
             {
                 fail("Painting error: Move frame to a different position.");
                 capturer.writeImages();
@@ -235,7 +234,7 @@ public class OOoBeanTest
                 oldPosition = f.getBounds();
                 f.setBounds(0, curY, oldPosition.width, oldPosition.height);
                 capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
+                if (!capturer.compare())
                 {
                     fail("Painting error: Move frame to a different position.");
                     capturer.writeImages();
@@ -261,13 +260,13 @@ public class OOoBeanTest
                 Thread.sleep(getSleepTime(200));
                 f.toFront();
                 Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
+                if (!f.checkUnoFramePosition())
                 {
                     fail("Sizing error: Frame moved from back to front.");
                 }
 
                 capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
+                if (!capturer.compare())
                 {
                     fail("Painting error: Move frame to back and to front.");
                     capturer.writeImages();
@@ -299,7 +298,7 @@ public class OOoBeanTest
         try
         {
             f = new WriterFrame(100, 100, 500, 300, true, connection.getComponentContext());
-            if (f.checkUnoFramePosition() == false)
+            if (!f.checkUnoFramePosition())
             {
                 fail("Sizing error.");
             }
@@ -330,7 +329,7 @@ public class OOoBeanTest
                 b.releaseSystemWindow();
                 b.aquireSystemWindow();
             }
-            if (f.checkUnoFramePosition() == false)
+            if (!f.checkUnoFramePosition())
             {
                 fail("Sizing error.");
             }
@@ -341,7 +340,7 @@ public class OOoBeanTest
             {
                 f.dispose();
             }
-            if (isWindows() == false)
+            if (!isWindows())
             {
                 Thread.sleep(10000);
             }
@@ -375,14 +374,14 @@ public class OOoBeanTest
             Thread.sleep(getSleepTime(200));
             capturer.grabTwo();
 
-            if (capturer.compare() == false)
+            if (!capturer.compare())
             {
                 fail("Painting error: adding and removing OOoBean " +
                        "repeatedly to java.lang.Frame.");
                 capturer.writeImages();
             }
 
-            if (f.checkUnoFramePosition() == false)
+            if (!f.checkUnoFramePosition())
             {
                 fail("Sizing error.");
             }
@@ -394,7 +393,7 @@ public class OOoBeanTest
             {
                 f.dispose();
             }
-            if (isWindows() == false)
+            if (!isWindows())
             {
                 Thread.sleep(10000);
             }
@@ -428,17 +427,13 @@ public class OOoBeanTest
                 StringBuffer buf = new StringBuffer(1000);
                 for (int i = 0; i < 1; i++)
                 {
-//                    Thread.sleep(1000);
                     bean.releaseSystemWindow();
                     frame.remove(bean);
-//                    frame.validate();
-//                    Thread.sleep(1000);
                     frame.add(bean, BorderLayout.CENTER);
                     bean.aquireSystemWindow();
-//                    frame.validate();
                 }
 
-                if (isWindows() == false)
+                if (!isWindows())
                 {
                     Thread.sleep(5000);
                 }
@@ -532,7 +527,7 @@ public class OOoBeanTest
                 Thread.sleep(1000);
                 }
 
-                if (isWindows() == false)
+                if (!isWindows())
                 {
                     Thread.sleep(5000);
                 }
@@ -549,7 +544,7 @@ public class OOoBeanTest
                 roby.keyRelease(KeyEvent.VK_H);
                 roby.waitForIdle();
 
-                buf.append("h");
+                buf.append('h');
                 Thread.sleep(1000);
                 String s = getText(bean);
                 System.out.println(" getText: " + s);
@@ -610,7 +605,7 @@ public class OOoBeanTest
                 f.goToStart();
                 f.validate();
 
-                if (text.equals(f.getText()) == false)
+                if (!text.equals(f.getText()))
                 {
                     fail("Repeated loading of a document failed.");
                 }
@@ -712,8 +707,7 @@ public class OOoBeanTest
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return(UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()));
     }
 
     // setup and close connections
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java
index fbdcf714b0ca..6ca4f3991efd 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.java
@@ -1,5 +1,5 @@
-//*************************************************************************
-//
+/*************************************************************************
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,7 +23,7 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
-//*************************************************************************
+ *************************************************************************/
 package oooapplet;
 
 import java.lang.reflect.Method;