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, 107 insertions, 108 deletions

diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index 229421359d33..5d4f1199e41b 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
@@ -27,7 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 package com.sun.star.wizards.report;
 
 import com.sun.star.wizards.common.JavaTools;
@@ -36,9 +35,9 @@ import com.sun.star.wizards.db.*;
 
 import java.util.Vector;
 
-
 public class GroupFieldHandler extends FieldSelection
 {
+
     IReportDocument CurReportDocument;
     private Vector GroupFieldVector = new Vector();
     QueryMetaData CurDBMetaData;
@@ -46,155 +45,155 @@ public class GroupFieldHandler extends FieldSelection
     static final short MAXSELFIELDS = 4;
 
     public GroupFieldHandler(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog)
-        {
-            super(_CurUnoDialog, ReportWizard.SOGROUPPAGE, 95, 27, 210, 127,
-                  _CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 19),
-                  _CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 50), 34340, false);
+    {
+        super(_CurUnoDialog, ReportWizard.SOGROUPPAGE, 95, 27, 210, 127,
+                _CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 19),
+                _CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 50), 34340, false);
 
-            try
-            {
-                this.oWizardDialog = _CurUnoDialog;
-                this.CurReportDocument = _CurReportDocument;
-                this.CurDBMetaData = CurReportDocument.getRecordParser();
-                CurUnoDialog.setControlProperty("lstFields_2", "MultiSelection", new Boolean(false));
-                CurUnoDialog.setControlProperty("lstSelFields_2", "MultiSelection", new Boolean(false));
-                addFieldSelectionListener(new FieldSelectionListener());
-                String sNote = ReportWizard.getBlindTextNote(_CurReportDocument, _CurUnoDialog.m_oResource);
-                CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_1",
-                                                new String[] {"Enabled", "Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "Width"},
-                                                new Object[] {new Boolean(false), new Integer(18), sNote, new Boolean(true), new Integer(95), new Integer(158), new Integer(ReportWizard.SOGROUPPAGE), new Integer(209)});
-            }
-            catch( Exception exception )
-            {
-                exception.printStackTrace(System.out);
-            }
+        try
+        {
+            this.oWizardDialog = _CurUnoDialog;
+            this.CurReportDocument = _CurReportDocument;
+            this.CurDBMetaData = CurReportDocument.getRecordParser();
+            CurUnoDialog.setControlProperty("lstFields_2", "MultiSelection", new Boolean(false));
+            CurUnoDialog.setControlProperty("lstSelFields_2", "MultiSelection", new Boolean(false));
+            addFieldSelectionListener(new FieldSelectionListener());
+            String sNote = ReportWizard.getBlindTextNote(_CurReportDocument, _CurUnoDialog.m_oResource);
+            CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_1",
+                    new String[]
+                    {
+                        "Enabled", "Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Boolean(false), new Integer(18), sNote, new Boolean(true), new Integer(95), new Integer(158), new Integer(ReportWizard.SOGROUPPAGE), new Integer(209)
+                    });
         }
-
-
-    public boolean isGroupField(String _FieldName)
+        catch (Exception exception)
         {
-            return (JavaTools.FieldInList(CurDBMetaData.GroupFieldNames, _FieldName) != -1);
+            exception.printStackTrace(System.out);
         }
+    }
+
+    public boolean isGroupField(String _FieldName)
+    {
+        return (JavaTools.FieldInList(CurDBMetaData.GroupFieldNames, _FieldName) != -1);
+    }
 
     public void initialize()
