switch to librevenge

11 files changed, 56 insertions, 56 deletions

diff --git a/build/win32/libsdw.vcproj b/build/win32/libsdw.vcproj
index 69cf603..c2dfb3e 100644
--- a/build/win32/libsdw.vcproj
+++ b/build/win32/libsdw.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR),$(BOOST_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/build/win32/libsdw.vcxproj b/build/win32/libsdw.vcxproj
index b1296ec..f05924e 100644
--- a/build/win32/libsdw.vcxproj
+++ b/build/win32/libsdw.vcxproj
@@ -44,7 +44,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/build/win32/sdw2html.dsp b/build/win32/sdw2html.dsp
index 1dd46a7..442623f 100644
--- a/build/win32/sdw2html.dsp
+++ b/build/win32/sdw2html.dsp
@@ -44,16 +44,16 @@ RSC=rc.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "librevenge-0.0" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "librevenge-0.0" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2html.exe" /libpath:"Release\lib"
-# ADD LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2html.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2html.exe" /libpath:"Release\lib"
+# ADD LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2html.exe" /libpath:"Release\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ELSEIF  "$(CFG)" == "sdw2html - Win32 Debug"
@@ -72,16 +72,16 @@ LINK32=link.exe
 MTL=midl.exe
 # ADD BASE MTL /nologo /win32
 # ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.0" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.0" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2html.exe" /libpath:"Debug\lib"
-# ADD LINK32 libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2html.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2html.exe" /libpath:"Debug\lib"
+# ADD LINK32 libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2html.exe" /libpath:"Debug\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
diff --git a/build/win32/sdw2html.vcproj b/build/win32/sdw2html.vcproj
index 4fc1873..ca7e433 100644
--- a/build/win32/sdw2html.vcproj
+++ b/build/win32/sdw2html.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -70,11 +70,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+				AdditionalDependencies="libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib"
 				OutputFile="Debug\bin\sdw2html.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR)"
+				AdditionalLibraryDirectories="Debug\lib,$(LIBREVENGE_LIB_DIR)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/sdw2html.pdb"
 				SubSystem="1"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
@@ -159,11 +159,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib"
+				AdditionalDependencies="librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib"
 				OutputFile="Release\bin\sdw2html.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR)"
+				AdditionalLibraryDirectories="Release\lib,$(LIBREVENGE_LIB_DIR)"
 				ProgramDatabaseFile=".\Release/sdw2html.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
diff --git a/build/win32/sdw2html.vcxproj b/build/win32/sdw2html.vcxproj
index 328271e..7a81001 100644
--- a/build/win32/sdw2html.vcxproj
+++ b/build/win32/sdw2html.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -69,10 +69,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libsdw-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdw-0.2.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>Debug\bin\sdw2html.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/sdw2html.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/sdw2html.pch</PrecompiledHeaderOutputFile>
@@ -111,10 +111,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libwpd-stream-0.9.lib;libsdw-0.2.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librevenge-stream-0.0.lib;libsdw-0.2.lib;librevenge-0.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>Release\bin\sdw2html.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>.\Release/sdw2html.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/build/win32/sdw2raw.dsp b/build/win32/sdw2raw.dsp
index b89591f..5e8c672 100644
--- a/build/win32/sdw2raw.dsp
+++ b/build/win32/sdw2raw.dsp
@@ -52,8 +52,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2raw.exe" /libpath:"Release\lib"
-# ADD LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2raw.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2raw.exe" /libpath:"Release\lib"
+# ADD LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2raw.exe" /libpath:"Release\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ELSEIF  "$(CFG)" == "sdw2raw - Win32 Debug"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2raw.exe" /libpath:"Debug\lib"
-# ADD LINK32 libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2raw.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2raw.exe" /libpath:"Debug\lib"
+# ADD LINK32 libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2raw.exe" /libpath:"Debug\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
diff --git a/build/win32/sdw2raw.vcproj b/build/win32/sdw2raw.vcproj
index 5ff4076..86b994d 100644
--- a/build/win32/sdw2raw.vcproj
+++ b/build/win32/sdw2raw.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -70,11 +70,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+				AdditionalDependencies="libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib"
 				OutputFile="Debug\bin\sdw2raw.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR)"
+				AdditionalLibraryDirectories="Debug\lib,$(LIBREVENGE_LIB_DIR)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/sdw2raw.pdb"
 				SubSystem="1"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
@@ -159,11 +159,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib"
+				AdditionalDependencies="librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib"
 				OutputFile="Release\bin\sdw2raw.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR)"
+				AdditionalLibraryDirectories="Release\lib,$(LIBREVENGE_LIB_DIR)"
 				ProgramDatabaseFile=".\Release/sdw2raw.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
diff --git a/build/win32/sdw2raw.vcxproj b/build/win32/sdw2raw.vcxproj
index bcbd451..b703c9c 100644
--- a/build/win32/sdw2raw.vcxproj
+++ b/build/win32/sdw2raw.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -69,10 +69,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libsdw-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdw-0.2.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>Debug\bin\sdw2raw.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/sdw2raw.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/sdw2raw.pch</PrecompiledHeaderOutputFile>
@@ -111,10 +111,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libwpd-stream-0.9.lib;libsdw-0.2.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librevenge-stream-0.0.lib;libsdw-0.2.lib;librevenge-0.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>Release\bin\sdw2raw.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>.\Release/sdw2raw.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/build/win32/sdw2text.dsp b/build/win32/sdw2text.dsp
index 6f94b38..ebbb202 100644
--- a/build/win32/sdw2text.dsp
+++ b/build/win32/sdw2text.dsp
@@ -52,8 +52,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2text.exe" /libpath:"Release\lib"
-# ADD LINK32 libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2text.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2text.exe" /libpath:"Release\lib"
+# ADD LINK32 librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\sdw2text.exe" /libpath:"Release\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ELSEIF  "$(CFG)" == "sdw2text - Win32 Debug"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2text.exe" /libpath:"Debug\lib"
-# ADD LINK32 libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2text.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2text.exe" /libpath:"Debug\lib"
+# ADD LINK32 libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\sdw2text.exe" /libpath:"Debug\lib"
 # SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
diff --git a/build/win32/sdw2text.vcproj b/build/win32/sdw2text.vcproj
index d7424fd..89bd9a0 100644
--- a/build/win32/sdw2text.vcproj
+++ b/build/win32/sdw2text.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR)"
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -70,11 +70,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libsdw-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+				AdditionalDependencies="libsdw-0.2.lib librevenge-stream-0.0.lib librevenge-0.0.lib"
 				OutputFile="Debug\bin\sdw2text.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Debug\lib,$(LIBWPD_LIB_DIR)"
