[Libreoffice-commits] core.git: wizards/com

[Ryan McCoskrie]

 wizards/com/sun/star/wizards/form/FormWizard.java |   26 ++++------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

New commits:
commit 86d05eea4578c58be8e4b7b8f3a365238bf22e02
Author: Ryan McCoskrie <ryan.mccoskrie at gmail.com>
Date:   Sun Sep 21 14:33:53 2014 +1200

    Removed uneeded checks.
    
    Change-Id: I9fd008f0265f195a8069526cea22a288ff6238f7
    Reviewed-on: https://gerrit.libreoffice.org/11562
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>

diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index eda3821..c6cba67 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -78,10 +78,8 @@ public class FormWizard extends DatabaseObjectWizard
                     210, Boolean.TRUE, "DialogForm", 102, 41, 1, new Short((short) 0), m_oResource.getResText(UIConsts.RID_FORM), 310
                 });
         drawNaviBar();
-        if (getFormResources())
-        {
-            setRightPaneHeaders(m_oResource, UIConsts.RID_FORM + 90, 8);
-        }
+        getFormResources();
+        setRightPaneHeaders(m_oResource, UIConsts.RID_FORM + 90, 8);
     }
 
     public static void main(String i_args[])
@@ -175,13 +173,7 @@ public class FormWizard extends DatabaseObjectWizard
                 curFormDocument.oMainFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
 
                 final String[] aMainFieldNames = curFormDocument.oMainFormDBMetaData.getFieldNames();
-                try
-                {
-                    curFormDocument.LinkFieldNames = JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aMainFieldNames, 1);
-                }
-                catch (java.lang.Exception e)
-                {
-                }
+                curFormDocument.LinkFieldNames = JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aMainFieldNames, 1);
             }
             break;
             case SOSUBFORM_PAGE:
@@ -193,13 +185,7 @@ public class FormWizard extends DatabaseObjectWizard
                 curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
 
                 final String[] aSubFieldNames = curFormDocument.oSubFormDBMetaData.getFieldNames();
-                try
-                {
-                    curFormDocument.LinkFieldNames = JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aSubFieldNames, 0);
-                }
-                catch (java.lang.Exception e)
-                {
-                }
+                curFormDocument.LinkFieldNames = JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aSubFieldNames, 0);
             }
             break;
             case SOFIELDLINKER_PAGE:
@@ -370,15 +356,13 @@ public class FormWizard extends DatabaseObjectWizard
         }
     }
 
-    private boolean getFormResources()
+    private void getFormResources()
     {
         sShowBinaryFields = m_oResource.getResText(UIConsts.RID_FORM + 2);
         slblTables = m_oResource.getResText(UIConsts.RID_FORM + 6);
         slblFields = m_oResource.getResText(UIConsts.RID_FORM + 12);
         slblSelFields = m_oResource.getResText(UIConsts.RID_FORM + 1);
         serrFormNameexists = m_oResource.getResText(UIConsts.RID_FORM + 98);
-
-        return true;
     }
 
     public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener