Skip to content

Commit 23c6297

Browse files
NikolayITNikolayIT
committed
Latest version from https://rdp.codeplex.com/ merged
1 parent 35a2b11 commit 23c6297

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+7920
-1514
lines changed

‎Source/XDesigner.RTF.sln renamed to ‎Source/DCSoft.RTF.sln

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{216DF09C-9B07-4186-A4E0-62D592A8783A}"
7-
ProjectSection(SolutionItems) = preProject
8-
readme.rtf = readme.rtf
9-
EndProjectSection
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCSoft.RTF", "Source\DCSoft.RTF.csproj", "{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}"
105
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDesigner.RTF", "Source\XDesigner.RTF.csproj", "{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}"
12-
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDesigner.RTF.Test", "Test\XDesigner.RTF.Test.csproj", "{E91ECAF1-8270-4BD2-8517-5F28DF5B8058}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCSoft.RTF.Test", "Test\DCSoft.RTF.Test.csproj", "{E91ECAF1-8270-4BD2-8517-5F28DF5B8058}"
147
EndProject
158
Global
169
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Source/Source/ByteBuffer.cs

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
1-
/***************************************************************************
2-
3-
Rtf Dom Parser
4-
5-
Copyright (c) 2010 sinosoft , written by yuans.
6-
http://www.sinoreport.net
7-
8-
This program is free software; you can redistribute it and/or
9-
modify it under the terms of the GNU General Public License
10-
as published by the Free Software Foundation; either version 2
11-
of the License, or (at your option) any later version.
12-
13-
This program is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU General Public License for more details.
17-
18-
You should have received a copy of the GNU General Public License
19-
along with this program; if not, write to the Free Software
20-
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21-
22-
****************************************************************************/
1+
/*
2+
*
3+
* DCSoft RTF DOM v1.0
4+
* Author : Yuan yong fu.
5+
* Email : [email protected]
6+
* blog site:http://www.cnblogs.com/xdesigner.
7+
*
8+
*/
239

2410
using System;
2511
using System.Windows.Forms;
2612

