CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 60 insertions, 36 deletions

diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 561d0b140dbe..60b0b1705487 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -1,5 +1,5 @@
 /*************************************************************************
-*
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2008 by Sun Microsystems, Inc.
@@ -41,7 +41,8 @@ import com.sun.star.wizards.common.Properties;
  * (<CODE>__writeRegistryServiceInfo</CODE>).
  * @author Bertram Nolte
  */
-public class CallFormWizard {
+public class CallFormWizard
+{
 
     /** Gives a factory for creating the service.
      * This method is called by the <code>JavaLoader</code>
@@ -56,10 +57,13 @@ public class CallFormWizard {
      * structures) of a single
      * registry key accessible.
      */
-    public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(String stringImplementationName, com.sun.star.lang.XMultiServiceFactory xMSF, com.sun.star.registry.XRegistryKey xregistrykey) {
+    public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(String stringImplementationName, com.sun.star.lang.XMultiServiceFactory xMSF, com.sun.star.registry.XRegistryKey xregistrykey)
+    {
         com.sun.star.lang.XSingleServiceFactory xsingleservicefactory = null;
         if (stringImplementationName.equals(FormWizardImplementation.class.getName()))
+        {
             xsingleservicefactory = com.sun.star.comp.loader.FactoryHelper.getServiceFactory(FormWizardImplementation.class, FormWizardImplementation.__serviceName, xMSF, xregistrykey);
+        }
         return xsingleservicefactory;
     }
 
@@ -71,14 +75,16 @@ public class CallFormWizard {
      * structures) of a single
      * registry key accessible.
      */
-    public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) {
+    public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
+    {
         return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(FormWizardImplementation.class.getName(), FormWizardImplementation.__serviceName, xregistrykey);
     }
 
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    public static class FormWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.lang.XTypeProvider, com.sun.star.task.XJobExecutor {
+    public static class FormWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.lang.XTypeProvider, com.sun.star.task.XJobExecutor
+    {
 
         PropertyValue[] databaseproperties;
         public XComponent Document = null;
@@ -88,38 +94,44 @@ public class CallFormWizard {
          * @param xmultiservicefactoryInitialization A special service factory
          * could be introduced while initializing.
          */
-        public FormWizardImplementation(com.sun.star.lang.XMultiServiceFactory xmultiservicefactoryInitialization) {
+        public FormWizardImplementation(com.sun.star.lang.XMultiServiceFactory xmultiservicefactoryInitialization)
+        {
             super();
             xmultiservicefactory = xmultiservicefactoryInitialization;
-            registerProperty("Document", (short)(PropertyAttribute.READONLY|PropertyAttribute.MAYBEVOID));
-            registerProperty("DocumentDefinition", (short)(PropertyAttribute.READONLY|PropertyAttribute.MAYBEVOID));
+            registerProperty("Document", (short) (PropertyAttribute.READONLY | PropertyAttribute.MAYBEVOID));
+            registerProperty("DocumentDefinition", (short) (PropertyAttribute.READONLY | PropertyAttribute.MAYBEVOID));
         }
 
-        public void trigger(String sEvent) {
-            try {
-                if (sEvent.compareTo("start") == 0) {
+        public void trigger(String sEvent)
+        {
+            try
+            {
+                if (sEvent.compareTo("start") == 0)
+                {
                     FormWizard CurFormWizard = new FormWizard(xmultiservicefactory);
                     XComponent[] obj = CurFormWizard.startFormWizard(xmultiservicefactory, databaseproperties);
-                    if ( obj != null ){
+                    if (obj != null)
+                    {
                         DocumentDefinition = obj[0];
                         Document = obj[1];
                     }
                 }
-                else if (sEvent.compareTo("end") == 0) {
+                else if (sEvent.compareTo("end") == 0)
+                {
                     DocumentDefinition = null;
                     Document = null;
                     databaseproperties = null;
                 }
-            } catch (Exception exception) {
+            }
+            catch (Exception exception)
+            {
                 System.err.println(exception);
             }
             System.gc();
         }
-
         /** The service name, that must be used to get an instance of this service.
          */
         private static final String __serviceName = "com.sun.star.wizards.form.CallFormWizard";
-
         /** The service manager, that gives access to all registered services.
          */
         private com.sun.star.lang.XMultiServiceFactory xmultiservicefactory;
@@ -131,14 +143,16 @@ public class CallFormWizard {
          * @throws Exception Every exception will not be handled, but will be
          * passed to the caller.
          */
-        public void initialize(Object[] object) throws com.sun.star.uno.Exception {
+        public void initialize(Object[] object) throws com.sun.star.uno.Exception
+        {
             databaseproperties = Properties.convertToPropertyValueArray(object);
         }
 
         /** This method returns an array of all supported service names.
          * @return Array of supported service names.
          */
-        public java.lang.String[] getSupportedServiceNames() {
+        public java.lang.String[] getSupportedServiceNames()
+        {
             String[] stringSupportedServiceNames = new String[1];
 
             stringSupportedServiceNames[0] = __serviceName;
@@ -151,10 +165,12 @@ public class CallFormWizard {
          * @param stringService Service name.
          * @return True, if the given service name will be supported.
          */
-        public boolean supportsService(String stringService) {
+        public boolean supportsService(String stringService)
+        {
             boolean booleanSupportsService = false;
 
-            if (stringService.equals(__serviceName)) {
+            if (stringService.equals(__serviceName))
+            {
                 booleanSupportsService = true;
             }
             return (booleanSupportsService);
@@ -171,13 +187,18 @@ public class CallFormWizard {
          * whole combination of objects.
          * @return Array of bytes, in order to distinguish between two sets.
          */
-        public byte[] getImplementationId() {
-            byte[] byteReturn = {
+        public byte[] getImplementationId()
+        {
+            byte[] byteReturn =
+            {
             };
 
-            try {
+            try
+            {
                 byteReturn = new String("" + this.hashCode()).getBytes();
-            } catch (Exception exception) {
+            }
+            catch (Exception exception)
+            {
                 System.err.println(exception);
             }
 
@@ -187,7 +208,8 @@ public class CallFormWizard {
         /** Return the class name of the component.
          * @return Class name of the component.
          */
-        public java.lang.String getImplementationName() {
+        public java.lang.String getImplementationName()
+        {
             return (FormWizardImplementation.class.getName());
         }
 
@@ -196,19 +218,21 @@ public class CallFormWizard {
          * @return Sequence of all types (usually interface types) provided by the
          * service.
          */
-        public Type[] getTypes() {
-            Type[] typeReturn = {
+        public Type[] getTypes()
+        {
+            Type[] typeReturn =
+            {
             };
 
-            try {
-                typeReturn = new Type[] { new Type(com.sun.star.task.XJobExecutor.class)
-                                        , new Type(com.sun.star.lang.XTypeProvider.class)
-                                        , new Type(com.sun.star.lang.XServiceInfo.class)
-                                        , new Type(com.sun.star.beans.XPropertySet.class)
-                                        , new Type(com.sun.star.beans.XFastPropertySet.class)
-                                        , new Type(com.sun.star.beans.XMultiPropertySet.class)
-                                        , new Type(com.sun.star.lang.XInitialization.class)};
-            } catch (Exception exception) {
+            try
+            {
+                typeReturn = new Type[]
+                        {
+                            new Type(com.sun.star.task.XJobExecutor.class), new Type(com.sun.star.lang.XTypeProvider.class), new Type(com.sun.star.lang.XServiceInfo.class), new Type(com.sun.star.beans.XPropertySet.class), new Type(com.sun.star.beans.XFastPropertySet.class), new Type(com.sun.star.beans.XMultiPropertySet.class), new Type(com.sun.star.lang.XInitialization.class)
+                        };
+            }
+            catch (Exception exception)
+            {
                 System.err.println(exception);
             }