From 2819c293054c336494770847885bd6969d650e4a Mon Sep 17 00:00:00 2001
From: FastReports-bot <github@fast-report.com>
Date: Fri, 1 Dec 2023 16:36:13 +0300
Subject: [PATCH] * sync 12/1/2023 version: 2024.1.1

---
 .../JsonDataSourceConnection.cs               |  1 +
 .../Export/Html/HTMLExportLayers.cs           |  3 +++
 FastReport.Base/PictureObject.cs              |  4 ++++
 UsedPackages.version                          | 20 +++++++++----------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/FastReport.Base/Data/JsonConnection/JsonDataSourceConnection.cs b/FastReport.Base/Data/JsonConnection/JsonDataSourceConnection.cs
index de5375fa..ecafcae9 100644
--- a/FastReport.Base/Data/JsonConnection/JsonDataSourceConnection.cs
+++ b/FastReport.Base/Data/JsonConnection/JsonDataSourceConnection.cs
@@ -220,6 +220,7 @@ private void InitConnection(bool rebuildSchema)
                     ServicePointManager.Expect100Continue = true;
                     ServicePointManager.SecurityProtocol = (SecurityProtocolType)(0xc0 | 0x300 | 0xc00);
                     var req = WebRequest.Create(jsonText);
+                    req.Timeout = CommandTimeout * 1000;
 
                     foreach (var header in builder.Headers)
                     {
diff --git a/FastReport.Base/Export/Html/HTMLExportLayers.cs b/FastReport.Base/Export/Html/HTMLExportLayers.cs
index 0f5ddafa..e55d2f3a 100644
--- a/FastReport.Base/Export/Html/HTMLExportLayers.cs
+++ b/FastReport.Base/Export/Html/HTMLExportLayers.cs
@@ -195,6 +195,9 @@ private FastString GetSpanText(TextObjectBase obj, FastString text,
             if (top != 0)
                 style.Append("margin-top:").Append(Px((top - obj.Padding.Top) * Zoom));
 
+            if (obj is TextObject textObject && !textObject.WordWrap)
+                style.Append("overflow: hidden; text-wrap: nowrap;");
+
                 // we need to apply border width in order to position our div perfectly
             float borderLeft;
             float borderRight;
diff --git a/FastReport.Base/PictureObject.cs b/FastReport.Base/PictureObject.cs
index cd78f293..111226c8 100644
--- a/FastReport.Base/PictureObject.cs
+++ b/FastReport.Base/PictureObject.cs
@@ -434,7 +434,11 @@ public override void DrawImage(FRPaintEventArgs e)
             {
                 g.Restore(state);
                 g.ResetClip();
+#if !SKIA
                 path.Dispose();
+#else
+                path = null;
+#endif    
             }
 
             if (IsPrinting)
diff --git a/UsedPackages.version b/UsedPackages.version
index b3191e34..78d23041 100644
--- a/UsedPackages.version
+++ b/UsedPackages.version
@@ -3,20 +3,20 @@
 <!-- This group sets version used packages in FastReport.Core, FastReport.OpenSource, FastReport.CoreWin, FastReport.WPF -->
     <PropertyGroup>
 
-        <FRCompatVersionNET>[2023.3.1]</FRCompatVersionNET>
+        <FRCompatVersionNET>[2024.1.0]</FRCompatVersionNET>
 
-        <FRCompatVersion>[2023.3.1]</FRCompatVersion>
-        <FRCompatSkiaVersion>[2023.3.4]</FRCompatSkiaVersion>
+        <FRCompatVersion>[2024.1.0]</FRCompatVersion>
+        <FRCompatSkiaVersion>[2024.1.0]</FRCompatSkiaVersion>
 
-        <FRDataVisualizationVersion>[2023.3.0]</FRDataVisualizationVersion>
-        <FRDataVisualizationSkiaVersion>[2023.3.4]</FRDataVisualizationSkiaVersion>
+        <FRDataVisualizationVersion>[2024.1.0]</FRDataVisualizationVersion>
+        <FRDataVisualizationSkiaVersion>[2024.1.0]</FRDataVisualizationSkiaVersion>
 		
         <!-- WPF -->
-        <FRWPFVersion>2023.3.0</FRWPFVersion>
-        <FRWPFRoslynPadVersion>2023.3.0</FRWPFRoslynPadVersion>
-        <FRFormsWPFVersion>2023.2.1</FRFormsWPFVersion>
-        <FRCompatWPFVersion>2023.3.1</FRCompatWPFVersion>
-        <FRDataVisualizationWPFVersion>2023.3.0</FRDataVisualizationWPFVersion>
+        <FRWPFVersion>2024.1.0</FRWPFVersion>
+        <FRWPFRoslynPadVersion>2024.1.0</FRWPFRoslynPadVersion>
+        <FRFormsWPFVersion>2024.1.0</FRFormsWPFVersion>
+        <FRCompatWPFVersion>2024.1.0</FRCompatWPFVersion>
+        <FRDataVisualizationWPFVersion>2024.1.0</FRDataVisualizationWPFVersion>
 
         <!-- Not available in Core3 -->
         <SystemDrawingCommonVersion>[4.7.0,)</SystemDrawingCommonVersion>