14 files changed, 8 insertions, 781 deletions
diff --git a/libs/hunspell/hunspell.vcxproj b/libs/hunspell/hunspell.vcxproj
index 08f1277815..5355790b1e 100644
--- a/libs/hunspell/hunspell.vcxproj
+++ b/libs/hunspell/hunspell.vcxproj
@@ -22,132 +22,19 @@
     <ProjectGuid>{b80c2c8d-b987-48b6-afe2-8da2d17f2f6a}</ProjectGuid>
     <ProjectName>hunspell</ProjectName>
   </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifest>false</GenerateManifest>
-    <EmbedManifest>false</EmbedManifest>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Libs\</OutDir>
-    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Libs\</OutDir>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="UserMacros">
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\bin10\lib</CommonLibDir>
-    <CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\bin12\lib</CommonLibDir>
-    <CommonLibDir Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\bin14\lib</CommonLibDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RootNamespace>$(ProjectName)</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
-    <IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+  </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\plugins\ExternalAPI;$(ProjectDir)..\..\..\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BUILDING_LIBHUNSPELL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4995;4996;4312;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <ExceptionHandling>false</ExceptionHandling>
+      <ExceptionHandling>Sync</ExceptionHandling>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;Wtsapi32.lib;netapi32.lib;pdh.lib;shlwapi.lib;Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CommonLibDir)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>false</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <OmitFramePointers>true</OmitFramePointers>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)' == '10.0'">/PDBALTPATH:%_PDB%</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\boost\stage64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
-    <TargetExt>.mir</TargetExt>
-    <TargetPath>$(OutDir)$(TargetName)$(TargetExt)</TargetPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClCompile Include="src\affentry.cxx" />
-    <ClCompile Include="src\affixmgr.cxx" />
-    <ClCompile Include="src\csutil.cxx" />
-    <ClCompile Include="src\dictmgr.cxx" />
-    <ClCompile Include="src\hashmgr.cxx" />
-    <ClCompile Include="src\hunspell.cxx" />
-    <ClCompile Include="src\suggestmgr.cxx" />
-    <ClCompile Include="src\filemgr.cxx" />
-    <ClCompile Include="src\phonet.cxx" />
-    <ClCompile Include="src\hunzip.cxx" />
-    <ClCompile Include="src\replist.cxx" />
-  </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClCompile Include="src\*.c++">
+      <PreprocessorDefinitions>BUILDING_LIBHUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClInclude Include="src\*.hxx" />
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\Hunspell.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
 \ No newline at end of file
