Skip to content

Commit c5629d6

Browse files
0legK0legK
authored
Merge pull request #498 from FastReports/sync_branch_2022.3.13
FastReport.OpenSource 2022.3.13
2 parents ab3ff9d + 19f11a4 commit c5629d6

File tree

14 files changed

+113
-103
lines changed

14 files changed

+113
-103
lines changed

‎FastReport.Base/Export/Html/HTMLExportLayers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ private FastString GetHtmlParagraph(HtmlTextRenderer renderer)
494494
}
495495

496496
}
497-
prevWidth = run.Width;
497+
prevWidth += run.Width;
498498
//run.ToHtml(sb, true);
499499
}
500500
}

‎FastReport.Base/Fills.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,6 @@ public TextureFill(byte[] imageBytes)
11421142
/// <summary>
11431143
/// Initializes the <see cref="TextureFill"/> class with specified image.
11441144
/// </summary>
1145-
/// <param name="image"></param>
11461145
public TextureFill(byte[] imageBytes, int width, int height, bool preserveAspectRatio, WrapMode wrapMode, int imageOffsetX, int imageOffsetY) : this(imageBytes)
11471146
{
11481147
PreserveAspectRatio = preserveAspectRatio;

‎FastReport.Base/Functions/NumToWordsBase.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ public string ConvertCurrency(decimal value, string currencyName)
169169
}
170170
catch (KeyNotFoundException e)
171171
{
172-
throw new Exception("Currency \"" + currencyName + "\" is not defined in the \"" + GetType().Name +
173-
"\" converter.");
172+
throw new Exception($"Currency \"{currencyName}\" is not defined in the \"{GetType().Name}\" converter.");
174173
}
175174
catch (NotImplementedException e)
176175
{

‎FastReport.Base/Functions/StdFunctions.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,9 +1022,7 @@ public static string ToWordsSp(object value, string currencyName)
10221022
/// Converts a numeric value to a spanish string representation of that value.
10231023
/// </summary>
10241024
/// <param name="value">The numeric value to convert.</param>
1025-
/// <param name="male">True if the name is of male gender.</param>
10261025
/// <param name="one">The name in singular form, for example "silla".</param>
1027-
/// <param name="two">The name in plural form, for example "Sillas".</param>
10281026
/// <param name="many">The name in plural form, for example "Sillas".</param>
10291027
/// <returns>The string representation of the specified value.</returns>
10301028
public static string ToWordsSp(object value, string one, string many)
@@ -1057,9 +1055,7 @@ public static string ToWordsPersian(object value, string currencyName)
10571055
/// Converts a numeric value to a persian string representation of that value.
10581056
/// </summary>
10591057
/// <param name="value">The numeric value to convert.</param>
1060-
/// <param name="male">True if the name is of male gender.</param>
10611058
/// <param name="one">The name in singular form, for example "silla".</param>
1062-
/// <param name="two">The name in plural form, for example "Sillas".</param>
10631059
/// <param name="many">The name in plural form, for example "Sillas".</param>
10641060
/// <returns>The string representation of the specified value.</returns>
10651061
public static string ToWordsPersian(object value, string one, string many)
@@ -1092,9 +1088,7 @@ public static string ToWordsPl(object value, string currencyName)
10921088
/// Converts a numeric value to a polish string representation of that value.
10931089
/// </summary>
10941090
/// <param name="value">The numeric value to convert.</param>
1095-
/// <param name="male">True if the name is of male gender.</param>
10961091
/// <param name="one">The name in singular form, for example "silla".</param>
1097-
/// <param name="two">The name in plural form, for example "Sillas".</param>
10981092
/// <param name="many">The name in plural form, for example "Sillas".</param>
10991093
/// <returns>The string representation of the specified value.</returns>
11001094
public static string ToWordsPl(object value, string one, string many)

‎FastReport.Base/Gauge/GaugeLabel.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public Color Color
5858
get { return color; }
5959
set
6060
{
61-
if (value == null)
62-
throw new ArgumentNullException("LabelFill");
6361
color = value;
6462
}
6563
}

‎FastReport.Base/Import/RDL/UnitsConverter.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
314314
return PictureBoxSizeMode.Zoom;
315315
}
316316

317-
/// <summary>
317+
/*/// <summary>
318318
/// Converts the RDL GradientType to GradientStyle.
319319
/// </summary>
320320
/// <param name="gradientType">The RDL GradientType value.</param>
321321
/// <returns>The GradientStyle value.</returns>
322-
/*public static GradientStyle ConvertGradientType(string gradientType)
322+
public static GradientStyle ConvertGradientType(string gradientType)
323323
{
324324
if (gradientType == "LeftRight")
325325
{
@@ -352,12 +352,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
352352
return GradientStyle.None;
353353
}*/
354354

