worksheet: fix set_row() and set_default_row() interaction

Fix an issue where set_row() with the default height of 15 was
ignored if set_default_row() was also used.

Author: jmcnamara

lib/Excel/Writer/XLSX/Worksheet.pm

@@ -8423,13 +8423,26 @@ sub _write_row {
     push @attributes, ( 's'            => $xf_index ) if $xf_index;
     push @attributes, ( 'customFormat' => 1 )         if $format;
 
-    if ( $height != $self->{_original_row_height} ) {
+
+    # Only add ht parameter if the height is non-default.
+    if (
+        $height != $self->{_original_row_height}
+        || (   $height == $self->{_original_row_height}
+            && $height != $self->{_default_row_height} )
+      )
+    {
         push @attributes, ( 'ht' => $height );
     }
 
     push @attributes, ( 'hidden'       => 1 )         if $hidden;
 
-    if ( $height != $self->{_original_row_height} ) {
+    # Only add customFormat parameter if the height is non-default.
+    if (
+        $height != $self->{_original_row_height}
+        || (   $height == $self->{_original_row_height}
+            && $height != $self->{_default_row_height} )
+      )
+    {
         push @attributes, ( 'customHeight' => 1 );
     }
 

t/regression/default_row06.t

@@ -0,0 +1,73 @@
+###############################################################################
+#
+# Tests the output of Excel::Writer::XLSX against Excel generated files.
+#
+# Copyright 2000-2024, John McNamara, jmcnamara@cpan.org
+#
+# SPDX-License-Identifier: Artistic-1.0-Perl OR GPL-1.0-or-later
+#
+
+use lib 't/lib';
+use TestFunctions qw(_compare_xlsx_files _is_deep_diff);
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+###############################################################################
+#
+# Tests setup.
+#
+my $filename     = 'default_row06.xlsx';
+my $dir          = 't/regression/';
+my $got_filename = $dir . "ewx_$filename";
+my $exp_filename = $dir . 'xlsx_files/' . $filename;
+
+my $ignore_members  = [];
+my $ignore_elements = {};
+
+
+###############################################################################
+#
+# Test the creation of a simple Excel::Writer::XLSX file.
+#
+use Excel::Writer::XLSX;
+
+my $workbook  = Excel::Writer::XLSX->new( $got_filename );
+my $worksheet = $workbook->add_worksheet();
+
+$worksheet->set_default_row( 24 );
+$worksheet->set_row( 4, 15 );
+
+$worksheet->write( 'A1',  'Foo' );
+$worksheet->write( 'A10', 'Bar' );
+
+$workbook->close();
+
+
+###############################################################################
+#
+# Compare the generated and existing Excel files.
+#
+
+my ( $got, $expected, $caption ) = _compare_xlsx_files(
+
+    $got_filename,
+    $exp_filename,
+    $ignore_members,
+    $ignore_elements,
+);
+
+_is_deep_diff( $got, $expected, $caption );
+
+
+###############################################################################
+#
+# Cleanup.
+#
+unlink $got_filename;
+
+__END__
+
+
+