Browse Source

Cleanup (FxCop)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5691 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 16 years ago
parent
commit
084f6c245e
  1. 13
      samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd
  2. 2
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs
  3. 2
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs
  4. 2
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs
  5. 4
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs
  6. 3
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs
  7. 1
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
  8. 12
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs

13
samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd

@ -86,7 +86,7 @@
<Size>661, 42</Size> <Size>661, 42</Size>
<ScaleImageToSize>False</ScaleImageToSize> <ScaleImageToSize>False</ScaleImageToSize>
<BackColor>Window</BackColor> <BackColor>Window</BackColor>
<RelativeFileName>..\Logos\Bannerbeige2.gif</RelativeFileName> <RelativeFileName>..\..\..\..\..\..\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</RelativeFileName>
<ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName> <ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
</BaseImageItem> </BaseImageItem>
<BaseLineItem> <BaseLineItem>
@ -133,13 +133,9 @@
<BackColor>Window</BackColor> <BackColor>Window</BackColor>
<Items> <Items>
<BaseRowItem> <BaseRowItem>
<Location>3, 10</Location>
<AlternateBackColor /> <AlternateBackColor />
<FrameColor>WindowFrame</FrameColor>
<Name>Row</Name> <Name>Row</Name>
<Location>3, 10</Location>
<Visible>True</Visible>
<Size>699, 40</Size>
<Padding>5, 5, 5, 5</Padding>
<Items> <Items>
<BaseDataItem> <BaseDataItem>
<DataType>System.String</DataType> <DataType>System.String</DataType>
@ -200,9 +196,12 @@
<FrameColor>WindowFrame</FrameColor> <FrameColor>WindowFrame</FrameColor>
</BaseDataItem> </BaseDataItem>
</Items> </Items>
<DrawBorder>False</DrawBorder>
<ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow> <ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow>
<FrameColor>WindowFrame</FrameColor>
<Size>699, 40</Size>
<BackColor>White</BackColor> <BackColor>White</BackColor>
<DrawBorder>False</DrawBorder> <Visible>True</Visible>
<ForeColor>ControlText</ForeColor> <ForeColor>ControlText</ForeColor>
</BaseRowItem> </BaseRowItem>
</Items> </Items>

2
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs

