ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fs34b: #i117454# don't ask for the value of the possibly

Browse Source 
non-existent 'Sorting' HiddenControl
This commit is contained in:
Frank Schoenheit [fs]
2012-07-18 09:29:19 +01:00
committed by Michael Meeks
parent ff6c2e7828
commit d97caa2a77
2 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wizards/com/sun/star/wizards/document/FormHandler.java
+6 -21
View File
@@ -219,23 +219,21 @@ public class FormHandler
return xFormsSupplier.getForms();
}
public String getValueofHiddenControl(XNameAccess xNamedForm, String ControlName, String sMsg) throws com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException
public String getValueofHiddenControl(XNameAccess xNamedForm, String ControlName)
{
String value = "";
try
{
if (xNamedForm.hasByName(ControlName))
{
return AnyConverter.toString(com.sun.star.wizards.common.Helper.getUnoPropertyValue(xNamedForm.getByName(ControlName), "HiddenValue"));
}
else
{
throw new UnknownHiddenControlException(xNamedForm, ControlName, sMsg);
value = AnyConverter.toString(com.sun.star.wizards.common.Helper.getUnoPropertyValue(xNamedForm.getByName(ControlName), "HiddenValue"));
}
}
catch (Exception exception)
catch (Exception ex)
{
throw new UnknownHiddenControlException(xNamedForm, ControlName, sMsg);
Logger.getLogger( FormHandler.class.getName() ).log( Level.SEVERE, null, ex );
}
return value;
}
public void insertHiddenControl(XNameAccess xNameAccess, XNameContainer xNamedForm, String ControlName, String ControlValue)
@@ -260,19 +258,6 @@ public class FormHandler
}
}
public class UnknownHiddenControlException extends java.lang.Throwable
{
public UnknownHiddenControlException(XNameAccess xNamedForm, String ControlName, String sMsgHiddenControlisMissing)
{
XNamed xNamed = UnoRuntime.queryInterface(XNamed.class, xNamedForm);
String FormName = xNamed.getName();
sMsgHiddenControlisMissing = JavaTools.replaceSubString(sMsgHiddenControlisMissing, FormName, "<REPORTFORM>");
sMsgHiddenControlisMissing = JavaTools.replaceSubString(sMsgHiddenControlisMissing, ControlName, "<CONTROLNAME>");
SystemDialog.showMessageBox(xMSFDoc, "ErrorBox", VclWindowPeerAttribute.OK, sMsgHiddenControlisMissing);
}
}
public boolean hasFormByName(String _FormName)
{
xNamedFormContainer = getDocumentForms();
wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+15 -26
View File
@@ -56,7 +56,6 @@ import com.sun.star.wizards.common.PropertyNames;
import com.sun.star.wizards.common.SystemDialog;
import com.sun.star.wizards.db.DBMetaData;
import com.sun.star.wizards.document.OfficeDocument;
import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
import com.sun.star.wizards.ui.UIConsts;
import java.util.ArrayList;
import java.util.Vector;
@@ -224,32 +223,27 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
XNameContainer xNamedForms = getDoc().oFormHandler.getDocumentForms();
Object oDBForm = Helper.getUnoObjectbyName(xNamedForms, ReportWizard.SOREPORTFORMNAME);
boolean bgetConnection;
String sQueryName = PropertyNames.EMPTY_STRING;
if (oDBForm != null)
{
String sMsg = sMsgHiddenControlMissing + (char) 13 + sMsgEndAutopilot;
XNameAccess xNamedForm = UnoRuntime.queryInterface( XNameAccess.class, oDBForm );
getRecordParser().Command = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, PropertyNames.COMMAND, sMsg);
String sCommandType = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, PropertyNames.COMMAND_TYPE, sMsg);
String sGroupFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", sMsg);
String sFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
String sorting;
try
{
sorting = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
}
catch (UnknownHiddenControlException exception)
{
sorting = "";
}
String sRecordFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", sMsg);
if (xNamedForm.hasByName("QueryName"))
{
sQueryName = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "QueryName", sMsg);
}
getRecordParser().Command = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, PropertyNames.COMMAND);
String sCommandType = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, PropertyNames.COMMAND_TYPE);
String sGroupFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames");
String sFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames");
String sRecordFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames");
String sorting = PropertyNames.EMPTY_STRING;
if ( xNamedForm.hasByName( "Sorting" ) )
sorting = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting");
String sQueryName = PropertyNames.EMPTY_STRING;
if ( xNamedForm.hasByName( "QueryName" ) )
sQueryName = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "QueryName");
String[] sFieldNameList = JavaTools.ArrayoutofString(sFieldNames, PropertyNames.SEMI_COLON);
String[] sNewList = JavaTools.ArrayoutofString(sRecordFieldNames, PropertyNames.SEMI_COLON);
if ( !PropertyNames.EMPTY_STRING.equals(sorting))
if ( sorting.length() > 0)
{
String[] sortList = JavaTools.ArrayoutofString(sorting, PropertyNames.SEMI_COLON);
ArrayList<String[]> aSortFields = new ArrayList<String[]>();
@@ -331,11 +325,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
Logger.getLogger( ReportTextImplementation.class.getName() ).log( Level.SEVERE, null, ex );
return false;
}
catch (com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException ex)
{
Logger.getLogger( ReportTextImplementation.class.getName() ).log( Level.SEVERE, null, ex );
return false;
}
}
private boolean m_bStopProcess;