From e32095d88db0ceb82e4ff9c8fcccf5d44193794e Mon Sep 17 00:00:00 2001
From: Doug Finke <finked@hotmail.com>
Date: Fri, 10 Apr 2015 14:32:48 -0400
Subject: [PATCH] Replaced `-Force` switch with `-NoClobber` switch

---
 ImportExcel.psm1 | 15 ++++++++++++---
 README.md        |  3 ++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ImportExcel.psm1 b/ImportExcel.psm1
index f583df2..a8b0efa 100644
--- a/ImportExcel.psm1
+++ b/ImportExcel.psm1
@@ -59,7 +59,7 @@ function Export-Excel {
         [Switch]$IncludePivotChart,
         [Switch]$AutoSize,
         [Switch]$Show,
-        [Switch]$Force
+        [Switch]$NoClobber
     )
 
     Begin {
@@ -68,13 +68,22 @@ function Export-Excel {
             $pkg = New-Object OfficeOpenXml.ExcelPackage $Path
 
             if($pkg.Workbook.Worksheets[$WorkSheetname]) {
-                $pkg.Workbook.Worksheets.delete($WorkSheetname)
+                if($NoClobber) {
+                    $AlreadyExists = $true
+                    throw ""
+                } else {
+                    $pkg.Workbook.Worksheets.delete($WorkSheetname)
+                }
             }
 
             $ws  = $pkg.Workbook.Worksheets.Add($WorkSheetname)
             $Row = 1
         } Catch {
-            throw $Error[0].Exception.InnerException
+            if($AlreadyExists) {
+                throw "$WorkSheetname already exists."
+            } else {
+                throw $Error[0].Exception.InnerException
+            }
         }
     }
 
diff --git a/README.md b/README.md
index f4abf10..1e1b682 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ What's new
 #### 4/10/2015
 * Renamed `AutoFitColumns` to `AutoSize`
 * Implemented `Export-MultipleExcelSheets`
-* Implemented `-Password` for a worksheet 
+* Implemented `-Password` for a worksheet
+* Repalce `-Force` switch with `-NoClobber` switch 
 
 #### Examples 
 `gsv | Export-Excel .\test.xlsx -WorkSheetname Services`