diff --git a/libs/hunspell/hunspell.vcxproj.filters b/libs/hunspell/hunspell.vcxproj.filters
index a6562c7606..de5ad9f66c 100644
--- a/libs/hunspell/hunspell.vcxproj.filters
+++ b/libs/hunspell/hunspell.vcxproj.filters
@@ -1,607 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
-  <ItemGroup>
-    <ClCompile Include="src\affentry.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\affixmgr.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\csutil.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dictmgr.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\hashmgr.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\hunspell.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\suggestmgr.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\filemgr.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phonet.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\hunzip.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\replist.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-    <ClInclude Include="src\affentry.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\affixmgr.hxx" />
-    <ClInclude Include="src\atypes.hxx" />
-    <ClInclude Include="src\baseaffix.hxx" />
-    <ClInclude Include="src\csutil.hxx" />
-    <ClInclude Include="src\dictmgr.hxx" />
-    <ClInclude Include="src\filemgr.hxx" />
-    <ClInclude Include="src\hashmgr.hxx" />
-    <ClInclude Include="src\htypes.hxx" />
-    <ClInclude Include="src\hunspell.hxx" />
-    <ClInclude Include="src\hunzip.hxx" />
-    <ClInclude Include="src\langnum.hxx" />
-    <ClInclude Include="src\phonet.hxx" />
-    <ClInclude Include="src\replist.hxx" />
-    <ClInclude Include="src\suggestmgr.hxx" />
-    <ClInclude Include="src\w_char.hxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\Hunspell.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/libs/hunspell/src/affentry.cxx b/libs/hunspell/src/affentry.c++
index 983fe2c1ec..983fe2c1ec 100644
--- a/libs/hunspell/src/affentry.cxx
+++ b/libs/hunspell/src/affentry.c++
diff --git a/libs/hunspell/src/affixmgr.cxx b/libs/hunspell/src/affixmgr.c++
index d21ff49573..d21ff49573 100644
--- a/libs/hunspell/src/affixmgr.cxx
+++ b/libs/hunspell/src/affixmgr.c++
diff --git a/libs/hunspell/src/csutil.cxx b/libs/hunspell/src/csutil.c++
index d7411bb216..d7411bb216 100644
--- a/libs/hunspell/src/csutil.cxx
+++ b/libs/hunspell/src/csutil.c++
diff --git a/libs/hunspell/src/dictmgr.cxx b/libs/hunspell/src/dictmgr.c++
index 473c09acfe..473c09acfe 100644
--- a/libs/hunspell/src/dictmgr.cxx
+++ b/libs/hunspell/src/dictmgr.c++
diff --git a/libs/hunspell/src/filemgr.cxx b/libs/hunspell/src/filemgr.c++
index cbe41c577b..cbe41c577b 100644
--- a/libs/hunspell/src/filemgr.cxx
+++ b/libs/hunspell/src/filemgr.c++
diff --git a/libs/hunspell/src/hashmgr.cxx b/libs/hunspell/src/hashmgr.c++
index dbcf56a51c..dbcf56a51c 100644
--- a/libs/hunspell/src/hashmgr.cxx
+++ b/libs/hunspell/src/hashmgr.c++
diff --git a/libs/hunspell/src/hunspell.cxx b/libs/hunspell/src/hunspell.c++
index 726c72931a..726c72931a 100644
--- a/libs/hunspell/src/hunspell.cxx
+++ b/libs/hunspell/src/hunspell.c++
diff --git a/libs/hunspell/src/hunspelldll.c b/libs/hunspell/src/hunspelldll.c
deleted file mode 100644
index fdd667ce8f..0000000000
--- a/libs/hunspell/src/hunspelldll.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Copyright (C) 2006
- * Miha Vrhovnik (http://simail.sf.net, http://xcollect.sf.net)
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** **/
-#include "hunspelldll.h"
-#include <windows.h>
-
-
-BOOL APIENTRY DllMain(HINSTANCE hInst /* Library instance handle. */,
-                      DWORD reason /* Reason this function is being called. */,
-                      LPVOID reserved /* Not used. */) {
-  switch (reason) {
-    case DLL_PROCESS_ATTACH:
-      break;
-
-    case DLL_PROCESS_DETACH:
-      break;
-
-    case DLL_THREAD_ATTACH:
-      break;
-
-    case DLL_THREAD_DETACH:
-      break;
-  }
-
-  /* Returns TRUE on success, FALSE on failure */
-  return TRUE;
-}
diff --git a/libs/hunspell/src/hunzip.cxx b/libs/hunspell/src/hunzip.c++
index b2788a1055..b2788a1055 100644
--- a/libs/hunspell/src/hunzip.cxx
+++ b/libs/hunspell/src/hunzip.c++
diff --git a/libs/hunspell/src/phonet.cxx b/libs/hunspell/src/phonet.c++
index 2b4d2ae504..2b4d2ae504 100644
--- a/libs/hunspell/src/phonet.cxx
+++ b/libs/hunspell/src/phonet.c++
diff --git a/libs/hunspell/src/replist.cxx b/libs/hunspell/src/replist.c++
index ace6c4aaf8..ace6c4aaf8 100644
--- a/libs/hunspell/src/replist.cxx
+++ b/libs/hunspell/src/replist.c++
diff --git a/libs/hunspell/src/suggestmgr.cxx b/libs/hunspell/src/suggestmgr.c++
index 4269a1181a..4269a1181a 100644
--- a/libs/hunspell/src/suggestmgr.cxx
+++ b/libs/hunspell/src/suggestmgr.c++