Skip to content

Commit ee6263e

Browse files
fridrichfridrich
committed
trying to move libvisio to librevenge API
Change-Id: I6a17a8e0e435b4de87e0017bddb5d16f6b1a543d
1 parent 410f564 commit ee6263e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1279
-1899
lines changed

‎build/win32/libvisio.dsp

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/win32/libvisio.vcproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
</FileConfiguration>
526526
</File>
527527
<File
528-
RelativePath="..\..\src\lib\VSDStringVector.cpp"
528+
RelativePath="..\..\src\lib\RVNGStringVector.cpp"
529529
>
530530
<FileConfiguration
531531
Name="Debug|Win32"
@@ -758,7 +758,7 @@
758758
>
759759
</File>
760760
<File
761-
RelativePath="..\..\inc\libvisio\VSDStringVector.h"
761+
RelativePath="..\..\inc\libvisio\RVNGStringVector.h"
762762
>
763763
</File>
764764
<File

‎build/win32/libvisio.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199199
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
200200
</ClCompile>
201-
<ClCompile Include="..\..\src\lib\VSDStringVector.cpp">
201+
<ClCompile Include="..\..\src\lib\RVNGStringVector.cpp">
202202
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
203203
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
204204
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -262,7 +262,7 @@
262262
<ItemGroup>
263263
<ClInclude Include="..\..\inc\libvisio\libvisio.h" />
264264
<ClInclude Include="..\..\inc\libvisio\VisioDocument.h" />
265-
<ClInclude Include="..\..\inc\libvisio\VSDStringVector.h" />
265+
<ClInclude Include="..\..\inc\libvisio\RVNGStringVector.h" />
266266
<ClInclude Include="..\..\src\lib\libvisio_utils.h" />
267267
<ClInclude Include="..\..\src\lib\tokenhash.h" />
268268
<ClInclude Include="..\..\src\lib\tokens.h" />

‎build/win32/vsd2raw.dsp

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/win32/vsd2raw.vcproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
/>
7272
<Tool
7373
Name="VCLinkerTool"
74-
AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
74+
AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
7575
OutputFile="Debug\bin\vsd2raw.exe"
7676
LinkIncremental="2"
7777
SuppressStartupBanner="true"
@@ -160,7 +160,7 @@
160160
/>
161161
<Tool
162162
Name="VCLinkerTool"
163-
AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
163+
AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
164164
OutputFile="Release\bin\vsd2raw.exe"
165165
LinkIncremental="1"
166166
SuppressStartupBanner="true"

‎build/win32/vsd2raw.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Culture>0x0409</Culture>
7171
</ResourceCompile>
7272
<Link>
73-
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
73+
<AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
7474
<OutputFile>Debug\bin\vsd2raw.exe</OutputFile>
7575
<SuppressStartupBanner>true</SuppressStartupBanner>
7676
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -112,7 +112,7 @@
112112
<Culture>0x0409</Culture>
113113
</ResourceCompile>
114114
<Link>
115-
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
115+
<AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
116116
<OutputFile>Release\bin\vsd2raw.exe</OutputFile>
117117
<SuppressStartupBanner>true</SuppressStartupBanner>
118118
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

‎build/win32/vsd2xhtml.dsp

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/win32/vsd2xhtml.vcproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
/>
7070
<Tool
7171
Name="VCLinkerTool"
72-
AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
72+
AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
7373
OutputFile="Release\bin\vsd2xhtml.exe"
7474
LinkIncremental="1"
7575
SuppressStartupBanner="true"
@@ -159,7 +159,7 @@
159159
/>
160160
<Tool
161161
Name="VCLinkerTool"
162-
AdditionalDependencies="libvisio-0.0.lib libwpd-0.9.lib libwpd-stream-0.9.lib"
162+
AdditionalDependencies="libvisio-0.0.lib librevenge-0.9.lib librevenge-stream-0.9.lib"
163163
OutputFile="Debug\bin\vsd2xhtml.exe"
164164
LinkIncremental="2"
165165
SuppressStartupBanner="true"