@ -245,7 +245,7 @@ namespace ICSharpCode.Reports.Addin
{ {
System.Console.WriteLine("RootDesigner:OnComponentChanged {0} from {1} to {2}",ce.Component.ToString(),ce.OldValue,ce.NewValue); System.Console.WriteLine("RootDesigner:OnComponentChanged {0} from {1} to {2}",ce.Component.ToString(),ce.OldValue,ce.NewValue);
MemberDescriptor m = ce.Member; // MemberDescriptor m = ce.Member;
if (ce.Member.Name == "Name") { if (ce.Member.Name == "Name") {
AbstractItem item = ce.Component as AbstractItem; AbstractItem item = ce.Component as AbstractItem;
if (item != null) { if (item != null) {

2
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.Reports.Addin
public void LoadOrCreateReport() public void LoadOrCreateReport()
{ {
string baseClassName = String.Empty; //string baseClassName = String.Empty;
Application.UseWaitCursor = true; Application.UseWaitCursor = true;
Application.DoEvents(); Application.DoEvents();

2
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs

@ -26,7 +26,6 @@ namespace ICSharpCode.Reports.Addin
public class ReportDesignerGenerator:IDesignerGenerator public class ReportDesignerGenerator:IDesignerGenerator
{ {
private ReportDesignerView viewContent; private ReportDesignerView viewContent;
private StringWriter generated;
public ReportDesignerGenerator() public ReportDesignerGenerator()
{ {
@ -72,7 +71,6 @@ namespace ICSharpCode.Reports.Addin
StringWriterWithEncoding writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8); StringWriterWithEncoding writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8);
XmlTextWriter xml = XmlHelper.CreatePropperWriter(writer); XmlTextWriter xml = XmlHelper.CreatePropperWriter(writer);
this.InternalMergeFormChanges(xml); this.InternalMergeFormChanges(xml);
this.generated = writer;
viewContent.ReportFileContent = writer.ToString(); viewContent.ReportFileContent = writer.ToString();
} }

4
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@ -50,7 +50,7 @@ namespace ICSharpCode.Reports.Addin
private XmlView xmlView; private XmlView xmlView;
private ReportPreview preview; private ReportPreview preview;
private ReportViewerSecondaryView reportViewer; private ReportViewerSecondaryView reportViewer;
private Encoding defaultEncoding = Encoding.UTF8; // private Encoding defaultEncoding = Encoding.UTF8;
#region Constructor #region Constructor
@ -332,7 +332,7 @@ namespace ICSharpCode.Reports.Addin
#region Transaction #region Transaction
bool shouldUpdateSelectableObjects = false; bool shouldUpdateSelectableObjects;
void TransactionClose(object sender, DesignerTransactionCloseEventArgs e) void TransactionClose(object sender, DesignerTransactionCloseEventArgs e)
{ {

3
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs

@ -41,16 +41,13 @@ namespace ICSharpCode.Reports.Core{
bool firstPage; bool firstPage;
bool landscape; bool landscape;
int gap = 1; int gap = 1;
Rectangle printableArea; Rectangle printableArea;
ReportSettings settings;
#region Constructor #region Constructor
public SectionBounds (ReportSettings settings,bool firstPage) public SectionBounds (ReportSettings settings,bool firstPage)
{ {
this.settings = settings;
this.firstPage = firstPage; this.firstPage = firstPage;
this.landscape = settings.Landscape; this.landscape = settings.Landscape;
this.printableArea = new Rectangle(settings.LeftMargin,settings.TopMargin, this.printableArea = new Rectangle(settings.LeftMargin,settings.TopMargin,

1
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs

@ -158,6 +158,7 @@ namespace ICSharpCode.Reports.Core.Exporter
PrintHelper.SetLayoutForRow(Graphics,Layouter,row); PrintHelper.SetLayoutForRow(Graphics,Layouter,row);
} }
protected Point BaseConvert(ExporterCollection myList,ISimpleContainer container,int leftPos,Point curPos) protected Point BaseConvert(ExporterCollection myList,ISimpleContainer container,int leftPos,Point curPos)
{ {
container.Location = new Point (leftPos,container.Location.Y); container.Location = new Point (leftPos,container.Location.Y);

12
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs

@ -65,7 +65,6 @@ namespace ICSharpCode.Reports.Core.Exporter
BaseLine baseLine = null; BaseLine baseLine = null;
baseLine = new BaseLine (lineStyle.ForeColor,lineStyle.DashStyle,lineStyle.Thickness); baseLine = new BaseLine (lineStyle.ForeColor,lineStyle.DashStyle,lineStyle.Thickness);
LineShape ls = lineStyle.Shape as LineShape;;
Point from = new Point(lineStyle.DisplayRectangle.Left + lineStyle.From.X, Point from = new Point(lineStyle.DisplayRectangle.Left + lineStyle.From.X,
lineStyle.DisplayRectangle.Top + lineStyle.From.Y); lineStyle.DisplayRectangle.Top + lineStyle.From.Y);
@ -79,8 +78,7 @@ namespace ICSharpCode.Reports.Core.Exporter
private void PdfLineDrawer (PdfWriter pdfWriter, private void PdfLineDrawer (PdfWriter pdfWriter)
ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter)
{ {
LineDecorator lineStyle = base.StyleDecorator as LineDecorator; LineDecorator lineStyle = base.StyleDecorator as LineDecorator;
if (lineStyle != null) { if (lineStyle != null) {
@ -90,14 +88,12 @@ namespace ICSharpCode.Reports.Core.Exporter
Point from = new Point ((int)UnitConverter.FromPixel(l), Point from = new Point ((int)UnitConverter.FromPixel(l),
(int)r.Top - (int)UnitConverter.FromPixel(lineStyle.From.Y)); (int)r.Top - (int)UnitConverter.FromPixel(lineStyle.From.Y));
// Point from = new Point((int)r.Left + (int)UnitConverter.FromPixel(lineStyle.From.X),
// (int)r.Top - (int)UnitConverter.FromPixel(lineStyle.From.Y));
l = lineStyle.DisplayRectangle.Left + lineStyle.To.X; l = lineStyle.DisplayRectangle.Left + lineStyle.To.X;
Point to = new Point ((int)UnitConverter.FromPixel(l), Point to = new Point ((int)UnitConverter.FromPixel(l),
(int)r.Top - (int)UnitConverter.FromPixel(lineStyle.To.Y)); (int)r.Top - (int)UnitConverter.FromPixel(lineStyle.To.Y));
// Point to = new Point((int)r.Left + lineStyle.To.X,
// (int)r.Top - lineStyle.To.Y);
lineStyle.Shape.DrawShape(base.PdfWriter.DirectContent, lineStyle.Shape.DrawShape(base.PdfWriter.DirectContent,
new BaseLine (lineStyle.ForeColor,lineStyle.DashStyle,lineStyle.Thickness), new BaseLine (lineStyle.ForeColor,lineStyle.DashStyle,lineStyle.Thickness),
lineStyle, lineStyle,
@ -112,7 +108,7 @@ namespace ICSharpCode.Reports.Core.Exporter
base.DrawItem(pdfWriter, converter); base.DrawItem(pdfWriter, converter);
ILineDecorator lineDecorator = base.StyleDecorator as LineDecorator; ILineDecorator lineDecorator = base.StyleDecorator as LineDecorator;
if (lineDecorator != null) { if (lineDecorator != null) {
PdfLineDrawer (pdfWriter,converter); PdfLineDrawer (pdfWriter);
} }
else { else {
IGraphicStyleDecorator style = base.StyleDecorator as GraphicStyleDecorator; IGraphicStyleDecorator style = base.StyleDecorator as GraphicStyleDecorator;

Loading…
Cancel
Save