--- trunk/all2xml.pl	2004/07/07 09:55:45	379
+++ trunk/all2xml.pl	2004/12/08 18:23:25	599
@@ -139,12 +139,14 @@
 		} else {
 			print STDERR "WARNING: field '$field' doesn't have 'name' attribute!";
 		}
+
 		if ($field_name) {
+			$field_name = x($field_name);
 			if (! $last_field_name) {
-				$last_field_name = x($field_name);
+				$last_field_name = $field_name;
 				return $last_field_name;
 			} elsif ($field_name ne $last_field_name) {
-				$last_field_name = x($field_name);
+				$last_field_name = $field_name;
 				return $last_field_name;
 			}
 		}
@@ -813,7 +815,11 @@
 			for(my $iC = $oWorksheet->{MinCol} ; defined $oWorksheet->{MaxCol} && $iC <= $oWorksheet->{MaxCol} ; $iC++) {
 				my $cell = $oWorksheet->{Cells}[$iR][$iC];
 				if ($cell) {
-					$row->{int2col($iC)} = $cell->Value;
+					# this conversion is a cludge.
+					# Files from Excell could have
+					# characters which don't fit into
+					# destination encoding.
+					$row->{int2col($iC)} = $utf2cp->convert($cell->Value) || $cell->Value;
 				}
 			}