diff --git a/.idea/nulib-spout.iml b/.idea/nulib-spout.iml
index 7d84d1a..a705279 100644
--- a/.idea/nulib-spout.iml
+++ b/.idea/nulib-spout.iml
@@ -5,6 +5,8 @@
+
+
diff --git a/src/spout/SpoutBuilder.php b/src/spout/SpoutBuilder.php
index c09c582..784ecc3 100644
--- a/src/spout/SpoutBuilder.php
+++ b/src/spout/SpoutBuilder.php
@@ -158,7 +158,8 @@ class SpoutBuilder extends AbstractBuilder {
}
$writerParams = $params["spout"] ?? static::WRITER_PARAMS;
- $writerParams["->setDefaultColumnWidth"] ??= 10.5;
+ $writerParams["default_column_width"] ??= 10.5;
+ self::ensure_style($writerParams["default_row_style"]);
switch ($writerType) {
case "ods":
case self::WRITER_TYPE_ODS:
@@ -174,7 +175,10 @@ class SpoutBuilder extends AbstractBuilder {
self::apply_params($writer, $writerParams, ref_params_xlsx::WRITER);
break;
}
- self::ensure_style($writerParams["default_row_style"]);
+ $defaultColumnWidth = $writerParams["default_column_width"];
+ if ($defaultColumnWidth !== null) $writer->setDefaultColumnWidth($defaultColumnWidth);
+ $defaultRowHeight = $writerParams["default_row_height"];
+ if ($defaultRowHeight !== null) $writer->setDefaultRowHeight($defaultRowHeight);
$defaultRowStyle = $writerParams["default_row_style"];
if ($defaultRowStyle !== null) $writer->setDefaultRowStyle($defaultRowStyle);
$writer->writeToStream($this->getResource());
diff --git a/src/spout/ref_params_ods.php b/src/spout/ref_params_ods.php
index 87c382e..7430fc4 100644
--- a/src/spout/ref_params_ods.php
+++ b/src/spout/ref_params_ods.php
@@ -6,10 +6,10 @@ class ref_params_ods extends ref_params {
];
const WRITER = [
- "->setDefaultColumnWidth" => ["float"],
- "->setDefaultRowHeight" => ["float"],
"->setColumnWidth" => ["float", ["int", null]],
"->setColumnWidthForRange" => ["int", "int", "int"],
+ "default_column_width" => "float",
+ "default_row_height" => "float",
"default_row_style" => self::STYLE,
];
diff --git a/src/spout/ref_params_xlsx.php b/src/spout/ref_params_xlsx.php
index c9d0c85..d7abaf8 100644
--- a/src/spout/ref_params_xlsx.php
+++ b/src/spout/ref_params_xlsx.php
@@ -6,10 +6,10 @@ class ref_params_xlsx extends ref_params {
];
const WRITER = [
- "->setDefaultColumnWidth" => ["float"],
- "->setDefaultRowHeight" => ["float"],
"->setColumnWidth" => ["float", ["int", null]],
"->setColumnWidthForRange" => ["int", "int", "int"],
+ "default_column_width" => "float",
+ "default_row_height" => "float",
"default_row_style" => self::STYLE,
];