INTEGRATION: CWS dbwizard4 (1.3.24); FILE MERGED

2005/03/16 13:16:18 bc 1.3.24.5: #43785# removeShapestoNirwana
2005/03/15 17:45:58 bc 1.3.24.4: #i44576#database connection now not disposed when RW finishes
2005/03/08 14:08:22 bc 1.3.24.3: #i43785#Several changes in handling new tables
2005/02/21 15:22:39 bc 1.3.24.2: ##Formarrangement 'In Blocks' improved
Issue number:
Submitted by:
Reviewed by:
2005/02/17 13:50:19 bc 1.3.24.1: ##ControlArrangement in FormWizard modified

1 files changed, 9 insertions, 4 deletions

diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 640fece85baf..9c0efb0e135e 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FormDocument.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: vg $  $Date: 2005-02-21 13:56:56 $
+ *  last change: $Author: kz $  $Date: 2005-03-18 16:17:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -294,6 +294,7 @@ public class FormDocument extends TextDocument {
 
     public boolean finalizeForms(DataEntrySetter _curDataEntrySetter, FieldLinker _curFieldLinker, FormConfiguration _curFormConfiguration){
         try {
+            this.xTextDocument.lockControllers();
             PropertyValue[] aFormProperties = _curDataEntrySetter.getFormProperties();
             ControlForm oMasterControlForm = getControlFormByName(SOMAINFORM);
             oMasterControlForm.setFormProperties(aFormProperties, oMainFormDBMetaData);
@@ -321,6 +322,9 @@ public class FormDocument extends TextDocument {
             e.printStackTrace(System.out);
             return false;
         }
+        finally{
+            unlockallControllers();
+        }
     }
 
 
@@ -367,8 +371,9 @@ public class FormDocument extends TextDocument {
                 oFormController = new FormControlArranger(oFormHandler, xFormContainer, oDBMetaData, xProgressBar, aStartPoint, aFormSize);
             else{
                 if (curArrangement == FormWizard.SOGRID){
-                    oFormHandler.moveShapesToNirwana(getLabelControls());
-                    oFormHandler.moveShapesToNirwana(getDatabaseControls());
+//                  oFormHandler.moveShapesToNirwana(getLabelControls());
+//                  oFormHandler.moveShapesToNirwana(getDatabaseControls());
+                    oFormHandler.moveShapesToNirwana();
                 }
             }
             if (curArrangement == FormWizard.SOGRID){