Attachment #83065 for issue #124349

View | Details | Raw Unified | Return to issue 124349
Collapse All | Expand All




            ArrayList<String> SortDescriptions = new ArrayList<String>();
            for (int i = 0; i <= MaxSortIndex; i++)
            {
                CurFieldName = xSortListBox[i].getSelectedItem();
                SortDescriptions.add(CurFieldName);
                iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
                SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
                    iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
                    SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
                }
            }
            // When searching for a duplicate entry we can neglect wether the entries are to be sorted ascending or descending
            // TODO for the future we should deliver a messagebox when two different sorting modes have been applied to one field




    private Resource m_resource;
    private XDatabaseDocumentUI m_documentUI;
    private static final int MAXIMUM_GROUPCOUNT = 4;
    private String[] groupNames = null;

    private ReportBuilderImplementation(XMultiServiceFactory _serviceFactory)
    {

    public void setSorting(String[][] _aSortFieldNames)
    {
        getRecordParser().setSortFieldNames(_aSortFieldNames);
        if (groupNames != null)
        {
            getRecordParser().prependSortFieldNames(groupNames);
        }
        getReportBuilderLayouter().insertSortingNames(_aSortFieldNames);
        getReportBuilderLayouter().layout();
    }

    public void setGrouping(String[] _aGroupFieldNames)
    {
        groupNames = _aGroupFieldNames;
        getRecordParser().prependSortFieldNames(_aGroupFieldNames);

        getReportBuilderLayouter().insertGroupNames(_aGroupFieldNames);

Return to issue 124349

Lines 254-266 Link Here

(-)wizards/com/sun/star/wizards/ui/SortingComponent.java (-7 / +4 lines)
254	ArrayList<String> SortDescriptions = new ArrayList<String>();	254	ArrayList<String> SortDescriptions = new ArrayList<String>();
255	for (int i = 0; i <= MaxSortIndex; i++)	255	for (int i = 0; i <= MaxSortIndex; i++)
256	{	256	{
257	if (!((Boolean) CurUnoDialog.getControlProperty("lstSort" + (i + 1), PropertyNames.READ_ONLY)))	257	CurFieldName = xSortListBox[i].getSelectedItem();
258	{	258	SortDescriptions.add(CurFieldName);
259	CurFieldName = xSortListBox[i].getSelectedItem();	259	iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
260	SortDescriptions.add(CurFieldName);	260	SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
261	iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
262	SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
263	}
264	}	261	}
265	// When searching for a duplicate entry we can neglect wether the entries are to be sorted ascending or descending	262	// When searching for a duplicate entry we can neglect wether the entries are to be sorted ascending or descending
266	// TODO for the future we should deliver a messagebox when two different sorting modes have been applied to one field	263	// TODO for the future we should deliver a messagebox when two different sorting modes have been applied to one field

Lines 77-83 Link Here

(-)wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java (-6 lines)
77	private Resource m_resource;	77	private Resource m_resource;
78	private XDatabaseDocumentUI m_documentUI;	78	private XDatabaseDocumentUI m_documentUI;
79	private static final int MAXIMUM_GROUPCOUNT = 4;	79	private static final int MAXIMUM_GROUPCOUNT = 4;
80	private String[] groupNames = null;
81		80
82	private ReportBuilderImplementation(XMultiServiceFactory _serviceFactory)	81	private ReportBuilderImplementation(XMultiServiceFactory _serviceFactory)
83	{	82	{
Lines 507-523 Link Here
507	public void setSorting(String[][] _aSortFieldNames)	506	public void setSorting(String[][] _aSortFieldNames)
508	{	507	{
509	getRecordParser().setSortFieldNames(_aSortFieldNames);	508	getRecordParser().setSortFieldNames(_aSortFieldNames);
510	if (groupNames != null)
511	{
512	getRecordParser().prependSortFieldNames(groupNames);
513	}
514	getReportBuilderLayouter().insertSortingNames(_aSortFieldNames);	509	getReportBuilderLayouter().insertSortingNames(_aSortFieldNames);
515	getReportBuilderLayouter().layout();	510	getReportBuilderLayouter().layout();
516	}	511	}
517		512
518	public void setGrouping(String[] _aGroupFieldNames)	513	public void setGrouping(String[] _aGroupFieldNames)
519	{	514	{
520	groupNames = _aGroupFieldNames;
521	getRecordParser().prependSortFieldNames(_aGroupFieldNames);	515	getRecordParser().prependSortFieldNames(_aGroupFieldNames);
522		516
523	getReportBuilderLayouter().insertGroupNames(_aGroupFieldNames);	517	getReportBuilderLayouter().insertGroupNames(_aGroupFieldNames);