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, 73 insertions, 49 deletions

diff --git a/wizards/com/sun/star/wizards/web/IconsDialog.java b/wizards/com/sun/star/wizards/web/IconsDialog.java
index ed366ff47c9b..38cb11826b0c 100644
--- a/wizards/com/sun/star/wizards/web/IconsDialog.java
+++ b/wizards/com/sun/star/wizards/web/IconsDialog.java
@@ -47,7 +47,8 @@ import com.sun.star.wizards.web.data.CGIconSet;
  * It also implements the ImageList.ImageRenderer interface, to handle
  * its own objects.
  */
-public class IconsDialog extends ImageListDialog implements ImageList.ImageRenderer, ListModel {
+public class IconsDialog extends ImageListDialog implements ImageList.ImageRenderer, ListModel
+{
 
     private ConfigSet set;
     String htmlexpDirectory;
@@ -55,41 +56,45 @@ public class IconsDialog extends ImageListDialog implements ImageList.ImageRende
      * this icons filename prefixes are used to display the icons.
      */
     private String[] icons = new String[]
-         {"firs","prev","next","last","nav","text","up","down"};
+    {
+        "firs", "prev", "next", "last", "nav", "text", "up", "down"
+    };
     private Integer[] objects;
 
-
     /**
      * @param xmsf
      * @param set_ the configuration set of the supported
      * icon sets.
      */
     public IconsDialog(XMultiServiceFactory xmsf,
-        ConfigSet set_,
-        WebWizardDialogResources resources)
-        throws Exception
+            ConfigSet set_,
+            WebWizardDialogResources resources)
+            throws Exception
     {
-        super(xmsf, WWHID.HID_IS, new String[] {
-            resources.resIconsDialog,
-            resources.resIconsDialogCaption,
-            resources.resOK,
-            resources.resCancel,
-            resources.resHelp,
-            resources.resDeselect,
-            resources.resOther,
-            resources.resCounter
-        } );
-
-        htmlexpDirectory = FileAccess.getOfficePath(xmsf,"Gallery","share", "");
+        super(xmsf, WWHID.HID_IS, new String[]
+                {
+                    resources.resIconsDialog,
+                    resources.resIconsDialogCaption,
+                    resources.resOK,
+                    resources.resCancel,
+                    resources.resHelp,
+                    resources.resDeselect,
+                    resources.resOther,
+                    resources.resCounter
+                });
+
+        htmlexpDirectory = FileAccess.getOfficePath(xmsf, "Gallery", "share", "");
         set = set_;
         objects = new Integer[set.getSize() * icons.length];
-        for (int i = 0; i<objects.length; i++)
-          objects[i] = new Integer(i);
+        for (int i = 0; i < objects.length; i++)
+        {
+            objects[i] = new Integer(i);
+        }
         il.setListModel(this);
         il.setRenderer(this);
         il.setRows(4);
         il.setCols(8);
-        il.setImageSize(new Size(20,20));
+        il.setImageSize(new Size(20, 20));
         il.setShowButtons(false);
         il.setRowSelect(true);
         il.scaleImages = Boolean.FALSE;
@@ -100,89 +105,108 @@ public class IconsDialog extends ImageListDialog implements ImageList.ImageRende
         build();
     }
 
-
-    public String getIconset() {
+    public String getIconset()
+    {
         if (getSelected() == null)
+        {
             return null;
+        }
         else
-            return (String) set.getKey( ((Number)getSelected()).intValue() / icons.length );
+        {
+            return (String) set.getKey(((Number) getSelected()).intValue() / icons.length);
+        }
     }
 
-    public void setIconset(String iconset) {
-        int icon = set.getIndexOf(set.getElement( iconset ) ) * icons.length;
-        this.setSelected( icon >= 0 ? objects[icon] : null );
+    public void setIconset(String iconset)
+    {
+        int icon = set.getIndexOf(set.getElement(iconset)) * icons.length;
+        this.setSelected(icon >= 0 ? objects[icon] : null);
     }
 
     /**
      * dummy
      */
-    public synchronized void addListDataListener(javax.swing.event.ListDataListener listener) {
+    public synchronized void addListDataListener(javax.swing.event.ListDataListener listener)
+    {
     }
+
     /**
      * dummy
      */
-    public synchronized void removeListDataListener(javax.swing.event.ListDataListener listener) {
+    public synchronized void removeListDataListener(javax.swing.event.ListDataListener listener)
+    {
     }
 
     /* (non-Javadoc)
      * @see javax.swing.ListModel#getSize()
      */
-    public int getSize() {
+    public int getSize()
+    {
         return set.getSize() * icons.length;
     }
     /* (non-Javadoc)
      * @see javax.swing.ListModel#getElementAt(int)
      */
-    public Object getElementAt(int arg0) {
+
+    public Object getElementAt(int arg0)
+    {
         return objects[arg0];
     }
 
     /* (non-Javadoc)
      * @see com.sun.star.wizards.ui.ImageList.ImageRenderer#getImageUrls(java.lang.Object)
      */
-    public Object[] getImageUrls(Object listItem) {
-        int i = ((Number)listItem).intValue();
+    public Object[] getImageUrls(Object listItem)
+    {
+        int i = ((Number) listItem).intValue();
         int iset = getIconsetNum(i);
         int icon = getIconNum(i);
         String[] sRetUrls = new String[2];
-        sRetUrls[0] =  htmlexpDirectory + "/htmlexpo/" +
-          getIconsetPref(iset) +
-          icons[icon] +
-          getIconsetPostfix(iset);
+        sRetUrls[0] = htmlexpDirectory + "/htmlexpo/" +
+                getIconsetPref(iset) +
+                icons[icon] +
+                getIconsetPostfix(iset);
         sRetUrls[1] = sRetUrls[0];
         //System.out.println(s);
         return sRetUrls;
     }
-        /* (non-Javadoc)
+    /* (non-Javadoc)
      * @see com.sun.star.wizards.common.Renderer#render(java.lang.Object)
      */
-    public String render(Object object) {
+
+    public String render(Object object)
+    {
         if (object == null)
-           return "";
-        int i = ((Number)object).intValue();
+        {
+            return "";
+        }
+        int i = ((Number) object).intValue();
         int iset = getIconsetNum(i);
         return getIconset(iset).cp_Name;
     }
 
-
-    private int getIconsetNum(int i) {
+    private int getIconsetNum(int i)
+    {
         return i / icons.length;
     }
 
-    private int getIconNum(int i) {
+    private int getIconNum(int i)
+    {
         return i % icons.length;
     }
 
-    private String getIconsetPref(int iconset) {
+    private String getIconsetPref(int iconset)
+    {
         return getIconset(iconset).cp_FNPrefix;
     }
 
-    private String getIconsetPostfix(int iconset) {
+    private String getIconsetPostfix(int iconset)
+    {
         return getIconset(iconset).cp_FNPostfix;
     }
 
-    private CGIconSet getIconset(int i ) {
-        return (CGIconSet)set.getElementAt(i);
+    private CGIconSet getIconset(int i)
+    {
+        return (CGIconSet) set.getElementAt(i);
     }
-
 }