+    {
+        try
         {
-            try
+            Vector NormalFieldsVector = new Vector();
+            Vector SelFieldsVector = new Vector();
+            String[] sFieldNames = CurDBMetaData.getFieldNames();
+            for (int i = 0; i < sFieldNames.length; i++)
             {
-                Vector NormalFieldsVector = new Vector();
-                Vector SelFieldsVector = new Vector();
-                String[] sFieldNames = CurDBMetaData.getFieldNames();
-                for (int i = 0; i < sFieldNames.length; i++)
+                String sfieldtitle = sFieldNames[i]; // CurDBMetaData.getFieldTitle(sFieldNames[i]);
+                if (isGroupField(sFieldNames[i]))
                 {
-                    String sfieldtitle = sFieldNames[i]; // CurDBMetaData.getFieldTitle(sFieldNames[i]);
-                    if (isGroupField(sFieldNames[i]))
-                    {
-                        SelFieldsVector.add(sfieldtitle);
-                    }
-                    else
-                    {
-                        NormalFieldsVector.add(sfieldtitle);
-                    }
+                    SelFieldsVector.add(sfieldtitle);
+                }
+                else
+                {
+                    NormalFieldsVector.add(sfieldtitle);
                 }
-                String[] SelFields = new String[SelFieldsVector.size()];
-                SelFieldsVector.toArray(SelFields);
-                String[] NormalFields = new String[NormalFieldsVector.size()];
-                NormalFieldsVector.toArray(NormalFields);
-                super.initialize(NormalFields, SelFields, true);
-            }
-            catch( Exception exception )
-            {
-                exception.printStackTrace(System.out);
             }
+            String[] SelFields = new String[SelFieldsVector.size()];
+            SelFieldsVector.toArray(SelFields);
+            String[] NormalFields = new String[NormalFieldsVector.size()];
+            NormalFieldsVector.toArray(NormalFields);
+            super.initialize(NormalFields, SelFields, true);
         }
-
-
-    public void removeGroupFieldNames()
-        {
-            emptyFieldsListBoxes();
-            GroupFieldVector.removeAllElements();
-            CurUnoDialog.setControlProperty("lblBlindTextNote_1", "Enabled", new Boolean(false));
-        }
-
-    public void getGroupFieldNames(CommandMetaData CurDBMetaData)
+        catch (Exception exception)
         {
-            String[] GroupFieldNames = new String[GroupFieldVector.size()];
-            GroupFieldVector.copyInto(GroupFieldNames);
-            CurDBMetaData.GroupFieldNames = GroupFieldNames;
+            exception.printStackTrace(System.out);
         }
+    }
 
+    public void removeGroupFieldNames()
+    {
+        emptyFieldsListBoxes();
+        GroupFieldVector.removeAllElements();
+        CurUnoDialog.setControlProperty("lblBlindTextNote_1", "Enabled", new Boolean(false));
+    }
 
+    public void getGroupFieldNames(CommandMetaData CurDBMetaData)
+    {
+        String[] GroupFieldNames = new String[GroupFieldVector.size()];
+        GroupFieldVector.copyInto(GroupFieldNames);
+        CurDBMetaData.GroupFieldNames = GroupFieldNames;
+    }
     // @Override
     protected void toggleListboxButtons(short iFieldsSelIndex, short iSelFieldsSelIndex)
+    {
+        super.toggleListboxButtons(iFieldsSelIndex, iSelFieldsSelIndex);
+        int iSelCount = xSelFieldsListBox.getItemCount();
+        if (iSelCount >= MAXSELFIELDS)
         {
-            super.toggleListboxButtons(iFieldsSelIndex, iSelFieldsSelIndex);
-            int iSelCount = xSelFieldsListBox.getItemCount();
-            if (iSelCount >= MAXSELFIELDS)
-            {
-                CurUnoDialog.setControlProperty("cmdMoveSelected" + sIncSuffix, "Enabled", Boolean.FALSE);
-            }
+            CurUnoDialog.setControlProperty("cmdMoveSelected" + sIncSuffix, "Enabled", Boolean.FALSE);
         }
-
+    }
 
     public void selectFields(boolean bMoveAll)
