diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 14:30:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 14:30:30 +0000 |
| commit | 61b58f92c1aa753801d2329b2d16ff7cdea132f4 (patch) | |
| tree | 1715dfb09aaaec30dc50a9d89458bba11053620a /wizards | |
| parent | INTEGRATION: CWS dbawizards (1.12.58); FILE MERGED (diff) | |
| download | core-61b58f92c1aa753801d2329b2d16ff7cdea132f4.tar.gz core-61b58f92c1aa753801d2329b2d16ff7cdea132f4.zip | |
INTEGRATION: CWS dbawizards (1.40.34); FILE MERGED
2008/01/03 13:55:15 bc 1.40.34.2: #i49332# resetting fixed property for date textfields
2008/01/02 13:46:36 bc 1.40.34.1: #i72887# incorrect behaviour of < in wizard
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/report/Dataimport.java | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 6c84560b7f22..f4079cfc3a34 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -4,9 +4,9 @@ * * $RCSfile: Dataimport.java,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: ihi $ $Date: 2007-04-16 16:52:49 $ + * last change: $Author: vg $ $Date: 2008-01-28 15:30:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -249,19 +249,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi int nCommandType = com.sun.star.sdb.CommandType.COMMAND; boolean bexecute = false; if (bgetConnection){ - if ((CurReportDocument.CurDBMetaData.getCommandType() == CommandType.QUERY) && (CurReportDocument.CurDBMetaData.Command.equals(""))){ - CurReportDocument.CurDBMetaData.oSQLQueryComposer = new SQLQueryComposer(CurReportDocument.CurDBMetaData); - DBMetaData.CommandObject oCommand = CurReportDocument.CurDBMetaData.getQueryByName(sQueryName); - if (CurReportDocument.CurDBMetaData.hasEscapeProcessing(oCommand.xPropertySet)){ - CurReportDocument.CurDBMetaData.Command = (String) oCommand.xPropertySet.getPropertyValue("Command"); - CurReportDocument.CurDBMetaData.oSQLQueryComposer.xQueryAnalyzer.setQuery(CurReportDocument.CurDBMetaData.Command); - CurReportDocument.CurDBMetaData.oSQLQueryComposer.prependSortingCriteria(); - } - else{ - nCommandType = com.sun.star.sdb.CommandType.QUERY; - CurReportDocument.CurDBMetaData.Command = sQueryName; - } - } bexecute = CurReportDocument.CurDBMetaData.executeCommand(nCommandType); //sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, true); if (bexecute){ bexecute = CurReportDocument.CurDBMetaData.getFields(sFieldNameList, true); @@ -296,6 +283,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi RecordParser CurDBMetaData = CurReportDocument.CurDBMetaData; com.sun.star.style.BreakType CorrBreakValue = null; String CorrPageDescName = ""; + CurReportDocument.oTextFieldHandler.fixDateFields(true); CurReportDocument.removeAllVisibleTextSections(); CurReportDocument.removeNonLayoutTextTables(); addTextSectionCopies(); |