[Libreoffice-commits] libvisio.git: 2 commits - build/win32 configure.ac createBuildNumber.pl inc/libvisio libvisio.pc.in libvisio.spec.in src/conv src/lib
Fridrich Å trba
fridrich.strba at bluewin.ch
Mon Nov 4 15:38:23 CET 2013
build/win32/libvisio.dsp | 14 -
build/win32/libvisio.vcproj | 4
build/win32/libvisio.vcxproj | 4
build/win32/vsd2raw.dsp | 16 -
build/win32/vsd2raw.vcproj | 4
build/win32/vsd2raw.vcxproj | 4
build/win32/vsd2xhtml.dsp | 16 -
build/win32/vsd2xhtml.vcproj | 4
build/win32/vsd2xhtml.vcxproj | 4
configure.ac | 34 ---
createBuildNumber.pl | 2
inc/libvisio/Makefile.am | 1
inc/libvisio/VSDStringVector.h | 61 -----
inc/libvisio/VisioDocument.h | 16 -
inc/libvisio/libvisio.h | 2
libvisio.pc.in | 2
libvisio.spec.in | 4
src/conv/raw/Makefile.am | 12 -
src/conv/raw/vsd2raw.cpp | 123 ++++++-----
src/conv/raw/vss2raw.cpp | 123 ++++++-----
src/conv/svg/Makefile.am | 12 -
src/conv/svg/vsd2xhtml.cpp | 8
src/conv/svg/vss2xhtml.cpp | 8
src/conv/text/Makefile.am | 12 -
src/conv/text/vsd2text.cpp | 69 ++++--
src/conv/text/vss2text.cpp | 69 ++++--
src/lib/Makefile.am | 9
src/lib/VDXParser.cpp | 13 -
src/lib/VDXParser.h | 11 -
src/lib/VSD5Parser.cpp | 104 ++++-----
src/lib/VSD5Parser.h | 51 ++--
src/lib/VSD6Parser.cpp | 72 +++---
src/lib/VSD6Parser.h | 21 -
src/lib/VSDCollector.h | 8
src/lib/VSDContentCollector.cpp | 314 ++++++++++++++---------------
src/lib/VSDContentCollector.h | 43 +---
src/lib/VSDFieldList.cpp | 18 -
src/lib/VSDFieldList.h | 10
src/lib/VSDInternalStream.cpp | 16 -
src/lib/VSDInternalStream.h | 27 +-
src/lib/VSDOutputElementList.cpp | 177 ++++++++--------
src/lib/VSDOutputElementList.h | 25 +-
src/lib/VSDPages.cpp | 18 -
src/lib/VSDPages.h | 8
src/lib/VSDParser.cpp | 418 +++++++++++++++++++--------------------
src/lib/VSDParser.h | 144 ++++++-------
src/lib/VSDSVGGenerator.cpp | 70 +++---
src/lib/VSDSVGGenerator.h | 60 +++--
src/lib/VSDStencils.h | 2
src/lib/VSDStringVector.cpp | 96 --------
src/lib/VSDStyles.h | 1
src/lib/VSDStylesCollector.cpp | 8
src/lib/VSDStylesCollector.h | 8
src/lib/VSDTypes.h | 12 -
src/lib/VSDXMLHelper.cpp | 10
src/lib/VSDXMLHelper.h | 8
src/lib/VSDXMLParserBase.cpp | 11 -
src/lib/VSDXMLParserBase.h | 2
src/lib/VSDXParser.cpp | 111 ++++------
src/lib/VSDXParser.h | 25 +-
src/lib/VSDXTheme.cpp | 2
src/lib/VSDXTheme.h | 4
src/lib/VSDZipStream.cpp | 399 -------------------------------------
src/lib/VSDZipStream.h | 64 -----
src/lib/VisioDocument.cpp | 79 +++----
src/lib/libvisio_utils.cpp | 28 +-
src/lib/libvisio_utils.h | 22 +-
src/lib/makefile.mk | 73 ------
68 files changed, 1279 insertions(+), 1951 deletions(-)
New commits:
commit 38e5d2998d4285df3cefdbcb60e149dc2a21fa92
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Nov 4 15:30:23 2013 +0100
Right pc-file content
Change-Id: Ib7a273842b58d512e0f2b1c3128c96bc95617ab4
diff --git a/configure.ac b/configure.ac
index 24bde9d..3cd9418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,21 +269,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
# =============
@@ -340,7 +325,6 @@ AC_MSG_NOTICE([
Build configuration:
debug: ${enable_debug}
docs: ${build_docs}
- static-tools: ${enable_static_tools}
werror: ${enable_werror}
==============================================================================
])
diff --git a/libvisio.pc.in b/libvisio.pc.in
index 6635130..f7b7302 100644
--- a/libvisio.pc.in
+++ b/libvisio.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
Description: Library for parsing the visio file format structure
Version: @VERSION@
-Requires: librevenge-0.9 librevenge-stream-0.9 libwpg-0.2
+Requires: librevenge-0.0
Libs: -L${libdir} -lvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
Cflags: -I${includedir}/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 52a7859..742d4fb 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -6,22 +6,10 @@ vsd2raw_DEPENDENCIES = @VSD2RAW_WIN32_RESOURCE@
vss2raw_DEPENDENCIES = @VSS2RAW_WIN32_RESOURCE@
-if STATIC_TOOLS
-
-vsd2raw_LDADD = ../../lib/@VSD_OBJDIR@/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.a $(LIBVISIO_LIBS) @VSD2RAW_WIN32_RESOURCE@
-vsd2raw_LDFLAGS = -all-static
-
-vss2raw_LDADD = ../../lib/@VSD_OBJDIR@/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.a $(LIBVISIO_LIBS) @VSS2RAW_WIN32_RESOURCE@
-vss2raw_LDFLAGS = -all-static
-
-else
-
vsd2raw_LDADD = ../../lib/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.la $(LIBVISIO_LIBS) @VSD2RAW_WIN32_RESOURCE@
vss2raw_LDADD = ../../lib/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.la $(LIBVISIO_LIBS) @VSS2RAW_WIN32_RESOURCE@
-endif
-
vsd2raw_SOURCES = \
vsd2raw.cpp
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index bb0d208..b958b0c 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -6,22 +6,10 @@ vsd2xhtml_DEPENDENCIES = @VSD2XHTML_WIN32_RESOURCE@
vss2xhtml_DEPENDENCIES = @VSS2XHTML_WIN32_RESOURCE@
-if STATIC_TOOLS
-
-vsd2xhtml_LDADD = ../../lib/@VSD_OBJDIR@/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.a $(LIBVISIO_LIBS) @VSD2XHTML_WIN32_RESOURCE@
-vsd2xhtml_LDFLAGS = -all-static
-
-vss2xhtml_LDADD = ../../lib/@VSD_OBJDIR@/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.a $(LIBVISIO_LIBS) @VSS2XHTML_WIN32_RESOURCE@
-vss2xhtml_LDFLAGS = -all-static
-
-else
-
vsd2xhtml_LDADD = ../../lib/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.la $(LIBVISIO_LIBS) @VSD2XHTML_WIN32_RESOURCE@
vss2xhtml_LDADD = ../../lib/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.la $(LIBVISIO_LIBS) @VSS2XHTML_WIN32_RESOURCE@
-endif
-
vsd2xhtml_SOURCES = \
vsd2xhtml.cpp
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 991d514..89602f8 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -6,22 +6,10 @@ vsd2text_DEPENDENCIES = @VSD2TEXT_WIN32_RESOURCE@
vss2text_DEPENDENCIES = @VSS2TEXT_WIN32_RESOURCE@
-if STATIC_TOOLS
-
-vsd2text_LDADD = ../../lib/@VSD_OBJDIR@/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.a $(LIBVISIO_LIBS) @VSD2TEXT_WIN32_RESOURCE@
-vsd2text_LDFLAGS = -all-static
-
-vss2text_LDADD = ../../lib/@VSD_OBJDIR@/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.a $(LIBVISIO_LIBS) @VSS2TEXT_WIN32_RESOURCE@
-vss2text_LDFLAGS = -all-static
-
-else
-
vsd2text_LDADD = ../../lib/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.la $(LIBVISIO_LIBS) @VSD2TEXT_WIN32_RESOURCE@
vss2text_LDADD = ../../lib/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@.la $(LIBVISIO_LIBS) @VSS2TEXT_WIN32_RESOURCE@
-endif
-
vsd2text_SOURCES = \
vsd2text.cpp
commit ee6263e6d4c07359f579ef5530c5356bfd9724a5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Nov 4 15:25:17 2013 +0100
trying to move libvisio to librevenge API
Change-Id: I6a17a8e0e435b4de87e0017bddb5d16f6b1a543d
diff --git a/build/win32/libvisio.dsp b/build/win32/libvisio.dsp
index a111ca8..23439c3 100644
--- a/build/win32/libvisio.dsp
+++ b/build/win32/libvisio.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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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" /I "libwpg-0.2" /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"
@@ -151,7 +151,7 @@ SOURCE=..\..\src\lib\VSDStencils.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\VSDStringVector.cpp
+SOURCE=..\..\src\lib\RVNGStringVector.cpp
# End Source File
# Begin Source File
@@ -203,7 +203,7 @@ SOURCE=..\..\inc\libvisio\VisioDocument.h
# End Source File
# Begin Source File
-SOURCE=..\..\inc\libvisio\VSDStringVector.h
+SOURCE=..\..\inc\libvisio\RVNGStringVector.h
# End Source File
# Begin Source File
@@ -283,7 +283,7 @@ SOURCE=..\..\src\lib\VSDStencils.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\VSDStringVector.h
+SOURCE=..\..\src\lib\RVNGStringVector.h
# End Source File
# Begin Source File
diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj
index dd703f3..e4f27ee 100644
--- a/build/win32/libvisio.vcproj
+++ b/build/win32/libvisio.vcproj
@@ -525,7 +525,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\lib\VSDStringVector.cpp"
+ RelativePath="..\..\src\lib\RVNGStringVector.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -758,7 +758,7 @@
>
</File>
<File
- RelativePath="..\..\inc\libvisio\VSDStringVector.h"
+ RelativePath="..\..\inc\libvisio\RVNGStringVector.h"
>
</File>
<File
diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index d7b09a8..8e7bf78 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -198,7 +198,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\lib\VSDStringVector.cpp">
+ <ClCompile Include="..\..\src\lib\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>
@@ -262,7 +262,7 @@
<ItemGroup>
<ClInclude Include="..\..\inc\libvisio\libvisio.h" />
<ClInclude Include="..\..\inc\libvisio\VisioDocument.h" />
- <ClInclude Include="..\..\inc\libvisio\VSDStringVector.h" />
+ <ClInclude Include="..\..\inc\libvisio\RVNGStringVector.h" />
<ClInclude Include="..\..\src\lib\libvisio_utils.h" />
<ClInclude Include="..\..\src\lib\tokenhash.h" />
<ClInclude Include="..\..\src\lib\tokens.h" />
diff --git a/build/win32/vsd2raw.dsp b/build/win32/vsd2raw.dsp
index a3a952a..d4a9cb3 100644
--- a/build/win32/vsd2raw.dsp
+++ b/build/win32/vsd2raw.dsp
@@ -44,16 +44,16 @@ RSC=rc.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /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 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2raw.exe" /libpath:"Release\lib"
-# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2raw.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2raw.exe" /libpath:"Release\lib"
+# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2raw.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "vsd2raw - Win32 Debug"
@@ -72,16 +72,16 @@ LINK32=link.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /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 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2raw.exe" /libpath:"Debug\lib"
-# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2raw.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2raw.exe" /libpath:"Debug\lib"
+# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2raw.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/vsd2raw.vcproj b/build/win32/vsd2raw.vcproj
index bdfbb7a..a95bb78 100644
--- a/build/win32/vsd2raw.vcproj
+++ b/build/win32/vsd2raw.vcproj
@@ -71,7 +71,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
+ AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
OutputFile="Debug\bin\vsd2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
+ AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
OutputFile="Release\bin\vsd2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/build/win32/vsd2raw.vcxproj b/build/win32/vsd2raw.vcxproj
index 25a454c..4669ef0 100644
--- a/build/win32/vsd2raw.vcxproj
+++ b/build/win32/vsd2raw.vcxproj
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\vsd2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\vsd2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/win32/vsd2xhtml.dsp b/build/win32/vsd2xhtml.dsp
index 0a6ff43..7d70029 100644
--- a/build/win32/vsd2xhtml.dsp
+++ b/build/win32/vsd2xhtml.dsp
@@ -44,16 +44,16 @@ RSC=rc.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
-# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c
+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c
+# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /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 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2xhtml.exe" /libpath:"Release\lib"
-# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2xhtml.exe" /libpath:"Release\lib"
+# ADD BASE LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2xhtml.exe" /libpath:"Release\lib"
+# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\vsd2xhtml.exe" /libpath:"Release\lib"
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF "$(CFG)" == "vsd2xhtml - Win32 Debug"
@@ -72,16 +72,16 @@ LINK32=link.exe
MTL=midl.exe
# ADD BASE MTL /nologo /win32
# ADD MTL /nologo /win32
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /I "libwpg-0.2" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "librevenge-0.9" /I "libwpg-0.2" /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 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2xhtml.exe" /libpath:"Debug\lib"
-# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib libwpd-0.9.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2xhtml.exe" /libpath:"Debug\lib"
+# ADD BASE LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2xhtml.exe" /libpath:"Debug\lib"
+# ADD LINK32 libvisio-0.0.lib libwpg-0.2.lib librevenge-0.9.lib librevenge-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\vsd2xhtml.exe" /libpath:"Debug\lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/build/win32/vsd2xhtml.vcproj b/build/win32/vsd2xhtml.vcproj
index 6d235fb..7dcf769 100644
--- a/build/win32/vsd2xhtml.vcproj
+++ b/build/win32/vsd2xhtml.vcproj
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
+ AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
OutputFile="Release\bin\vsd2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
+ AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
OutputFile="Debug\bin\vsd2xhtml.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
diff --git a/build/win32/vsd2xhtml.vcxproj b/build/win32/vsd2xhtml.vcxproj
index c6f32cc..1521c6c 100644
--- a/build/win32/vsd2xhtml.vcxproj
+++ b/build/win32/vsd2xhtml.vcxproj
@@ -68,7 +68,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\vsd2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\vsd2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/configure.ac b/configure.ac
index 6141e2f..24bde9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ AC_PREREQ([2.65])
# Version informations
# ====================
m4_define([libvisio_version_major],[0])
-m4_define([libvisio_version_minor],[0])
-m4_define([libvisio_version_micro],[31])
+m4_define([libvisio_version_minor],[1])
+m4_define([libvisio_version_micro],[0])
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
# =============
@@ -57,13 +57,9 @@ AC_SUBST(GPERF)
# ====================
# Find additional apps
# ====================
-PKG_CHECK_MODULES([WPD],[
- libwpd-0.9 >= 0.9.5
- libwpd-stream-0.9 >= 0.9.5
-])
-
-PKG_CHECK_MODULES([WPG],[
- libwpg-0.2
+PKG_CHECK_MODULES([REVENGE],[
+ librevenge-0.0
+ librevenge-stream-0.0
])
PKG_CHECK_MODULES([LIBXML],[
@@ -251,8 +247,8 @@ AS_IF([test "x$native_win32" = "xyes"], [
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow -pedantic"
])
])
-LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS} ${ICU_CFLAGS}"
-LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS} ${ICU_LIBS}"
+LIBVISIO_CXXFLAGS="${REVENGE_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS} ${ICU_CFLAGS}"
+LIBVISIO_LIBS="${REVENGE_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS} ${ICU_LIBS}"
AC_SUBST(LIBVISIO_CXXFLAGS)
AC_SUBST(LIBVISIO_LIBS)
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/libvisio/Makefile.am b/inc/libvisio/Makefile.am
index e4c3d6a..16c458f 100644
--- a/inc/libvisio/Makefile.am
+++ b/inc/libvisio/Makefile.am
@@ -1,4 +1,3 @@
EXTRA_DIST = \
libvisio.h \
- VSDStringVector.h \
VisioDocument.h
diff --git a/inc/libvisio/VSDStringVector.h b/inc/libvisio/VSDStringVector.h
deleted file mode 100644
index 50c929f..0000000
--- a/inc/libvisio/VSDStringVector.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libvisio
- * 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 __VSDSTRINGVECTOR_H__
-#define __VSDSTRINGVECTOR_H__
-
-#include <libwpd/libwpd.h>
-
-namespace libvisio
-{
-class VSDStringVectorImpl;
-
-class VSDStringVector
-{
-public:
- VSDStringVector();
- VSDStringVector(const VSDStringVector &vec);
- ~VSDStringVector();
-
- VSDStringVector &operator=(const VSDStringVector &vec);
-
- unsigned size() const;
- bool empty() const;
- const WPXString &operator[](unsigned idx) const;
- void append(const WPXString &str);
- void clear();
-
-private:
- VSDStringVectorImpl *m_pImpl;
-};
-
-} // namespace libvisio
-
-#endif /* __VSDSTRINGVECTOR_H__ */
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libvisio/VisioDocument.h b/inc/libvisio/VisioDocument.h
index 75ed5ab..498ab2c 100644
--- a/inc/libvisio/VisioDocument.h
+++ b/inc/libvisio/VisioDocument.h
@@ -31,11 +31,7 @@
#ifndef __VISIODOCUMENT_H__
#define __VISIODOCUMENT_H__
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "VSDStringVector.h"
-
-class WPXInputStream;
+#include <librevenge/librevenge.h>
namespace libvisio
{
@@ -44,15 +40,15 @@ class VisioDocument
{
public:
- static bool isSupported(WPXInputStream *input);
+ static bool isSupported(RVNGInputStream *input);
- static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ static bool parse(RVNGInputStream *input, RVNGDrawingInterface *painter);
- static bool parseStencils(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ static bool parseStencils(RVNGInputStream *input, RVNGDrawingInterface *painter);
- static bool generateSVG(WPXInputStream *input, VSDStringVector &output);
+ static bool generateSVG(RVNGInputStream *input, RVNGStringVector &output);
- static bool generateSVGStencils(WPXInputStream *input, VSDStringVector &output);
+ static bool generateSVGStencils(RVNGInputStream *input, RVNGStringVector &output);
};
} // namespace libvisio
diff --git a/inc/libvisio/libvisio.h b/inc/libvisio/libvisio.h
index ff454a9..96286ad 100644
--- a/inc/libvisio/libvisio.h
+++ b/inc/libvisio/libvisio.h
@@ -31,8 +31,6 @@
#ifndef __LIBVISIO_H__
#define __LIBVISIO_H__
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
#include "VisioDocument.h"
#endif
diff --git a/libvisio.pc.in b/libvisio.pc.in
index 8bd5cc6..6635130 100644
--- a/libvisio.pc.in
+++ b/libvisio.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
Description: Library for parsing the visio file format structure
Version: @VERSION@
-Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
+Requires: librevenge-0.9 librevenge-stream-0.9 libwpg-0.2
Libs: -L${libdir} -lvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
Cflags: -I${includedir}/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
diff --git a/libvisio.spec.in b/libvisio.spec.in
index e3d34c6..875e948 100644
--- a/libvisio.spec.in
+++ b/libvisio.spec.in
@@ -11,7 +11,7 @@ Source: %{name}-%{version}.tar.gz
Group: System Environment/Libraries
URL: http://libvisio.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 xhtml (with embedded svg pages)
%package devel
Requires: %{name} >= %{version}
-Requires: libwpd-devel >= 0.9.0
+Requires: librevenge-devel >= 0.9.0
Summary: Files for developing with libvisio.
Group: Development/Libraries
diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index f65ace5..e953541 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -33,8 +33,8 @@
#include <string.h>
#include <stack>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
enum PainterCallback
@@ -72,35 +72,56 @@ enum PainterCallback
m_callStack.pop(); \
}
-class RawPainter : public libwpg::WPGPaintInterface
+class RawPainter : public RVNGDrawingInterface
{
public:
RawPainter(bool printCallgraphScore);
~RawPainter();
- void startGraphics(const ::WPXPropertyList &propList);
- void endGraphics();
- void startLayer(const ::WPXPropertyList &propList);
+ void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void endDocument() {}
+ void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
+ void startPage(const ::RVNGPropertyList &propList);
+ void endPage();
+ void startLayer(const ::RVNGPropertyList &propList);
void endLayer();
- void startEmbeddedGraphics(const ::WPXPropertyList &propList);
+ void startEmbeddedGraphics(const ::RVNGPropertyList &propList);
void endEmbeddedGraphics();
- void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
+ void setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &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 drawRectangle(const ::RVNGPropertyList &propList);
+ void drawEllipse(const ::RVNGPropertyList &propList);
+ void drawPolyline(const ::RVNGPropertyListVector &vertices);
+ void drawPolygon(const ::RVNGPropertyListVector &vertices);
+ void drawPath(const ::RVNGPropertyListVector &path);
+ void drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData &binaryData);
+ void startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path);
void endTextObject();
- void startTextLine(const ::WPXPropertyList &propList);
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &propList);
- void endTextSpan();
- void insertText(const ::WPXString &str);
+
+
+ void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeOrderedListLevel() {}
+
+ void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeUnorderedListLevel() {}
+
+ void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void closeListElement() {}
+
+ void openParagraph(const RVNGPropertyList &propList, const RVNGPropertyListVector &tabStops);
+ void closeParagraph();
+
+ void openSpan(const RVNGPropertyList &propList);
+ void closeSpan();
+
+ void insertTab() {}
+ void insertSpace() {}
+ void insertText(const RVNGString &text);
+ void insertLineBreak() {}
+ void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+
private:
int m_indent;
@@ -122,10 +143,10 @@ private:
void __idprintf(const char *format, ...);
};
-WPXString getPropString(const WPXPropertyList &propList)
+RVNGString getPropString(const RVNGPropertyList &propList)
{
- WPXString propString;
- WPXPropertyList::Iter i(propList);
+ RVNGString propString;
+ RVNGPropertyList::Iter i(propList);
if (!i.last())
{
propString.append(i.key());
@@ -143,12 +164,12 @@ WPXString getPropString(const WPXPropertyList &propList)
return propString;
}
-WPXString getPropString(const WPXPropertyListVector &itemList)
+RVNGString getPropString(const RVNGPropertyListVector &itemList)
{
- WPXString propString;
+ RVNGString propString;
propString.append("(");
- WPXPropertyListVector::Iter i(itemList);
+ RVNGPropertyListVector::Iter i(itemList);
if (!i.last())
{
@@ -170,7 +191,7 @@ WPXString getPropString(const WPXPropertyListVector &itemList)
}
RawPainter::RawPainter(bool printCallgraphScore):
- libwpg::WPGPaintInterface(),
+ RVNGDrawingInterface(),
m_indent(0),
m_callbackMisses(0),
m_printCallgraphScore(printCallgraphScore),
@@ -218,17 +239,17 @@ void RawPainter::__idprintf(const char *format, ...)
va_end(args);
}
-void RawPainter::startGraphics(const ::WPXPropertyList &propList)
+void RawPainter::startPage(const ::RVNGPropertyList &propList)
{
- _U(("RawPainter::startGraphics(%s)\n", getPropString(propList).cstr()), PC_START_GRAPHICS);
+ _U(("RawPainter::startPage(%s)\n", getPropString(propList).cstr()), PC_START_GRAPHICS);
}
-void RawPainter::endGraphics()
+void RawPainter::endPage()
{
- _D(("RawPainter::endGraphics\n"), PC_START_GRAPHICS);
+ _D(("RawPainter::endPage\n"), PC_START_GRAPHICS);
}
-void RawPainter::startLayer(const ::WPXPropertyList &propList)
+void RawPainter::startLayer(const ::RVNGPropertyList &propList)
{
_U(("RawPainter::startLayer (%s)\n", getPropString(propList).cstr()), PC_START_LAYER);
}
@@ -238,7 +259,7 @@ void RawPainter::endLayer()
_D(("RawPainter::endLayer\n"), PC_START_LAYER);
}
-void RawPainter::startEmbeddedGraphics(const ::WPXPropertyList &propList)
+void RawPainter::startEmbeddedGraphics(const ::RVNGPropertyList &propList)
{
_U(("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr()), PC_START_EMBEDDED_GRAPHICS);
}
@@ -248,7 +269,7 @@ void RawPainter::endEmbeddedGraphics()
_D(("RawPainter::endEmbeddedGraphics \n"), PC_START_EMBEDDED_GRAPHICS);
}
-void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient)
+void RawPainter::setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &gradient)
{
if (m_printCallgraphScore)
return;
@@ -256,7 +277,7 @@ void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXProperty
__iprintf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
}
-void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
+void RawPainter::drawRectangle(const ::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -264,7 +285,7 @@ void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
__iprintf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawEllipse(const ::WPXPropertyList &propList)
+void RawPainter::drawEllipse(const ::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -272,7 +293,7 @@ void RawPainter::drawEllipse(const ::WPXPropertyList &propList)
__iprintf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawPolyline(const ::WPXPropertyListVector &vertices)
+void RawPainter::drawPolyline(const ::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -280,7 +301,7 @@ void RawPainter::drawPolyline(const ::WPXPropertyListVector &vertices)
__iprintf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPolygon(const ::WPXPropertyListVector &vertices)
+void RawPainter::drawPolygon(const ::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -288,7 +309,7 @@ void RawPainter::drawPolygon(const ::WPXPropertyListVector &vertices)
__iprintf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPath(const ::WPXPropertyListVector &path)
+void RawPainter::drawPath(const ::RVNGPropertyListVector &path)
{
if (m_printCallgraphScore)
return;
@@ -296,7 +317,7 @@ void RawPainter::drawPath(const ::WPXPropertyListVector &path)
__iprintf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
}
-void RawPainter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData & /*binaryData*/)
+void RawPainter::drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData & /*binaryData*/)
{
if (m_printCallgraphScore)
return;
@@ -304,7 +325,7 @@ void RawPainter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WP
__iprintf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path)
+void RawPainter::startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path)
{
_U(("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr()), PC_START_TEXT_OBJECT);
}
@@ -314,27 +335,27 @@ void RawPainter::endTextObject()
_D(("RawPainter::endTextObject\n"), PC_START_TEXT_OBJECT);
}
-void RawPainter::startTextLine(const ::WPXPropertyList &propList)
+void RawPainter::openParagraph(const ::RVNGPropertyList &propList, const RVNGPropertyListVector &tabStops)
{
- _U(("RawPainter::startTextLine (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_LINE);
+ _U(("RawPainter::openParagraph (%s, tabStops: (%s))\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), PC_START_TEXT_LINE);
}
-void RawPainter::endTextLine()
+void RawPainter::closeParagraph()
{
- _D(("RawPainter::endTextLine\n"), PC_START_TEXT_LINE);
+ _D(("RawPainter::closeParagraph\n"), PC_START_TEXT_LINE);
}
-void RawPainter::startTextSpan(const ::WPXPropertyList &propList)
+void RawPainter::openSpan(const ::RVNGPropertyList &propList)
{
- _U(("RawPainter::startTextSpan (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_SPAN);
+ _U(("RawPainter::openSpan (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_SPAN);
}
-void RawPainter::endTextSpan()
+void RawPainter::closeSpan()
{
- _D(("RawPainter::endTextSpan\n"), PC_START_TEXT_SPAN);
+ _D(("RawPainter::closeSpan\n"), PC_START_TEXT_SPAN);
}
-void RawPainter::insertText(const ::WPXString &str)
+void RawPainter::insertText(const ::RVNGString &str)
{
if (m_printCallgraphScore)
return;
@@ -379,7 +400,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp
index d04d376..5dde8ad 100644
--- a/src/conv/raw/vss2raw.cpp
+++ b/src/conv/raw/vss2raw.cpp
@@ -33,8 +33,8 @@
#include <string.h>
#include <stack>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
enum PainterCallback
@@ -72,35 +72,56 @@ enum PainterCallback
m_callStack.pop(); \
}
-class RawPainter : public libwpg::WPGPaintInterface
+class RawPainter : public RVNGDrawingInterface
{
public:
RawPainter(bool printCallgraphScore);
~RawPainter();
- void startGraphics(const ::WPXPropertyList &propList);
- void endGraphics();
- void startLayer(const ::WPXPropertyList &propList);
+ void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void endDocument() {}
+ void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
+ void startPage(const ::RVNGPropertyList &propList);
+ void endPage();
+ void startLayer(const ::RVNGPropertyList &propList);
void endLayer();
- void startEmbeddedGraphics(const ::WPXPropertyList &propList);
+ void startEmbeddedGraphics(const ::RVNGPropertyList &propList);
void endEmbeddedGraphics();
- void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
+ void setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &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 drawRectangle(const ::RVNGPropertyList &propList);
+ void drawEllipse(const ::RVNGPropertyList &propList);
+ void drawPolyline(const ::RVNGPropertyListVector &vertices);
+ void drawPolygon(const ::RVNGPropertyListVector &vertices);
+ void drawPath(const ::RVNGPropertyListVector &path);
+ void drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData &binaryData);
+ void startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path);
void endTextObject();
- void startTextLine(const ::WPXPropertyList &propList);
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &propList);
- void endTextSpan();
- void insertText(const ::WPXString &str);
+
+
+ void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeOrderedListLevel() {}
+
+ void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeUnorderedListLevel() {}
+
+ void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void closeListElement() {}
+
+ void openParagraph(const RVNGPropertyList &propList, const RVNGPropertyListVector &tabStops);
+ void closeParagraph();
+
+ void openSpan(const RVNGPropertyList &propList);
+ void closeSpan();
+
+ void insertTab() {}
+ void insertSpace() {}
+ void insertText(const RVNGString &text);
+ void insertLineBreak() {}
+ void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+
private:
int m_indent;
@@ -122,10 +143,10 @@ private:
void __idprintf(const char *format, ...);
};
-WPXString getPropString(const WPXPropertyList &propList)
+RVNGString getPropString(const RVNGPropertyList &propList)
{
- WPXString propString;
- WPXPropertyList::Iter i(propList);
+ RVNGString propString;
+ RVNGPropertyList::Iter i(propList);
if (!i.last())
{
propString.append(i.key());
@@ -143,12 +164,12 @@ WPXString getPropString(const WPXPropertyList &propList)
return propString;
}
-WPXString getPropString(const WPXPropertyListVector &itemList)
+RVNGString getPropString(const RVNGPropertyListVector &itemList)
{
- WPXString propString;
+ RVNGString propString;
propString.append("(");
- WPXPropertyListVector::Iter i(itemList);
+ RVNGPropertyListVector::Iter i(itemList);
if (!i.last())
{
@@ -170,7 +191,7 @@ WPXString getPropString(const WPXPropertyListVector &itemList)
}
RawPainter::RawPainter(bool printCallgraphScore):
- libwpg::WPGPaintInterface(),
+ RVNGDrawingInterface(),
m_indent(0),
m_callbackMisses(0),
m_printCallgraphScore(printCallgraphScore),
@@ -218,17 +239,17 @@ void RawPainter::__idprintf(const char *format, ...)
va_end(args);
}
-void RawPainter::startGraphics(const ::WPXPropertyList &propList)
+void RawPainter::startPage(const ::RVNGPropertyList &propList)
{
- _U(("RawPainter::startGraphics(%s)\n", getPropString(propList).cstr()), PC_START_GRAPHICS);
+ _U(("RawPainter::startPage(%s)\n", getPropString(propList).cstr()), PC_START_GRAPHICS);
}
-void RawPainter::endGraphics()
+void RawPainter::endPage()
{
- _D(("RawPainter::endGraphics\n"), PC_START_GRAPHICS);
+ _D(("RawPainter::endPage\n"), PC_START_GRAPHICS);
}
-void RawPainter::startLayer(const ::WPXPropertyList &propList)
+void RawPainter::startLayer(const ::RVNGPropertyList &propList)
{
_U(("RawPainter::startLayer (%s)\n", getPropString(propList).cstr()), PC_START_LAYER);
}
@@ -238,7 +259,7 @@ void RawPainter::endLayer()
_D(("RawPainter::endLayer\n"), PC_START_LAYER);
}
-void RawPainter::startEmbeddedGraphics(const ::WPXPropertyList &propList)
+void RawPainter::startEmbeddedGraphics(const ::RVNGPropertyList &propList)
{
_U(("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr()), PC_START_EMBEDDED_GRAPHICS);
}
@@ -248,7 +269,7 @@ void RawPainter::endEmbeddedGraphics()
_D(("RawPainter::endEmbeddedGraphics \n"), PC_START_EMBEDDED_GRAPHICS);
}
-void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient)
+void RawPainter::setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &gradient)
{
if (m_printCallgraphScore)
return;
@@ -256,7 +277,7 @@ void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXProperty
__iprintf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
}
-void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
+void RawPainter::drawRectangle(const ::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -264,7 +285,7 @@ void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
__iprintf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawEllipse(const ::WPXPropertyList &propList)
+void RawPainter::drawEllipse(const ::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -272,7 +293,7 @@ void RawPainter::drawEllipse(const ::WPXPropertyList &propList)
__iprintf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawPolyline(const ::WPXPropertyListVector &vertices)
+void RawPainter::drawPolyline(const ::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -280,7 +301,7 @@ void RawPainter::drawPolyline(const ::WPXPropertyListVector &vertices)
__iprintf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPolygon(const ::WPXPropertyListVector &vertices)
+void RawPainter::drawPolygon(const ::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -288,7 +309,7 @@ void RawPainter::drawPolygon(const ::WPXPropertyListVector &vertices)
__iprintf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPath(const ::WPXPropertyListVector &path)
+void RawPainter::drawPath(const ::RVNGPropertyListVector &path)
{
if (m_printCallgraphScore)
return;
@@ -296,7 +317,7 @@ void RawPainter::drawPath(const ::WPXPropertyListVector &path)
__iprintf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
}
-void RawPainter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData & /*binaryData*/)
+void RawPainter::drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData & /*binaryData*/)
{
if (m_printCallgraphScore)
return;
@@ -304,7 +325,7 @@ void RawPainter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WP
__iprintf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path)
+void RawPainter::startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path)
{
_U(("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr()), PC_START_TEXT_OBJECT);
}
@@ -314,27 +335,27 @@ void RawPainter::endTextObject()
_D(("RawPainter::endTextObject\n"), PC_START_TEXT_OBJECT);
}
-void RawPainter::startTextLine(const ::WPXPropertyList &propList)
+void RawPainter::openParagraph(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &tabStops)
{
- _U(("RawPainter::startTextLine (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_LINE);
+ _U(("RawPainter::openParagraph (%s, tabStops: (%s))\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), PC_START_TEXT_LINE);
}
-void RawPainter::endTextLine()
+void RawPainter::closeParagraph()
{
- _D(("RawPainter::endTextLine\n"), PC_START_TEXT_LINE);
+ _D(("RawPainter::closeParagraph\n"), PC_START_TEXT_LINE);
}
-void RawPainter::startTextSpan(const ::WPXPropertyList &propList)
+void RawPainter::openSpan(const ::RVNGPropertyList &propList)
{
- _U(("RawPainter::startTextSpan (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_SPAN);
+ _U(("RawPainter::openSpan (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_SPAN);
}
-void RawPainter::endTextSpan()
+void RawPainter::closeSpan()
{
- _D(("RawPainter::endTextSpan\n"), PC_START_TEXT_SPAN);
+ _D(("RawPainter::closeSpan\n"), PC_START_TEXT_SPAN);
}
-void RawPainter::insertText(const ::WPXString &str)
+void RawPainter::insertText(const ::RVNGString &str)
{
if (m_printCallgraphScore)
return;
@@ -379,7 +400,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp
index 4865005..299f876 100644
--- a/src/conv/svg/vsd2xhtml.cpp
+++ b/src/conv/svg/vsd2xhtml.cpp
@@ -32,8 +32,8 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
namespace
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
return 1;
}
- libvisio::VSDStringVector output;
+ RVNGStringVector output;
if (!libvisio::VisioDocument::generateSVG(&input, output))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp
index 531d12c..9491a21 100644
--- a/src/conv/svg/vss2xhtml.cpp
+++ b/src/conv/svg/vss2xhtml.cpp
@@ -32,8 +32,8 @@
#include <sstream>
#include <stdio.h>
#include <string.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
namespace
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
return 1;
}
- libvisio::VSDStringVector output;
+ RVNGStringVector output;
if (!libvisio::VisioDocument::generateSVGStencils(&input, output))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp
index 6f33172..d7c9e04 100644
--- a/src/conv/text/vsd2text.cpp
+++ b/src/conv/text/vsd2text.cpp
@@ -31,49 +31,70 @@
#include <stdio.h>
#include <string.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
-class TextPainter : public libwpg::WPGPaintInterface
+class TextPainter : public RVNGDrawingInterface
{
public:
TextPainter();
- void startGraphics(const ::WPXPropertyList &) {}
- void endGraphics() {}
- void startLayer(const ::WPXPropertyList &) {}
+ void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void endDocument() {}
+ void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
+ void startPage(const ::RVNGPropertyList &) {}
+ void endPage() {}
+ void startLayer(const ::RVNGPropertyList &) {}
void endLayer() {}
- void startEmbeddedGraphics(const ::WPXPropertyList &) {}
+ void startEmbeddedGraphics(const ::RVNGPropertyList &) {}
void endEmbeddedGraphics() {}
- void setStyle(const ::WPXPropertyList &, const ::WPXPropertyListVector &) {}
+ void setStyle(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
- 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 drawRectangle(const ::RVNGPropertyList &) {}
+ void drawEllipse(const ::RVNGPropertyList &) {}
+ void drawPolyline(const ::RVNGPropertyListVector &) {}
+ void drawPolygon(const ::RVNGPropertyListVector &) {}
+ void drawPath(const ::RVNGPropertyListVector &) {}
+ void drawGraphicObject(const ::RVNGPropertyList &, const ::RVNGBinaryData &) {}
+ void startTextObject(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
void endTextObject() {}
- void startTextLine(const ::WPXPropertyList &) {}
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &) {}
- void endTextSpan() {}
- void insertText(const ::WPXString &str);
+
+
+ void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeOrderedListLevel() {}
+
+ void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeUnorderedListLevel() {}
+
+ void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void closeListElement() {}
+
+ void openParagraph(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void closeParagraph();
+
+ void openSpan(const RVNGPropertyList & /* propList */) {}
+ void closeSpan() {}
+
+ void insertTab() {}
+ void insertSpace() {}
+ void insertText(const RVNGString &text);
+ void insertLineBreak() {}
+ void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+
};
-TextPainter::TextPainter(): libwpg::WPGPaintInterface()
+TextPainter::TextPainter(): RVNGDrawingInterface()
{
}
-void TextPainter::insertText(const ::WPXString &str)
+void TextPainter::insertText(const ::RVNGString &str)
{
printf("%s", str.cstr());
}
-void TextPainter::endTextLine()
+void TextPainter::closeParagraph()
{
printf("\n");
}
@@ -110,7 +131,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp
index e6e8c6f..2a103bf 100644
--- a/src/conv/text/vss2text.cpp
+++ b/src/conv/text/vss2text.cpp
@@ -31,49 +31,70 @@
#include <stdio.h>
#include <string.h>
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpd/libwpd.h>
+#include <librevenge-stream/librevenge-stream.h>
+#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
-class TextPainter : public libwpg::WPGPaintInterface
+class TextPainter : public RVNGDrawingInterface
{
public:
TextPainter();
- void startGraphics(const ::WPXPropertyList &) {}
- void endGraphics() {}
- void startLayer(const ::WPXPropertyList &) {}
+ void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void endDocument() {}
+ void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
+ void startPage(const ::RVNGPropertyList &) {}
+ void endPage() {}
+ void startLayer(const ::RVNGPropertyList &) {}
void endLayer() {}
- void startEmbeddedGraphics(const ::WPXPropertyList &) {}
+ void startEmbeddedGraphics(const ::RVNGPropertyList &) {}
void endEmbeddedGraphics() {}
- void setStyle(const ::WPXPropertyList &, const ::WPXPropertyListVector &) {}
+ void setStyle(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
- 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 drawRectangle(const ::RVNGPropertyList &) {}
+ void drawEllipse(const ::RVNGPropertyList &) {}
+ void drawPolyline(const ::RVNGPropertyListVector &) {}
+ void drawPolygon(const ::RVNGPropertyListVector &) {}
+ void drawPath(const ::RVNGPropertyListVector &) {}
+ void drawGraphicObject(const ::RVNGPropertyList &, const ::RVNGBinaryData &) {}
+ void startTextObject(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
void endTextObject() {}
- void startTextLine(const ::WPXPropertyList &) {}
- void endTextLine();
- void startTextSpan(const ::WPXPropertyList &) {}
- void endTextSpan() {}
- void insertText(const ::WPXString &str);
+
+
+ void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeOrderedListLevel() {}
+
+ void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void closeUnorderedListLevel() {}
+
+ void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void closeListElement() {}
+
+ void openParagraph(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void closeParagraph();
+
+ void openSpan(const RVNGPropertyList & /*propList*/) {}
+ void closeSpan() {}
+
+ void insertTab() {}
+ void insertSpace() {}
+ void insertText(const RVNGString &text);
+ void insertLineBreak() {}
+ void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+
};
-TextPainter::TextPainter(): libwpg::WPGPaintInterface()
+TextPainter::TextPainter(): RVNGDrawingInterface()
{
}
-void TextPainter::insertText(const ::WPXString &str)
+void TextPainter::insertText(const ::RVNGString &str)
{
printf("%s", str.cstr());
}
-void TextPainter::endTextLine()
+void TextPainter::closeParagraph()
{
printf("\n");
}
@@ -110,7 +131,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- WPXFileStream input(file);
+ RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c5b5d45..8eeafc4 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -9,7 +9,6 @@ noinst_LTLIBRARIES = libtokenmap.la
libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_includedir = $(includedir)/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@/libvisio
libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_include_HEADERS = \
$(top_srcdir)/inc/libvisio/libvisio.h \
- $(top_srcdir)/inc/libvisio/VSDStringVector.h \
$(top_srcdir)/inc/libvisio/VisioDocument.h
AM_CXXFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBVISIO_CXXFLAGS) $(DEBUG_CXXFLAGS)
@@ -38,11 +37,9 @@ libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_SOURCES = \
VSDParser.cpp \
VSDShapeList.cpp \
VSDStencils.cpp \
- VSDStringVector.cpp \
VSDStyles.cpp \
VSDStylesCollector.cpp \
VSDXMLHelper.cpp \
- VSDZipStream.cpp \
libvisio_utils.h \
VSD5Parser.h \
VSD6Parser.h \
@@ -63,8 +60,7 @@ libvisio_ at VSD_MAJOR_VERSION@_ at VSD_MINOR_VERSION@_la_SOURCES = \
VSDStyles.h \
VSDStylesCollector.h \
VSDTypes.h \
- VSDXMLHelper.h \
- VSDZipStream.h
+ VSDXMLHelper.h
libtokenmap_la_SOURCES = \
VDXParser.cpp \
@@ -106,8 +102,7 @@ distclean-local :
EXTRA_DIST = \
tokens.txt \
gentoken.pl \
- libvisio.rc.in \
- makefile.mk
+ libvisio.rc.in
# These may be in the builddir too
BUILD_EXTRA_DIST = \
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index bef0b59..23de46d 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -30,18 +30,17 @@
#include <string.h>
#include <libxml/xmlIO.h>
#include <libxml/xmlstring.h>
-#include <libwpd-stream/libwpd-stream.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <boost/algorithm/string.hpp>
#include "VDXParser.h"
#include "libvisio_utils.h"
#include "VSDContentCollector.h"
#include "VSDStylesCollector.h"
-#include "VSDZipStream.h"
#include "VSDXMLHelper.h"
#include "VSDXMLTokenMap.h"
-libvisio::VDXParser::VDXParser(WPXInputStream *input, libwpg::WPGPaintInterface *painter)
+libvisio::VDXParser::VDXParser(RVNGInputStream *input, RVNGDrawingInterface *painter)
: VSDXMLParserBase(), m_input(input), m_painter(painter)
{
}
@@ -63,7 +62,7 @@ bool libvisio::VDXParser::parseMain()
VSDStylesCollector stylesCollector(groupXFormsSequence, groupMembershipsSequence, documentPageShapeOrders);
m_collector = &stylesCollector;
- m_input->seek(0, WPX_SEEK_SET);
+ m_input->seek(0, RVNG_SEEK_SET);
if (!processXmlDocument(m_input))
return false;
@@ -71,7 +70,7 @@ bool libvisio::VDXParser::parseMain()
VSDContentCollector contentCollector(m_painter, groupXFormsSequence, groupMembershipsSequence, documentPageShapeOrders, styles, m_stencils);
m_collector = &contentCollector;
- m_input->seek(0, WPX_SEEK_SET);
+ m_input->seek(0, RVNG_SEEK_SET);
if (!processXmlDocument(m_input))
return false;
@@ -89,7 +88,7 @@ bool libvisio::VDXParser::extractStencils()
return parseMain();
}
-bool libvisio::VDXParser::processXmlDocument(WPXInputStream *input)
+bool libvisio::VDXParser::processXmlDocument(RVNGInputStream *input)
{
if (!input)
return false;
@@ -715,7 +714,7 @@ void libvisio::VDXParser::readFonts(xmlTextReaderPtr reader)
if (id && name)
{
unsigned idx = (unsigned)xmlStringToLong(id);
- WPXBinaryData textStream(name, xmlStrlen(name));
+ RVNGBinaryData textStream(name, xmlStrlen(name));
m_fonts[idx] = VSDName(textStream, libvisio::VSD_TEXT_UTF8);
}
xmlFree(name);
diff --git a/src/lib/VDXParser.h b/src/lib/VDXParser.h
index 32038a6..a5be6f0 100644
--- a/src/lib/VDXParser.h
+++ b/src/lib/VDXParser.h
@@ -30,8 +30,7 @@
#ifndef __VDXPARSER_H__
#define __VDXPARSER_H__
-#include <libwpd-stream/libwpd-stream.h>
-#include <libwpg/libwpg.h>
+#include <librevenge/librevenge.h>
#include "VSDXMLParserBase.h"
namespace libvisio
@@ -47,7 +46,7 @@ class VDXParser : public VSDXMLParserBase
using VSDXMLParserBase::readLongData;
public:
- explicit VDXParser(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ explicit VDXParser(RVNGInputStream *input, RVNGDrawingInterface *painter);
virtual ~VDXParser();
bool parseMain();
bool extractStencils();
@@ -66,7 +65,7 @@ private:
// Functions to read the DatadiagramML document structure
- bool processXmlDocument(WPXInputStream *input);
+ bool processXmlDocument(RVNGInputStream *input);
void processXmlNode(xmlTextReaderPtr reader);
// Functions reading the DiagramML document content
@@ -85,8 +84,8 @@ private:
// Private data
- WPXInputStream *m_input;
- libwpg::WPGPaintInterface *m_painter;
+ RVNGInputStream *m_input;
+ RVNGDrawingInterface *m_painter;
};
} // namespace libvisio
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 1ccb7d8..283a0f3 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -28,7 +28,7 @@
* instead of those above.
*/
-#include <libwpd-stream/libwpd-stream.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <locale.h>
#include <sstream>
#include <string>
@@ -40,51 +40,51 @@
#include "VSDContentCollector.h"
#include "VSDStylesCollector.h"
-libvisio::VSD5Parser::VSD5Parser(WPXInputStream *input, libwpg::WPGPaintInterface *painter)
+libvisio::VSD5Parser::VSD5Parser(RVNGInputStream *input, RVNGDrawingInterface *painter)
: VSD6Parser(input, painter)
{}
libvisio::VSD5Parser::~VSD5Parser()
{}
-void libvisio::VSD5Parser::readPointer(WPXInputStream *input, Pointer &ptr)
+void libvisio::VSD5Parser::readPointer(RVNGInputStream *input, Pointer &ptr)
{
ptr.Type = readU16(input) & 0x00ff;
ptr.Format = readU16(input) & 0x00ff;
- input->seek(4, WPX_SEEK_CUR); // Skip dword
+ input->seek(4, RVNG_SEEK_CUR); // Skip dword
ptr.Offset = readU32(input);
ptr.Length = readU32(input);
}
-void libvisio::VSD5Parser::readPointerInfo(WPXInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount)
+void libvisio::VSD5Parser::readPointerInfo(RVNGInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount)
{
VSD_DEBUG_MSG(("VSD5Parser::readPointerInfo\n"));
switch (ptrType)
{
case VSD_TRAILER_STREAM:
- input->seek(shift+0x82, WPX_SEEK_SET);
+ input->seek(shift+0x82, RVNG_SEEK_SET);
break;
case VSD_PAGE:
- input->seek(shift+0x42, WPX_SEEK_SET);
+ input->seek(shift+0x42, RVNG_SEEK_SET);
break;
case VSD_FONT_LIST:
- input->seek(shift+0x2e, WPX_SEEK_SET);
+ input->seek(shift+0x2e, RVNG_SEEK_SET);
break;
case VSD_STYLES:
- input->seek(shift+0x12, WPX_SEEK_SET);
+ input->seek(shift+0x12, RVNG_SEEK_SET);
break;
case VSD_STENCILS:
case VSD_SHAPE_FOREIGN:
- input->seek(shift+0x1e, WPX_SEEK_SET);
+ input->seek(shift+0x1e, RVNG_SEEK_SET);
break;
case VSD_STENCIL_PAGE:
- input->seek(shift+0x36, WPX_SEEK_SET);
+ input->seek(shift+0x36, RVNG_SEEK_SET);
break;
default:
if (ptrType > 0x45)
- input->seek(shift+0x1e, WPX_SEEK_SET);
+ input->seek(shift+0x1e, RVNG_SEEK_SET);
else
- input->seek(shift+0xa, WPX_SEEK_SET);
+ input->seek(shift+0xa, RVNG_SEEK_SET);
break;
}
pointerCount = readS16(input);
@@ -92,16 +92,16 @@ void libvisio::VSD5Parser::readPointerInfo(WPXInputStream *input, unsigned ptrTy
VSD_DEBUG_MSG(("VSD5Parser::readPointerInfo ptrType %u shift %u pointerCount %i\n", ptrType, shift, pointerCount));
}
-bool libvisio::VSD5Parser::getChunkHeader(WPXInputStream *input)
+bool libvisio::VSD5Parser::getChunkHeader(RVNGInputStream *input)
{
unsigned char tmpChar = 0;
- while (!input->atEOS() && !tmpChar)
+ while (!input->isEnd() && !tmpChar)
tmpChar = readU8(input);
- if (input->atEOS())
+ if (input->isEnd())
return false;
else
- input->seek(-1, WPX_SEEK_CUR);
+ input->seek(-1, RVNG_SEEK_CUR);
m_header.chunkType = getUInt(input);
m_header.id = getUInt(input);
@@ -117,15 +117,15 @@ bool libvisio::VSD5Parser::getChunkHeader(WPXInputStream *input)
return true;
}
-void libvisio::VSD5Parser::handleChunkRecords(WPXInputStream *input)
+void libvisio::VSD5Parser::handleChunkRecords(RVNGInputStream *input)
{
long startPosition = input->tell();
long endPosition = input->tell() + m_header.dataLength;
- input->seek(endPosition - 4, WPX_SEEK_SET);
+ input->seek(endPosition - 4, RVNG_SEEK_SET);
unsigned numRecords = readU16(input);
unsigned endOffset = readU16(input);
std::map<unsigned, ChunkHeader> records;
- input->seek(endPosition-4*(numRecords+1), WPX_SEEK_SET);
+ input->seek(endPosition-4*(numRecords+1), RVNG_SEEK_SET);
unsigned i = 0;
for (i = 0; i < numRecords; ++i)
{
@@ -145,12 +145,12 @@ void libvisio::VSD5Parser::handleChunkRecords(WPXInputStream *input)
{
m_header = iter->second;
m_header.id = i++;
- input->seek(startPosition + iter->first, WPX_SEEK_SET);
+ input->seek(startPosition + iter->first, RVNG_SEEK_SET);
handleChunk(input);
}
}
-void libvisio::VSD5Parser::readGeomList(WPXInputStream *input)
+void libvisio::VSD5Parser::readGeomList(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readGeomList\n"));
if (!m_shape.m_geometries.empty() && m_currentGeometryList->empty())
@@ -162,57 +162,57 @@ void libvisio::VSD5Parser::readGeomList(WPXInputStream *input)
handleChunkRecords(input);
}
-void libvisio::VSD5Parser::readList(WPXInputStream *input)
+void libvisio::VSD5Parser::readList(RVNGInputStream *input)
{
if (!m_isStencilStarted)
m_collector->collectUnhandledChunk(m_header.id, m_header.level);
handleChunkRecords(input);
}
-void libvisio::VSD5Parser::readCharList(WPXInputStream *input)
+void libvisio::VSD5Parser::readCharList(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readCharList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readParaList(WPXInputStream *input)
+void libvisio::VSD5Parser::readParaList(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readParaList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readShapeList(WPXInputStream *input)
+void libvisio::VSD5Parser::readShapeList(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readShapeList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readPropList(WPXInputStream *input)
+void libvisio::VSD5Parser::readPropList(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readPropList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readFieldList(WPXInputStream *input)
+void libvisio::VSD5Parser::readFieldList(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readFieldList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readNameList2(WPXInputStream *input)
+void libvisio::VSD5Parser::readNameList2(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readNameList2\n"));
readList(input);
}
-void libvisio::VSD5Parser::readLine(WPXInputStream *input)
+void libvisio::VSD5Parser::readLine(RVNGInputStream *input)
{
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double strokeWidth = readDouble(input);
unsigned char colourIndex = readU8(input);
Colour c = _colourFromIndex(colourIndex);
unsigned char linePattern = readU8(input);
- input->seek(10, WPX_SEEK_CUR);
+ input->seek(10, RVNG_SEEK_CUR);
unsigned char startMarker = readU8(input);
unsigned char endMarker = readU8(input);
unsigned char lineCap = readU8(input);
@@ -223,7 +223,7 @@ void libvisio::VSD5Parser::readLine(WPXInputStream *input)
m_shape.m_lineStyle.override(VSDOptionalLineStyle(strokeWidth, c, linePattern, startMarker, endMarker, lineCap));
}
-void libvisio::VSD5Parser::readCharIX(WPXInputStream *input)
+void libvisio::VSD5Parser::readCharIX(RVNGInputStream *input)
{
unsigned charCount = readU16(input);
unsigned fontID = readU16(input);
@@ -256,7 +256,7 @@ void libvisio::VSD5Parser::readCharIX(WPXInputStream *input)
if (fontMod & 1) superscript = true;
if (fontMod & 2) subscript = true;
- input->seek(4, WPX_SEEK_CUR);
+ input->seek(4, RVNG_SEEK_CUR);
double fontSize = readDouble(input);
#if 0
@@ -286,13 +286,13 @@ void libvisio::VSD5Parser::readCharIX(WPXInputStream *input)
}
}
-void libvisio::VSD5Parser::readFillAndShadow(WPXInputStream *input)
+void libvisio::VSD5Parser::readFillAndShadow(RVNGInputStream *input)
{
Colour colourFG = _colourFromIndex(readU8(input));
Colour colourBG = _colourFromIndex(readU8(input));
unsigned char fillPattern = readU8(input);
Colour shfgc = _colourFromIndex(readU8(input));
- input->seek(1, WPX_SEEK_CUR); // Shadow Background Colour skipped
+ input->seek(1, RVNG_SEEK_CUR); // Shadow Background Colour skipped
unsigned char shadowPattern = readU8(input);
if (m_isInStyles)
@@ -318,9 +318,9 @@ void libvisio::VSD5Parser::readFillAndShadow(WPXInputStream *input)
}
}
-void libvisio::VSD5Parser::readStyleSheet(WPXInputStream *input)
+void libvisio::VSD5Parser::readStyleSheet(RVNGInputStream *input)
{
- input->seek(10, WPX_SEEK_CUR);
+ input->seek(10, RVNG_SEEK_CUR);
unsigned lineStyle = getUInt(input);
unsigned fillStyle = getUInt(input);
unsigned textStyle = getUInt(input);
@@ -328,7 +328,7 @@ void libvisio::VSD5Parser::readStyleSheet(WPXInputStream *input)
m_collector->collectStyleSheet(m_header.id, m_header.level, lineStyle, fillStyle, textStyle);
}
-void libvisio::VSD5Parser::readShape(WPXInputStream *input)
+void libvisio::VSD5Parser::readShape(RVNGInputStream *input)
{
m_currentGeomListCount = 0;
m_isShapeStarted = true;
@@ -345,9 +345,9 @@ void libvisio::VSD5Parser::readShape(WPXInputStream *input)
try
{
- input->seek(2, WPX_SEEK_CUR);
+ input->seek(2, RVNG_SEEK_CUR);
parent = getUInt(input);
- input->seek(2, WPX_SEEK_CUR);
+ input->seek(2, RVNG_SEEK_CUR);
masterPage = getUInt(input);
masterShape = getUInt(input);
lineStyle = getUInt(input);
@@ -378,21 +378,21 @@ void libvisio::VSD5Parser::readShape(WPXInputStream *input)
m_currentShapeID = MINUS_ONE;
}
-void libvisio::VSD5Parser::readPage(WPXInputStream *input)
+void libvisio::VSD5Parser::readPage(RVNGInputStream *input)
{
unsigned backgroundPageID = getUInt(input);
m_collector->collectPage(m_header.id, m_header.level, backgroundPageID, m_isBackgroundPage, m_currentPageName);
}
-void libvisio::VSD5Parser::readTextBlock(WPXInputStream *input)
+void libvisio::VSD5Parser::readTextBlock(RVNGInputStream *input)
{
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double leftMargin = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double rightMargin = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double topMargin = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double bottomMargin = readDouble(input);
unsigned char verticalAlign = readU8(input);
unsigned char colourIndex = readU8(input);
@@ -409,9 +409,9 @@ void libvisio::VSD5Parser::readTextBlock(WPXInputStream *input)
verticalAlign, isBgFilled, c, 0.0, (unsigned char)0));
}
-void libvisio::VSD5Parser::readTextField(WPXInputStream *input)
+void libvisio::VSD5Parser::readTextField(RVNGInputStream *input)
{
- input->seek(3, WPX_SEEK_CUR);
+ input->seek(3, RVNG_SEEK_CUR);
if (0xe8 == readU8(input))
{
int nameId = readS16(input);
@@ -424,7 +424,7 @@ void libvisio::VSD5Parser::readTextField(WPXInputStream *input)
}
}
-void libvisio::VSD5Parser::readNameIDX(WPXInputStream *input)
+void libvisio::VSD5Parser::readNameIDX(RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readNameIDX\n"));
std::map<unsigned, VSDName> names;
@@ -441,13 +441,13 @@ void libvisio::VSD5Parser::readNameIDX(WPXInputStream *input)
}
-unsigned libvisio::VSD5Parser::getUInt(WPXInputStream *input)
+unsigned libvisio::VSD5Parser::getUInt(RVNGInputStream *input)
{
int value = readS16(input);
return (unsigned)value;
}
-int libvisio::VSD5Parser::getInt(WPXInputStream *input)
+int libvisio::VSD5Parser::getInt(RVNGInputStream *input)
{
return readS16(input);
}
diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h
index 64f4c6c..d67c714 100644
--- a/src/lib/VSD5Parser.h
+++ b/src/lib/VSD5Parser.h
@@ -33,8 +33,7 @@
#include <stdio.h>
#include <iostream>
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
+#include <librevenge/librevenge.h>
#include "VSD6Parser.h"
#include "VSDInternalStream.h"
@@ -44,46 +43,46 @@ namespace libvisio
class VSD5Parser : public VSD6Parser
{
public:
- explicit VSD5Parser(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ explicit VSD5Parser(RVNGInputStream *input, RVNGDrawingInterface *painter);
~VSD5Parser();
protected:
- virtual void readPointer(WPXInputStream *input, Pointer &ptr);
- virtual bool getChunkHeader(WPXInputStream *input);
- virtual void readPointerInfo(WPXInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount);
+ virtual void readPointer(RVNGInputStream *input, Pointer &ptr);
+ virtual bool getChunkHeader(RVNGInputStream *input);
+ virtual void readPointerInfo(RVNGInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount);
- virtual void readGeomList(WPXInputStream *input);
- virtual void readCharList(WPXInputStream *input);
- virtual void readParaList(WPXInputStream *input);
- virtual void readShapeList(WPXInputStream *input);
- virtual void readPropList(WPXInputStream *input);
- virtual void readFieldList(WPXInputStream *input);
- virtual void readNameList2(WPXInputStream *input);
+ virtual void readGeomList(RVNGInputStream *input);
+ virtual void readCharList(RVNGInputStream *input);
+ virtual void readParaList(RVNGInputStream *input);
+ virtual void readShapeList(RVNGInputStream *input);
+ virtual void readPropList(RVNGInputStream *input);
+ virtual void readFieldList(RVNGInputStream *input);
+ virtual void readNameList2(RVNGInputStream *input);
- virtual void readLine(WPXInputStream *input);
- virtual void readFillAndShadow(WPXInputStream *input);
- virtual void readTextBlock(WPXInputStream *input);
- virtual void readCharIX(WPXInputStream *input);
- virtual void readTextField(WPXInputStream *input);
+ virtual void readLine(RVNGInputStream *input);
+ virtual void readFillAndShadow(RVNGInputStream *input);
+ virtual void readTextBlock(RVNGInputStream *input);
+ virtual void readCharIX(RVNGInputStream *input);
+ virtual void readTextField(RVNGInputStream *input);
- virtual void readShape(WPXInputStream *input);
- virtual void readPage(WPXInputStream *input);
+ virtual void readShape(RVNGInputStream *input);
+ virtual void readPage(RVNGInputStream *input);
- virtual void handleChunkRecords(WPXInputStream *input);
+ virtual void handleChunkRecords(RVNGInputStream *input);
- virtual void readStyleSheet(WPXInputStream *input);
+ virtual void readStyleSheet(RVNGInputStream *input);
- virtual void readNameIDX(WPXInputStream *input);
+ virtual void readNameIDX(RVNGInputStream *input);
- virtual unsigned getUInt(WPXInputStream *input);
- virtual int getInt(WPXInputStream *input);
+ virtual unsigned getUInt(RVNGInputStream *input);
+ virtual int getInt(RVNGInputStream *input);
private:
VSD5Parser();
VSD5Parser(const VSDParser &);
VSD5Parser &operator=(const VSDParser &);
- void readList(WPXInputStream *input);
+ void readList(RVNGInputStream *input);
};
} // namespace libvisio
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index a34862b..f1f4564 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -28,7 +28,7 @@
* instead of those above.
*/
-#include <libwpd-stream/libwpd-stream.h>
+#include <librevenge-stream/librevenge-stream.h>
#include <locale.h>
#include <sstream>
#include <string>
@@ -39,23 +39,23 @@
#include "VSDContentCollector.h"
#include "VSDStylesCollector.h"
-libvisio::VSD6Parser::VSD6Parser(WPXInputStream *input, libwpg::WPGPaintInterface *painter)
+libvisio::VSD6Parser::VSD6Parser(RVNGInputStream *input, RVNGDrawingInterface *painter)
: VSDParser(input, painter)
{}
libvisio::VSD6Parser::~VSD6Parser()
{}
-bool libvisio::VSD6Parser::getChunkHeader(WPXInputStream *input)
+bool libvisio::VSD6Parser::getChunkHeader(RVNGInputStream *input)
{
unsigned char tmpChar = 0;
- while (!input->atEOS() && !tmpChar)
+ while (!input->isEnd() && !tmpChar)
tmpChar = readU8(input);
- if (input->atEOS())
+ if (input->isEnd())
return false;
else
- input->seek(-1, WPX_SEEK_CUR);
+ input->seek(-1, RVNG_SEEK_CUR);
m_header.chunkType = readU32(input);
m_header.id = readU32(input);
@@ -84,10 +84,10 @@ bool libvisio::VSD6Parser::getChunkHeader(WPXInputStream *input)
return true;
}
-void libvisio::VSD6Parser::readText(WPXInputStream *input)
+void libvisio::VSD6Parser::readText(RVNGInputStream *input)
{
- input->seek(8, WPX_SEEK_CUR);
- ::WPXBinaryData textStream;
+ input->seek(8, RVNG_SEEK_CUR);
+ ::RVNGBinaryData textStream;
unsigned long numBytesRead = 0;
const unsigned char *tmpBuffer = input->read(m_header.dataLength - 8, numBytesRead);
@@ -103,7 +103,7 @@ void libvisio::VSD6Parser::readText(WPXInputStream *input)
}
}
-void libvisio::VSD6Parser::readCharIX(WPXInputStream *input)
+void libvisio::VSD6Parser::readCharIX(RVNGInputStream *input)
{
unsigned charCount = readU32(input);
unsigned fontID = readU16(input);
@@ -111,7 +111,7 @@ void libvisio::VSD6Parser::readCharIX(WPXInputStream *input)
std::map<unsigned, VSDName>::const_iterator iter = m_fonts.find(fontID);
if (iter != m_fonts.end())
font = iter->second;
- input->seek(1, WPX_SEEK_CUR); // Color ID
+ input->seek(1, RVNG_SEEK_CUR); // Color ID
Colour fontColour; // Font Colour
fontColour.r = readU8(input);
fontColour.g = readU8(input);
@@ -141,7 +141,7 @@ void libvisio::VSD6Parser::readCharIX(WPXInputStream *input)
if (fontMod & 1) superscript = true;
if (fontMod & 2) subscript = true;
- input->seek(4, WPX_SEEK_CUR);
+ input->seek(4, RVNG_SEEK_CUR);
double fontSize = readDouble(input);
fontMod = readU8(input);
@@ -169,20 +169,20 @@ void libvisio::VSD6Parser::readCharIX(WPXInputStream *input)
}
}
-void libvisio::VSD6Parser::readParaIX(WPXInputStream *input)
+void libvisio::VSD6Parser::readParaIX(RVNGInputStream *input)
{
unsigned charCount = getUInt(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double indFirst = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double indLeft = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double indRight = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double spLine = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double spBefore = readDouble(input);
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
double spAfter = readDouble(input);
unsigned char align = readU8(input);
@@ -204,7 +204,7 @@ void libvisio::VSD6Parser::readParaIX(WPXInputStream *input)
}
-void libvisio::VSD6Parser::readFillAndShadow(WPXInputStream *input)
+void libvisio::VSD6Parser::readFillAndShadow(RVNGInputStream *input)
{
unsigned char colourFGIndex = readU8(input);
Colour colourFG;
@@ -271,21 +271,21 @@ void libvisio::VSD6Parser::readFillAndShadow(WPXInputStream *input)
}
}
-void libvisio::VSD6Parser::readName(WPXInputStream *input)
+void libvisio::VSD6Parser::readName(RVNGInputStream *input)
{
unsigned long numBytesRead = 0;
const unsigned char *tmpBuffer = input->read(m_header.dataLength, numBytesRead);
if (numBytesRead)
{
- ::WPXBinaryData name(tmpBuffer, numBytesRead);
+ ::RVNGBinaryData name(tmpBuffer, numBytesRead);
m_shape.m_names[m_header.id] = VSDName(name, libvisio::VSD_TEXT_ANSI);
}
}
-void libvisio::VSD6Parser::readName2(WPXInputStream *input)
+void libvisio::VSD6Parser::readName2(RVNGInputStream *input)
{
unsigned char character = 0;
- ::WPXBinaryData name;
+ ::RVNGBinaryData name;
getInt(input); // skip a dword that seems to be always 1
while ((character = readU8(input)))
name.append(character);
@@ -293,52 +293,52 @@ void libvisio::VSD6Parser::readName2(WPXInputStream *input)
m_names[m_header.id] = VSDName(name, libvisio::VSD_TEXT_ANSI);
}
-void libvisio::VSD6Parser::readTextField(WPXInputStream *input)
+void libvisio::VSD6Parser::readTextField(RVNGInputStream *input)
{
unsigned long initialPosition = input->tell();
- input->seek(7, WPX_SEEK_CUR);
+ input->seek(7, RVNG_SEEK_CUR);
unsigned char tmpCode = readU8(input);
if (tmpCode == 0xe8)
{
int nameId = readS32(input);
- input->seek(6, WPX_SEEK_CUR);
+ input->seek(6, RVNG_SEEK_CUR);
int formatStringId = readS32(input);
m_shape.m_fields.addTextField(m_header.id, m_header.level, nameId, formatStringId);
}
else
{
double numericValue = readDouble(input);
- input->seek(2, WPX_SEEK_CUR);
+ input->seek(2, RVNG_SEEK_CUR);
int formatStringId = readS32(input);
unsigned blockIdx = 0;
unsigned length = 0;
unsigned short formatNumber = 0;
- input->seek(initialPosition+0x24, WPX_SEEK_SET);
- while (blockIdx != 2 && !input->atEOS() && (unsigned long) input->tell() < (unsigned long)(initialPosition+m_header.dataLength+m_header.trailer))
+ input->seek(initialPosition+0x24, RVNG_SEEK_SET);
+ while (blockIdx != 2 && !input->isEnd() && (unsigned long) input->tell() < (unsigned long)(initialPosition+m_header.dataLength+m_header.trailer))
{
unsigned long inputPos = input->tell();
length = readU32(input);
if (!length)
break;
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
blockIdx = readU8(input);
if (blockIdx != 2)
- input->seek(inputPos + length, WPX_SEEK_SET);
+ input->seek(inputPos + length, RVNG_SEEK_SET);
else
{
- input->seek(1, WPX_SEEK_CUR);
+ input->seek(1, RVNG_SEEK_CUR);
formatNumber = readU16(input);
if (0x80 != readU8(input))
{
- input->seek(inputPos + length, WPX_SEEK_SET);
+ input->seek(inputPos + length, RVNG_SEEK_SET);
blockIdx = 0;
}
else
{
if (0xc2 != readU8(input))
{
- input->seek(inputPos + length, WPX_SEEK_SET);
+ input->seek(inputPos + length, RVNG_SEEK_SET);
blockIdx = 0;
}
else
@@ -347,7 +347,7 @@ void libvisio::VSD6Parser::readTextField(WPXInputStream *input)
}
}
- if (input->atEOS())
+ if (input->isEnd())
return;
if (blockIdx != 2)
diff --git a/src/lib/VSD6Parser.h b/src/lib/VSD6Parser.h
index dd7663b..50c5859 100644
--- a/src/lib/VSD6Parser.h
+++ b/src/lib/VSD6Parser.h
@@ -33,8 +33,7 @@
#include <stdio.h>
#include <iostream>
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
+#include <librevenge/librevenge.h>
#include "VSDParser.h"
#include "VSDInternalStream.h"
@@ -44,18 +43,18 @@ namespace libvisio
class VSD6Parser : public VSDParser
{
public:
- explicit VSD6Parser(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+ explicit VSD6Parser(RVNGInputStream *input, RVNGDrawingInterface *painter);
~VSD6Parser();
protected:
- virtual bool getChunkHeader(WPXInputStream *input);
+ virtual bool getChunkHeader(RVNGInputStream *input);
private:
- void readText(WPXInputStream *input);
- virtual void readCharIX(WPXInputStream *input);
- virtual void readParaIX(WPXInputStream *input);
- virtual void readFillAndShadow(WPXInputStream *input);
- virtual void readName(WPXInputStream *input);
- virtual void readName2(WPXInputStream *input);
- virtual void readTextField(WPXInputStream *input);
+ void readText(RVNGInputStream *input);
+ virtual void readCharIX(RVNGInputStream *input);
+ virtual void readParaIX(RVNGInputStream *input);
+ virtual void readFillAndShadow(RVNGInputStream *input);
+ virtual void readName(RVNGInputStream *input);
+ virtual void readName2(RVNGInputStream *input);
+ virtual void readTextField(RVNGInputStream *input);
VSD6Parser();
VSD6Parser(const VSDParser &);
diff --git a/src/lib/VSDCollector.h b/src/lib/VSDCollector.h
index af47078..2bb889a 100644
--- a/src/lib/VSDCollector.h
+++ b/src/lib/VSDCollector.h
@@ -45,9 +45,9 @@ public:
virtual ~VSDCollector() {}
virtual void collectEllipticalArcTo(unsigned id, unsigned level, double x3, double y3, double x2, double y2, double angle, double ecc) = 0;
- virtual void collectForeignData(unsigned level, const WPXBinaryData &binaryData) = 0;
+ virtual void collectForeignData(unsigned level, const RVNGBinaryData &binaryData) = 0;
virtual void collectOLEList(unsigned id, unsigned level) = 0;
- virtual void collectOLEData(unsigned id, unsigned level, const WPXBinaryData &oleData) = 0;
+ virtual void collectOLEData(unsigned id, unsigned level, const RVNGBinaryData &oleData) = 0;
virtual void collectEllipse(unsigned id, unsigned level, double cx, double cy, double xleft, double yleft, double xtop, double ytop) = 0;
virtual void collectLine(unsigned level, const boost::optional<double> &strokeWidth, const boost::optional<Colour> &c, const boost::optional<unsigned char> &linePattern,
const boost::optional<unsigned char> &startMarker, const boost::optional<unsigned char> &endMarker,
@@ -93,7 +93,7 @@ public:
virtual void collectUnhandledChunk(unsigned id, unsigned level) = 0;
- virtual void collectText(unsigned level, const ::WPXBinaryData &textStream, TextFormat format) = 0;
+ virtual void collectText(unsigned level, const ::RVNGBinaryData &textStream, TextFormat format) = 0;
virtual void collectCharIX(unsigned id, unsigned level, unsigned charCount, const boost::optional<VSDName> &font,
const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize, const boost::optional<bool> &bold,
const boost::optional<bool> &italic, const boost::optional<bool> &underline, const boost::optional<bool> &doubleunderline,
@@ -118,7 +118,7 @@ public:
const boost::optional<Colour> &bgColour, const boost::optional<double> &defaultTabStop,
const boost::optional<unsigned char> &textDirection) = 0;
virtual void collectNameList(unsigned id, unsigned level) = 0;
- virtual void collectName(unsigned id, unsigned level, const ::WPXBinaryData &name, TextFormat format) = 0;
+ virtual void collectName(unsigned id, unsigned level, const ::RVNGBinaryData &name, TextFormat format) = 0;
virtual void collectPageSheet(unsigned id, unsigned level) = 0;
virtual void collectMisc(unsigned level, const VSDMisc &misc) = 0;
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 6063fe2..ec5a0ed 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -57,7 +57,7 @@ static unsigned bitmapId = 0;
namespace
{
-static void _appendUCS4(WPXString &text, UChar32 ucs4Character)
+static void _appendUCS4(RVNGString &text, UChar32 ucs4Character)
{
// Convert carriage returns to new line characters
// Writerperfect/LibreOffice will replace them by <text:line-break>
@@ -76,7 +76,7 @@ static void _appendUCS4(WPXString &text, UChar32 ucs4Character)
libvisio::VSDContentCollector::VSDContentCollector(
- libwpg::WPGPaintInterface *painter,
+ RVNGDrawingInterface *painter,
std::vector<std::map<unsigned, XForm> > &groupXFormsSequence,
std::vector<std::map<unsigned, unsigned> > &groupMembershipsSequence,
std::vector<std::list<unsigned> > &documentPageShapeOrders,
@@ -219,16 +219,16 @@ void libvisio::VSDContentCollector::_flushShape()
numPathElements++;
if (m_lineStyle.pattern && !m_currentLineGeometry.empty())
numPathElements++;
- if (m_currentForeignData.size() && m_currentForeignProps["libwpg:mime-type"] && m_foreignWidth != 0.0 && m_foreignHeight != 0.0)
+ if (m_currentForeignData.size() && m_currentForeignProps["librevenge:mime-type"] && m_foreignWidth != 0.0 && m_foreignHeight != 0.0)
numForeignElements++;
if (m_textStream.size())
numTextElements++;
if (numPathElements+numForeignElements+numTextElements > 1)
- m_shapeOutputDrawing->addStartLayer(WPXPropertyList());
+ m_shapeOutputDrawing->addStartLayer(RVNGPropertyList());
if (numPathElements > 1 && (numForeignElements || numTextElements))
- m_shapeOutputDrawing->addStartLayer(WPXPropertyList());
+ m_shapeOutputDrawing->addStartLayer(RVNGPropertyList());
_flushCurrentPath();
if (numPathElements > 1 && (numForeignElements || numTextElements))
m_shapeOutputDrawing->addEndLayer();
@@ -248,15 +248,15 @@ void libvisio::VSDContentCollector::_flushShape()
void libvisio::VSDContentCollector::_flushCurrentPath()
{
- WPXPropertyList styleProps;
+ RVNGPropertyList styleProps;
_lineProperties(m_lineStyle, styleProps);
_fillAndShadowProperties(m_fillStyle, styleProps);
- WPXPropertyList fillPathProps(styleProps);
+ RVNGPropertyList fillPathProps(styleProps);
fillPathProps.insert("draw:stroke", "none");
- WPXPropertyList linePathProps(styleProps);
+ RVNGPropertyList linePathProps(styleProps);
linePathProps.insert("draw:fill", "none");
- std::vector<WPXPropertyList> tmpPath;
+ std::vector<RVNGPropertyList> tmpPath;
if (m_fillStyle.pattern && !m_currentFillGeometry.empty())
{
bool firstPoint = true;
@@ -268,16 +268,16 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
firstPoint = false;
wasMove = true;
}
- else if (m_currentFillGeometry[i]["libwpg:path-action"]->getStr() == "M")
+ else if (m_currentFillGeometry[i]["librevenge:path-action"]->getStr() == "M")
{
if (!tmpPath.empty())
{
if (!wasMove)
{
- if (tmpPath.back()["libwpg:path-action"]->getStr() != "Z")
+ if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- WPXPropertyList closedPath;
- closedPath.insert("libwpg:path-action", "Z");
+ RVNGPropertyList closedPath;
+ closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
}
@@ -296,10 +296,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if (!wasMove)
{
- if (tmpPath.back()["libwpg:path-action"]->getStr() != "Z")
+ if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- WPXPropertyList closedPath;
- closedPath.insert("libwpg:path-action", "Z");
+ RVNGPropertyList closedPath;
+ closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
}
@@ -308,10 +308,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
}
if (!tmpPath.empty())
{
- WPXPropertyListVector path;
+ RVNGPropertyListVector path;
for (unsigned i = 0; i < tmpPath.size(); ++i)
path.append(tmpPath[i]);
- m_shapeOutputDrawing->addStyle(fillPathProps, WPXPropertyListVector());
+ m_shapeOutputDrawing->addStyle(fillPathProps, RVNGPropertyListVector());
m_shapeOutputDrawing->addPath(path);
}
}
@@ -335,7 +335,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
x = m_currentLineGeometry[i]["svg:x"]->getDouble();
y = m_currentLineGeometry[i]["svg:y"]->getDouble();
}
- else if (m_currentLineGeometry[i]["libwpg:path-action"]->getStr() == "M")
+ else if (m_currentLineGeometry[i]["librevenge:path-action"]->getStr() == "M")
{
if (!tmpPath.empty())
{
@@ -343,10 +343,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if ((x == prevX) && (y == prevY))
{
- if (tmpPath.back()["libwpg:path-action"]->getStr() != "Z")
+ if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- WPXPropertyList closedPath;
- closedPath.insert("libwpg:path-action", "Z");
+ RVNGPropertyList closedPath;
+ closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
}
@@ -374,10 +374,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if ((x == prevX) && (y == prevY))
{
- if (tmpPath.back()["libwpg:path-action"]->getStr() != "Z")
+ if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- WPXPropertyList closedPath;
- closedPath.insert("libwpg:path-action", "Z");
+ RVNGPropertyList closedPath;
+ closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
}
@@ -389,10 +389,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
}
if (!tmpPath.empty())
{
- WPXPropertyListVector path;
+ RVNGPropertyListVector path;
for (unsigned i = 0; i < tmpPath.size(); ++i)
path.append(tmpPath[i]);
- m_shapeOutputDrawing->addStyle(linePathProps, WPXPropertyListVector());
+ m_shapeOutputDrawing->addStyle(linePathProps, RVNGPropertyListVector());
m_shapeOutputDrawing->addPath(path);
}
}
@@ -415,7 +415,7 @@ void libvisio::VSDContentCollector::_flushText()
double angle = 0.0;
transformAngle(angle, m_txtxform);
- WPXPropertyList textBlockProps;
+ RVNGPropertyList textBlockProps;
bool flipX = false;
bool flipY = false;
@@ -437,7 +437,7 @@ void libvisio::VSDContentCollector::_flushText()
textBlockProps.insert("fo:padding-bottom", m_textBlockStyle.bottomMargin);
textBlockProps.insert("fo:padding-left", m_textBlockStyle.leftMargin);
textBlockProps.insert("fo:padding-right", m_textBlockStyle.rightMargin);
- textBlockProps.insert("libwpg:rotate", angle*180/M_PI, WPX_GENERIC);
+ textBlockProps.insert("librevenge:rotate", angle*180/M_PI, RVNG_GENERIC);
switch (m_textBlockStyle.verticalAlign)
{
@@ -477,7 +477,7 @@ void libvisio::VSDContentCollector::_flushText()
m_paraFormats[iPara].charCount = numCharsInText;
}
- m_shapeOutputText->addStartTextObject(textBlockProps, WPXPropertyListVector());
+ m_shapeOutputText->addStartTextObject(textBlockProps, RVNGPropertyListVector());
unsigned int charIndex = 0;
unsigned int paraCharCount = 0;
@@ -488,7 +488,7 @@ void libvisio::VSDContentCollector::_flushText()
for (std::vector<VSDParaStyle>::iterator paraIt = m_paraFormats.begin();
paraIt != m_paraFormats.end() && charIndex < m_charFormats.size(); ++paraIt)
{
- WPXPropertyList paraProps;
+ RVNGPropertyList paraProps;
paraProps.insert("fo:text-indent", (*paraIt).indFirst);
paraProps.insert("fo:margin-left", (*paraIt).indLeft);
@@ -522,9 +522,9 @@ void libvisio::VSDContentCollector::_flushText()
if ((*paraIt).spLine > 0)
paraProps.insert("fo:line-height", (*paraIt).spLine);
else
- paraProps.insert("fo:line-height", -(*paraIt).spLine, WPX_PERCENT);
+ paraProps.insert("fo:line-height", -(*paraIt).spLine, RVNG_PERCENT);
- m_shapeOutputText->addStartTextLine(paraProps);
+ m_shapeOutputText->addOpenParagraph(paraProps, RVNGPropertyListVector());
paraCharCount = (*paraIt).charCount;
@@ -533,9 +533,9 @@ void libvisio::VSDContentCollector::_flushText()
{
paraCharCount -= m_charFormats[charIndex].charCount;
- WPXPropertyList textProps;
+ RVNGPropertyList textProps;
- WPXString fontName;
+ RVNGString fontName;
if (m_charFormats[charIndex].font.m_data.size())
_convertDataToString(fontName, m_charFormats[charIndex].font.m_data, m_charFormats[charIndex].font.m_format);
else
@@ -554,24 +554,24 @@ void libvisio::VSDContentCollector::_flushText()
if (m_charFormats[charIndex].smallcaps) textProps.insert("fo:font-variant", "small-caps");
if (m_charFormats[charIndex].superscript) textProps.insert("style:text-position", "super");
if (m_charFormats[charIndex].subscript) textProps.insert("style:text-position", "sub");
- textProps.insert("fo:font-size", m_charFormats[charIndex].size*72.0, WPX_POINT);
+ textProps.insert("fo:font-size", m_charFormats[charIndex].size*72.0, RVNG_POINT);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list