XLSX export: boolean cells export

plugins/org.jkiss.dbeaver.data.office/plugin.xml

@@ -18,8 +18,8 @@
                         <property id="nullString" label="%dataTransfer.processor.xlsx.property.nullString.name" type="string" description="%dataTransfer.processor.xlsx.property.nullString.description" defaultValue="" required="false"/>
                         <property id="header" label="%dataTransfer.processor.xlsx.property.header.name" type="boolean" description="%dataTransfer.processor.xlsx.property.header.description" defaultValue="true" required="true"/>
                         <property id="headerfont" label="%dataTransfer.processor.xlsx.property.headerFont.name" type="string" description="%dataTransfer.processor.xlsx.property.headerFont.description" defaultValue="BOLD" required="false" validValues="NONE,BOLD,ITALIC,STRIKEOUT,UNDERLINE"/>
-                        <property id="trueString" label="%dataTransfer.processor.xlsx.property.boolStringTrue.name" type="string" description="%dataTransfer.processor.xlsx.property.boolStringTrue.description" defaultValue="+" required="false"/>
-                        <property id="falseString" label="%dataTransfer.processor.xlsx.property.boolStringFalse.name" type="string" description="%dataTransfer.processor.xlsx.property.boolStringFalse.description" defaultValue="-" required="false"/>
+                        <property id="trueString" label="%dataTransfer.processor.xlsx.property.boolStringTrue.name" type="string" description="%dataTransfer.processor.xlsx.property.boolStringTrue.description" defaultValue="true" required="false"/>
+                        <property id="falseString" label="%dataTransfer.processor.xlsx.property.boolStringFalse.name" type="string" description="%dataTransfer.processor.xlsx.property.boolStringFalse.description" defaultValue="false" required="false"/>
                         <property id="exportSql" label="%dataTransfer.processor.xlsx.property.exportSql.name" type="boolean" description="%dataTransfer.processor.xlsx.property.exportSql.description" defaultValue="false" required="false"/>
                         <property id="splitSqlText" label="%dataTransfer.processor.xlsx.property.splitSqlText.name" type="boolean" description="%dataTransfer.processor.xlsx.property.splitSqlText.description" defaultValue="false" required="false"/>
                         <property id="splitByRowCount" label="%dataTransfer.processor.xlsx.property.splitByRowCount.name" type="integer" description="%dataTransfer.processor.xlsx.property.splitByRowCount.description" defaultValue="1048575" required="false"/>

plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java

@@ -85,8 +85,9 @@ public class DataExporterXLSX extends StreamExporterAbstract {
 
     private boolean printHeader = false;
     private boolean rowNumber = false;
-    private String boolTrue = "YES";
-    private String boolFalse = "NO";
+    private String boolTrue = "true";
+    private String boolFalse = "false";
+    private boolean booleRedefined;
     private boolean exportSql = false;
     private boolean splitSqlText = false;
 
@@ -105,8 +106,8 @@ public class DataExporterXLSX extends StreamExporterAbstract {
         properties.put(DataExporterXLSX.PROP_HEADER, true);
         properties.put(DataExporterXLSX.PROP_NULL_STRING, null);
         properties.put(DataExporterXLSX.PROP_HEADER_FONT, "BOLD");
-        properties.put(DataExporterXLSX.PROP_TRUESTRING, "+");
-        properties.put(DataExporterXLSX.PROP_FALSESTRING, "-");
+        properties.put(DataExporterXLSX.PROP_TRUESTRING, "true");
+        properties.put(DataExporterXLSX.PROP_FALSESTRING, "false");
         properties.put(DataExporterXLSX.PROP_EXPORT_SQL, false);
         properties.put(DataExporterXLSX.PROP_SPLIT_SQLTEXT, false);
         properties.put(DataExporterXLSX.PROP_SPLIT_BYROWCOUNT, EXCEL2007MAXROWS);
@@ -120,84 +121,53 @@ public class DataExporterXLSX extends StreamExporterAbstract {
         nullString = nullStringProp == null ? null : nullStringProp.toString();
 
         try {
-
             printHeader = (Boolean) site.getProperties().get(PROP_HEADER);
-
         } catch (Exception e) {
-
             printHeader = false;
-
         }
 
-
         try {
-
             rowNumber = (Boolean) site.getProperties().get(PROP_ROWNUMBER);
-
         } catch (Exception e) {
-
             rowNumber = false;
-
         }
 
         try {
-
             boolTrue = (String) site.getProperties().get(PROP_TRUESTRING);
-
         } catch (Exception e) {
-
-            boolTrue = "YES";
-
+            boolTrue = "true";
         }
-
         try {
-
             boolFalse = (String) site.getProperties().get(PROP_FALSESTRING);
-
         } catch (Exception e) {
-
-            boolTrue = "NO";
-
+            boolFalse = "false";
+        }
+        if (!"true".equals(boolTrue) || !"false".equals(boolFalse)) {
+            booleRedefined = true;
         }
 
         try {
-
             exportSql = (Boolean) site.getProperties().get(PROP_EXPORT_SQL);
-
         } catch (Exception e) {
-
             exportSql = false;
-
         }
 
         try {
-
             splitSqlText = (Boolean) site.getProperties().get(PROP_SPLIT_SQLTEXT);
-
         } catch (Exception e) {
-
             splitSqlText = false;
-
         }
 
         try {
-
             splitByRowCount = (Integer) site.getProperties().get(PROP_SPLIT_BYROWCOUNT);
-
         } catch (Exception e) {
-
             splitByRowCount = EXCEL2007MAXROWS;
-
         }
 
         try {
-
             splitByCol = (Integer) site.getProperties().get(PROP_SPLIT_BYCOL);
-
         } catch (Exception e) {
-
             splitByCol = -1;
-
         }
 
 
@@ -317,11 +287,6 @@ public class DataExporterXLSX extends StreamExporterAbstract {
         super.dispose();
     }
 
-    @Override
-    public boolean isTextExporter() {
-        return false;
-    }
-
     @Override
     public void exportHeader(DBCSession session) throws DBException, IOException {
 
@@ -489,7 +454,11 @@ public class DataExporterXLSX extends StreamExporterAbstract {
                 }
             } else if (row[i] instanceof Boolean) {
 
-                cell.setCellValue((Boolean) row[i]);
+                if (booleRedefined) {
+                    cell.setCellValue((Boolean) row[i] ? boolTrue : boolFalse);
+                } else {
+                    cell.setCellValue((Boolean) row[i]);
+                }
 
             } else if (row[i] instanceof Number) {