27-
namespace XDesigner.RTF
13+
namespace DCSoft.RTF
2814
{
2915
/// <summary>
3016
/// Binary data buffer

‎Source/Source/XDesigner.RTF.csproj renamed to ‎Source/Source/DCSoft.RTF.csproj

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,26 +8,36 @@
88
<ProjectGuid>{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>XDesigner.RTF</RootNamespace>
12-
<AssemblyName>XDesigner.RTF</AssemblyName>
13-
<SccProjectName>
14-
</SccProjectName>
15-
<SccLocalPath>
16-
</SccLocalPath>
17-
<SccAuxPath>
18-
</SccAuxPath>
19-
<SccProvider>
20-
</SccProvider>
11+
<RootNamespace>DCSoft.RTF</RootNamespace>
12+
<AssemblyName>DCSoft.RTF</AssemblyName>
13+
<SccProjectName>Svn</SccProjectName>
14+
<SccLocalPath>Svn</SccLocalPath>
15+
<SccAuxPath>Svn</SccAuxPath>
16+
<SccProvider>SubversionScc</SccProvider>
2117
<SignAssembly>true</SignAssembly>
2218
<AssemblyOriginatorKeyFile>yyf.snk</AssemblyOriginatorKeyFile>
2319
<StartupObject>
2420
</StartupObject>
2521
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
2622
<FileUpgradeFlags>
2723
</FileUpgradeFlags>
28-
<UpgradeBackupLocation>
29-
</UpgradeBackupLocation>
3024
<OldToolsVersion>2.0</OldToolsVersion>
25+
<UpgradeBackupLocation />
26+
<PublishUrl>http://localhost/XDesigner.RTF/</PublishUrl>
27+
<Install>true</Install>
28+
<InstallFrom>Web</InstallFrom>
29+
<UpdateEnabled>true</UpdateEnabled>
30+
<UpdateMode>Foreground</UpdateMode>
31+
<UpdateInterval>7</UpdateInterval>
32+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
33+
<UpdatePeriodically>false</UpdatePeriodically>
34+
<UpdateRequired>false</UpdateRequired>
35+
<MapFileExtensions>true</MapFileExtensions>
36+
<ApplicationRevision>0</ApplicationRevision>
37+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
38+
<IsWebBootstrapper>true</IsWebBootstrapper>
39+
<UseApplicationTrust>false</UseApplicationTrust>
40+
<BootstrapperEnabled>true</BootstrapperEnabled>
3141
</PropertyGroup>
3242
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3343
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +47,8 @@
3747
<DefineConstants>DEBUG;TRACE</DefineConstants>
3848
<ErrorReport>prompt</ErrorReport>
3949
<WarningLevel>4</WarningLevel>
50+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
51+
<PlatformTarget>AnyCPU</PlatformTarget>
4052
</PropertyGroup>
4153
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4254
<DebugType>pdbonly</DebugType>
@@ -45,6 +57,7 @@
4557
<DefineConstants>TRACE</DefineConstants>
4658
<ErrorReport>prompt</ErrorReport>
4759
<WarningLevel>4</WarningLevel>
60+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4861
</PropertyGroup>
4962
<ItemGroup>
5063
<Reference Include="System" />
@@ -56,13 +69,19 @@
5669
<ItemGroup>
5770
<Compile Include="ByteBuffer.cs" />
5871
<Compile Include="DocumentFormatInfo.cs" />
72+
<Compile Include="LevelNumberType.cs" />
73+
<Compile Include="RTFBorderStyle.cs" />
74+
<Compile Include="RTFDomHeader.cs" />
75+
<Compile Include="RTFDomObject.cs" />
76+
<Compile Include="RTFDomPageBreak.cs" />
77+
<Compile Include="RTFDomTempContainer.cs" />
5978
<Compile Include="RTFInstanceDebugView.cs" />
6079
<Compile Include="ProgressEventHandler.cs" />
6180
<Compile Include="RTFDomBookmark.cs" />
6281
<Compile Include="RTFDomElementList.cs" />
6382
<Compile Include="RTFDomField.cs" />
6483
<Compile Include="RTFDomImage.cs" />
65-
<Compile Include="RTFDomLine.cs" />
84+
<Compile Include="RTFDomLineBreak.cs" />
6685
<Compile Include="RTFDomParagraph.cs" />
6786
<Compile Include="RTFDomShape.cs" />
6887
<Compile Include="RTFDomShapeGroup.cs" />
@@ -72,6 +91,9 @@
7291
<Compile Include="RTFDomTableRow.cs" />
7392
<Compile Include="RTFDomText.cs" />
7493
<Compile Include="RTFDomElementContainer.cs" />
94+
<Compile Include="RTFListOverrideTable.cs" />
95+
<Compile Include="RTFListTable.cs" />
96+
<Compile Include="RTFRawLayerInfo.cs" />
7597
<Compile Include="StringAttribute.cs" />
7698
<Compile Include="Parser.cs" />
7799
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -95,6 +117,23 @@
95117
<Compile Include="RTFVerticalAlignment.cs" />
96118
<Compile Include="RTFWriter.cs" />
97119
</ItemGroup>
120+
<ItemGroup>
121+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
122+
<Visible>False</Visible>
123+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
124+
<Install>false</Install>
125+
</BootstrapperPackage>
126+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
127+
<Visible>False</Visible>
128+
<ProductName>.NET Framework 3.5 SP1</ProductName>
129+
<Install>true</Install>
130+
</BootstrapperPackage>
131+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
132+
<Visible>False</Visible>
133+
<ProductName>Windows Installer 3.1</ProductName>
134+
<Install>true</Install>
135+
</BootstrapperPackage>
136+
</ItemGroup>
98137
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
99138
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
100139
Other similar extension points exist, see Microsoft.Common.targets.

‎Source/Source/DCSoft.RTF.sln

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 9.00
3+
# Visual Studio 2005
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCSoft.RTF", "DCSoft.RTF.csproj", "{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}"
5+
EndProject
6+
Global
7+
GlobalSection(SourceCodeControl) = preSolution
8+
SccNumberOfProjects = 1
9+
SccProjectUniqueName0 = DCSoft.RTF.csproj
10+
SccProjectName0 = \u0022$/2008004-报表软件/01开发库/08代码/Main/RTF\u0022,\u0020KOFCAAAA
11+
SccLocalPath0 = .
12+
SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
13+
EndGlobalSection
14+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15+
Debug|Any CPU = Debug|Any CPU
16+
Release|Any CPU = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19+
{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{D35F9B37-CF93-48AE-9A1A-3A99930F04FB}.Release|Any CPU.Build.0 = Release|Any CPU
23+
EndGlobalSection
24+
GlobalSection(SolutionProperties) = preSolution
25+
HideSolutionNode = FALSE
26+
EndGlobalSection
27+
EndGlobal

0 commit comments

Comments
 (0)