diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportItem.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportItem.cs index a5315721cf..1cb2f28926 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseReportItem.cs @@ -31,33 +31,12 @@ namespace SharpReportCore { public event EventHandler ItemPrinting; public event EventHandler ItemPrinted; -// public event EventHandler FormatOutput; public event EventHandler Disposed; public BaseReportItem() :base(){ } - #region Event's handling - /// - /// Format a string according to his datatype - /// - /// The String to Format - /// the formatString - /// Value to return when there is null in toFormat - /// - protected string old_FireFormatOutput(string toFormat,string format, string nullValue) { -// if (FormatOutput != null) { -// FormatOutputEventArgs ea = new FormatOutputEventArgs (toFormat, -// format, -// nullValue); -// FormatOutput (this,ea); -// return ea.FormatedValue; -// } - return toFormat; - } - - #endregion #region EventHandling diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs index 0c84356c1d..cd35796d84 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs @@ -291,23 +291,6 @@ namespace SharpReportCore { return drawPoint.Y; } - - // Called by FormatOutPutEvent of the BaseReportItem - /* - void FormatBaseReportItem (object sender, FormatOutputEventArgs rpea) { - BaseDataItem baseDataItem = sender as BaseDataItem; - - if (baseDataItem != null) { - if (!String.IsNullOrEmpty(baseDataItem.FormatString)) { - - rpea.FormatedValue = standartFormatter.FormatItem (baseDataItem); - } else { - rpea.FormatedValue = rpea.ValueToFormat; - } - } - } - */ - #region privates protected void FitSectionToItems (BaseSection section,ReportPageEventArgs rpea){ if (section == null) { diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/FormatOutputEventArgs.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/FormatOutputEventArgs.cs deleted file mode 100644 index 90099a7e1e..0000000000 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/FormatOutputEventArgs.cs +++ /dev/null @@ -1,65 +0,0 @@ - -// -/// -/// created by - Forstmeier Peter -/// Peter Forstmeier (Peter.Forstmeier@t-online.de) -/// created on - 12.06.2005 18:17:46 -/// - -using System; - /// - /// This Delegate is used to format the output from TextBased Items - /// -namespace SharpReportCore { - - public class FormatOutputEventArgs : System.EventArgs { - - /// - /// Default constructor - initializes all fields to default values - /// - private string format; - private string valueToFormat; - private string nullValue; - private string formatedValue; - - public FormatOutputEventArgs() { - } - - public FormatOutputEventArgs(string valueToFormat,string format, string nullValue ) - { - this.format = format; - this.nullValue = nullValue; - this.valueToFormat = valueToFormat; - } - - #region Property's - public string Format { - get { - return format; - } - } - public string NullValue { - get { - return nullValue; - } - } - public string ValueToFormat { - get { - return valueToFormat; - } - } - - public string FormatedValue { - get { - return formatedValue; - } - set { - formatedValue = value; - } - } - - - #endregion - - } -} diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Text/StandardFormatter.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Text/StandardFormatter.cs index 3bf3be953a..05880e8aa6 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Text/StandardFormatter.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Text/StandardFormatter.cs @@ -21,6 +21,8 @@ namespace SharpReportCore { public StandardFormatter() { } + //TODO why not TypeCode tc = Type.GetTypeCode( Type.GetType(this.dataType)); + public string FormatItem (string valueToFormat,string formatString, TypeCode typeCode,string nullValue) { string retValue = String.Empty; diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj index 818717a06b..eafc947feb 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj @@ -91,7 +91,6 @@ -