Browse Source

Fixes from FxCop

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1041 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Peter Forstmeier 20 years ago
parent
commit
ed17b45b28
  1. 42
      src/AddIns/Misc/SharpReport/SharpReport/AutoReport.cs
  2. 30
      src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs
  3. 12
      src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs
  4. 5
      src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs
  5. 8
      src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSection.cs
  6. 3
      src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs
  7. 3
      src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/SectionChangedEventArgs.cs
  8. 2
      src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs
  9. 17
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/PageNumber.cs
  10. 15
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/Today.cs
  11. 8
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs
  12. 4
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs
  13. 9
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs
  14. 8
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs
  15. 14
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs
  16. 14
      src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs
  17. 15
      src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs
  18. 1
      src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs
  19. 3
      src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs

42
src/AddIns/Misc/SharpReport/SharpReport/AutoReport.cs

@ -10,11 +10,10 @@ @@ -10,11 +10,10 @@
using System;
using System.Diagnostics;
using System.Data;
using System.Drawing;
using System.Drawing.Printing;
using System.Data;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
@ -115,7 +114,6 @@ namespace SharpReport { @@ -115,7 +114,6 @@ namespace SharpReport {
ReportDataItem newItem = new ReportDataItem();
oldItem = (ReportDataItem)col[i];
newItem.VisualControl.Text = oldItem.ColumnName;
// newItem.Name = this.CreateName (itemCol,"ReportDataItem");
newItem.ColumnName = oldItem.ColumnName;
newItem.DbValue = oldItem.DbValue;
newItem.BaseTableName = oldItem.BaseTableName;
@ -137,7 +135,6 @@ namespace SharpReport { @@ -137,7 +135,6 @@ namespace SharpReport {
ReportTextItem newItem = new ReportTextItem();
oldItem = (ReportDataItem)col[i];
newItem.VisualControl.Text = oldItem.ColumnName;
// newItem.Name = this.CreateName (itemCol,"ReportTextItem");
newItem.Text = oldItem.ColumnName;
newItem.Location = new Point (i * 30,5);
itemCol.Add(newItem);
@ -177,39 +174,8 @@ namespace SharpReport { @@ -177,39 +174,8 @@ namespace SharpReport {
}
return itemCol;
}
/// <summary>
/// Build Headerline from a *.xsd File
/// </summary>
/// <param name="model">the ReportModel</param>
/// <param name="section">location of the Headerlines</param>
/// <param name="schemaTable">the Schematable with ColumnInrofmations</param>
/// <param name="setOnTop">Locate the Columns of Top or an Bottom of the Section</param>
/// <returns>a Collection of BaseTextItems</returns>
public ReportItemCollection old_AutoHeaderFromSchema (ReportModel model,BaseSection section,DataSet dataSet,bool setOnTop) {
if (dataSet.Tables.Count > 1) {
MessageService.ShowError ("AutoBuildFromDataSet : at this time no more than one table is allowed " + dataSet.Tables.Count.ToString());
throw new ArgumentException ("Too much Tables in DataSet");
}
ReportItemCollection itemCol = new ReportItemCollection();
foreach (DataTable tbl in dataSet.Tables) {
int i = 0;
foreach (DataColumn col in tbl.Columns) {
BaseTextItem rItem = (BaseTextItem)iDesignableFactory.Create("ReportTextItem");
rItem.Text = col.ColumnName;
if (setOnTop) {
rItem.Location = new Point (i * 30,1);
} else {
int y = section.Size.Height - rItem.Size.Height - 5;
rItem.Location = new Point (i * 30,y);
}
i ++;
itemCol.Add (rItem);
}
}
return itemCol;
}
#endregion
}
}

30
src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs

@ -3,24 +3,25 @@ @@ -3,24 +3,25 @@
// This code was generated by a tool.
// Runtime Version: 1.1.4322.2032
//
// Changes to this file may cause incorrect behavior and will be lost if
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------
using System;
using System.Globalization;
using System.ComponentModel;
using SharpReportCore;
/// <summary>
/// Build proper (unique) Names for all added Item's
/// </summary>
/// <remarks>
/// created by - Forstmeier Peter
/// created on - 27.08.2005 16:21:50
/// </remarks>
namespace SharpReport {
using System;
using System.Windows.Forms;
using System.ComponentModel;
using SharpReportCore;
/// <summary>
/// Build proper (unique) Names for all added Item's
/// </summary>
/// <remarks>
/// created by - Forstmeier Peter
/// created on - 27.08.2005 16:21:50
/// </remarks>
public class NameService : System.ComponentModel.Design.Serialization.INameCreationService {
/// <summary>
@ -33,7 +34,8 @@ namespace SharpReport { @@ -33,7 +34,8 @@ namespace SharpReport {
public string CreateName (ReportItemCollection collection,
string typeName) {
string name = Char.ToLower(typeName[0]) + typeName.Substring(1);
string name = Char.ToLower(typeName[0],CultureInfo.InvariantCulture) + typeName.Substring(1);
int number = 1;
while (collection.Find(name + number.ToString()) != null) {

12
src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs

@ -53,7 +53,7 @@ namespace SharpReport.Designer{ @@ -53,7 +53,7 @@ namespace SharpReport.Designer{
[EditorBrowsable(EditorBrowsableState.Always), Browsable(true)]
public event SelectedEventHandler ObjectSelected;
public event SectionChangedEventHandler SectionChanged;
public event EventHandler <SectionChangedEventArgs> SectionChanged;
public event ItemDragDropEventHandler DesignViewChanged;
public Report(){
@ -325,7 +325,7 @@ namespace SharpReport.Designer{ @@ -325,7 +325,7 @@ namespace SharpReport.Designer{
this.visualDetail.Size = new System.Drawing.Size(400, 72);
this.visualDetail.StringAlignment = System.Drawing.StringAlignment.Near;
this.visualDetail.TabIndex = 3;
this.visualDetail.SectionChanged += new SharpReport.Designer.SectionChangedEventHandler(this.SectionSizeChanged);
this.visualDetail.SectionChanged += new EventHandler<SectionChangedEventArgs> (this.SectionSizeChanged);
//
// visualPageFooter
//
@ -337,7 +337,7 @@ namespace SharpReport.Designer{ @@ -337,7 +337,7 @@ namespace SharpReport.Designer{
this.visualPageFooter.Size = new System.Drawing.Size(400, 68);
this.visualPageFooter.StringAlignment = System.Drawing.StringAlignment.Near;
this.visualPageFooter.TabIndex = 6;
this.visualPageFooter.SectionChanged += new SharpReport.Designer.SectionChangedEventHandler(this.SectionSizeChanged);
this.visualDetail.SectionChanged += new EventHandler<SectionChangedEventArgs> (this.SectionSizeChanged);
//
// visualFooter
//
@ -349,7 +349,7 @@ namespace SharpReport.Designer{ @@ -349,7 +349,7 @@ namespace SharpReport.Designer{
this.visualFooter.Size = new System.Drawing.Size(400, 76);
this.visualFooter.StringAlignment = System.Drawing.StringAlignment.Near;
this.visualFooter.TabIndex = 7;
this.visualFooter.SectionChanged += new SharpReport.Designer.SectionChangedEventHandler(this.SectionSizeChanged);
this.visualDetail.SectionChanged += new EventHandler<SectionChangedEventArgs> (this.SectionSizeChanged);
//
// visualPageHeader
//
@ -361,7 +361,7 @@ namespace SharpReport.Designer{ @@ -361,7 +361,7 @@ namespace SharpReport.Designer{
this.visualPageHeader.Size = new System.Drawing.Size(400, 84);
this.visualPageHeader.StringAlignment = System.Drawing.StringAlignment.Near;
this.visualPageHeader.TabIndex = 1;
this.visualPageHeader.SectionChanged += new SharpReport.Designer.SectionChangedEventHandler(this.SectionSizeChanged);
this.visualDetail.SectionChanged += new EventHandler<SectionChangedEventArgs> (this.SectionSizeChanged);
//
// visualReportHeader
//
@ -373,7 +373,7 @@ namespace SharpReport.Designer{ @@ -373,7 +373,7 @@ namespace SharpReport.Designer{
this.visualReportHeader.Size = new System.Drawing.Size(400, 56);
this.visualReportHeader.StringAlignment = System.Drawing.StringAlignment.Near;
this.visualReportHeader.TabIndex = 0;
this.visualReportHeader.SectionChanged += new SharpReport.Designer.SectionChangedEventHandler(this.SectionSizeChanged);
this.visualDetail.SectionChanged += new EventHandler<SectionChangedEventArgs> (this.SectionSizeChanged);
//
// Report
//

5
src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs

@ -11,6 +11,7 @@ using System; @@ -11,6 +11,7 @@ using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
using SharpReport;
using SharpReportCore;
@ -28,7 +29,7 @@ namespace SharpReport.Designer @@ -28,7 +29,7 @@ namespace SharpReport.Designer
private System.Drawing.GraphicsUnit graphicsUnit = GraphicsUnit.Point;
private ReportModel reportModel = null;
private ReportModel reportModel;
public event PropertyChangedEventHandler DesignerDirty;
@ -193,7 +194,7 @@ namespace SharpReport.Designer @@ -193,7 +194,7 @@ namespace SharpReport.Designer
this.reportControl.Name = "reportControl";
this.reportControl.Size = new System.Drawing.Size(592, 400);
this.reportControl.TabIndex = 1;
this.reportControl.SectionChanged += new SharpReport.Designer.SectionChangedEventHandler(this.ReportControlSectionChanged);
this.reportControl.SectionChanged += new EventHandler<SectionChangedEventArgs> (this.ReportControlSectionChanged);
this.reportControl.SizeChanged += new System.EventHandler(this.ReportControlSizeChanged);
this.reportControl.DesignViewChanged += new SharpReport.Designer.ItemDragDropEventHandler(this.ReportControlDesignViewChanged);
//

8
src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSection.cs

@ -58,9 +58,7 @@ namespace SharpReport{ @@ -58,9 +58,7 @@ namespace SharpReport{
#endregion
private void Initialize(){
// base.Items.Added += new ItemCollectionEventHandler(OnItemAddeded);
// base.Items.Removed += new ItemCollectionEventHandler(OnItemRemoveded);
base.Items.Added += OnItemAddeded;
base.Items.Added += OnItemAddeded;
base.Items.Removed += OnItemRemoveded;
}
@ -144,10 +142,6 @@ namespace SharpReport{ @@ -144,10 +142,6 @@ namespace SharpReport{
XmlAttribute attPropValue;
foreach (PropertyInfo p in prop) {
AttributeCollection attributes = TypeDescriptor.GetProperties(this)[p.Name].Attributes;
XmlIgnoreAttribute xmlIgnoreAttribute = (XmlIgnoreAttribute)attributes[typeof(XmlIgnoreAttribute)];
if (this.CheckForXmlIgnore(p) == null ) {
if (p.CanWrite) {
xmlProperty = xmlSection.OwnerDocument.CreateElement (p.Name);

3
src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs

@ -38,8 +38,7 @@ namespace SharpReport.Designer{ @@ -38,8 +38,7 @@ namespace SharpReport.Designer{
public event SelectedEventHandler ItemSelected;
public event ItemDragDropEventHandler ItemDragDrop;
public event SectionChangedEventHandler SectionChanged;
public event EventHandler <SectionChangedEventArgs> SectionChanged;
internal ReportSectionControlBase()
{

3
src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/SectionChangedEventArgs.cs

@ -23,8 +23,7 @@ namespace SharpReport.Designer { @@ -23,8 +23,7 @@ namespace SharpReport.Designer {
/// </remarks>
public delegate void SelectedEventHandler(object sender, EventArgs e);
public delegate void SectionChangedEventHandler (object sender, SectionChangedEventArgs e);
public class SectionChangedEventArgs : System.EventArgs {
ReportSection section;

2
src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs

@ -24,7 +24,7 @@ namespace SharpReport @@ -24,7 +24,7 @@ namespace SharpReport
/// </summary>
public class BuildSideTab{
SharpDevelopSideBar sideBar;
AxSideTab sideTab = null;
AxSideTab sideTab;
AxSideTab sideTabFunctions;
public BuildSideTab(SharpDevelopSideBar sideBar){

17
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/PageNumber.cs

@ -10,9 +10,10 @@ @@ -10,9 +10,10 @@
using System;
using System.ComponentModel;
using System.Drawing;
using System.ComponentModel;
using System.Drawing.Printing;
using SharpReportCore;
using SharpReport.Designer;
/// <summary>
@ -28,7 +29,7 @@ namespace SharpReport.ReportItems.Functions { @@ -28,7 +29,7 @@ namespace SharpReport.ReportItems.Functions {
public class PageNumber : SharpReportCore.BasePageNumber,SharpReport.Designer.IDesignable {
private string functionName = "PageNumber";
private FunctionControl visualControl;
private bool initDone = false;
private bool initDone;
public new event PropertyChangedEventHandler PropertyChanged;
@ -68,7 +69,7 @@ namespace SharpReport.ReportItems.Functions { @@ -68,7 +69,7 @@ namespace SharpReport.ReportItems.Functions {
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateTextControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
public void OnControlSelect(object sender, EventArgs e){
@ -81,7 +82,7 @@ namespace SharpReport.ReportItems.Functions { @@ -81,7 +82,7 @@ namespace SharpReport.ReportItems.Functions {
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -99,7 +100,7 @@ namespace SharpReport.ReportItems.Functions { @@ -99,7 +100,7 @@ namespace SharpReport.ReportItems.Functions {
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -112,7 +113,7 @@ namespace SharpReport.ReportItems.Functions { @@ -112,7 +113,7 @@ namespace SharpReport.ReportItems.Functions {
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}
@ -125,7 +126,7 @@ namespace SharpReport.ReportItems.Functions { @@ -125,7 +126,7 @@ namespace SharpReport.ReportItems.Functions {
if (this.visualControl != null) {
this.visualControl.Font = value;
}
this.FirePropertyChanged("Font");
this.HandlePropertyChanged("Font");
}
}
///<summary>
@ -142,7 +143,7 @@ namespace SharpReport.ReportItems.Functions { @@ -142,7 +143,7 @@ namespace SharpReport.ReportItems.Functions {
this.visualControl.Text = value;
this.visualControl.Refresh();
}
this.FirePropertyChanged("Text");
this.HandlePropertyChanged("Text");
}
}

15
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/Today.cs

@ -10,9 +10,8 @@ @@ -10,9 +10,8 @@
using System;
using System.ComponentModel;
//using System.Globalization;
using System.Drawing;
using System.ComponentModel;
using SharpReportCore;
using SharpReport.Designer;
@ -72,7 +71,7 @@ namespace SharpReport.ReportItems.Functions { @@ -72,7 +71,7 @@ namespace SharpReport.ReportItems.Functions {
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateTextControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
public void OnControlSelect(object sender, EventArgs e){
@ -85,7 +84,7 @@ namespace SharpReport.ReportItems.Functions { @@ -85,7 +84,7 @@ namespace SharpReport.ReportItems.Functions {
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -116,7 +115,7 @@ namespace SharpReport.ReportItems.Functions { @@ -116,7 +115,7 @@ namespace SharpReport.ReportItems.Functions {
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -129,7 +128,7 @@ namespace SharpReport.ReportItems.Functions { @@ -129,7 +128,7 @@ namespace SharpReport.ReportItems.Functions {
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}
@ -143,7 +142,7 @@ namespace SharpReport.ReportItems.Functions { @@ -143,7 +142,7 @@ namespace SharpReport.ReportItems.Functions {
if (this.visualControl != null) {
this.visualControl.Font = value;
}
this.FirePropertyChanged("Font");
this.HandlePropertyChanged("Font");
}
}
///<summary>
@ -160,7 +159,7 @@ namespace SharpReport.ReportItems.Functions { @@ -160,7 +159,7 @@ namespace SharpReport.ReportItems.Functions {
this.visualControl.Text = value;
this.visualControl.Refresh();
}
this.FirePropertyChanged("Text");
this.HandlePropertyChanged("Text");
}
}

8
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs

@ -56,7 +56,7 @@ namespace SharpReport.ReportItems{ @@ -56,7 +56,7 @@ namespace SharpReport.ReportItems{
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateGraphicControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
private void OnControlSelect(object sender, EventArgs e){
@ -69,7 +69,7 @@ namespace SharpReport.ReportItems{ @@ -69,7 +69,7 @@ namespace SharpReport.ReportItems{
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -104,7 +104,7 @@ namespace SharpReport.ReportItems{ @@ -104,7 +104,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -117,7 +117,7 @@ namespace SharpReport.ReportItems{ @@ -117,7 +117,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}

4
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs

@ -72,7 +72,7 @@ namespace SharpReport.ReportItems { @@ -72,7 +72,7 @@ namespace SharpReport.ReportItems {
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateGraphicControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
private void OnControlSelect(object sender, EventArgs e){
@ -85,7 +85,7 @@ namespace SharpReport.ReportItems { @@ -85,7 +85,7 @@ namespace SharpReport.ReportItems {
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));

9
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs

@ -55,7 +55,7 @@ namespace SharpReport.ReportItems{ @@ -55,7 +55,7 @@ namespace SharpReport.ReportItems{
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateGraphicControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
private void OnControlSelect(object sender, EventArgs e){
@ -68,7 +68,7 @@ namespace SharpReport.ReportItems{ @@ -68,7 +68,7 @@ namespace SharpReport.ReportItems{
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
private void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -105,7 +105,8 @@ namespace SharpReport.ReportItems{ @@ -105,7 +105,8 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -118,7 +119,7 @@ namespace SharpReport.ReportItems{ @@ -118,7 +119,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}

8
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs

@ -67,7 +67,7 @@ namespace SharpReport.ReportItems{ @@ -67,7 +67,7 @@ namespace SharpReport.ReportItems{
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateGraphicControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
private void OnControlSelect(object sender, EventArgs e){
@ -80,7 +80,7 @@ namespace SharpReport.ReportItems{ @@ -80,7 +80,7 @@ namespace SharpReport.ReportItems{
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -116,7 +116,7 @@ namespace SharpReport.ReportItems{ @@ -116,7 +116,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -129,7 +129,7 @@ namespace SharpReport.ReportItems{ @@ -129,7 +129,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}

14
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs

@ -22,7 +22,7 @@ namespace SharpReport.ReportItems{ @@ -22,7 +22,7 @@ namespace SharpReport.ReportItems{
public class ReportDataItem : BaseDataItem ,SharpReport.Designer.IDesignable{
private ReportDbTextControl visualControl;
bool initDone = false;
bool initDone;
#region Constructors
@ -87,7 +87,7 @@ namespace SharpReport.ReportItems{ @@ -87,7 +87,7 @@ namespace SharpReport.ReportItems{
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateTextControl (this.visualControl,this);
this.FirePropertyChanged("OnControlChanged");
this.HandlePropertyChanged("OnControlChanged");
}
public void OnControlSelect(object sender, EventArgs e){
@ -100,7 +100,7 @@ namespace SharpReport.ReportItems{ @@ -100,7 +100,7 @@ namespace SharpReport.ReportItems{
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -121,7 +121,7 @@ namespace SharpReport.ReportItems{ @@ -121,7 +121,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -134,7 +134,7 @@ namespace SharpReport.ReportItems{ @@ -134,7 +134,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}
@ -147,7 +147,7 @@ namespace SharpReport.ReportItems{ @@ -147,7 +147,7 @@ namespace SharpReport.ReportItems{
if (this.visualControl != null) {
this.visualControl.Font = value;
}
this.FirePropertyChanged("Font");
this.HandlePropertyChanged("Font");
}
}
@ -165,7 +165,7 @@ namespace SharpReport.ReportItems{ @@ -165,7 +165,7 @@ namespace SharpReport.ReportItems{
this.visualControl.Text = value;
this.visualControl.Refresh();
}
this.FirePropertyChanged("Text");
this.HandlePropertyChanged("Text");
}
}

14
src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs

@ -29,7 +29,7 @@ namespace SharpReport.ReportItems { @@ -29,7 +29,7 @@ namespace SharpReport.ReportItems {
private ReportTextControl visualControl;
bool initDone = false;
bool initDone;
#region Constructor
public ReportTextItem() : base(){
@ -79,7 +79,7 @@ namespace SharpReport.ReportItems { @@ -79,7 +79,7 @@ namespace SharpReport.ReportItems {
private void OnControlChanged (object sender, EventArgs e) {
ItemsHelper.UpdateTextControl (this.visualControl,this);
this.FirePropertyChanged("OnControlSelected");
this.HandlePropertyChanged("OnControlSelected");
}
public void OnControlSelect(object sender, EventArgs e){
@ -92,7 +92,7 @@ namespace SharpReport.ReportItems { @@ -92,7 +92,7 @@ namespace SharpReport.ReportItems {
/// to set the View's 'IsDirtyFlag' to true
/// </summary>
protected void FirePropertyChanged(string info) {
protected void HandlePropertyChanged(string info) {
if ( !base.Suspend) {
if (PropertyChanged != null) {
PropertyChanged (this,new PropertyChangedEventArgs(info));
@ -110,7 +110,7 @@ namespace SharpReport.ReportItems { @@ -110,7 +110,7 @@ namespace SharpReport.ReportItems {
if (this.visualControl != null) {
this.visualControl.Size = value;
}
this.FirePropertyChanged("Size");
this.HandlePropertyChanged("Size");
}
}
@ -123,7 +123,7 @@ namespace SharpReport.ReportItems { @@ -123,7 +123,7 @@ namespace SharpReport.ReportItems {
if (this.visualControl != null) {
this.visualControl.Location = value;
}
this.FirePropertyChanged("Location");
this.HandlePropertyChanged("Location");
}
}
@ -136,7 +136,7 @@ namespace SharpReport.ReportItems { @@ -136,7 +136,7 @@ namespace SharpReport.ReportItems {
if (this.visualControl != null) {
this.visualControl.Font = value;
}
this.FirePropertyChanged("Font");
this.HandlePropertyChanged("Font");
}
}
///<summary>
@ -153,7 +153,7 @@ namespace SharpReport.ReportItems { @@ -153,7 +153,7 @@ namespace SharpReport.ReportItems {
this.visualControl.Text = value;
this.visualControl.Refresh();
}
this.FirePropertyChanged("Text");
this.HandlePropertyChanged("Text");
}
}

15
src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs

@ -38,10 +38,8 @@ namespace SharpReport{ @@ -38,10 +38,8 @@ namespace SharpReport{
/// Description of SharpReportManager.
/// </summary>
public class SharpReportManager :SharpReportEngine {
private BaseDesignerControl baseDesignerControl = null;
private GraphicsUnit graphicsUnit;
private BaseDesignerControl baseDesignerControl;
private ReportModel reportModel;
//TODO Move this to reportSettings
@ -489,17 +487,6 @@ namespace SharpReport{ @@ -489,17 +487,6 @@ namespace SharpReport{
}
}
public GraphicsUnit a_GraphicsUnit {
get {
return graphicsUnit;
}
set {
graphicsUnit = value;
if (this.baseDesignerControl != null) {
this.baseDesignerControl.GraphicsUnit = this.graphicsUnit;
}
}
}
#endregion
}

1
src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs

@ -55,7 +55,6 @@ namespace SharpReportCore { @@ -55,7 +55,6 @@ namespace SharpReportCore {
}
set {
thickness = value;
// base.NotifyPropertyChanged("FormatString",true);
base.NotifyPropertyChanged("FormatString");
}
}

3
src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs

@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
using System;
using System.ComponentModel;
using System.Globalization;
using System.Drawing;
using System.Windows.Forms;
using System.Data;
@ -157,7 +158,7 @@ namespace ReportGenerator @@ -157,7 +158,7 @@ namespace ReportGenerator
this.txtSqlString.AppendText ("SELECT ");
this.txtSqlString.AppendText (colName);
} else if (this.txtSqlString.Text.ToLower().IndexOf("where") > 0){
} else if (this.txtSqlString.Text.ToLower(CultureInfo.InvariantCulture).IndexOf("where") > 0){
this.txtSqlString.AppendText (colName + " = ?");
}
else {

Loading…
Cancel
Save