‎build/win32/vsd2xhtml.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<Culture>0x0409</Culture>
6969
</ResourceCompile>
7070
<Link>
71-
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
71+
<AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
7272
<OutputFile>Release\bin\vsd2xhtml.exe</OutputFile>
7373
<SuppressStartupBanner>true</SuppressStartupBanner>
7474
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -111,7 +111,7 @@
111111
<Culture>0x0409</Culture>
112112
</ResourceCompile>
113113
<Link>
114-
<AdditionalDependencies>libvisio-0.0.lib;libwpd-0.9.lib;libwpd-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
114+
<AdditionalDependencies>libvisio-0.0.lib;librevenge-0.9.lib;librevenge-stream-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
115115
<OutputFile>Debug\bin\vsd2xhtml.exe</OutputFile>
116116
<SuppressStartupBanner>true</SuppressStartupBanner>
117117
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LIBXML_LIB_DIR);$(ZLIB_LIB_DIR);$(ICU_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

‎configure.ac

+7-11
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ AC_PREREQ([2.65])
66
# Version informations
77
# ====================
88
m4_define([libvisio_version_major],[0])
9-
m4_define([libvisio_version_minor],[0])
10-
m4_define([libvisio_version_micro],[31])
9+
m4_define([libvisio_version_minor],[1])
10+
m4_define([libvisio_version_micro],[0])
1111
m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro])
1212

1313
# =============
@@ -57,13 +57,9 @@ AC_SUBST(GPERF)
5757
# ====================
5858
# Find additional apps
5959
# ====================
60-
PKG_CHECK_MODULES([WPD],[
61-
libwpd-0.9 >= 0.9.5
62-
libwpd-stream-0.9 >= 0.9.5
63-
])
64-
65-
PKG_CHECK_MODULES([WPG],[
66-
libwpg-0.2
60+
PKG_CHECK_MODULES([REVENGE],[
61+
librevenge-0.0
62+
librevenge-stream-0.0
6763
])
6864

6965
PKG_CHECK_MODULES([LIBXML],[
@@ -251,8 +247,8 @@ AS_IF([test "x$native_win32" = "xyes"], [
251247
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow -pedantic"
252248
])
253249
])
254-
LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS} ${ICU_CFLAGS}"
255-
LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS} ${ICU_LIBS}"
250+
LIBVISIO_CXXFLAGS="${REVENGE_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS} ${ICU_CFLAGS}"
251+
LIBVISIO_LIBS="${REVENGE_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS} ${ICU_LIBS}"
256252
AC_SUBST(LIBVISIO_CXXFLAGS)
257253
AC_SUBST(LIBVISIO_LIBS)
258254

‎createBuildNumber.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# License along with this library; if not, write to the Free Software
2323
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2424
#
25-
# For further information visit http://libwpd.sourceforge.net
25+
# For further information visit http://librevenge.sourceforge.net
2626
#
2727
#
2828
# "This product is not manufactured, approved, or supported by

‎inc/libvisio/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
EXTRA_DIST = \
22
libvisio.h \
3-
VSDStringVector.h \
43
VisioDocument.h

‎inc/libvisio/VSDStringVector.h

-61
This file was deleted.

‎inc/libvisio/VisioDocument.h

+6-10
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@
3131
#ifndef __VISIODOCUMENT_H__
3232
#define __VISIODOCUMENT_H__
3333

34-
#include <libwpd/libwpd.h>
35-
#include <libwpg/libwpg.h>
36-
#include "VSDStringVector.h"
37-
38-
class WPXInputStream;
34+
#include <librevenge/librevenge.h>
3935

4036
namespace libvisio
4137
{
@@ -44,15 +40,15 @@ class VisioDocument
4440
{
4541
public:
4642

47-
static bool isSupported(WPXInputStream *input);
43+
static bool isSupported(RVNGInputStream *input);
4844

49-
static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
45+
static bool parse(RVNGInputStream *input, RVNGDrawingInterface *painter);
5046

51-
static bool parseStencils(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
47+
static bool parseStencils(RVNGInputStream *input, RVNGDrawingInterface *painter);
5248

53-
static bool generateSVG(WPXInputStream *input, VSDStringVector &output);
49+
static bool generateSVG(RVNGInputStream *input, RVNGStringVector &output);
5450

55-
static bool generateSVGStencils(WPXInputStream *input, VSDStringVector &output);
51+
static bool generateSVGStencils(RVNGInputStream *input, RVNGStringVector &output);
5652
};
5753

5854
} // namespace libvisio

‎inc/libvisio/libvisio.h

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#ifndef __LIBVISIO_H__
3232
#define __LIBVISIO_H__
3333

34-
#include <libwpd/libwpd.h>
35-
#include <libwpg/libwpg.h>
3634
#include "VisioDocument.h"
3735

3836
#endif

0 commit comments

Comments
 (0)