Merge pull request #326 from FastReports/sync_branch_637665321363079529

FastReport.OpenSource 2021.4.0
FastReports · Sep 6, 2021 · f965bce · f965bce
2 parents ed95b9d + 316f83a
commit f965bce
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 20 deletions.
diff --git a/Demos/Reports/Sales in the USA.frx b/Demos/Reports/Sales in the USA.frx
diff --git a/Demos/Reports/USA Map.frx → Demos/Reports/The USA Map.frx b/Demos/Reports/USA Map.frx → Demos/Reports/The USA Map.frx
diff --git a/Demos/Reports/reports.xml b/Demos/Reports/reports.xml
@@ -102,7 +102,7 @@
   </Folder>
   <Folder Name="Maps" Core="false" Basic="false" Description="Reports with sample maps, and their combination with other features.">
     <Report File="World Map.frx"/>
-    <Report File="USA Map.frx"/>
+    <Report File="The USA Map.frx"/>
     <Report File="World Sales.frx"/>
     <Report File="Sales in the USA.frx"/>
     <Report File="Sales in Germany.frx"/>

diff --git a/FastReport.Base/Engine/ReportEngine.cs b/FastReport.Base/Engine/ReportEngine.cs
@@ -436,6 +436,7 @@ internal bool Run(bool runDialogs, bool append, bool resetDataState, ReportPage
             }
             finally
             {
+                RestoreTemplate();
                 Report.OnFinishReport(EventArgs.Empty);
                 Config.ReportSettings.OnFinishProgress(Report);
                 Report.SetOperation(ReportOperation.None);

diff --git a/FastReport.OpenSource/Engine/ReportEngine.Rich.cs b/FastReport.OpenSource/Engine/ReportEngine.Rich.cs
@@ -16,5 +16,10 @@ private void TranslateObjects(BandBase parentBand)
         {
 	   // Avoid compilation errors
         }
+
+        private void RestoreTemplate()
+        {
+	   // Avoid compilation errors
+        }
     }
 }
diff --git a/FastReport.OpenSource/Preview/SourcePages.OpenSource.cs b/FastReport.OpenSource/Preview/SourcePages.OpenSource.cs
diff --git a/UsedPackages.version b/UsedPackages.version
@@ -5,7 +5,7 @@
 
         <FRCompatVersion>2021.3.0</FRCompatVersion>
 
-        <FRDataVisualizationVersion>2021.2.3</FRDataVisualizationVersion>
+        <FRDataVisualizationVersion>2021.3.0</FRDataVisualizationVersion>
 
         <!-- Not available in Core3 -->
         <SystemDrawingCommonVersion>[4.6.1,)</SystemDrawingCommonVersion>