diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:21:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:21:55 +0000 |
| commit | 59dedfc9347c7a8a882220a1f60c14e945f16646 (patch) | |
| tree | 9b8f052db830248dfa456388a2a9bb52260833f7 /wizards | |
| parent | 9155071d06ad61fa43d5bbab683f4aff119260fb (diff) | |
INTEGRATION: CWS dbwizardpp1 (1.6.30); FILE MERGED
2005/12/13 16:46:39 bc 1.6.30.4: #i37223#several changes
2005/12/06 01:02:16 bc 1.6.30.3: RESYNC: (1.6-1.7); FILE MERGED
2005/08/26 16:11:07 bc 1.6.30.2: #i49327#handling of special characters in fieldnames modified
2005/08/15 15:43:06 bc 1.6.30.1: ##several issues
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/report/DBColumn.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 2af2ba586cac..6d531613466a 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -4,9 +4,9 @@ * * $RCSfile: DBColumn.java,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:36:34 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:21:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -198,7 +198,6 @@ public class DBColumn { public void setDBField(String _FieldName){ CurDBField = CurDBMetaData.getFieldColumnByDisplayName(_FieldName); CurDBField.DisplayFieldName = _FieldName; - CurDBField.FieldName = FieldColumn.getFieldName(CurDBField.DisplayFieldName); CurDBField.AliasName = CurDBMetaData.getFieldTitle(_FieldName); } @@ -220,8 +219,8 @@ public class DBColumn { public void initializeNumberFormat(){ - oTextTableHandler.getNumberFormatter().setNumberFormat(xValCell, CurDBField.DBFormatKey); setCellFont(); + oTextTableHandler.getNumberFormatter().setNumberFormat(xValCell, CurDBField.DBFormatKey); } @@ -325,7 +324,7 @@ public class DBColumn { if (bAlignLeft) Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", new Integer(ParagraphAdjust.LEFT_value)); - if (CurDBField.FieldType == com.sun.star.sdbc.DataType.BIT){ + if ((CurDBField.FieldType == com.sun.star.sdbc.DataType.BIT) || (CurDBField.FieldType == com.sun.star.sdbc.DataType.BOOLEAN)){ CharFontName = "StarSymbol"; Helper.setUnoPropertyValue(xValCellCursor, "CharFontName", CharFontName); if (bIsGroupColumn == false) @@ -351,9 +350,12 @@ public class DBColumn { try{ XPropertyState xPropertyState; int FieldType = CurDBField.FieldType; - if (FieldType == com.sun.star.sdbc.DataType.BIT){ + if ((FieldType == com.sun.star.sdbc.DataType.BIT) || (CurDBField.FieldType == com.sun.star.sdbc.DataType.BOOLEAN)){ CharFontName = "StarSymbol"; PropertyState = com.sun.star.beans.PropertyState.DIRECT_VALUE; + xValCellCursor.gotoStart(false); + xValCellCursor.gotoEnd(true); + Helper.setUnoPropertyValue(xValCellCursor, "CharFontName", CharFontName); } else{ xPropertyState = (XPropertyState) UnoRuntime.queryInterface(XPropertyState.class, xValCellCursor); |