build/win32/libvisio.vcproj | 4 ++--
build/win32/libvisio.vcxproj | 4 ++--
build/win32/vsd2raw.vcproj | 4 ++--
build/win32/vsd2raw.vcxproj | 4 ++--
build/win32/vsd2xhtml.vcproj | 4 ++--
build/win32/vsd2xhtml.vcxproj | 4 ++--
src/lib/VSDParser.cpp | 15 +++++++++++++++
7 files changed, 27 insertions(+), 12 deletions(-)
New commits:
commit a7190200d4b0022b07d1487950fe42ec8b756c45
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Apr 2 00:36:44 2013 +0200
Add ICU stuff to the MSVC build files
diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj
index 952544a..4401712 100644
--- a/build/win32/libvisio.vcproj
+++ b/build/win32/libvisio.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -116,7 +116,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR)"
+
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(LIBXML_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="2"
diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index a1f82cc..803e91a 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -43,7 +43,7 @@
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(LIBXML_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff --git a/build/win32/vsd2raw.vcproj b/build/win32/vsd2raw.vcproj
index 5db58a2..d6b9058 100644
--- a/build/win32/vsd2raw.vcproj
+++ b/build/win32/vsd2raw.vcproj
@@ -75,7 +75,7 @@
OutputFile="Debug\bin\vsd2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+
AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/vsd2raw.pdb"
SubSystem="1"
@@ -164,7 +164,7 @@
OutputFile="Release\bin\vsd2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
ProgramDatabaseFile=".\Release/vsd2raw.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
diff --git a/build/win32/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index 53b6b6d..c774295 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -73,7 +73,7 @@
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\vsd2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
-
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Debug/vsd2raw.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -96,7 +96,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\src\lib;$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ICU_LIB_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
diff --git a/build/win32/vsd2xhtml.vcproj b/build/win32/vsd2xhtml.vcproj
index a540c22..37934c6 100644
--- a/build/win32/vsd2xhtml.vcproj
+++ b/build/win32/vsd2xhtml.vcproj
@@ -73,7 +73,7 @@
OutputFile="Release\bin\vsd2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+
AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
ProgramDatabaseFile=".\Release/vsd2xhtml.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
@@ -163,7 +163,7 @@
OutputFile="Debug\bin\vsd2xhtml.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR)"
+
AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR),$(LIBXML_LIB_DIR),$(ZLIB_LIB_DIR),$(ICU_LIB_DIR)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/vsd2xhtml.pdb"
SubSystem="1"
diff --git a/build/win32/vsd2xhtml.vcxproj b/build/win32/vsd2xhtml.vcxproj
index 8f27e1c..f00761e 100644
--- a/build/win32/vsd2xhtml.vcxproj
+++ b/build/win32/vsd2xhtml.vcxproj
@@ -71,7 +71,7 @@
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\vsd2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
-
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>.\Release/vsd2xhtml.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -114,7 +114,7 @@
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\vsd2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
-
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Debug/vsd2xhtml.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
commit 4a70e2ab4c9b794f136a5a78bd5f222fd3855561
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Apr 2 00:36:20 2013 +0200
Extend the encoding support
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index cd7b307..4232e5a 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -1568,6 +1568,9 @@ void libvisio::VSDParser::readFontIX(WPXInputStream
*input)
case 0: // ANSI
format = libvisio::VSD_TEXT_ANSI;
break;
+ case 0x02:
+ format = libvisio::VSD_TEXT_SYMBOL;
+ break;
case 0xa1: // GREEK
format = libvisio::VSD_TEXT_GREEK;
break;
@@ -1595,6 +1598,18 @@ void libvisio::VSDParser::readFontIX(WPXInputStream
*input)
case 0xee: // CENTRAL EUROPE
format = libvisio::VSD_TEXT_CENTRAL_EUROPE;
break;
+ case 0x80: // SHIFTJIS
+ format = libvisio::VSD_TEXT_JAPANESE;
+ break;
+ case 0x81: // HANGUL
+ format = libvisio::VSD_TEXT_KOREAN;
+ break;
+ case 0x86: // GB2312
+ format = libvisio::VSD_TEXT_CHINESE_SIMPLIFIED;
+ break;
+ case 0x88: // CHINESEBIG5
+ format = libvisio::VSD_TEXT_CHINESE_TRADITIONAL;
+ break;
default:
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
