Browse Source

Fixed all warnings. Most were "Exception e" where "Exception" was sufficient, but some were "hiding" base methods that needed a "new" keyword.

Removed the strong name key as per Cathal's suggestion.
master
bdm_cp 15 years ago
parent
commit
ae48e62a69

+ 5
- 5
DocX/DocX.cs View File

@@ -928,7 +928,7 @@ namespace Novacode
/// }// Release this document from memory.
/// </code>
/// </example>
public Table InsertTable(int coloumnCount, int rowCount)
public new Table InsertTable(int coloumnCount, int rowCount)
{
if (rowCount < 1 || coloumnCount < 1)
throw new ArgumentOutOfRangeException("Row and Coloumn count must be greater than zero.");
@@ -979,7 +979,7 @@ namespace Novacode
/// }// Release this document from memory.
/// </code>
/// </example>
public Table InsertTable(int index, Table t)
public new Table InsertTable(int index, Table t)
{
Table t2 = base.InsertTable(index, t);
t2.mainPart = mainPart;
@@ -1018,7 +1018,7 @@ namespace Novacode
/// }// Release this document from memory.
/// </code>
/// </example>
public Table InsertTable(Table t)
public new Table InsertTable(Table t)
{
t.mainPart = mainPart;
return base.InsertTable(t);
@@ -1060,10 +1060,10 @@ namespace Novacode
/// }// Release this document from memory.
/// </code>
/// </example>
public Table InsertTable(int index, int coloumnCount, int rowCount)
public new Table InsertTable(int index, int coloumnCount, int rowCount)
{
if (rowCount < 1 || coloumnCount < 1)
throw new ArgumentOutOfRangeException("Row and Coloumn count must be greater than zero.");
throw new ArgumentOutOfRangeException("Row and Column count must be greater than zero.");
Table t = InsertTable(index, coloumnCount, rowCount);
t.mainPart = mainPart;

+ 0
- 3
DocX/DocX.csproj View File

@@ -18,8 +18,6 @@
<SccProvider>SAK</SccProvider>
<StartupObject>
</StartupObject>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>StrongNameKey.pfx</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
@@ -109,7 +107,6 @@
<None Include="Help\Changes in this version 1.0.0.10.docx" />
<None Include="Help\DocX v1.0.0.10 - Documentation.chm" />
<None Include="Help\Read Me.docx" />
<None Include="StrongNameKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="License\License.html" />

+ 1
- 1
DocX/Paragraph.cs View File

@@ -723,7 +723,7 @@ namespace Novacode
/// }// Release this new document form memory.
/// </code>
/// </example>
public Paragraph InsertParagraphBeforeSelf(string text)
public override Paragraph InsertParagraphBeforeSelf(string text)
{
Paragraph p = base.InsertParagraphBeforeSelf(text);
p.PackagePart = mainPart;

+ 1
- 1
DocX/Picture.cs View File

@@ -22,7 +22,7 @@ namespace Novacode
private string name;
private string descr;
private int cx, cy;
private string fileName;
//private string fileName;
private uint rotation;
private bool hFlip, vFlip;
private object pictureShape;

+ 1
- 1
DocX/Properties/AssemblyInfo.cs View File

@@ -15,7 +15,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCulture("")]
// Allow the UnitTests to get at internal stuff.
[assembly: InternalsVisibleTo("UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001008f789f4c5e510820397a319f4470c971513778e65ad102a225ed5b204aef1c6750ba5086268afe54fc515e005447be038d89fdfa5f55935f83e0916a229956b36f0eabf7ea9b2ee2e216b9e63e40a715833a2e5c9c6944de97231dd792ebdc3132cef5c6e0d7160383d7a44ae39933cfaee0aa6ae9fe1175630f443bfce259b2")]
[assembly: InternalsVisibleTo("UnitTests")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from

BIN
DocX/StrongNameKey.pfx View File


+ 1
- 1
DocX/Table.cs View File

@@ -211,7 +211,7 @@ namespace Novacode
design = (TableDesign)Enum.Parse(typeof(TableDesign), val.Value.Replace("-", string.Empty));
}
catch (Exception e)
catch (Exception)
{
design = TableDesign.Custom;
}

BIN
UnitTests/StrongNameKey.pfx View File


+ 12
- 12
UnitTests/UnitTest1.cs View File

@@ -696,8 +696,8 @@ namespace UnitTests
p1.RemoveHyperlink(-1);
Assert.Fail();
}
catch (ArgumentException e) { }
catch (Exception e) { Assert.Fail(); }
catch (ArgumentException) { }
catch (Exception) { Assert.Fail(); }
// Try and remove a Hyperlink at an index greater than the last.
// This should throw an exception.
@@ -706,8 +706,8 @@ namespace UnitTests
p1.RemoveHyperlink(3);
Assert.Fail();
}
catch (ArgumentException e) {}
catch (Exception e) { Assert.Fail(); }
catch (ArgumentException) {}
catch (Exception) { Assert.Fail(); }
p1.RemoveHyperlink(0); Assert.IsTrue(p1.Text == "AlinkClink");
p1.RemoveHyperlink(1); Assert.IsTrue(p1.Text == "AlinkC");
@@ -762,8 +762,8 @@ namespace UnitTests
p1.RemoveText(p1.Text.Length, 1);
Assert.Fail();
}
catch (ArgumentOutOfRangeException e) { }
catch (Exception e) { Assert.Fail(); }
catch (ArgumentOutOfRangeException) { }
catch (Exception) { Assert.Fail(); }
// Try and remove text at a negative index.
// This should throw an exception.
@@ -772,8 +772,8 @@ namespace UnitTests
p1.RemoveText(-1, 1);
Assert.Fail();
}
catch (ArgumentOutOfRangeException e) { }
catch (Exception e) { Assert.Fail(); }
catch (ArgumentOutOfRangeException) { }
catch (Exception) { Assert.Fail(); }
// Difficult
//<p>
@@ -873,8 +873,8 @@ namespace UnitTests
p1.InsertText(p1.Text.Length + 1, "-");
Assert.Fail();
}
catch (ArgumentOutOfRangeException e) { }
catch (Exception e) { Assert.Fail(); }
catch (ArgumentOutOfRangeException) { }
catch (Exception) { Assert.Fail(); }
// Try and insert text at a negative index.
// This should throw an exception.
@@ -883,8 +883,8 @@ namespace UnitTests
p1.InsertText(-1, "-");
Assert.Fail();
}
catch (ArgumentOutOfRangeException e) { }
catch (Exception e) { Assert.Fail(); }
catch (ArgumentOutOfRangeException) { }
catch (Exception) { Assert.Fail(); }
// Difficult
//<p>

+ 0
- 7
UnitTests/UnitTests.csproj View File

@@ -36,12 +36,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>StrongNameKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
@@ -72,7 +66,6 @@
<None Include="documents\Paragraphs.docx" />
<None Include="documents\Tables.docx" />
<None Include="documents\Template.dotx" />
<None Include="StrongNameKey.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DocX\DocX.csproj">

Loading…
Cancel
Save