Skip to content

Commit 226e6dc

Browse files
dxMariadxMaria
committed
update modules
1 parent 8148d91 commit 226e6dc

File tree

10 files changed

+61
-62
lines changed

10 files changed

+61
-62
lines changed

‎CS/SpreadsheetControl_WPF_API_Part02/MainWindow.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<Setter Property="ItemsSource" Value="{Binding Items}" />
1414
</Style>
1515
<Style TargetType="dxn:NavBarItem">
16-
<!--<Setter Property="Content" Value="{Binding}"/>-->
1716
<Setter Property="Template">
1817
<Setter.Value>
1918
<DataTemplate>

‎CS/SpreadsheetControl_WPF_API_Part02/MainWindow.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using DevExpress.Spreadsheet;
22
using DevExpress.Xpf.NavBar;
33
using System;
4+
using System.Net;
45
using System.Windows;
56
using System.Windows.Input;
67

@@ -15,6 +16,7 @@ public partial class MainWindow : DevExpress.Xpf.Core.ThemedWindow
1516

1617
public MainWindow()
1718
{
19+
System.Net.ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
1820
InitializeComponent();
1921
// Access a workbook.
2022
workbook = spreadsheetControl1.Document;

‎CS/SpreadsheetControl_WPF_API_Part02/SpreadsheetActions/AutoFilterActions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,7 @@ static void DynamicFilterValue(IWorkbook workbook)
256256

257257
// Apply a dynamic filter to the "Sales" column to display only values that are above the average.
258258
worksheet.AutoFilter.Columns[2].ApplyDynamicFilter(DynamicFilterType.AboveAverage);
259-
// Apply a dynamic filter to the "Reported Date" column to display values reported this year.
260-
worksheet.AutoFilter.Columns[3].ApplyDynamicFilter(DynamicFilterType.ThisYear);
259+
261260
#endregion #DynamicFilter
262261
}
263262
finally { workbook.EndUpdate(); }

