diff --git a/src/AddIns/Misc/SharpReport/SharpReport/AutoReport.cs b/src/AddIns/Misc/SharpReport/SharpReport/AutoReport.cs index a61202567e..cf481303ad 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/AutoReport.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/AutoReport.cs @@ -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 { 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 { 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 { } return itemCol; } - - /// - /// Build Headerline from a *.xsd File - /// - /// the ReportModel - /// location of the Headerlines - /// the Schematable with ColumnInrofmations - /// Locate the Columns of Top or an Bottom of the Section - /// a Collection of BaseTextItems - 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 } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs index cfcad964c5..1b57196884 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/NameService.cs @@ -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. // //------------------------------------------------------------------------------ +using System; +using System.Globalization; +using System.ComponentModel; + +using SharpReportCore; + +/// +/// Build proper (unique) Names for all added Item's +/// +/// +/// created by - Forstmeier Peter +/// created on - 27.08.2005 16:21:50 +/// namespace SharpReport { - using System; - using System.Windows.Forms; - using System.ComponentModel; - using SharpReportCore; - - /// - /// Build proper (unique) Names for all added Item's - /// - /// - /// created by - Forstmeier Peter - /// created on - 27.08.2005 16:21:50 - /// public class NameService : System.ComponentModel.Design.Serialization.INameCreationService { /// @@ -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) { diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs index 5928de28f7..8cca8169b8 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs @@ -53,7 +53,7 @@ namespace SharpReport.Designer{ [EditorBrowsable(EditorBrowsableState.Always), Browsable(true)] public event SelectedEventHandler ObjectSelected; - public event SectionChangedEventHandler SectionChanged; + public event EventHandler SectionChanged; public event ItemDragDropEventHandler DesignViewChanged; public Report(){ @@ -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 (this.SectionSizeChanged); // // visualPageFooter // @@ -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 (this.SectionSizeChanged); // // visualFooter // @@ -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 (this.SectionSizeChanged); // // visualPageHeader // @@ -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 (this.SectionSizeChanged); // // visualReportHeader // @@ -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 (this.SectionSizeChanged); // // Report // diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs index adce34691b..3942ad0712 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs @@ -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 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 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 (this.ReportControlSectionChanged); this.reportControl.SizeChanged += new System.EventHandler(this.ReportControlSizeChanged); this.reportControl.DesignViewChanged += new SharpReport.Designer.ItemDragDropEventHandler(this.ReportControlDesignViewChanged); // diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSection.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSection.cs index b1ac878409..940cef4386 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSection.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSection.cs @@ -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{ 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); diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs index bdade014f2..9330af3343 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/ReportSectionControlbase.cs @@ -38,8 +38,7 @@ namespace SharpReport.Designer{ public event SelectedEventHandler ItemSelected; public event ItemDragDropEventHandler ItemDragDrop; - public event SectionChangedEventHandler SectionChanged; - + public event EventHandler SectionChanged; internal ReportSectionControlBase() { diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/SectionChangedEventArgs.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/SectionChangedEventArgs.cs index 12c1b51f2e..4cf99b9e75 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/SectionChangedEventArgs.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/SectionChangedEventArgs.cs @@ -23,8 +23,7 @@ namespace SharpReport.Designer { /// public delegate void SelectedEventHandler(object sender, EventArgs e); - public delegate void SectionChangedEventHandler (object sender, SectionChangedEventArgs e); - + public class SectionChangedEventArgs : System.EventArgs { ReportSection section; diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs index a710922b18..a1303b7731 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs @@ -24,7 +24,7 @@ namespace SharpReport /// public class BuildSideTab{ SharpDevelopSideBar sideBar; - AxSideTab sideTab = null; + AxSideTab sideTab; AxSideTab sideTabFunctions; public BuildSideTab(SharpDevelopSideBar sideBar){ diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/PageNumber.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/PageNumber.cs index aa3e49f7b6..4364b7d6c7 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/PageNumber.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/PageNumber.cs @@ -10,9 +10,10 @@ using System; -using System.ComponentModel; using System.Drawing; +using System.ComponentModel; using System.Drawing.Printing; + using SharpReportCore; using SharpReport.Designer; /// @@ -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 { 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 { /// to set the View's 'IsDirtyFlag' to true /// - 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 { if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); } } @@ -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 { if (this.visualControl != null) { this.visualControl.Font = value; } - this.FirePropertyChanged("Font"); + this.HandlePropertyChanged("Font"); } } /// @@ -142,7 +143,7 @@ namespace SharpReport.ReportItems.Functions { this.visualControl.Text = value; this.visualControl.Refresh(); } - this.FirePropertyChanged("Text"); + this.HandlePropertyChanged("Text"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/Today.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/Today.cs index bc760b0c76..a0a251c470 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/Today.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/Functions/MiscFunctions/Today.cs @@ -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 { 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 { /// to set the View's 'IsDirtyFlag' to true /// - 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 { if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); } } @@ -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 { if (this.visualControl != null) { this.visualControl.Font = value; } - this.FirePropertyChanged("Font"); + this.HandlePropertyChanged("Font"); } } /// @@ -160,7 +159,7 @@ namespace SharpReport.ReportItems.Functions { this.visualControl.Text = value; this.visualControl.Refresh(); } - this.FirePropertyChanged("Text"); + this.HandlePropertyChanged("Text"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs index 280b73d6a2..8d49eb4cda 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportCircleItem.cs @@ -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{ /// to set the View's 'IsDirtyFlag' to true /// - 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{ if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); } } @@ -117,7 +117,7 @@ namespace SharpReport.ReportItems{ if (this.visualControl != null) { this.visualControl.Location = value; } - this.FirePropertyChanged("Location"); + this.HandlePropertyChanged("Location"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs index 847846eb1f..c55e03c2ba 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs @@ -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 { /// to set the View's 'IsDirtyFlag' to true /// - protected void FirePropertyChanged(string info) { + protected void HandlePropertyChanged(string info) { if ( !base.Suspend) { if (PropertyChanged != null) { PropertyChanged (this,new PropertyChangedEventArgs(info)); diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs index 153d24bd90..87a88adbc6 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportLineItem.cs @@ -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{ /// to set the View's 'IsDirtyFlag' to true /// - 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{ if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); + } } @@ -118,7 +119,7 @@ namespace SharpReport.ReportItems{ if (this.visualControl != null) { this.visualControl.Location = value; } - this.FirePropertyChanged("Location"); + this.HandlePropertyChanged("Location"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs index d916fc49a1..28ff506e6e 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportRectangleItem.cs @@ -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{ /// to set the View's 'IsDirtyFlag' to true /// - 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{ if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); } } @@ -129,7 +129,7 @@ namespace SharpReport.ReportItems{ if (this.visualControl != null) { this.visualControl.Location = value; } - this.FirePropertyChanged("Location"); + this.HandlePropertyChanged("Location"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs index 94db947d01..a0d49f9d75 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportDataItem.cs @@ -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{ 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{ /// to set the View's 'IsDirtyFlag' to true /// - 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{ if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); } } @@ -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{ if (this.visualControl != null) { this.visualControl.Font = value; } - this.FirePropertyChanged("Font"); + this.HandlePropertyChanged("Font"); } } @@ -165,7 +165,7 @@ namespace SharpReport.ReportItems{ this.visualControl.Text = value; this.visualControl.Refresh(); } - this.FirePropertyChanged("Text"); + this.HandlePropertyChanged("Text"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs index 540fd9b258..d463830de8 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/TextBased/ReportTextItem.cs @@ -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 { 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 { /// to set the View's 'IsDirtyFlag' to true /// - 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 { if (this.visualControl != null) { this.visualControl.Size = value; } - this.FirePropertyChanged("Size"); + this.HandlePropertyChanged("Size"); } } @@ -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 { if (this.visualControl != null) { this.visualControl.Font = value; } - this.FirePropertyChanged("Font"); + this.HandlePropertyChanged("Font"); } } /// @@ -153,7 +153,7 @@ namespace SharpReport.ReportItems { this.visualControl.Text = value; this.visualControl.Refresh(); } - this.FirePropertyChanged("Text"); + this.HandlePropertyChanged("Text"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs b/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs index b62cae3b68..75baccb612 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs @@ -38,10 +38,8 @@ namespace SharpReport{ /// Description of SharpReportManager. /// 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{ } } - public GraphicsUnit a_GraphicsUnit { - get { - return graphicsUnit; - } - set { - graphicsUnit = value; - if (this.baseDesignerControl != null) { - this.baseDesignerControl.GraphicsUnit = this.graphicsUnit; - } - } - } #endregion } diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs index 811801d97b..5d44d6de0e 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs @@ -55,7 +55,6 @@ namespace SharpReportCore { } set { thickness = value; -// base.NotifyPropertyChanged("FormatString",true); base.NotifyPropertyChanged("FormatString"); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs index a33ac2eb9b..f47746ee9c 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs @@ -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 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 {