+				AdditionalLibraryDirectories="Debug\lib,$(LIBREVENGE_LIB_DIR)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/sdw2text.pdb"
 				SubSystem="1"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
-				AdditionalIncludeDirectories="..\..\inc,$(LIBWPD_INCLUDE_DIR)"
+				AdditionalIncludeDirectories="..\..\inc,$(LIBREVENGE_INCLUDE_DIR)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="false"
@@ -159,11 +159,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libwpd-stream-0.9.lib libsdw-0.2.lib libwpd-0.9.lib"
+				AdditionalDependencies="librevenge-stream-0.0.lib libsdw-0.2.lib librevenge-0.0.lib"
 				OutputFile="Release\bin\sdw2text.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Release\lib,$(LIBWPD_LIB_DIR)"
+				AdditionalLibraryDirectories="Release\lib,$(LIBREVENGE_LIB_DIR)"
 				ProgramDatabaseFile=".\Release/sdw2text.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
diff --git a/build/win32/sdw2text.vcxproj b/build/win32/sdw2text.vcxproj
index 728628b..3058c66 100644
--- a/build/win32/sdw2text.vcxproj
+++ b/build/win32/sdw2text.vcxproj
@@ -51,7 +51,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -69,10 +69,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libsdw-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsdw-0.2.lib;librevenge-stream-0.0.lib;librevenge-0.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>Debug\bin\sdw2text.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>Debug\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/sdw2text.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\inc;$(LIBWPD_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\inc;$(LIBREVENGE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>.\Release/sdw2text.pch</PrecompiledHeaderOutputFile>
@@ -111,10 +111,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libwpd-stream-0.9.lib;libsdw-0.2.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>librevenge-stream-0.0.lib;libsdw-0.2.lib;librevenge-0.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>Release\bin\sdw2text.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>Release\lib;$(LIBREVENGE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>.\Release/sdw2text.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>