diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs index 5e52fb3..b0299d0 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs @@ -668,7 +668,11 @@ var xlColumns = (XLColumns) ws.Columns(col.Min, col.Max); if (col.Width != null) - xlColumns.Width = col.Width - ColumnWidthOffset; + { + Double width = col.Width - ColumnWidthOffset; + //if (width < 0) width = 0; + xlColumns.Width = width; + } else xlColumns.Width = ws.ColumnWidth; diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs index aecc2f9..ca06220 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs @@ -144,26 +144,26 @@ context.RelIdGenerator.AddValues(worksheetPart.Parts.Select(p => p.RelationshipId).ToList(), RelType.Worksheet); // delete comment related parts (todo: review) - worksheetPart.DeletePart(worksheetPart.WorksheetCommentsPart); - worksheetPart.DeleteParts(worksheetPart.GetPartsOfType()); + //worksheetPart.DeletePart(worksheetPart.WorksheetCommentsPart); + //worksheetPart.DeleteParts(worksheetPart.GetPartsOfType()); - if (worksheet.Internals.CellsCollection.GetCells(c => c.HasComment).Any()) - { - WorksheetCommentsPart worksheetCommentsPart = - worksheetPart.AddNewPart(context.RelIdGenerator.GetNext(RelType.Worksheet)); - GenerateWorksheetCommentsPartContent(worksheetCommentsPart, worksheet); + //if (worksheet.Internals.CellsCollection.GetCells(c => c.HasComment).Any()) + //{ + // WorksheetCommentsPart worksheetCommentsPart = + // worksheetPart.AddNewPart(context.RelIdGenerator.GetNext(RelType.Worksheet)); + // GenerateWorksheetCommentsPartContent(worksheetCommentsPart, worksheet); - worksheet.LegacyDrawingId = context.RelIdGenerator.GetNext(RelType.Worksheet); - VmlDrawingPart vmlDrawingPart = worksheetPart.AddNewPart(worksheet.LegacyDrawingId); - GenerateVmlDrawingPartContent(vmlDrawingPart, worksheet, context); - } + // worksheet.LegacyDrawingId = context.RelIdGenerator.GetNext(RelType.Worksheet); + // VmlDrawingPart vmlDrawingPart = worksheetPart.AddNewPart(worksheet.LegacyDrawingId); + // GenerateVmlDrawingPartContent(vmlDrawingPart, worksheet, context); + //} GenerateWorksheetPartContent(worksheetPart, worksheet, context); - if (worksheet.PivotTables.Any()) - { - GeneratePivotTables(workbookPart, worksheetPart, worksheet, context); - } + //if (worksheet.PivotTables.Any()) + //{ + // GeneratePivotTables(workbookPart, worksheetPart, worksheet, context); + //} @@ -3331,15 +3331,15 @@ #endregion #region LegacyDrawing - worksheetPart.Worksheet.RemoveAllChildren(); - { - if (!StringExtensions.IsNullOrWhiteSpace(xlWorksheet.LegacyDrawingId)) - { - var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.LegacyDrawing); - worksheetPart.Worksheet.InsertAfter(new LegacyDrawing { Id = xlWorksheet.LegacyDrawingId }, - previousElement); - } - } + //worksheetPart.Worksheet.RemoveAllChildren(); + //{ + // if (!StringExtensions.IsNullOrWhiteSpace(xlWorksheet.LegacyDrawingId)) + // { + // var previousElement = cm.GetPreviousElementFor(XLWSContentManager.XLWSContents.LegacyDrawing); + // worksheetPart.Worksheet.InsertAfter(new LegacyDrawing { Id = xlWorksheet.LegacyDrawingId }, + // previousElement); + // } + //} #endregion } @@ -3380,9 +3380,8 @@ private static double GetColumnWidth(double columnWidth) { - if (columnWidth > 0) - return columnWidth + ColumnWidthOffset; - return columnWidth; + Double retVal = columnWidth + ColumnWidthOffset; + return retVal > 0 ? retVal : 0; } private static void UpdateColumn(Column column, Columns columns, Dictionary sheetColumnsByMin)