‎CS/SpreadsheetControl_WPF_API_Part02/SpreadsheetActions/ShapeActions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void InsertShapeValue(IWorkbook workbook)
5151
static void InsertShapeFromUriValue(IWorkbook workbook)
5252
{
5353
#region #insertshapefromuri
54-
string imageUri = "http://www.devexpress.com/Products/NET/Document-Server/i/Unit-Conversion.png";
54+
string imageUri = "https://docs.devexpress.com/WPF/images/spreadsheet-main-page.png";
5555
// Create an image from Uri.
5656
SpreadsheetImageSource imageSource = SpreadsheetImageSource.FromUri(imageUri, workbook);
5757
// Set the measurement unit to point.
@@ -63,7 +63,7 @@ static void InsertShapeFromUriValue(IWorkbook workbook)
6363
Worksheet worksheet = workbook.Worksheets[0];
6464
// Insert a picture from the SpreadsheetImageSource at 100 pt from the left, 40 pt from the top,
6565
// and resize it to a width of 200 pt and a height of 180 pt.
66-
worksheet.Pictures.AddPicture(imageSource, 100, 40, 200, 180 );
66+
worksheet.Pictures.AddPicture(imageSource, 100, 40, 400, 300 );
6767
}
6868
finally
6969
{
@@ -76,7 +76,6 @@ static void InsertShapeFromUriValue(IWorkbook workbook)
7676

7777
static void ModifyShapeValue(IWorkbook workbook)
7878
{
79-
8079
#region #modifyshape
8180
// Set the measurement unit to Millimeter.
8281
workbook.Unit = DevExpress.Office.DocumentUnit.Millimeter;

‎CS/SpreadsheetControl_WPF_API_Part02/SpreadsheetControl_WPF_API_Part02.csproj

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,67 +35,67 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="DevExpress.Charts.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
38+
<Reference Include="DevExpress.Charts.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="DevExpress.Data.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
41+
<Reference Include="DevExpress.Data.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4242
<Private>True</Private>
4343
</Reference>
44-
<Reference Include="DevExpress.Office.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
44+
<Reference Include="DevExpress.Office.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="DevExpress.Pdf.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
47+
<Reference Include="DevExpress.Pdf.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="DevExpress.RichEdit.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
50+
<Reference Include="DevExpress.RichEdit.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="DevExpress.RichEdit.v21.1.Export, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
53+
<Reference Include="DevExpress.RichEdit.v21.1.Export, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="DevExpress.Printing.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
56+
<Reference Include="DevExpress.Printing.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
5757
<Private>True</Private>
5858
</Reference>
59-
<Reference Include="DevExpress.DataVisualization.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
59+
<Reference Include="DevExpress.DataVisualization.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="DevExpress.Spreadsheet.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
62+
<Reference Include="DevExpress.Spreadsheet.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6363
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="DevExpress.Xpf.Charts.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
65+
<Reference Include="DevExpress.Xpf.Charts.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6666
<Private>True</Private>
6767
</Reference>
68-
<Reference Include="DevExpress.Data.Desktop.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
68+
<Reference Include="DevExpress.Data.Desktop.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
6969
<Private>True</Private>
7070
</Reference>
71-
<Reference Include="DevExpress.Xpf.Core.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
71+
<Reference Include="DevExpress.Xpf.Core.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7272
<Private>True</Private>
7373
</Reference>
74-
<Reference Include="DevExpress.Xpf.Grid.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
74+
<Reference Include="DevExpress.Xpf.Grid.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="DevExpress.Xpf.Grid.v21.1.Core, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
77+
<Reference Include="DevExpress.Xpf.Grid.v21.1.Core, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7878
<Private>True</Private>
7979
</Reference>
80-
<Reference Include="DevExpress.Mvvm.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
80+
<Reference Include="DevExpress.Mvvm.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8181
<Private>True</Private>
8282
</Reference>
83-
<Reference Include="DevExpress.Xpf.NavBar.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
83+
<Reference Include="DevExpress.Xpf.NavBar.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8484
<Private>True</Private>
8585
</Reference>
86-
<Reference Include="DevExpress.Xpf.Printing.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
86+
<Reference Include="DevExpress.Xpf.Printing.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8787
<Private>True</Private>
8888
</Reference>
89-
<Reference Include="DevExpress.Xpf.Ribbon.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
89+
<Reference Include="DevExpress.Xpf.Ribbon.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9090
<Private>True</Private>
9191
</Reference>
92-
<Reference Include="DevExpress.Xpf.Office.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
92+
<Reference Include="DevExpress.Xpf.Office.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9393
<Private>True</Private>
9494
</Reference>
95-
<Reference Include="DevExpress.Xpf.Spreadsheet.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
95+
<Reference Include="DevExpress.Xpf.Spreadsheet.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9696
<Private>True</Private>
9797
</Reference>
98-
<Reference Include="DevExpress.Xpf.Themes.MetropolisLight.v21.1, Version=21.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
98+
<Reference Include="DevExpress.Xpf.Themes.MetropolisLight.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="System" />

‎VB/SpreadsheetControl_WPF_API_Part02/MainWindow.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<Setter Property="ItemsSource" Value="{Binding Items}"/>
1717
</Style>
1818
<Style TargetType="dxn:NavBarItem">
19-
<!--<Setter Property="Content" Value="{Binding}"/>-->
2019
<Setter Property="Template">
2120
<Setter.Value>
2221
<DataTemplate>

‎VB/SpreadsheetControl_WPF_API_Part02/MainWindow.xaml.vb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Imports DevExpress.Spreadsheet
22
Imports DevExpress.Xpf.NavBar
33
Imports System
4+
Imports System.Net
45
Imports System.Windows
56
Imports System.Windows.Input
67

@@ -14,6 +15,7 @@ Namespace SpreadsheetControl_WPF_API_Part02
1415
Private workbook As IWorkbook
1516

1617
Public Sub New()
18+
System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls12
1719
InitializeComponent()
1820
' Access a workbook.
1921
workbook = spreadsheetControl1.Document
@@ -36,14 +38,14 @@ Namespace SpreadsheetControl_WPF_API_Part02
3638
End Sub
3739
' ------------------- Load and Save a Document -------------------
3840
Private Sub LoadDocumentFromFile()
39-
' #Region "#LoadDocumentFromFile"
41+
' #Region "#LoadDocumentFromFile"
4042
' Load a workbook from a file.
4143
workbook.LoadDocument("Documents\Document.xlsx", DocumentFormat.OpenXml)
42-
' #End Region ' #LoadDocumentFromFile
44+
' #End Region ' #LoadDocumentFromFile
4345
End Sub
4446

4547
Private Sub SaveDocumentToFile()
46-
' #Region "#SaveDocumentToFile"
48+
' #Region "#SaveDocumentToFile"
4749
' Save the modified document to a file.
4850
workbook.SaveDocument("Documents\SavedDocument.xlsx", DocumentFormat.OpenXml)
4951
' #End Region ' #SaveDocumentToFile

‎VB/SpreadsheetControl_WPF_API_Part02/SpreadsheetActions/AutoFilterActions.vb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,8 @@ Namespace SpreadsheetControl_WPF_API_Part02
242242

243243
' Apply a dynamic filter to the "Sales" column to display only values that are above the average.
244244
worksheet.AutoFilter.Columns(2).ApplyDynamicFilter(DynamicFilterType.AboveAverage)
245-
' Apply a dynamic filter to the "Reported Date" column to display values reported this year.
246-
worksheet.AutoFilter.Columns(3).ApplyDynamicFilter(DynamicFilterType.ThisYear)
247-
' #End Region ' #DynamicFilter
245+
246+
' #End Region ' #DynamicFilter
248247
Finally
249248
workbook.EndUpdate()
250249
End Try

‎VB/SpreadsheetControl_WPF_API_Part02/SpreadsheetActions/ShapeActions.vb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Namespace SpreadsheetControl_WPF_API_Part02
1919
#End Region
2020

2121
Private Shared Sub InsertShapeValue(ByVal workbook As IWorkbook)
22-
' #Region "#insertshape"
23-
Dim imageStream As Stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("Pictures.chart.png")
22+
' #Region "#insertshape"
23+
Dim imageStream As Stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("chart.png")
2424
Dim imageSource As SpreadsheetImageSource = SpreadsheetImageSource.FromStream(imageStream)
2525
workbook.BeginUpdate()
2626
' Set the measurement unit to Millimeter.
@@ -48,8 +48,8 @@ Namespace SpreadsheetControl_WPF_API_Part02
4848
End Sub
4949

5050
Private Shared Sub InsertShapeFromUriValue(ByVal workbook As IWorkbook)
51-
' #Region "#insertshapefromuri"
52-
Dim imageUri As String = "http://www.devexpress.com/Products/NET/Document-Server/i/Unit-Conversion.png"
51+
' #Region "#insertshapefromuri"
52+
Dim imageUri As String = "https://docs.devexpress.com/WPF/images/spreadsheet-main-page.png"
5353
' Create an image from Uri.
5454
Dim imageSource As SpreadsheetImageSource = SpreadsheetImageSource.FromUri(imageUri, workbook)
5555
' Set the measurement unit to point.
@@ -60,7 +60,7 @@ Namespace SpreadsheetControl_WPF_API_Part02
6060
Dim worksheet As Worksheet = workbook.Worksheets(0)
6161
' Insert a picture from the SpreadsheetImageSource at 100 pt from the left, 40 pt from the top,
6262
' and resize it to a width of 200 pt and a height of 180 pt.
63-
worksheet.Pictures.AddPicture(imageSource, 100, 40, 200, 180)
63+
worksheet.Pictures.AddPicture(imageSource, 100, 40, 400, 300)
6464
Finally
6565
workbook.EndUpdate()
6666
End Try

0 commit comments

Comments
 (0)