355-
/// <summary>
355+
/*/// <summary>
356356
/// Converts the RDL Chart.Type to SeriesChartType.
357357
/// </summary>
358358
/// <param name="chartType">The RDL Chart.Type value.</param>
359359
/// <returns>The SeriesChartType value.</returns>
360-
/*public static SeriesChartType ConvertChartType(string chartType)
360+
public static SeriesChartType ConvertChartType(string chartType)
361361
{
362362
if (chartType == "Area")
363363
{
@@ -386,12 +386,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
386386
return SeriesChartType.Column;
387387
}*/
388388

389-
/// <summary>
389+
/*/// <summary>
390390
/// Converts the RDL Chart.Palette to ChartColorPalette.
391391
/// </summary>
392392
/// <param name="chartPalette">The RDL Chart.Palette value.</param>
393393
/// <returns>The RDL ChartColorPalette value.</returns>
394-
/*public static ChartColorPalette ConvertChartPalette(string chartPalette)
394+
public static ChartColorPalette ConvertChartPalette(string chartPalette)
395395
{
396396
if (chartPalette == "EarthTones")
397397
{
@@ -420,12 +420,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
420420
return ChartColorPalette.None;
421421
}*/
422422

423-
/// <summary>
423+
/*/// <summary>
424424
/// Converts the RDL Chart.Legend.Position to Legend.Docking and Legend.Alignment.
425425
/// </summary>
426426
/// <param name="chartLegendPosition">The RDL Chart.Legend.Position value.</param>
427427
/// <param name="legend">The Legend instance to convert to.</param>
428-
/*public static void ConvertChartLegendPosition(string chartLegendPosition, Legend legend)
428+
public static void ConvertChartLegendPosition(string chartLegendPosition, Legend legend)
429429
{
430430
if (chartLegendPosition == "TopLeft")
431431
{
@@ -489,12 +489,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
489489
}
490490
}*/
491491

492-
/// <summary>
492+
/*/// <summary>
493493
/// Converts the RDL Chart.Legend.Layout to LegendStyle.
494494
/// </summary>
495495
/// <param name="chartLegendLayout">The RDL Chart.Legend.Layout value.</param>
496496
/// <returns>The LegendStyle value.</returns>
497-
/*public static LegendStyle ConvertChartLegendLayout(string chartLegendLayout)
497+
public static LegendStyle ConvertChartLegendLayout(string chartLegendLayout)
498498
{
499499
if (chartLegendLayout == "Table")
500500
{
@@ -507,12 +507,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
507507
return LegendStyle.Column;
508508
}*/
509509

510-
/// <summary>
510+
/*/// <summary>
511511
/// Converts the RDL BorderStyle to ChartDashStyle.
512512
/// </summary>
513513
/// <param name="borderStyle">The RDL BorderStyle value.</param>
514514
/// <returns>The ChartDashStyle value.</returns>
515-
/*public static ChartDashStyle ConvertBorderStyleToChartDashStyle(string borderStyle)
515+
public static ChartDashStyle ConvertBorderStyleToChartDashStyle(string borderStyle)
516516
{
517517
if (borderStyle == "Dotted")
518518
{
@@ -525,12 +525,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
525525
return ChartDashStyle.Solid;
526526
}*/
527527

528-
/// <summary>
528+
/*/// <summary>
529529
/// Converts the RDL Axis.Visible to AxisEnabled.
530530
/// </summary>
531531
/// <param name="axisVisible">The RDL Axis.Visible value.</param>
532532
/// <returns>The AxisEnabled value.</returns>
533-
/*public static AxisEnabled ConvertAxisVisibleToAxisEnabled(string axisVisible)
533+
public static AxisEnabled ConvertAxisVisibleToAxisEnabled(string axisVisible)
534534
{
535535
if (axisVisible.ToLower() == "true")
536536
{
@@ -543,12 +543,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
543543
return AxisEnabled.Auto;
544544
}*/
545545

546-
/// <summary>
546+
/*/// <summary>
547547
/// Converts the RDL TickMarkStyle to TickMarkStyle.
548548
/// </summary>
549549
/// <param name="tickMarkStyle">The RDL TickMarkStyle value.</param>
550550
/// <returns>The TickMarkStyle value.</returns>
551-
/*public static TickMarkStyle ConvertTickMarkStyle(string tickMarkStyle)
551+
public static TickMarkStyle ConvertTickMarkStyle(string tickMarkStyle)
552552
{
553553
if (tickMarkStyle == "Inside")
554554
{
@@ -565,12 +565,12 @@ public static PictureBoxSizeMode ConvertSizing(string sizing)
565565
return TickMarkStyle.None;
566566
}*/
567567

568-
/// <summary>
568+
/*/// <summary>
569569
/// Converts the RDL Shading to LightStyle.
570570
/// </summary>
571571
/// <param name="shading">The RDL Shading value.</param>
572572
/// <returns>The LightStyle value.</returns>
573-
/*public static LightStyle ConvertShading(string shading)
573+
public static LightStyle ConvertShading(string shading)
574574
{
575575
if (shading == "Simple")
576576
{

0 commit comments

Comments
 (0)