Bugfix/biwebsvody 8848

.gitignore

@@ -52,4 +52,12 @@ _ReSharper*/
 ~$*
 
 #NuGet
-packages/
+packages/
+.idea/.idea.EPPlus/.idea/contentModel.xml
+.idea/.idea.EPPlus/.idea/encodings.xml
+.idea/.idea.EPPlus/.idea/indexLayout.xml
+.idea/.idea.EPPlus/.idea/misc.xml
+.idea/.idea.EPPlus/.idea/modules.xml
+.idea/.idea.EPPlus/.idea/vcs.xml
+.idea/.idea.EPPlus/.idea/workspace.xml
+.idea/.idea.EPPlus/riderModule.iml

EPPlus/Drawing/Vml/ExcelVmlDrawingCommentCollection.cs

@@ -113,7 +113,15 @@ private XmlNode AddDrawing(ExcelRangeBase cell)
             {
                 ix = ~ix;
                 var prevDraw = _drawings[ix] as ExcelVmlDrawingBase;
-                prevDraw.TopNode.ParentNode.InsertBefore(node, prevDraw.TopNode);
+                var parentNode = prevDraw.TopNode.ParentNode;
+                if (parentNode!=null)
+                {
+                    parentNode.InsertBefore(node, prevDraw.TopNode);
+                }
+                else
+                {
+                    VmlDrawingXml.DocumentElement.AppendChild(node);
+                }
             }
             else
             {

EPPlus/EPPlus.csproj

@@ -25,7 +25,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>

EPPlus/ExcelCommentCollection.cs

@@ -218,10 +218,15 @@ public void Remove(ExcelComment comment)
             }
             if (comment==c)
             {
-                comment.TopNode.ParentNode.RemoveChild(comment.TopNode); //Remove VML
-                comment._commentHelper.TopNode.ParentNode.RemoveChild(comment._commentHelper.TopNode); //Remove Comment
+                //
+                comment.TopNode.ParentNode?.RemoveChild(comment.TopNode); //Remove VML
+                comment._commentHelper.TopNode.ParentNode?.RemoveChild(comment._commentHelper.TopNode); //Remove Comment
+
+                if (Worksheet.VmlDrawingsComments._drawings.ContainsKey(id))
+                {
+                    Worksheet.VmlDrawingsComments._drawings.Delete(id);
+                }
 
-                Worksheet.VmlDrawingsComments._drawings.Delete(id);
                 _list.RemoveAt(i);                
                 Worksheet._commentsStore.Delete(comment.Range._fromRow, comment.Range._fromCol, 1, 1, false);   //Issue 15549, Comments should not be shifted 
                 var ci = new CellsStoreEnumerator<int>(Worksheet._commentsStore);

EPPlus/ExcelRangeBase.cs

@@ -253,11 +253,11 @@ private static void Set_StyleName(ExcelRangeBase range, object value, int row, i
         private static void Set_Value(ExcelRangeBase range, object value, int row, int col)
         {
             var sfi = range._worksheet._formulas.GetValue(row, col);
-            if (sfi is int)
+            if (sfi is int && !range.IsSingleCell)
             {
                 range.SplitFormulas(range._worksheet.Cells[row, col]);
             }
-            if (sfi != null) range._worksheet._formulas.SetValue(row, col, string.Empty);
+           // if (sfi != null) range._worksheet._formulas.SetValue(row, col, string.Empty);
             range._worksheet.SetValueInner(row, col, value);
         }
         private static void Set_Formula(ExcelRangeBase range, object value, int row, int col)
@@ -1270,7 +1270,11 @@ public bool Merge
             set
             {
                 IsRangeValid("merging");
-                _worksheet.MergedCells.Clear(this);
+                if (!_worksheet.DisableMergeValidation)
+                {
+                    _worksheet.MergedCells.Clear(this);
+                }
+
                 if (value)
                 {
                     _worksheet.MergedCells.Add(new ExcelAddressBase(FirstAddress), true);
@@ -1608,7 +1612,7 @@ private void SplitFormula(ExcelAddressBase address, int ix)
             //The formula is inside the currenct range, remove it
             if (collide == eAddressCollition.Equal || collide == eAddressCollition.Inside)
             {
-                _worksheet._sharedFormulas.Remove(ix);
+               // _worksheet._sharedFormulas.Remove(ix);
                 return;
                 //fRange.SetSharedFormulaID(int.MinValue); 
             }
@@ -2609,29 +2613,35 @@ public void Copy(ExcelRangeBase Destination, ExcelRangeCopyOptionFlags? excelRan
             }
             var copiedMergedCells = new Dictionary<int, ExcelAddress>();
             //Merged cells
-            var csem = new CellsStoreEnumerator<int>(_worksheet.MergedCells._cells, _fromRow, _fromCol, _toRow, _toCol);
-            while (csem.Next())
+
+            for (var row = _fromRow; row <= _toRow; row++)
             {
-                if (!copiedMergedCells.ContainsKey(csem.Value))
+                for (var col = _fromCol; col <= _toCol; col++)
                 {
-                    var adr = new ExcelAddress(_worksheet.Name, _worksheet.MergedCells.List[csem.Value]);
-                    var collideResult = Collide(adr);
-                    if (collideResult == eAddressCollition.Inside || collideResult == eAddressCollition.Equal)
-                    {
-                        copiedMergedCells.Add(csem.Value, new ExcelAddress(
-                            Destination._fromRow + (adr.Start.Row - _fromRow),
-                            Destination._fromCol + (adr.Start.Column - _fromCol),
-                            Destination._fromRow + (adr.End.Row - _fromRow),
-                            Destination._fromCol + (adr.End.Column - _fromCol)));
-                    }
-                    else
+                    var key = _worksheet.GetMergeCellId(row, col) - 1;
+                    if (key >= 0 && !copiedMergedCells.ContainsKey(key))
                     {
-                        //Partial merge of the address ignore.
-                        copiedMergedCells.Add(csem.Value, null);
+                        var adr = new ExcelAddress(_worksheet.Name, _worksheet.MergedCells.List[key]);
+                        var collideResult = Collide(adr);
+                        if (collideResult == eAddressCollition.Inside || collideResult == eAddressCollition.Equal)
+                        {
+                            copiedMergedCells.Add(
+                                key,
+                                new ExcelAddress(
+                                    Destination._fromRow + (adr.Start.Row - _fromRow),
+                                    Destination._fromCol + (adr.Start.Column - _fromCol),
+                                    Destination._fromRow + (adr.End.Row - _fromRow),
+                                    Destination._fromCol + (adr.End.Column - _fromCol)));
+                        }
+                        else
+                        {
+                            //Partial merge of the address ignore.
+                            copiedMergedCells.Add(key, null);
+                        }
                     }
                 }
             }
-
+            
             Destination._worksheet.MergedCells.Clear(new ExcelAddressBase(Destination._fromRow, Destination._fromCol, Destination._fromRow + toRow - 1, Destination._fromCol + toCol - 1));
 
             Destination._worksheet._values.Clear(Destination._fromRow, Destination._fromCol, toRow, toCol);

EPPlus/ExcelStyles.cs

@@ -953,6 +953,7 @@ internal int CloneStyle(ExcelStyles style, int styleID, bool isNamedStyle, bool
                     xfs = style.CellXfs[styleID];
                 }
                 ExcelXfs newXfs = xfs.Copy(this);
+                newXfs.XfId = 0;
                 //Numberformat
                 if (xfs.NumberFormatId > 0)
                 {
@@ -1026,7 +1027,7 @@ internal int CloneStyle(ExcelStyles style, int styleID, bool isNamedStyle, bool
                 }
 
                 //Named style reference
-                if (xfs.XfId > 0)
+                if (isNamedStyle && xfs.XfId > 0)
                 {
                     var id = style.CellStyleXfs[xfs.XfId].Id;
                     var newId = CellStyleXfs.FindIndexByID(id);

EPPlus/ExcelWorkbook.cs

@@ -175,6 +175,11 @@ internal void GetDefinedNames()
 				{ 
 					string fullAddress = elem.InnerText;
 
+                    if(fullAddress.EndsWith("!#REF!"))
+                    {
+                        continue;
+                    }
+
 					int localSheetID;
 					ExcelWorksheet nameWorksheet;