[Libreoffice-commits] libcdr.git: build/win32 configure.ac createBuildNumber.pl inc/libcdr libcdr.pc.in libcdr.spec.in src/conv src/lib src/Makefile.am
Fridrich Å trba
fridrich.strba at bluewin.ch
Tue Nov 5 17:11:23 CET 2013
build/win32/cdr2raw.dsp | 16
build/win32/cdr2raw.vcproj | 4
build/win32/cdr2raw.vcxproj | 4
build/win32/cdr2text.dsp | 16
build/win32/cdr2text.vcproj | 4
build/win32/cdr2text.vcxproj | 4
build/win32/cdr2xhtml.dsp | 16
build/win32/cdr2xhtml.vcproj | 4
build/win32/cdr2xhtml.vcxproj | 4
build/win32/cmx2raw.dsp | 16
build/win32/cmx2raw.vcproj | 4
build/win32/cmx2raw.vcxproj | 4
build/win32/cmx2text.dsp | 16
build/win32/cmx2text.vcproj | 4
build/win32/cmx2text.vcxproj | 4
build/win32/cmx2xhtml.dsp | 16
build/win32/cmx2xhtml.vcproj | 4
build/win32/cmx2xhtml.vcxproj | 4
build/win32/libcdr.dsp | 12
build/win32/libcdr.vcproj | 4
build/win32/libcdr.vcxproj | 4
configure.ac | 68 ++-
createBuildNumber.pl | 2
inc/libcdr/CDRDocument.h | 12
inc/libcdr/CDRStringVector.h | 60 ---
inc/libcdr/CMXDocument.h | 12
inc/libcdr/Makefile.am | 1
inc/libcdr/libcdr.h | 2
libcdr.pc.in | 2
libcdr.spec.in | 4
src/Makefile.am | 6
src/conv/Makefile.am | 3
src/conv/raw/Makefile.am | 35 +-
src/conv/raw/cdr2raw.cpp | 192 -----------
src/conv/raw/cmx2raw.cpp | 192 -----------
src/conv/svg/Makefile.am | 35 +-
src/conv/svg/cdr2xhtml.cpp | 13
src/conv/svg/cmx2xhtml.cpp | 13
src/conv/text/Makefile.am | 35 +-
src/conv/text/cdr2text.cpp | 52 ---
src/conv/text/cmx2text.cpp | 53 ---
src/lib/.gitignore | 2
src/lib/CDRCollector.cpp | 6
src/lib/CDRCollector.h | 14
src/lib/CDRContentCollector.cpp | 191 +++++------
src/lib/CDRContentCollector.h | 14
src/lib/CDRDocument.cpp | 78 +---
src/lib/CDRInternalStream.cpp | 14
src/lib/CDRInternalStream.h | 27 +
src/lib/CDROutputElementList.cpp | 177 +++++-----
src/lib/CDROutputElementList.h | 26 -
src/lib/CDRParser.cpp | 642 ++++++++++++++++++-------------------
src/lib/CDRParser.h | 112 +++---
src/lib/CDRPath.cpp | 100 ++---
src/lib/CDRPath.h | 8
src/lib/CDRSVGGenerator.cpp | 675 ---------------------------------------
src/lib/CDRSVGGenerator.h | 88 -----
src/lib/CDRStringVector.cpp | 96 -----
src/lib/CDRStylesCollector.cpp | 12
src/lib/CDRStylesCollector.h | 4
src/lib/CDRTypes.h | 18 -
src/lib/CDRZipStream.cpp | 398 ----------------------
src/lib/CDRZipStream.h | 64 ---
src/lib/CMXDocument.cpp | 28 -
src/lib/CMXParser.cpp | 96 ++---
src/lib/CMXParser.h | 38 +-
src/lib/CommonParser.cpp | 12
src/lib/CommonParser.h | 14
src/lib/Makefile.am | 10
src/lib/libcdr_utils.cpp | 36 +-
src/lib/libcdr_utils.h | 30 -
71 files changed, 1075 insertions(+), 2911 deletions(-)
New commits:
commit a9b2a6129dde8e3e59c8f9233c391cff5ec5aef1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Nov 5 17:10:50 2013 +0100
Port to librevenge
Change-Id: I62edd528358a5f2614b75b21bdd9d89e7c8dcc8d
diff --git a/build/win32/cdr2raw.dsp b/build/win32/cdr2raw.dsp
index 65fe8cb..33f7dfa 100644
--- a/build/win32/cdr2raw.dsp
+++ b/build/win32/cdr2raw.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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2raw.exe" /libpath:"Release\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2raw.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2raw.exe" /libpath:"Release\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2raw.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "cdr2raw - 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 "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /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 "\..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2raw.exe" /libpath:"Debug\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2raw.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2raw.exe" /libpath:"Debug\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2raw.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/cdr2raw.vcproj b/build/win32/cdr2raw.vcproj
index 4b51c52..3d75ad6 100755
--- a/build/win32/cdr2raw.vcproj
+++ b/build/win32/cdr2raw.vcproj
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Debug\bin\cdr2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Release\bin\cdr2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/build/win32/cdr2raw.vcxproj b/build/win32/cdr2raw.vcxproj
index b4e650e..825ca52 100755
--- a/build/win32/cdr2raw.vcxproj
+++ b/build/win32/cdr2raw.vcxproj
@@ -69,7 +69,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cdr2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cdr2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/cdr2text.dsp b/build/win32/cdr2text.dsp
index dfabe31..77f8430 100644
--- a/build/win32/cdr2text.dsp
+++ b/build/win32/cdr2text.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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2text.exe" /libpath:"Release\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2text.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2text.exe" /libpath:"Release\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2text.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "cdr2text - 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 "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /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 "\..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2text.exe" /libpath:"Debug\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2text.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2text.exe" /libpath:"Debug\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2text.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/cdr2text.vcproj b/build/win32/cdr2text.vcproj
index 1f498a2..850d2ca 100755
--- a/build/win32/cdr2text.vcproj
+++ b/build/win32/cdr2text.vcproj
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Debug\bin\cdr2text.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Release\bin\cdr2text.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/build/win32/cdr2text.vcxproj b/build/win32/cdr2text.vcxproj
index 11130cc..c30e124 100755
--- a/build/win32/cdr2text.vcxproj
+++ b/build/win32/cdr2text.vcxproj
@@ -69,7 +69,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cdr2text.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cdr2text.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/cdr2xhtml.dsp b/build/win32/cdr2xhtml.dsp
index 202594a..fb9ce10 100644
--- a/build/win32/cdr2xhtml.dsp
+++ b/build/win32/cdr2xhtml.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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2xhtml.exe" /libpath:"Release\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2xhtml.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2xhtml.exe" /libpath:"Release\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cdr2xhtml.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "cdr2xhtml - 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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /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 "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2xhtml.exe" /libpath:"Debug\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2xhtml.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2xhtml.exe" /libpath:"Debug\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cdr2xhtml.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/cdr2xhtml.vcproj b/build/win32/cdr2xhtml.vcproj
index bbe2479..bf350f2 100755
--- a/build/win32/cdr2xhtml.vcproj
+++ b/build/win32/cdr2xhtml.vcproj
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Release\bin\cdr2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Debug\bin\cdr2xhtml.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
diff --git a/build/win32/cdr2xhtml.vcxproj b/build/win32/cdr2xhtml.vcxproj
index 96e2cd3..be8de11 100755
--- a/build/win32/cdr2xhtml.vcxproj
+++ b/build/win32/cdr2xhtml.vcxproj
@@ -67,7 +67,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cdr2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -110,7 +110,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cdr2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/cmx2raw.dsp b/build/win32/cmx2raw.dsp
index f5a777a..fa9a3de 100644
--- a/build/win32/cmx2raw.dsp
+++ b/build/win32/cmx2raw.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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2raw.exe" /libpath:"Release\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2raw.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2raw.exe" /libpath:"Release\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2raw.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "cmx2raw - 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 "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /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 "\..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2raw.exe" /libpath:"Debug\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2raw.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2raw.exe" /libpath:"Debug\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2raw.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/cmx2raw.vcproj b/build/win32/cmx2raw.vcproj
index 2b0a8af..d406e94 100755
--- a/build/win32/cmx2raw.vcproj
+++ b/build/win32/cmx2raw.vcproj
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Debug\bin\cmx2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Release\bin\cmx2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/build/win32/cmx2raw.vcxproj b/build/win32/cmx2raw.vcxproj
index 93fe66d..180938e 100755
--- a/build/win32/cmx2raw.vcxproj
+++ b/build/win32/cmx2raw.vcxproj
@@ -69,7 +69,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cmx2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cmx2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/cmx2text.dsp b/build/win32/cmx2text.dsp
index b14ced3..0a2c0ca 100644
--- a/build/win32/cmx2text.dsp
+++ b/build/win32/cmx2text.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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2text.exe" /libpath:"Release\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2text.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2text.exe" /libpath:"Release\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2text.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "cmx2text - 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 "\..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /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 "\..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2text.exe" /libpath:"Debug\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2text.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2text.exe" /libpath:"Debug\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2text.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/cmx2text.vcproj b/build/win32/cmx2text.vcproj
index 2fd75fa..4e766d8 100755
--- a/build/win32/cmx2text.vcproj
+++ b/build/win32/cmx2text.vcproj
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Debug\bin\cmx2text.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Release\bin\cmx2text.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/build/win32/cmx2text.vcxproj b/build/win32/cmx2text.vcxproj
index 1550c60..86ca9b5 100755
--- a/build/win32/cmx2text.vcxproj
+++ b/build/win32/cmx2text.vcxproj
@@ -69,7 +69,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cmx2text.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cmx2text.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/cmx2xhtml.dsp b/build/win32/cmx2xhtml.dsp
index 3e824ae..2b0d0a3 100644
--- a/build/win32/cmx2xhtml.dsp
+++ b/build/win32/cmx2xhtml.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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2xhtml.exe" /libpath:"Release\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2xhtml.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2xhtml.exe" /libpath:"Release\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\cmx2xhtml.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "cmx2xhtml - 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 "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /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 "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /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 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2xhtml.exe" /libpath:"Debug\lib"
-# ADD LINK32 libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2xhtml.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2xhtml.exe" /libpath:"Debug\lib"
+# ADD LINK32 libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\cmx2xhtml.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/cmx2xhtml.vcproj b/build/win32/cmx2xhtml.vcproj
index d64f5f5..a0d81ef 100755
--- a/build/win32/cmx2xhtml.vcproj
+++ b/build/win32/cmx2xhtml.vcproj
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Debug\bin\cmx2xhtml.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib librevenge-stream-0.9.lib librevenge-0.9.lib"
OutputFile="Release\bin\cmx2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/build/win32/cmx2xhtml.vcxproj b/build/win32/cmx2xhtml.vcxproj
index de4301a..fc7af31 100755
--- a/build/win32/cmx2xhtml.vcxproj
+++ b/build/win32/cmx2xhtml.vcxproj
@@ -69,7 +69,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cmx2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;librevenge-stream-0.9.lib;librevenge-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cmx2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/libcdr.dsp b/build/win32/libcdr.dsp
index a3d032b..50ec255 100644
--- a/build/win32/libcdr.dsp
+++ b/build/win32/libcdr.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\inc" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\inc" /I "librevenge-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -64,8 +64,8 @@ LIB32=link.exe -lib
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "..\..\inc" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "..\..\inc" /I "librevenge-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -115,7 +115,7 @@ SOURCE=..\..\src\lib\CDRPath.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\CDRStringVector.cpp
+SOURCE=..\..\src\lib\librevenge::RVNGStringVector.cpp
# End Source File
# Begin Source File
@@ -163,7 +163,7 @@ SOURCE=..\..\inc\libcdr\CDRDocument.h
# End Source File
# Begin Source File
-SOURCE=..\..\inc\libcdr\CDRStringVector.h
+SOURCE=..\..\inc\libcdr\librevenge::RVNGStringVector.h
# End Source File
# Begin Source File
diff --git a/build/win32/libcdr.vcproj b/build/win32/libcdr.vcproj
index a3c9d7c..637316e 100755
--- a/build/win32/libcdr.vcproj
+++ b/build/win32/libcdr.vcproj
@@ -327,7 +327,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\lib\CDRStringVector.cpp"
+ RelativePath="..\..\src\lib\librevenge::RVNGStringVector.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -556,7 +556,7 @@
>
</File>
<File
- RelativePath="..\..\inc\libcdr\CDRStringVector.h"
+ RelativePath="..\..\inc\libcdr\librevenge::RVNGStringVector.h"
>
</File>
<File
diff --git a/build/win32/libcdr.vcxproj b/build/win32/libcdr.vcxproj
index 1390228..1367c78 100755
--- a/build/win32/libcdr.vcxproj
+++ b/build/win32/libcdr.vcxproj
@@ -144,7 +144,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\lib\CDRStringVector.cpp">
+ <ClCompile Include="..\..\src\lib\librevenge::RVNGStringVector.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -207,7 +207,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\inc\libcdr\CDRDocument.h" />
- <ClInclude Include="..\..\inc\libcdr\CDRStringVector.h" />
+ <ClInclude Include="..\..\inc\libcdr\librevenge::RVNGStringVector.h" />
<ClInclude Include="..\..\inc\libcdr\CMXDocument.h" />
<ClInclude Include="..\..\inc\libcdr\libcdr.h" />
<ClInclude Include="..\..\src\lib\CDRCollector.h" />
diff --git a/configure.ac b/configure.ac
index 689e44d..550fddc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ AC_PREREQ([2.65])
# Version informations
# ====================
m4_define([libcdr_version_major],[0])
-m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[14])
+m4_define([libcdr_version_minor],[1])
+m4_define([libcdr_version_micro],[0])
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
# =============
@@ -35,27 +35,46 @@ AC_CANONICAL_HOST
PKG_PROG_PKG_CONFIG([0.20])
-# ====================
-# Find additional apps
-# ====================
-PKG_CHECK_MODULES([WPD],[
- libwpd-0.9 >= 0.9.5
- libwpd-stream-0.9 >= 0.9.5
+# ===============
+# Find librevenge
+# ===============
+PKG_CHECK_MODULES([REVENGE],[
+ librevenge-0.0
+])
+AC_SUBST([REVENGE_CFLAGS])
+AC_SUBST([REVENGE_LIBS])
+
+PKG_CHECK_MODULES([REVENGE_GENERATORS],[
+ librevenge-generators-0.0
])
-AC_SUBST(WPD_CFLAGS)
-AC_SUBST(WPD_LIBS)
+AC_SUBST([REVENGE_GENERATORS_CFLAGS])
+AC_SUBST([REVENGE_GENERATORS_LIBS])
-PKG_CHECK_MODULES([WPG],[
- libwpg-0.2
+# =====
+# Tools
+# =====
+AC_ARG_ENABLE([tools],
+ [AS_HELP_STRING([--disable-tools], [Build conversion tools])],
+ [enable_tools="$enableval"],
+ [enable_tools=yes]
+)
+AS_IF([test "x$enable_tools" = "xyes"], [
+ PKG_CHECK_MODULES([REVENGE_STREAM],[
+ librevenge-stream-0.0
+ ])
])
-AC_SUBST(WPG_CFLAGS)
-AC_SUBST(WPG_LIBS)
+AC_SUBST([REVENGE_STREAM_CFLAGS])
+AC_SUBST([REVENGE_STREAM_LIBS])
+AM_CONDITIONAL(BUILD_TOOLS, [test "x$enable_tools" = "xyes"])
+# ==========
+# Find lcms2
+# ==========
PKG_CHECK_MODULES([LCMS2],[
lcms2
])
-AC_SUBST(LCMS2_CFLAGS)
-AC_SUBST(LCMS2_LIBS)
+AC_SUBST([LCMS2_CFLAGS])
+AC_SUBST([LCMS_LIBS])
# =========
# Find zlib
@@ -256,21 +275,6 @@ AS_IF([test "x$enable_debug" = "xyes"], [
])
AC_SUBST(DEBUG_CXXFLAGS)
-# ============
-# Static tools
-# ============
-AC_ARG_ENABLE([static-tools],
- [AS_HELP_STRING([--enable-static-tools], [Link tools (binaries) statically])],
- [enable_static_tools="$enableval"],
- [enable_static_tools=no]
-)
-AS_IF([test "x$enable_static_tools" = "xyes"], [
- enable_static="yes"
-], [
- AC_DISABLE_STATIC
-])
-AM_CONDITIONAL(STATIC_TOOLS, [test "x$enable_static_tools" = "xyes"])
-
# =============
# Documentation
# =============
@@ -327,7 +331,7 @@ AC_MSG_NOTICE([
Build configuration:
debug: ${enable_debug}
docs: ${build_docs}
- static-tools: ${enable_static_tools}
+ tools: ${enable_tools}
werror: ${enable_werror}
==============================================================================
])
diff --git a/createBuildNumber.pl b/createBuildNumber.pl
index 6fc2949..72e4ff5 100644
--- a/createBuildNumber.pl
+++ b/createBuildNumber.pl
@@ -22,7 +22,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# For further information visit http://libwpd.sourceforge.net
+# For further information visit http://librevenge.sourceforge.net
#
#
# "This product is not manufactured, approved, or supported by
diff --git a/inc/libcdr/CDRDocument.h b/inc/libcdr/CDRDocument.h
index e8cce46..5f11f87 100644
--- a/inc/libcdr/CDRDocument.h
+++ b/inc/libcdr/CDRDocument.h
@@ -31,11 +31,7 @@
#ifndef __CDRDOCUMENT_H__
#define __CDRDOCUMENT_H__
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "CDRStringVector.h"
-
-class WPXInputStream;
+#include <librevenge/librevenge.h>
namespace libcdr
{
@@ -43,11 +39,9 @@ class CDRDocument
{
public:
- static bool isSupported(WPXInputStream *input);
-
- static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ static bool isSupported(librevenge::RVNGInputStream *input);
- static bool generateSVG(WPXInputStream *input, CDRStringVector &output);
+ static bool parse(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
};
} // namespace libcdr
diff --git a/inc/libcdr/CDRStringVector.h b/inc/libcdr/CDRStringVector.h
deleted file mode 100644
index 8b3ba90..0000000
--- a/inc/libcdr/CDRStringVector.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libcdr
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * 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 or as specified alternatively below. 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.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.strba at bluewin.ch>
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __CDRSTRINGVECTOR_H__
-#define __CDRSTRINGVECTOR_H__
-
-#include <libwpd/libwpd.h>
-
-namespace libcdr
-{
-class CDRStringVectorImpl;
-
-class CDRStringVector
-{
-public:
- CDRStringVector();
- CDRStringVector(const CDRStringVector &vec);
- ~CDRStringVector();
-
- CDRStringVector &operator=(const CDRStringVector &vec);
-
- unsigned size() const;
- bool empty() const;
- const WPXString &operator[](unsigned idx) const;
- void append(const WPXString &str);
- void clear();
-
-private:
- CDRStringVectorImpl *m_pImpl;
-};
-
-} // namespace libcdr
-
-#endif /* __CDRSTRINGVECTOR_H__ */
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libcdr/CMXDocument.h b/inc/libcdr/CMXDocument.h
index 11e7eef..b19d537 100644
--- a/inc/libcdr/CMXDocument.h
+++ b/inc/libcdr/CMXDocument.h
@@ -29,11 +29,7 @@
#ifndef __CMXDOCUMENT_H__
#define __CMXDOCUMENT_H__
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "CDRStringVector.h"
-
-class WPXInputStream;
+#include <librevenge/librevenge.h>
namespace libcdr
{
@@ -41,11 +37,9 @@ class CMXDocument
{
public:
- static bool isSupported(WPXInputStream *input);
-
- static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ static bool isSupported(librevenge::RVNGInputStream *input);
- static bool generateSVG(WPXInputStream *input, CDRStringVector &output);
+ static bool parse(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
};
} // namespace libcdr
diff --git a/inc/libcdr/Makefile.am b/inc/libcdr/Makefile.am
index fe5cef7..16634fc 100644
--- a/inc/libcdr/Makefile.am
+++ b/inc/libcdr/Makefile.am
@@ -1,5 +1,4 @@
EXTRA_DIST = \
libcdr.h \
CDRDocument.h \
- CDRStringVector.h \
CMXDocument.h
diff --git a/inc/libcdr/libcdr.h b/inc/libcdr/libcdr.h
index bd8548c..7856c7b 100644
--- a/inc/libcdr/libcdr.h
+++ b/inc/libcdr/libcdr.h
@@ -33,8 +33,6 @@
#include "CDRDocument.h"
#include "CMXDocument.h"
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
#endif
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/libcdr.pc.in b/libcdr.pc.in
index 212502a..bc035bd 100644
--- a/libcdr.pc.in
+++ b/libcdr.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
Description: Library for parsing the Corel Draw file format structure
Version: @VERSION@
-Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
+Requires: librevenge-0.9 librevenge-stream-0.9 librevenge-0.2
Libs: -L${libdir} -lcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
Cflags: -I${includedir}/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@
diff --git a/libcdr.spec.in b/libcdr.spec.in
index 6cbc54e..ec2698b 100644
--- a/libcdr.spec.in
+++ b/libcdr.spec.in
@@ -11,7 +11,7 @@ Source: %{name}-%{version}.tar.gz
Group: System Environment/Libraries
URL: http://libcdr.sf.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-BuildRequires: libwpd-devel >= 0.9.0, gcc-c++, libstdc++-devel, pkgconfig >= 0.9.0
+BuildRequires: librevenge-devel >= 0.9.0, gcc-c++, libstdc++-devel, pkgconfig >= 0.9.0
License: LGPL
Prefix: %{prefix}
@@ -29,7 +29,7 @@ Currently supported: raw svg
%package devel
Requires: %{name} >= %{version}
-Requires: libwpd-devel >= 0.9.0
+Requires: librevenge-devel >= 0.9.0
Summary: Files for developing with libcdr.
Group: Development/Libraries
diff --git a/src/Makefile.am b/src/Makefile.am
index 4796627..64fd45e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = lib conv
+SUBDIRS = lib
+
+if BUILD_TOOLS
+SUBDIRS += conv
+endif
diff --git a/src/conv/Makefile.am b/src/conv/Makefile.am
index eb88fe3..f46e7d9 100644
--- a/src/conv/Makefile.am
+++ b/src/conv/Makefile.am
@@ -1,2 +1,5 @@
+if BUILD_TOOLS
+
SUBDIRS = raw svg text
+endif
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index e3352e5..024ab8d 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,27 +1,34 @@
+if BUILD_TOOLS
+
bin_PROGRAMS = cdr2raw cmx2raw
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = \
+ -I$(top_srcdir)/inc \
+ $(REVENGE_CFLAGS) \
+ $(REVENGE_GENERATORS_CFLAGS) \
+ $(REVENGE_STREAM_CFLAGS) \
+ $(DEBUG_CXXFLAGS)
cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
-if STATIC_TOOLS
-cdr2raw_LDADD = ../../lib/@CDR_OBJDIR@/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.a $(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
-cdr2raw_LDFLAGS = -all-static
-else
-cdr2raw_LDADD = ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la $(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
-endif
+cdr2raw_LDADD = \
+ ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+ $(REVENGE_GENERATORS_LIBS) \
+ $(REVENGE_LIBS) \
+ $(REVENGE_STREAM_LIBS) \
+ @CDR2RAW_WIN32_RESOURCE@
cdr2raw_SOURCES = \
cdr2raw.cpp
cmx2raw_DEPENDENCIES = @CMX2RAW_WIN32_RESOURCE@
-if STATIC_TOOLS
-cmx2raw_LDADD = ../../lib/@CDR_OBJDIR@/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.a $(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
-cmx2raw_LDFLAGS = -all-static
-else
-cmx2raw_LDADD = ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la $(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
-endif
+cmx2raw_LDADD = \
+ ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+ $(REVENGE_GENERATORS_LIBS) \
+ $(REVENGE_LIBS) \
+ $(REVENGE_STREAM_LIBS) \
+ @CMX2RAW_WIN32_RESOURCE@
cmx2raw_SOURCES = \
cmx2raw.cpp
@@ -47,3 +54,5 @@ EXTRA_DIST = \
BUILD_EXTRA_DIST = \
cdr2raw.rc \
cmx2raw.rc
+
+endif
diff --git a/src/conv/raw/cdr2raw.cpp b/src/conv/raw/cdr2raw.cpp
index 0742783..2e1c49e 100644
--- a/src/conv/raw/cdr2raw.cpp
+++ b/src/conv/raw/cdr2raw.cpp
@@ -30,192 +30,10 @@
#include <stdio.h>
#include <string.h>
-
+#include <librevenge/librevenge.h>
+#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <libcdr/libcdr.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-
-class RawPainter : public libwpg::WPGPaintInterface
-{
-public:
- RawPainter();
-
- void startGraphics(const ::WPXPropertyList &propList);
- void endGraphics();
- void startLayer(const ::WPXPropertyList &propList);
- void endLayer();
- void startEmbeddedGraphics(const ::WPXPropertyList &propList);
- void endEmbeddedGraphics();
-
- void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
-
- void drawRectangle(const ::WPXPropertyList &propList);
- void drawEllipse(const ::WPXPropertyList &propList);
- void drawPolyline(const ::WPXPropertyListVector &vertices);
- void drawPolygon(const ::WPXPropertyListVector &vertices);
- void drawPath(const ::WPXPropertyListVector &path);
- void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
- void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
- void endTextObject();
- void startTextLine(const ::WPXPropertyList &propList);
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &propList);
- void endTextSpan();
- void insertText(const ::WPXString &str);
-};
-
-WPXString getPropString(const WPXPropertyList &propList)
-{
- WPXString propString;
- WPXPropertyList::Iter i(propList);
- if (!i.last())
- {
- propString.append(i.key());
- propString.append(": ");
- propString.append(i()->getStr().cstr());
- for (; i.next(); )
- {
- propString.append(", ");
- propString.append(i.key());
- propString.append(": ");
- propString.append(i()->getStr().cstr());
- }
- }
-
- return propString;
-}
-
-WPXString getPropString(const WPXPropertyListVector &itemList)
-{
- WPXString propString;
-
- propString.append("(");
- WPXPropertyListVector::Iter i(itemList);
-
- if (!i.last())
- {
- propString.append("(");
- propString.append(getPropString(i()));
- propString.append(")");
-
- for (; i.next();)
- {
- propString.append(", (");
- propString.append(getPropString(i()));
- propString.append(")");
- }
-
- }
- propString.append(")");
-
- return propString;
-}
-
-RawPainter::RawPainter(): libwpg::WPGPaintInterface()
-{
-}
-
-void RawPainter::startGraphics(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startGraphics(%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endGraphics()
-{
- printf("RawPainter::endGraphics\n");
-}
-
-void RawPainter::startLayer(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startLayer (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endLayer()
-{
- printf("RawPainter::endLayer\n");
-}
-
-void RawPainter::startEmbeddedGraphics(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endEmbeddedGraphics()
-{
- printf("RawPainter::endEmbeddedGraphics \n");
-}
-
-void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient)
-{
- printf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
-}
-
-void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::drawEllipse(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::drawPolyline(const ::WPXPropertyListVector &vertices)
-{
- printf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
-}
-
-void RawPainter::drawPolygon(const ::WPXPropertyListVector &vertices)
-{
- printf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
-}
-
-void RawPainter::drawPath(const ::WPXPropertyListVector &path)
-{
- printf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
-}
-
-void RawPainter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData & /*binaryData*/)
-{
- printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path)
-{
- printf("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr());
-}
-
-void RawPainter::endTextObject()
-{
- printf("RawPainter::endTextObject\n");
-}
-
-void RawPainter::startTextLine(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startTextLine (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endTextLine()
-{
- printf("RawPainter::endTextLine\n");
-}
-
-void RawPainter::startTextSpan(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startTextSpan (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endTextSpan()
-{
- printf("RawPainter::endTextSpan\n");
-}
-
-void RawPainter::insertText(const ::WPXString &str)
-{
- printf("RawPainter::insertText (%s)\n", str.cstr());
-}
-
namespace
{
@@ -249,7 +67,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libcdr::CDRDocument::isSupported(&input))
{
@@ -257,7 +75,7 @@ int main(int argc, char *argv[])
return 1;
}
- RawPainter painter;
+ librevenge::RVNGRawDrawingGenerator painter;
libcdr::CDRDocument::parse(&input, &painter);
return 0;
diff --git a/src/conv/raw/cmx2raw.cpp b/src/conv/raw/cmx2raw.cpp
index 42c4eff..7eab9e1 100644
--- a/src/conv/raw/cmx2raw.cpp
+++ b/src/conv/raw/cmx2raw.cpp
@@ -30,192 +30,10 @@
#include <stdio.h>
#include <string.h>
-
+#include <librevenge/librevenge.h>
+#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <libcdr/libcdr.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-
-class RawPainter : public libwpg::WPGPaintInterface
-{
-public:
- RawPainter();
-
- void startGraphics(const ::WPXPropertyList &propList);
- void endGraphics();
- void startLayer(const ::WPXPropertyList &propList);
- void endLayer();
- void startEmbeddedGraphics(const ::WPXPropertyList &propList);
- void endEmbeddedGraphics();
-
- void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
-
- void drawRectangle(const ::WPXPropertyList &propList);
- void drawEllipse(const ::WPXPropertyList &propList);
- void drawPolyline(const ::WPXPropertyListVector &vertices);
- void drawPolygon(const ::WPXPropertyListVector &vertices);
- void drawPath(const ::WPXPropertyListVector &path);
- void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
- void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
- void endTextObject();
- void startTextLine(const ::WPXPropertyList &propList);
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &propList);
- void endTextSpan();
- void insertText(const ::WPXString &str);
-};
-
-WPXString getPropString(const WPXPropertyList &propList)
-{
- WPXString propString;
- WPXPropertyList::Iter i(propList);
- if (!i.last())
- {
- propString.append(i.key());
- propString.append(": ");
- propString.append(i()->getStr().cstr());
- for (; i.next(); )
- {
- propString.append(", ");
- propString.append(i.key());
- propString.append(": ");
- propString.append(i()->getStr().cstr());
- }
- }
-
- return propString;
-}
-
-WPXString getPropString(const WPXPropertyListVector &itemList)
-{
- WPXString propString;
-
- propString.append("(");
- WPXPropertyListVector::Iter i(itemList);
-
- if (!i.last())
- {
- propString.append("(");
- propString.append(getPropString(i()));
- propString.append(")");
-
- for (; i.next();)
- {
- propString.append(", (");
- propString.append(getPropString(i()));
- propString.append(")");
- }
-
- }
- propString.append(")");
-
- return propString;
-}
-
-RawPainter::RawPainter(): libwpg::WPGPaintInterface()
-{
-}
-
-void RawPainter::startGraphics(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startGraphics(%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endGraphics()
-{
- printf("RawPainter::endGraphics\n");
-}
-
-void RawPainter::startLayer(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startLayer (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endLayer()
-{
- printf("RawPainter::endLayer\n");
-}
-
-void RawPainter::startEmbeddedGraphics(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endEmbeddedGraphics()
-{
- printf("RawPainter::endEmbeddedGraphics \n");
-}
-
-void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient)
-{
- printf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
-}
-
-void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::drawEllipse(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::drawPolyline(const ::WPXPropertyListVector &vertices)
-{
- printf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
-}
-
-void RawPainter::drawPolygon(const ::WPXPropertyListVector &vertices)
-{
- printf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
-}
-
-void RawPainter::drawPath(const ::WPXPropertyListVector &path)
-{
- printf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
-}
-
-void RawPainter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData & /*binaryData*/)
-{
- printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path)
-{
- printf("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr());
-}
-
-void RawPainter::endTextObject()
-{
- printf("RawPainter::endTextObject\n");
-}
-
-void RawPainter::startTextLine(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startTextLine (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endTextLine()
-{
- printf("RawPainter::endTextLine\n");
-}
-
-void RawPainter::startTextSpan(const ::WPXPropertyList &propList)
-{
- printf("RawPainter::startTextSpan (%s)\n", getPropString(propList).cstr());
-}
-
-void RawPainter::endTextSpan()
-{
- printf("RawPainter::endTextSpan\n");
-}
-
-void RawPainter::insertText(const ::WPXString &str)
-{
- printf("RawPainter::insertText (%s)\n", str.cstr());
-}
-
namespace
{
@@ -249,7 +67,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libcdr::CMXDocument::isSupported(&input))
{
@@ -257,7 +75,7 @@ int main(int argc, char *argv[])
return 1;
}
- RawPainter painter;
+ librevenge::RVNGRawDrawingGenerator painter;
libcdr::CMXDocument::parse(&input, &painter);
return 0;
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 0644819..97196b0 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,27 +1,34 @@
+if BUILD_TOOLS
+
bin_PROGRAMS = cdr2xhtml cmx2xhtml
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = \
+ -I$(top_srcdir)/inc \
+ $(REVENGE_CFLAGS) \
+ $(REVENGE_GENERATORS_CFLAGS) \
+ $(REVENGE_STREAM_CFLAGS) \
+ $(DEBUG_CXXFLAGS)
cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
-if STATIC_TOOLS
-cdr2xhtml_LDADD = ../../lib/@CDR_OBJDIR@/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.a $(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
-cdr2xhtml_LDFLAGS = -all-static
-else
-cdr2xhtml_LDADD = ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la $(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
-endif
+cdr2xhtml_LDADD = \
+ ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+ $(REVENGE_GENERATORS_LIBS) \
+ $(REVENGE_LIBS) \
+ $(REVENGE_STREAM_LIBS) \
+ @CDR2XHTML_WIN32_RESOURCE@
cdr2xhtml_SOURCES = \
cdr2xhtml.cpp
cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
-if STATIC_TOOLS
-cmx2xhtml_LDADD = ../../lib/@CDR_OBJDIR@/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.a $(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
-cmx2xhtml_LDFLAGS = -all-static
-else
-cmx2xhtml_LDADD = ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la $(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
-endif
+cmx2xhtml_LDADD = \
+ ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+ $(REVENGE_LIBS) \
+ $(REVENGE_GENERATORS_LIBS) \
+ $(REVENGE_STREAM_LIBS) \
+ @CMX2XHTML_WIN32_RESOURCE@
cmx2xhtml_SOURCES = \
cmx2xhtml.cpp
@@ -47,3 +54,5 @@ EXTRA_DIST = \
BUILD_EXTRA_DIST = \
cdr2xhtml.rc \
cmx2xhtml.rc
+
+endif
diff --git a/src/conv/svg/cdr2xhtml.cpp b/src/conv/svg/cdr2xhtml.cpp
index 154c9f7..e8eeb7b 100644
--- a/src/conv/svg/cdr2xhtml.cpp
+++ b/src/conv/svg/cdr2xhtml.cpp
@@ -32,9 +32,10 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
+#include <librevenge/librevenge.h>
+#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <libcdr/libcdr.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
namespace
{
@@ -68,7 +69,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libcdr::CDRDocument::isSupported(&input))
{
@@ -76,13 +77,13 @@ int main(int argc, char *argv[])
return 1;
}
- libcdr::CDRStringVector output;
- if (!libcdr::CDRDocument::generateSVG(&input, output))
+ librevenge::RVNGStringVector output;
+ librevenge::RVNGSVGDrawingGenerator generator(output, "");
+ if (!libcdr::CDRDocument::parse(&input, &generator))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
return 1;
}
-
if (output.empty())
{
std::cerr << "ERROR: No SVG document generated!" << std::endl;
diff --git a/src/conv/svg/cmx2xhtml.cpp b/src/conv/svg/cmx2xhtml.cpp
index 568eb19..9638fd2 100644
--- a/src/conv/svg/cmx2xhtml.cpp
+++ b/src/conv/svg/cmx2xhtml.cpp
@@ -32,9 +32,10 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
+#include <librevenge/librevenge.h>
+#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <libcdr/libcdr.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
namespace
{
@@ -68,7 +69,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libcdr::CMXDocument::isSupported(&input))
{
@@ -76,13 +77,13 @@ int main(int argc, char *argv[])
return 1;
}
- libcdr::CDRStringVector output;
- if (!libcdr::CMXDocument::generateSVG(&input, output))
+ librevenge::RVNGStringVector output;
+ librevenge::RVNGSVGDrawingGenerator generator(output, "");
+ if (!libcdr::CMXDocument::parse(&input, &generator))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
return 1;
}
-
if (output.empty())
{
std::cerr << "ERROR: No SVG document generated!" << std::endl;
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index b20d158..7085f67 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,27 +1,34 @@
+if BUILD_TOOLS
+
bin_PROGRAMS = cdr2text cmx2text
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = \
+ -I$(top_srcdir)/inc \
+ $(REVENGE_CFLAGS) \
+ $(REVENGE_GENERATORS_CFLAGS) \
+ $(REVENGE_STREAM_CFLAGS) \
+ $(DEBUG_CXXFLAGS)
cdr2text_DEPENDENCIES = @CDR2TEXT_WIN32_RESOURCE@
-if STATIC_TOOLS
-cdr2text_LDADD = ../../lib/@CDR_OBJDIR@/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.a $(WPD_LIBS) @CDR2TEXT_WIN32_RESOURCE@
-cdr2text_LDFLAGS = -all-static
-else
-cdr2text_LDADD = ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la $(WPD_LIBS) @CDR2TEXT_WIN32_RESOURCE@
-endif
+cdr2text_LDADD = \
+ ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+ $(REVENGE_GENERATORS_LIBS) \
+ $(REVENGE_LIBS) \
+ $(REVENGE_STREAM_LIBS) \
+ @CDR2TEXT_WIN32_RESOURCE@
cdr2text_SOURCES = \
cdr2text.cpp
cmx2text_DEPENDENCIES = @CMX2TEXT_WIN32_RESOURCE@
-if STATIC_TOOLS
-cmx2text_LDADD = ../../lib/@CDR_OBJDIR@/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.a $(WPD_LIBS) @CMX2TEXT_WIN32_RESOURCE@
-cmx2text_LDFLAGS = -all-static
-else
-cmx2text_LDADD = ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la $(WPD_LIBS) @CMX2TEXT_WIN32_RESOURCE@
-endif
+cmx2text_LDADD = \
+ ../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+ $(REVENGE_LIBS) \
+ $(REVENGE_GENERATORS_LIBS) \
+ $(REVENGE_STREAM_LIBS) \
+ @CMX2TEXT_WIN32_RESOURCE@
cmx2text_SOURCES = \
cmx2text.cpp
@@ -47,3 +54,5 @@ EXTRA_DIST = \
BUILD_EXTRA_DIST = \
cdr2text.rc \
cmx2text.rc
+
+endif
diff --git a/src/conv/text/cdr2text.cpp b/src/conv/text/cdr2text.cpp
index 92a2b31..32dd298 100644
--- a/src/conv/text/cdr2text.cpp
+++ b/src/conv/text/cdr2text.cpp
@@ -31,52 +31,10 @@
#include <stdio.h>
#include <string.h>
+#include <librevenge/librevenge.h>
+#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <libcdr/libcdr.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
-
-class TextPainter : public libwpg::WPGPaintInterface
-{
-public:
- TextPainter();
-
- void startGraphics(const ::WPXPropertyList &) {}
- void endGraphics() {}
- void startLayer(const ::WPXPropertyList &) {}
- void endLayer() {}
- void startEmbeddedGraphics(const ::WPXPropertyList &) {}
- void endEmbeddedGraphics() {}
-
- void setStyle(const ::WPXPropertyList &, const ::WPXPropertyListVector &) {}
-
- void drawRectangle(const ::WPXPropertyList &) {}
- void drawEllipse(const ::WPXPropertyList &) {}
- void drawPolyline(const ::WPXPropertyListVector &) {}
- void drawPolygon(const ::WPXPropertyListVector &) {}
- void drawPath(const ::WPXPropertyListVector &) {}
- void drawGraphicObject(const ::WPXPropertyList &, const ::WPXBinaryData &) {}
- void startTextObject(const ::WPXPropertyList &, const ::WPXPropertyListVector &) {}
- void endTextObject() {}
- void startTextLine(const ::WPXPropertyList &) {}
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &) {}
- void endTextSpan() {}
- void insertText(const ::WPXString &str);
-};
-
-TextPainter::TextPainter(): libwpg::WPGPaintInterface()
-{
-}
-
-void TextPainter::insertText(const ::WPXString &str)
-{
- printf("%s", str.cstr());
-}
-
-void TextPainter::endTextLine()
-{
- printf("\n");
-}
namespace
{
@@ -110,7 +68,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libcdr::CDRDocument::isSupported(&input))
{
@@ -118,7 +76,7 @@ int main(int argc, char *argv[])
return 1;
}
- TextPainter painter;
+ librevenge::RVNGTextDrawingGenerator painter;
if (!libcdr::CDRDocument::parse(&input, &painter))
{
fprintf(stderr, "ERROR: Parsing of document failed!\n");
diff --git a/src/conv/text/cmx2text.cpp b/src/conv/text/cmx2text.cpp
index ebfd40c..899f59c 100644
--- a/src/conv/text/cmx2text.cpp
+++ b/src/conv/text/cmx2text.cpp
@@ -30,53 +30,10 @@
#include <stdio.h>
#include <string.h>
-
+#include <librevenge/librevenge.h>
+#include <librevenge-generators/librevenge-generators.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <libcdr/libcdr.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
-
-class TextPainter : public libwpg::WPGPaintInterface
-{
-public:
- TextPainter();
-
- void startGraphics(const ::WPXPropertyList &) {}
- void endGraphics() {}
- void startLayer(const ::WPXPropertyList &) {}
- void endLayer() {}
- void startEmbeddedGraphics(const ::WPXPropertyList &) {}
- void endEmbeddedGraphics() {}
-
- void setStyle(const ::WPXPropertyList &, const ::WPXPropertyListVector &) {}
-
- void drawRectangle(const ::WPXPropertyList &) {}
- void drawEllipse(const ::WPXPropertyList &) {}
- void drawPolyline(const ::WPXPropertyListVector &) {}
- void drawPolygon(const ::WPXPropertyListVector &) {}
- void drawPath(const ::WPXPropertyListVector &) {}
- void drawGraphicObject(const ::WPXPropertyList &, const ::WPXBinaryData &) {}
- void startTextObject(const ::WPXPropertyList &, const ::WPXPropertyListVector &) {}
- void endTextObject() {}
- void startTextLine(const ::WPXPropertyList &) {}
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &) {}
- void endTextSpan() {}
- void insertText(const ::WPXString &str);
-};
-
-TextPainter::TextPainter(): libwpg::WPGPaintInterface()
-{
-}
-
-void TextPainter::insertText(const ::WPXString &str)
-{
- printf("%s", str.cstr());
-}
-
-void TextPainter::endTextLine()
-{
- printf("\n");
-}
namespace
{
@@ -110,7 +67,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libcdr::CDRDocument::isSupported(&input))
{
@@ -118,7 +75,7 @@ int main(int argc, char *argv[])
return 1;
}
- TextPainter painter;
+ librevenge::RVNGTextDrawingGenerator painter;
if (!libcdr::CDRDocument::parse(&input, &painter))
{
fprintf(stderr, "ERROR: Parsing of document failed!\n");
diff --git a/src/lib/.gitignore b/src/lib/.gitignore
index c086f3e..7e58a36 100644
--- a/src/lib/.gitignore
+++ b/src/lib/.gitignore
@@ -6,4 +6,4 @@
*.rc
Makefile
Makefile.in
-libwpg.h
+librevenge.h
diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index bf386b4..266f1d6 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -89,7 +89,7 @@ void libcdr::CDRParserState::setColorTransform(const std::vector<unsigned char>
cmsCloseProfile(tmpRGBProfile);
}
-void libcdr::CDRParserState::setColorTransform(WPXInputStream *input)
+void libcdr::CDRParserState::setColorTransform(librevenge::RVNGInputStream *input)
{
if (!input)
return;
@@ -531,9 +531,9 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor &color)
return (unsigned)((red << 16) | (green << 8) | blue);
}
-WPXString libcdr::CDRParserState::getRGBColorString(const libcdr::CDRColor &color)
+librevenge::RVNGString libcdr::CDRParserState::getRGBColorString(const libcdr::CDRColor &color)
{
- WPXString tempString;
+ librevenge::RVNGString tempString;
tempString.sprintf("#%.6x", _getRGBColor(color));
return tempString;
}
diff --git a/src/lib/CDRCollector.h b/src/lib/CDRCollector.h
index c26307b..5ba73e7 100644
--- a/src/lib/CDRCollector.h
+++ b/src/lib/CDRCollector.h
@@ -33,8 +33,8 @@
#include <map>
#include <vector>
#include <stack>
-#include <libwpg/libwpg.h>
-#include <libwpd-stream/libwpd-stream.h>
+#include <librevenge/librevenge.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <lcms2.h>
#include "CDRTypes.h"
#include "CDRPath.h"
@@ -54,22 +54,22 @@ class CDRParserState
public:
CDRParserState();
~CDRParserState();
- std::map<unsigned, WPXBinaryData> m_bmps;
+ std::map<unsigned, librevenge::RVNGBinaryData> m_bmps;
std::map<unsigned, CDRPattern> m_patterns;
- std::map<unsigned, WPXBinaryData> m_vects;
+ std::map<unsigned, librevenge::RVNGBinaryData> m_vects;
std::vector<CDRPage> m_pages;
std::map<unsigned, CDRColor> m_documentPalette;
std::map<unsigned, std::vector<CDRTextLine> > m_texts;
unsigned _getRGBColor(const CDRColor &color);
unsigned getBMPColor(const CDRColor &color);
- WPXString getRGBColorString(const CDRColor &color);
+ librevenge::RVNGString getRGBColorString(const CDRColor &color);
cmsHTRANSFORM m_colorTransformCMYK2RGB;
cmsHTRANSFORM m_colorTransformLab2RGB;
cmsHTRANSFORM m_colorTransformRGB2RGB;
void setColorTransform(const std::vector<unsigned char> &profile);
- void setColorTransform(WPXInputStream *input);
+ void setColorTransform(librevenge::RVNGInputStream *input);
private:
CDRParserState(const CDRParserState &);
@@ -111,7 +111,7 @@ public:
virtual void collectColorProfile(const std::vector<unsigned char> &profile) = 0;
virtual void collectBBox(double x0, double y0, double x1, double y1) = 0;
virtual void collectSpnd(unsigned spnd) = 0;
- virtual void collectVectorPattern(unsigned id, const WPXBinaryData &data) = 0;
+ virtual void collectVectorPattern(unsigned id, const librevenge::RVNGBinaryData &data) = 0;
virtual void collectPaletteEntry(unsigned colorId, unsigned userId, const CDRColor &color) = 0;
virtual void collectText(unsigned textId, unsigned styleId, const std::vector<unsigned char> &data,
const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRCharacterStyle> &styleOverrides) = 0;
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index aa55e23..0df3ca3 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -29,8 +29,8 @@
#include <math.h>
#include <string.h>
+#include <librevenge-generators/librevenge-generators.h>
#include <libcdr/libcdr.h>
-#include "CDRSVGGenerator.h"
#include "CDRContentCollector.h"
#include "CDRInternalStream.h"
#include "libcdr_utils.h"
@@ -47,7 +47,7 @@
#define DUMP_VECT 0
#endif
-libcdr::CDRContentCollector::CDRContentCollector(libcdr::CDRParserState &ps, libwpg::WPGPaintInterface *painter) :
+libcdr::CDRContentCollector::CDRContentCollector(libcdr::CDRParserState &ps, librevenge::RVNGDrawingInterface *painter) :
m_painter(painter),
m_isPageProperties(false), m_isPageStarted(false), m_ignorePage(false),
m_page(ps.m_pages[0]), m_pageIndex(0), m_currentFillStyle(), m_currentLineStyle(), m_spnd(0),
@@ -70,12 +70,12 @@ void libcdr::CDRContentCollector::_startPage(double width, double height)
{
if (m_ignorePage)
return;
- WPXPropertyList propList;
+ librevenge::RVNGPropertyList propList;
propList.insert("svg:width", width);
propList.insert("svg:height", height);
if (m_painter)
{
- m_painter->startGraphics(propList);
+ m_painter->startPage(propList);
m_isPageStarted = true;
}
}
@@ -90,7 +90,7 @@ void libcdr::CDRContentCollector::_endPage()
m_contentOutputElements.pop();
}
if (m_painter)
- m_painter->endGraphics();
+ m_painter->endPage();
m_isPageStarted = false;
}
@@ -117,7 +117,7 @@ void libcdr::CDRContentCollector::collectGroup(unsigned level)
{
if (!m_isPageStarted && !m_currentVectLevel && !m_ignorePage)
_startPage(m_page.width, m_page.height);
- WPXPropertyList propList;
+ librevenge::RVNGPropertyList propList;
CDROutputElementList outputElement;
// Since the CDR objects are drawn in reverse order, reverse the logic of groups too
outputElement.addEndGroup();
@@ -185,8 +185,8 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
double previousY = 0.0;
double x = 0.0;
double y = 0.0;
- WPXPropertyList style;
- WPXPropertyListVector gradient;
+ librevenge::RVNGPropertyList style;
+ librevenge::RVNGPropertyListVector gradient;
_fillProperties(style, gradient);
_lineProperties(style);
outputElement.addStyle(style, gradient);
@@ -198,17 +198,17 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
tmpTrafo = CDRTransform(1.0, 0.0, 0.0, 0.0, -1.0, m_page.height);
m_currentPath.transform(tmpTrafo);
- std::vector<WPXPropertyList> tmpPath;
+ std::vector<librevenge::RVNGPropertyList> tmpPath;
- WPXPropertyListVector path;
+ librevenge::RVNGPropertyListVector path;
m_currentPath.writeOut(path);
bool isPathClosed = m_currentPath.isClosed();
- WPXPropertyListVector::Iter i(path);
+ librevenge::RVNGPropertyListVector::Iter i(path);
for (i.rewind(); i.next();)
{
- if (!i()["libwpg:path-action"])
+ if (!i()["librevenge:path-action"])
continue;
if (i()["svg:x"] && i()["svg:y"])
{
@@ -222,7 +222,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
firstPoint = false;
wasMove = true;
}
- else if (i()["libwpg:path-action"]->getStr() == "M")
+ else if (i()["librevenge:path-action"]->getStr() == "M")
{
// This is needed for a good generation of path from polygon
if (CDR_ALMOST_ZERO(previousX - x) && CDR_ALMOST_ZERO(previousY - y))
@@ -235,8 +235,8 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
{
if ((CDR_ALMOST_ZERO(initialX - previousX) && CDR_ALMOST_ZERO(initialY - previousY)) || isPathClosed)
{
- WPXPropertyList node;
- node.insert("libwpg:path-action", "Z");
+ librevenge::RVNGPropertyList node;
+ node.insert("librevenge:path-action", "Z");
tmpPath.push_back(node);
}
}
@@ -273,8 +273,8 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
{
if ((CDR_ALMOST_ZERO(initialX - previousX) && CDR_ALMOST_ZERO(initialY - previousY)) || isPathClosed)
{
- WPXPropertyList closedPath;
- closedPath.insert("libwpg:path-action", "Z");
+ librevenge::RVNGPropertyList closedPath;
+ closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
}
@@ -283,8 +283,8 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
}
if (!tmpPath.empty())
{
- WPXPropertyListVector outputPath;
- for (std::vector<WPXPropertyList>::const_iterator iter = tmpPath.begin(); iter != tmpPath.end(); ++iter)
+ librevenge::RVNGPropertyListVector outputPath;
+ for (std::vector<librevenge::RVNGPropertyList>::const_iterator iter = tmpPath.begin(); iter != tmpPath.end(); ++iter)
outputPath.append(*iter);
outputElement.addPath(outputPath);
@@ -330,7 +330,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
double height = sqrt((corner2x - corner1x)*(corner2x - corner1x) + (corner2y - corner1y)*(corner2y - corner1y));
double rotate = atan2(corner3y-corner2y, corner3x-corner2x);
- WPXPropertyList propList;
+ librevenge::RVNGPropertyList propList;
propList.insert("svg:x", cx - width / 2.0);
propList.insert("svg:width", width);
@@ -354,9 +354,9 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
rotate -= 2.0*M_PI;
if (rotate != 0.0)
- propList.insert("libwpg:rotate", rotate * 180 / M_PI, WPX_GENERIC);
+ propList.insert("librevenge:rotate", rotate * 180 / M_PI, librevenge::RVNG_GENERIC);
- propList.insert("libwpg:mime-type", "image/bmp");
+ propList.insert("librevenge:mime-type", "image/bmp");
outputElement.addGraphicObject(propList, m_currentImage.getImage());
}
@@ -408,7 +408,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
if (y1 > y2)
std::swap(y1, y2);
- WPXPropertyList textFrameProps;
+ librevenge::RVNGPropertyList textFrameProps;
textFrameProps.insert("svg:width", fabs(x2-x1));
textFrameProps.insert("svg:height", fabs(y2-y1));
textFrameProps.insert("svg:x", x1);
@@ -417,10 +417,10 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
textFrameProps.insert("fo:padding-bottom", 0.0);
textFrameProps.insert("fo:padding-left", 0.0);
textFrameProps.insert("fo:padding-right", 0.0);
- outputElement.addStartTextObject(textFrameProps, WPXPropertyListVector());
+ outputElement.addStartTextObject(textFrameProps, librevenge::RVNGPropertyListVector());
for (unsigned i = 0; i < m_currentText->size(); ++i)
{
- WPXPropertyList paraProps;
+ librevenge::RVNGPropertyList paraProps;
bool rtl = false;
switch ((*m_currentText)[i].m_line[0].m_charStyle.m_align)
{
@@ -452,21 +452,21 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
// paraProps.insert("fo:text-indent", (*m_currentText)[i].m_charStyle.m_firstIndent);
// paraProps.insert("fo:margin-left", (*m_currentText)[i].m_charStyle.m_leftIndent);
// paraProps.insert("fo:margin-right", (*m_currentText)[i].m_charStyle.m_rightIndent);
- outputElement.addStartTextLine(paraProps);
+ outputElement.addOpenParagraph(paraProps, librevenge::RVNGPropertyListVector());
for (unsigned j = 0; j < (*m_currentText)[i].m_line.size(); ++j)
{
- WPXPropertyList spanProps;
+ librevenge::RVNGPropertyList spanProps;
double fontSize = (double)cdr_round(144.0*(*m_currentText)[i].m_line[j].m_charStyle.m_fontSize) / 2.0;
- spanProps.insert("fo:font-size", fontSize, WPX_POINT);
+ spanProps.insert("fo:font-size", fontSize, librevenge::RVNG_POINT);
if ((*m_currentText)[i].m_line[j].m_charStyle.m_fontName.len())
spanProps.insert("style:font-name", (*m_currentText)[i].m_line[j].m_charStyle.m_fontName);
if ((*m_currentText)[i].m_line[j].m_charStyle.m_fillStyle.fillType != (unsigned short)-1)
spanProps.insert("fo:color", m_ps.getRGBColorString((*m_currentText)[i].m_line[j].m_charStyle.m_fillStyle.color1));
- outputElement.addStartTextSpan(spanProps);
+ outputElement.addOpenSpan(spanProps);
outputElement.addInsertText((*m_currentText)[i].m_line[j].m_text);
- outputElement.addEndTextSpan();
+ outputElement.addCloseSpan();
}
- outputElement.addEndTextLine();
+ outputElement.addCloseParagraph();
}
outputElement.addEndTextObject();
}
@@ -501,7 +501,7 @@ void libcdr::CDRContentCollector::collectLevel(unsigned level)
}
while (!m_groupLevels.empty() && level <= m_groupLevels.top())
{
- WPXPropertyList propList;
+ librevenge::RVNGPropertyList propList;
CDROutputElementList outputElement;
// since the CDR objects are drawn in reverse order, reverse group marks too
outputElement.addStartGroup(propList);
@@ -511,28 +511,28 @@ void libcdr::CDRContentCollector::collectLevel(unsigned level)
}
if (m_currentVectLevel && m_spnd && m_groupLevels.empty() && !m_fillOutputElements.empty())
{
- CDRStringVector svgOutput;
- CDRSVGGenerator generator(svgOutput);
- WPXPropertyList propList;
+ librevenge::RVNGStringVector svgOutput;
+ librevenge::RVNGSVGDrawingGenerator generator(svgOutput, "");
+ librevenge::RVNGPropertyList propList;
propList.insert("svg:width", m_page.width);
propList.insert("svg:height", m_page.height);
- generator.startGraphics(propList);
+ generator.startPage(propList);
while (!m_fillOutputElements.empty())
{
m_fillOutputElements.top().draw(&generator);
m_fillOutputElements.pop();
}
- generator.endGraphics();
+ generator.endPage();
if (!svgOutput.empty())
{
const char *header =
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n";
- WPXBinaryData output((const unsigned char *)header, strlen(header));
+ librevenge::RVNGBinaryData output((const unsigned char *)header, strlen(header));
output.append((unsigned char *)svgOutput[0].cstr(), strlen(svgOutput[0].cstr()));
m_ps.m_vects[m_spnd] = output;
}
#if DUMP_VECT
- WPXString filename;
+ librevenge::RVNGString filename;
filename.sprintf("vect%.8x.svg", m_spnd);
FILE *f = fopen(filename.cstr(), "wb");
if (f)
@@ -601,10 +601,10 @@ void libcdr::CDRContentCollector::collectPolygonTransform(unsigned numAngles, un
m_polygon = new CDRPolygon(numAngles, nextPoint, rx, ry, cx, cy);
}
-void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPXPropertyListVector &vec)
+void libcdr::CDRContentCollector::_fillProperties(librevenge::RVNGPropertyList &propList, librevenge::RVNGPropertyListVector &vec)
{
if (m_fillOpacity < 1.0)
- propList.insert("draw:opacity", m_fillOpacity, WPX_PERCENT);
+ propList.insert("draw:opacity", m_fillOpacity, librevenge::RVNG_PERCENT);
if (m_currentFillStyle.fillType == 0)
propList.insert("draw:fill", "none");
else
@@ -651,19 +651,19 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
while (angle > 360.0)
angle -= 360.0;
propList.insert("draw:angle", (int)angle);
- propList.insert("draw:border", (double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0, WPX_PERCENT);
+ propList.insert("draw:border", (double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0, librevenge::RVNG_PERCENT);
break;
case 2: // radial
- propList.insert("draw:border", (2.0 * (double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0), WPX_PERCENT);
+ propList.insert("draw:border", (2.0 * (double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0), librevenge::RVNG_PERCENT);
propList.insert("draw:style", "radial");
- propList.insert("svg:cx", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), WPX_PERCENT);
- propList.insert("svg:cy", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), WPX_PERCENT);
+ propList.insert("svg:cx", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), librevenge::RVNG_PERCENT);
+ propList.insert("svg:cy", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), librevenge::RVNG_PERCENT);
break;
case 4: // square
- propList.insert("draw:border", (2.0 * (double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0), WPX_PERCENT);
+ propList.insert("draw:border", (2.0 * (double)(m_currentFillStyle.gradient.m_edgeOffset)/100.0), librevenge::RVNG_PERCENT);
propList.insert("draw:style", "square");
- propList.insert("svg:cx", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), WPX_PERCENT);
- propList.insert("svg:cy", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), WPX_PERCENT);
+ propList.insert("svg:cx", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), librevenge::RVNG_PERCENT);
+ propList.insert("svg:cy", (double)(0.5 + m_currentFillStyle.gradient.m_centerXOffset/200.0), librevenge::RVNG_PERCENT);
break;
default:
propList.insert("draw:style", "linear");
@@ -676,10 +676,10 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
for (unsigned i = 0; i < m_currentFillStyle.gradient.m_stops.size(); i++)
{
libcdr::CDRGradientStop &gradStop = m_currentFillStyle.gradient.m_stops[i];
- WPXPropertyList stopElement;
- stopElement.insert("svg:offset", gradStop.m_offset, WPX_PERCENT);
+ librevenge::RVNGPropertyList stopElement;
+ stopElement.insert("svg:offset", gradStop.m_offset, librevenge::RVNG_PERCENT);
stopElement.insert("svg:stop-color", m_ps.getRGBColorString(gradStop.m_color));
- stopElement.insert("svg:stop-opacity", m_fillOpacity, WPX_PERCENT);
+ stopElement.insert("svg:stop-opacity", m_fillOpacity, librevenge::RVNG_PERCENT);
vec.append(stopElement);
}
break;
@@ -699,10 +699,10 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
for (unsigned i = 0; i < m_currentFillStyle.gradient.m_stops.size(); i++)
{
libcdr::CDRGradientStop &gradStop = m_currentFillStyle.gradient.m_stops[i];
- WPXPropertyList stopElement;
- stopElement.insert("svg:offset", gradStop.m_offset, WPX_PERCENT);
+ librevenge::RVNGPropertyList stopElement;
+ stopElement.insert("svg:offset", gradStop.m_offset, librevenge::RVNG_PERCENT);
stopElement.insert("svg:stop-color", m_ps.getRGBColorString(gradStop.m_color));
- stopElement.insert("svg:stop-opacity", m_fillOpacity, WPX_PERCENT);
+ stopElement.insert("svg:stop-opacity", m_fillOpacity, librevenge::RVNG_PERCENT);
vec.append(stopElement);
}
}
@@ -713,10 +713,10 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
if (iterPattern != m_ps.m_patterns.end())
{
propList.insert("draw:fill", "bitmap");
- WPXBinaryData image;
+ librevenge::RVNGBinaryData image;
_generateBitmapFromPattern(image, iterPattern->second, m_currentFillStyle.color1, m_currentFillStyle.color2);
#if DUMP_PATTERN
- WPXString filename;
+ librevenge::RVNGString filename;
filename.sprintf("pattern%.8x.bmp", m_currentFillStyle.imageFill.id);
FILE *f = fopen(filename.cstr(), "wb");
if (f)
@@ -728,12 +728,12 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
}
#endif
propList.insert("draw:fill-image", image.getBase64Data());
- propList.insert("libwpg:mime-type", "image/bmp");
+ propList.insert("librevenge:mime-type", "image/bmp");
propList.insert("style:repeat", "repeat");
if (m_currentFillStyle.imageFill.isRelative)
{
- propList.insert("svg:width", m_currentFillStyle.imageFill.width, WPX_PERCENT);
- propList.insert("svg:height", m_currentFillStyle.imageFill.height, WPX_PERCENT);
+ propList.insert("svg:width", m_currentFillStyle.imageFill.width, librevenge::RVNG_PERCENT);
+ propList.insert("svg:height", m_currentFillStyle.imageFill.height, librevenge::RVNG_PERCENT);
}
else
{
@@ -751,9 +751,9 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
if (m_currentFillStyle.imageFill.isRelative)
{
if (m_currentFillStyle.imageFill.xOffset != 0.0 && m_currentFillStyle.imageFill.xOffset != 1.0)
- propList.insert("draw:fill-image-ref-point-x", m_currentFillStyle.imageFill.xOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-x", m_currentFillStyle.imageFill.xOffset, librevenge::RVNG_PERCENT);
if (m_currentFillStyle.imageFill.yOffset != 0.0 && m_currentFillStyle.imageFill.yOffset != 1.0)
- propList.insert("draw:fill-image-ref-point-y", m_currentFillStyle.imageFill.yOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-y", m_currentFillStyle.imageFill.yOffset, librevenge::RVNG_PERCENT);
}
else
{
@@ -764,7 +764,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
xOffset += 1.0;
while (xOffset > 1.0)
xOffset -= 1.0;
- propList.insert("draw:fill-image-ref-point-x", xOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-x", xOffset, librevenge::RVNG_PERCENT);
}
if (m_fillTransforms.getTranslateY() != 0.0)
{
@@ -773,7 +773,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
yOffset += 1.0;
while (yOffset > 1.0)
yOffset -= 1.0;
- propList.insert("draw:fill-image-ref-point-y", 1.0 - yOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-y", 1.0 - yOffset, librevenge::RVNG_PERCENT);
}
}
}
@@ -789,17 +789,17 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
case 9: // Bitmap
case 11: // Texture
{
- std::map<unsigned, WPXBinaryData>::iterator iterBmp = m_ps.m_bmps.find(m_currentFillStyle.imageFill.id);
+ std::map<unsigned, librevenge::RVNGBinaryData>::iterator iterBmp = m_ps.m_bmps.find(m_currentFillStyle.imageFill.id);
if (iterBmp != m_ps.m_bmps.end())
{
- propList.insert("libwpg:mime-type", "image/bmp");
+ propList.insert("librevenge:mime-type", "image/bmp");
propList.insert("draw:fill", "bitmap");
propList.insert("draw:fill-image", iterBmp->second.getBase64Data());
propList.insert("style:repeat", "repeat");
if (m_currentFillStyle.imageFill.isRelative)
{
- propList.insert("svg:width", m_currentFillStyle.imageFill.width, WPX_PERCENT);
- propList.insert("svg:height", m_currentFillStyle.imageFill.height, WPX_PERCENT);
+ propList.insert("svg:width", m_currentFillStyle.imageFill.width, librevenge::RVNG_PERCENT);
+ propList.insert("svg:height", m_currentFillStyle.imageFill.height, librevenge::RVNG_PERCENT);
}
else
{
@@ -817,9 +817,9 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
if (m_currentFillStyle.imageFill.isRelative)
{
if (m_currentFillStyle.imageFill.xOffset != 0.0 && m_currentFillStyle.imageFill.xOffset != 1.0)
- propList.insert("draw:fill-image-ref-point-x", m_currentFillStyle.imageFill.xOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-x", m_currentFillStyle.imageFill.xOffset, librevenge::RVNG_PERCENT);
if (m_currentFillStyle.imageFill.yOffset != 0.0 && m_currentFillStyle.imageFill.yOffset != 1.0)
- propList.insert("draw:fill-image-ref-point-y", m_currentFillStyle.imageFill.yOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-y", m_currentFillStyle.imageFill.yOffset, librevenge::RVNG_PERCENT);
}
else
{
@@ -830,7 +830,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
xOffset += 1.0;
while (xOffset > 1.0)
xOffset -= 1.0;
- propList.insert("draw:fill-image-ref-point-x", xOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-x", xOffset, librevenge::RVNG_PERCENT);
}
if (m_fillTransforms.getTranslateY() != 0.0)
{
@@ -839,7 +839,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
yOffset += 1.0;
while (yOffset > 1.0)
yOffset -= 1.0;
- propList.insert("draw:fill-image-ref-point-y", 1.0 - yOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-y", 1.0 - yOffset, librevenge::RVNG_PERCENT);
}
}
}
@@ -849,17 +849,17 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
break;
case 10: // Full color
{
- std::map<unsigned, WPXBinaryData>::iterator iterVect = m_ps.m_vects.find(m_currentFillStyle.imageFill.id);
+ std::map<unsigned, librevenge::RVNGBinaryData>::iterator iterVect = m_ps.m_vects.find(m_currentFillStyle.imageFill.id);
if (iterVect != m_ps.m_vects.end())
{
propList.insert("draw:fill", "bitmap");
- propList.insert("libwpg:mime-type", "image/svg+xml");
+ propList.insert("librevenge:mime-type", "image/svg+xml");
propList.insert("draw:fill-image", iterVect->second.getBase64Data());
propList.insert("style:repeat", "repeat");
if (m_currentFillStyle.imageFill.isRelative)
{
- propList.insert("svg:width", m_currentFillStyle.imageFill.width, WPX_PERCENT);
- propList.insert("svg:height", m_currentFillStyle.imageFill.height, WPX_PERCENT);
+ propList.insert("svg:width", m_currentFillStyle.imageFill.width, librevenge::RVNG_PERCENT);
+ propList.insert("svg:height", m_currentFillStyle.imageFill.height, librevenge::RVNG_PERCENT);
}
else
{
@@ -877,9 +877,9 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
if (m_currentFillStyle.imageFill.isRelative)
{
if (m_currentFillStyle.imageFill.xOffset != 0.0 && m_currentFillStyle.imageFill.xOffset != 1.0)
- propList.insert("draw:fill-image-ref-point-x", m_currentFillStyle.imageFill.xOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-x", m_currentFillStyle.imageFill.xOffset, librevenge::RVNG_PERCENT);
if (m_currentFillStyle.imageFill.yOffset != 0.0 && m_currentFillStyle.imageFill.yOffset != 1.0)
- propList.insert("draw:fill-image-ref-point-y", m_currentFillStyle.imageFill.yOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-y", m_currentFillStyle.imageFill.yOffset, librevenge::RVNG_PERCENT);
}
else
{
@@ -890,7 +890,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
xOffset += 1.0;
while (xOffset > 1.0)
xOffset -= 1.0;
- propList.insert("draw:fill-image-ref-point-x", xOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-x", xOffset, librevenge::RVNG_PERCENT);
}
if (m_fillTransforms.getTranslateY() != 0.0)
{
@@ -899,7 +899,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
yOffset += 1.0;
while (yOffset > 1.0)
yOffset -= 1.0;
- propList.insert("draw:fill-image-ref-point-y", 1.0 - yOffset, WPX_PERCENT);
+ propList.insert("draw:fill-image-ref-point-y", 1.0 - yOffset, librevenge::RVNG_PERCENT);
}
}
}
@@ -915,7 +915,7 @@ void libcdr::CDRContentCollector::_fillProperties(WPXPropertyList &propList, WPX
}
}
-void libcdr::CDRContentCollector::_lineProperties(WPXPropertyList &propList)
+void libcdr::CDRContentCollector::_lineProperties(librevenge::RVNGPropertyList &propList)
{
if (m_currentLineStyle.lineType == (unsigned short)-1)
{
@@ -1014,10 +1014,10 @@ void libcdr::CDRContentCollector::_lineProperties(WPXPropertyList &propList)
dots2len = dots1len;
}
propList.insert("draw:dots1", dots1);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list