+    {
+        int iSelCount = xSelFieldsListBox.getItemCount();
+        if (iSelCount < MAXSELFIELDS)
         {
-            int iSelCount = xSelFieldsListBox.getItemCount();
-            if (iSelCount < MAXSELFIELDS)
-            {
-                super.selectFields(bMoveAll);
-            }
-
+            super.selectFields(bMoveAll);
         }
 
+    }
+
     /* protected */ class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
     {
 
         public void moveItemDown(String Selitem)
-            {
-                CurReportDocument.refreshGroupFields(xSelFieldsListBox.getItems());
-            }
+        {
+            CurReportDocument.refreshGroupFields(xSelFieldsListBox.getItems());
+        }
 
         public void moveItemUp(String item)
-            {
-                CurReportDocument.refreshGroupFields(xSelFieldsListBox.getItems());
-            }
+        {
+            CurReportDocument.refreshGroupFields(xSelFieldsListBox.getItems());
+        }
 
         public void shiftFromLeftToRight(String[] Selitems, String[] Newitems)
+        {
+            String CurGroupTitle = Selitems[0];
+            int iSelCount = xSelFieldsListBox.getItemCount();
+            String[] CurGroupNames = xFieldsListBox.getItems();
+            CurReportDocument.liveupdate_addGroupNametoDocument(CurGroupNames, CurGroupTitle, GroupFieldVector, CurReportDocument.getReportPath(), iSelCount);
+            CurUnoDialog.setControlProperty("lblBlindTextNote_1", "Enabled", new Boolean(true));
+            if (iSelCount >= MAXSELFIELDS)
             {
-                String CurGroupTitle = Selitems[0];
-                int iSelCount = xSelFieldsListBox.getItemCount();
-                String[] CurGroupNames = xFieldsListBox.getItems();
-                CurReportDocument.liveupdate_addGroupNametoDocument(CurGroupNames, CurGroupTitle, GroupFieldVector, CurReportDocument.getReportPath(), iSelCount);
-                CurUnoDialog.setControlProperty("lblBlindTextNote_1", "Enabled", new Boolean(true));
-                if (iSelCount >= MAXSELFIELDS)
-                {
-                    toggleMoveButtons(false, false);
-                }
+                toggleMoveButtons(false, false);
             }
+        }
 
         public void shiftFromRightToLeft(String[] OldSelitems, String[] Newitems)
+        {
+            int iSelPos = OldSelitems.length;
+            if (iSelPos > 0)
             {
-                int iSelPos = OldSelitems.length;
-                if (iSelPos > 0)
-                {
-                    String OldGroupTitle = OldSelitems[0];
-                    String[] NewSelList = xSelFieldsListBox.getItems();
-                    CurReportDocument.liveupdate_removeGroupName(NewSelList, OldGroupTitle, GroupFieldVector);
-                    String[] NewSelGroupNames = xSelFieldsListBox.getItems();
-                    CurUnoDialog.setControlProperty("lblBlindTextNote_1", "Enabled", new Boolean(NewSelGroupNames.length == 0));
+                String OldGroupTitle = OldSelitems[0];
+                String[] NewSelList = xSelFieldsListBox.getItems();
+                CurReportDocument.liveupdate_removeGroupName(NewSelList, OldGroupTitle, GroupFieldVector);
+                String[] NewSelGroupNames = xSelFieldsListBox.getItems();
+                CurUnoDialog.setControlProperty("lblBlindTextNote_1", "Enabled", new Boolean(NewSelGroupNames.length == 0));
 
-                    // CurReportDocument.refreshGroupFields(xSelFieldsListBox.getItems());
-                }
+            // CurReportDocument.refreshGroupFields(xSelFieldsListBox.getItems());
             }
+        }
 
         public int getID()
-            {
-                // TODO: here is a good place for a comment, isn't it?
-                return 2;
-            }
+        {
+            // TODO: here is a good place for a comment, isn't it?
+            return 2;
+        }
 
         public void setID(String sIncSuffix)
-            {
-            }
-
+        {
+        }
     }
 }