This related with #2123, made editAs attribute value empty for one cell anchor drawing object (#2128)

* Fix absolute positioning to-point error and adjust one cell anchor drawing object failed
* Revert default column width and row height
* Clean shared formula cell cache before remvoe it in calc chain
* Revert adjustFormulaRef changes in the commit 3ccbdaa
* Update unit tests



* Format code

Author: Now-Shimmer

adjust.go

@@ -416,30 +416,48 @@ func (f *File) adjustFormulaOperand(sheet, sheetN string, keepRelative bool, tok
 // adjustFormulaRef returns adjusted formula by giving adjusting direction and
 // the base number of column or row, and offset.
 func (f *File) adjustFormulaRef(sheet, sheetN, formula string, keepRelative bool, dir adjustDirection, num, offset int) (string, error) {
-	var definedNames []string
+	var (
+		val          string
+		definedNames []string
+		ps           = efp.ExcelParser()
+	)
 	for _, definedName := range f.GetDefinedName() {
 		if definedName.Scope == "Workbook" || definedName.Scope == sheet {
 			definedNames = append(definedNames, definedName.Name)
 		}
 	}
-	ps := efp.ExcelParser()
-	tokens := ps.Parse(formula)
-	for i, token := range tokens {
+	for _, token := range ps.Parse(formula) {
 		if token.TType == efp.TokenTypeUnknown {
-			return formula, nil
+			val = formula
+			break
 		}
 		if token.TType == efp.TokenTypeOperand && token.TSubType == efp.TokenSubTypeRange {
-			if inStrSlice(definedNames, token.TValue, true) != -1 || strings.ContainsAny(token.TValue, "[]") {
+			if inStrSlice(definedNames, token.TValue, true) != -1 {
+				val += token.TValue
+				continue
+			}
+			if strings.ContainsAny(token.TValue, "[]") {
+				val += token.TValue
 				continue
 			}
 			operand, err := f.adjustFormulaOperand(sheet, sheetN, keepRelative, token, dir, num, offset)
 			if err != nil {
-				return ps.Render(), err
+				return val, err
 			}
-			tokens[i].TValue = operand
+			val += operand
+			continue
 		}
+		if paren := transformParenthesesToken(token); paren != "" {
+			val += transformParenthesesToken(token)
+			continue
+		}
+		if token.TType == efp.TokenTypeOperand && token.TSubType == efp.TokenSubTypeText {
+			val += string(efp.QuoteDouble) + strings.ReplaceAll(token.TValue, "\"", "\"\"") + string(efp.QuoteDouble)
+			continue
+		}
+		val += token.TValue
 	}
-	return ps.Render(), nil
+	return val, nil
 }
 
 // transformParenthesesToken returns formula part with parentheses by given

cell.go

@@ -189,11 +189,11 @@ func (f *File) removeFormula(c *xlsxC, ws *xlsxWorksheet, sheet string) error {
 		}
 		if c.F.T == STCellFormulaTypeShared && c.F.Ref != "" {
 			si := c.F.Si
-			ws.deleteSharedFormula(c)
 			for r, row := range ws.SheetData.Row {
 				for col, cell := range row.C {
 					if cell.F != nil && cell.F.Si != nil && *cell.F.Si == *si {
 						ws.SheetData.Row[r].C[col].F = nil
+						ws.deleteSharedFormula(c)
 						_ = f.deleteCalcChain(sheetID, cell.R)
 					}
 				}

chart_test.go

@@ -93,11 +93,8 @@ func TestChartSize(t *testing.T) {
 		t.FailNow()
 	}
 
-	if !assert.Equal(t, 11, anchor.To.Col, "Expected 'to' column 11") ||
-		!assert.Equal(t, 27, anchor.To.Row, "Expected 'to' row 27") {
-
-		t.FailNow()
-	}
+	assert.Equal(t, 14, anchor.To.Col, "Expected 'to' column 14")
+	assert.Equal(t, 29, anchor.To.Row, "Expected 'to' row 29")
 }
 
 func TestAddDrawingChart(t *testing.T) {

col.go

@@ -22,10 +22,10 @@ import (
 
 // Define the default cell size and EMU unit of measurement.
 const (
-	defaultColWidth        float64 = 10.5
-	defaultColWidthPixels  float64 = 84.0
-	defaultRowHeight       float64 = 15.6
-	defaultRowHeightPixels float64 = 20.8
+	defaultColWidth        float64 = 9.140625
+	defaultColWidthPixels  float64 = 64
+	defaultRowHeight       float64 = 15
+	defaultRowHeightPixels float64 = 20
 	EMU                    int     = 9525
 )
 
@@ -625,7 +625,7 @@ func (f *File) positionObjectPixels(sheet string, col, row, width, height int, o
 	// Initialized end cell to the same as the start cell.
 	colEnd, rowEnd := colIdx, rowIdx
 	x1, y1, x2, y2 := opts.OffsetX, opts.OffsetY, width, height
-	if opts.Positioning == "" || opts.Positioning == "twoCell" {
+	if opts.Positioning != "oneCell" {
 		// Using a twoCellAnchor, the maximum possible offset is limited by the
 		// "from" cell dimensions. If these were to be exceeded the "toPoint" would
 		// be calculated incorrectly, since the requested "fromPoint" is not possible
@@ -801,10 +801,6 @@ func convertColWidthToPixels(width float64) float64 {
 	if width == 0 {
 		return pixels
 	}
-	if width < 1 {
-		pixels = (width * 12) + 0.5
-		return float64(int(pixels))
-	}
 	pixels = (width*maxDigitWidth + 0.5)
 	return float64(int(pixels))
 }

col_test.go

@@ -484,5 +484,5 @@ func TestRemoveCol(t *testing.T) {
 }
 
 func TestConvertColWidthToPixels(t *testing.T) {
-	assert.Equal(t, -11.0, convertColWidthToPixels(-1))
+	assert.Equal(t, -7.0, convertColWidthToPixels(-1))
 }

drawing.go

@@ -1466,7 +1466,7 @@ func (f *File) addSheetDrawingChart(drawingXML string, rID int, opts *GraphicOpt
 	absoluteAnchor := xdrCellAnchor{
 		EditAs: opts.Positioning,
 		Pos:    &xlsxPoint2D{},
-		Ext:    &aExt{},
+		Ext:    &xlsxPositiveSize2D{},
 	}
 
 	graphicFrame := xlsxGraphicFrame{

picture.go

@@ -372,7 +372,6 @@ func (f *File) addDrawingPicture(sheet, drawingXML, cell, ext string, rID, hyper
 		return err
 	}
 	cellAnchor := xdrCellAnchor{}
-	cellAnchor.EditAs = opts.Positioning
 	from := xlsxFrom{}
 	from.Col = colStart
 	from.ColOff = x1 * EMU
@@ -387,6 +386,7 @@ func (f *File) addDrawingPicture(sheet, drawingXML, cell, ext string, rID, hyper
 		to.Row = rowEnd
 		to.RowOff = y2 * EMU
 		cellAnchor.To = &to
+		cellAnchor.EditAs = opts.Positioning
 	}
 
 	pic := xlsxPic{}
@@ -420,7 +420,7 @@ func (f *File) addDrawingPicture(sheet, drawingXML, cell, ext string, rID, hyper
 	if opts.Positioning == "oneCell" {
 		cx := x2 * EMU
 		cy := y2 * EMU
-		cellAnchor.Ext = &aExt{
+		cellAnchor.Ext = &xlsxPositiveSize2D{
 			Cx: cx,
 			Cy: cy,
 		}

rows.go

@@ -467,7 +467,7 @@ func (f *File) getRowHeight(sheet string, row int) int {
 		return int(convertRowHeightToPixels(ws.SheetFormatPr.DefaultRowHeight))
 	}
 	// Optimization for when the row heights haven't changed.
-	return int(math.Round(defaultRowHeightPixels))
+	return int(defaultRowHeightPixels)
 }
 
 // GetRowHeight provides a function to get row height by given worksheet name
@@ -1012,5 +1012,5 @@ func convertRowHeightToPixels(height float64) float64 {
 	if height == 0 {
 		return 0
 	}
-	return float64(int(height*4.0/3.0 + 0.5))
+	return math.Ceil(4.0 / 3.4 * height)
 }

rows_test.go

@@ -205,7 +205,7 @@ func TestRowHeight(t *testing.T) {
 	assert.NoError(t, f.SetCellValue("Sheet2", "A2", true))
 	height, err = f.GetRowHeight("Sheet2", 1)
 	assert.NoError(t, err)
-	assert.Equal(t, 15.6, height)
+	assert.Equal(t, 15.0, height)
 
 	err = f.SaveAs(filepath.Join("test", "TestRowHeight.xlsx"))
 	if !assert.NoError(t, err) {

slicer.go

@@ -612,7 +612,7 @@ func (f *File) addDrawingSlicer(sheet, slicerName string, ns xml.Attr, opts *Sli
 				Name: slicerName,
 			},
 		},
-		Xfrm: xlsxXfrm{Off: xlsxOff{}, Ext: aExt{}},
+		Xfrm: xlsxXfrm{Off: xlsxOff{}, Ext: xlsxPositiveSize2D{}},
 		Graphic: &xlsxGraphic{
 			GraphicData: &xlsxGraphicData{
 				URI: NameSpaceDrawingMLSlicer.Value,
@@ -632,7 +632,7 @@ func (f *File) addDrawingSlicer(sheet, slicerName string, ns xml.Attr, opts *Sli
 			},
 		},
 		SpPr: &xlsxSpPr{
-			Xfrm:      xlsxXfrm{Off: xlsxOff{X: 2914650, Y: 152400}, Ext: aExt{Cx: 1828800, Cy: 2238375}},
+			Xfrm:      xlsxXfrm{Off: xlsxOff{X: 2914650, Y: 152400}, Ext: xlsxPositiveSize2D{Cx: 1828800, Cy: 2238375}},
 			SolidFill: &xlsxInnerXML{Content: "<a:prstClr val=\"white\"/>"},
 			PrstGeom: xlsxPrstGeom{
 				Prst: "rect",