Makefile.am | 12 -----
configure.ac | 2
libvisio-zip.in | 44 ------------------
libvisio.spec.in | 100 ------------------------------------------
src/lib/Makefile.am | 19 ++++---
src/lib/VSDInternalStream.cpp | 16 ------
src/lib/VSDInternalStream.h | 2
src/lib/VSDStencils.cpp | 5 --
src/lib/VSDStencils.h | 1
src/lib/VSDStyles.cpp | 28 -----------
src/lib/VSDStyles.h | 4 -
src/lib/VSDXMLParserBase.cpp | 25 ----------
src/lib/VSDXMLParserBase.h | 1
src/lib/VSDXMLTokenMap.cpp | 16 ------
src/lib/VSDXMLTokenMap.h | 1
15 files changed, 12 insertions(+), 264 deletions(-)
New commits:
commit fd93a83e675ebff31c9ab8d3d0abdc8e41c964fc
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Nov 6 11:31:17 2013 +0100
Some callcatcher stuff
Change-Id: Icf5b5ade64b81a37fac79e930527e3e2b8d841bb
diff --git a/src/lib/VSDInternalStream.cpp b/src/lib/VSDInternalStream.cpp
index 85e3b4d..bf0b605 100644
--- a/src/lib/VSDInternalStream.cpp
+++ b/src/lib/VSDInternalStream.cpp
@@ -33,22 +33,6 @@
#include "VSDInternalStream.h"
-VSDInternalStream::VSDInternalStream(const std::vector<unsigned char> &buffer)
:
- librevenge::RVNGInputStream(),
- m_offset(0),
- m_buffer(buffer)
-{
-}
-
-VSDInternalStream::VSDInternalStream(const unsigned char *buffer, size_t
bufferLength) :
- librevenge::RVNGInputStream(),
- m_offset(0),
- m_buffer(bufferLength)
-{
- memcpy(&m_buffer[0], buffer, bufferLength);
-}
-
-
VSDInternalStream::VSDInternalStream(librevenge::RVNGInputStream *input,
unsigned long size, bool compressed) :
librevenge::RVNGInputStream(),
m_offset(0),
diff --git a/src/lib/VSDInternalStream.h b/src/lib/VSDInternalStream.h
index 87d0436..89a1f5f 100644
--- a/src/lib/VSDInternalStream.h
+++ b/src/lib/VSDInternalStream.h
@@ -40,8 +40,6 @@ class VSDInternalStream : public librevenge::RVNGInputStream
{
public:
VSDInternalStream(librevenge::RVNGInputStream *input, unsigned long size,
bool compressed=false);
- VSDInternalStream(const std::vector<unsigned char> &buffer);
- VSDInternalStream(const unsigned char *buffer, size_t bufferLength);
~VSDInternalStream() {}
virtual bool isStructured()
diff --git a/src/lib/VSDStencils.cpp b/src/lib/VSDStencils.cpp
index e963f72..b6ce4e8 100644
--- a/src/lib/VSDStencils.cpp
+++ b/src/lib/VSDStencils.cpp
@@ -215,9 +215,4 @@ const libvisio::VSDShape
*libvisio::VSDStencils::getStencilShape(unsigned pageId
return tmpStencil->getStencilShape(shapeId);
}
-void libvisio::VSDStencils::clear()
-{
- m_stencils.clear();
-}
-
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDStencils.h b/src/lib/VSDStencils.h
index 4b5139f..dff1cdb 100644
--- a/src/lib/VSDStencils.h
+++ b/src/lib/VSDStencils.h
@@ -104,7 +104,6 @@ public:
{
return m_stencils.size();
}
- void clear();
private:
std::map<unsigned, VSDStencil> m_stencils;
};
diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp
index e820c0e..1ea7356 100644
--- a/src/lib/VSDStyles.cpp
+++ b/src/lib/VSDStyles.cpp
@@ -131,13 +131,6 @@ libvisio::VSDOptionalLineStyle
libvisio::VSDStyles::getOptionalLineStyle(unsigne
return lineStyle;
}
-libvisio::VSDLineStyle libvisio::VSDStyles::getLineStyle(unsigned
lineStyleIndex) const
-{
- VSDLineStyle lineStyle;
- lineStyle.override(getOptionalLineStyle(lineStyleIndex));
- return lineStyle;
-}
-
libvisio::VSDOptionalFillStyle
libvisio::VSDStyles::getOptionalFillStyle(unsigned fillStyleIndex) const
{
VSDOptionalFillStyle fillStyle;
@@ -195,13 +188,6 @@ libvisio::VSDOptionalTextBlockStyle
libvisio::VSDStyles::getOptionalTextBlockSty
return textBlockStyle;
}
-libvisio::VSDTextBlockStyle libvisio::VSDStyles::getTextBlockStyle(unsigned
textStyleIndex) const
-{
- VSDTextBlockStyle textBlockStyle;
- textBlockStyle.override(getOptionalTextBlockStyle(textStyleIndex));
- return textBlockStyle;
-}
-
libvisio::VSDOptionalCharStyle
libvisio::VSDStyles::getOptionalCharStyle(unsigned textStyleIndex) const
{
VSDOptionalCharStyle charStyle;
@@ -227,13 +213,6 @@ libvisio::VSDOptionalCharStyle
libvisio::VSDStyles::getOptionalCharStyle(unsigne
return charStyle;
}
-libvisio::VSDCharStyle libvisio::VSDStyles::getCharStyle(unsigned
textStyleIndex) const
-{
- VSDCharStyle charStyle;
- charStyle.override(getOptionalCharStyle(textStyleIndex));
- return charStyle;
-}
-
libvisio::VSDOptionalParaStyle
libvisio::VSDStyles::getOptionalParaStyle(unsigned textStyleIndex) const
{
VSDOptionalParaStyle paraStyle;
@@ -259,11 +238,4 @@ libvisio::VSDOptionalParaStyle
libvisio::VSDStyles::getOptionalParaStyle(unsigne
return paraStyle;
}
-libvisio::VSDParaStyle libvisio::VSDStyles::getParaStyle(unsigned
textStyleIndex) const
-{
- VSDParaStyle paraStyle;
- paraStyle.override(getOptionalParaStyle(textStyleIndex));
- return paraStyle;
-}
-
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDStyles.h b/src/lib/VSDStyles.h
index 8b680c5..938a1e4 100644
--- a/src/lib/VSDStyles.h
+++ b/src/lib/VSDStyles.h
@@ -449,15 +449,11 @@ public:
void addFillStyleMaster(unsigned fillStyleIndex, unsigned fillStyleMaster);
void addTextStyleMaster(unsigned textStyleIndex, unsigned textStyleMaster);
- VSDLineStyle getLineStyle(unsigned lineStyleIndex) const;
VSDOptionalLineStyle getOptionalLineStyle(unsigned lineStyleIndex) const;
VSDFillStyle getFillStyle(unsigned fillStyleIndex) const;
VSDOptionalFillStyle getOptionalFillStyle(unsigned fillStyleIndex) const;
- VSDTextBlockStyle getTextBlockStyle(unsigned textStyleIndex) const;
VSDOptionalTextBlockStyle getOptionalTextBlockStyle(unsigned textStyleIndex)
const;
- VSDCharStyle getCharStyle(unsigned textStyleIndex) const;
VSDOptionalCharStyle getOptionalCharStyle(unsigned textStyleIndex) const;
- VSDParaStyle getParaStyle(unsigned textStyleIndex) const;
VSDOptionalParaStyle getOptionalParaStyle(unsigned textStyleIndex) const;
private:
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index 9eb7946..762fb13 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -2090,31 +2090,6 @@ int
libvisio::VSDXMLParserBase::readByteData(boost::optional<unsigned char> &val
return ret;
}
-int libvisio::VSDXMLParserBase::readColourData(Colour &value, xmlTextReaderPtr
reader)
-{
- xmlChar *stringValue = readStringData(reader);
- if (stringValue)
- {
- VSD_DEBUG_MSG(("VSDXMLParserBase::readColourData stringValue %s\n", (const
char *)stringValue));
- if (!xmlStrEqual(stringValue, BAD_CAST("Themed")))
- {
- try
- {
- Colour tmpColour = xmlStringToColour(stringValue);
- value = tmpColour;
- }
- catch (const XmlParserException &)
- {
- xmlFree(stringValue);
- throw XmlParserException();
- }
- }
- xmlFree(stringValue);
- return 1;
- }
- return -1;
-}
-
int libvisio::VSDXMLParserBase::readExtendedColourData(Colour &value, long
&idx, xmlTextReaderPtr reader)
{
xmlChar *stringValue = readStringData(reader);
diff --git a/src/lib/VSDXMLParserBase.h b/src/lib/VSDXMLParserBase.h
index 8e545d9..b3e29ab 100644
--- a/src/lib/VSDXMLParserBase.h
+++ b/src/lib/VSDXMLParserBase.h
@@ -90,7 +90,6 @@ protected:
int readDoubleData(double &value, xmlTextReaderPtr reader);
int readBoolData(boost::optional<bool> &value, xmlTextReaderPtr reader);
int readBoolData(bool &value, xmlTextReaderPtr reader);
- int readColourData(Colour &value, xmlTextReaderPtr reader);
int readExtendedColourData(Colour &value, long &idx, xmlTextReaderPtr
reader);
int readExtendedColourData(Colour &value, xmlTextReaderPtr reader);
int readExtendedColourData(boost::optional<Colour> &value, xmlTextReaderPtr
reader);
diff --git a/src/lib/VSDXMLTokenMap.cpp b/src/lib/VSDXMLTokenMap.cpp
index 08070dd..2f7b32a 100644
--- a/src/lib/VSDXMLTokenMap.cpp
+++ b/src/lib/VSDXMLTokenMap.cpp
@@ -46,20 +46,4 @@ int libvisio::VSDXMLTokenMap::getTokenId(const xmlChar *name)
return XML_TOKEN_INVALID;
}
-const xmlChar *libvisio::VSDXMLTokenMap::getTokenName(int tokenId)
-{
- if(tokenId >= XML_TOKEN_COUNT)
- return 0;
-
- const xmltoken *currentToken = wordlist;
- while(currentToken != wordlist+sizeof(wordlist)/sizeof(*wordlist))
- {
- if(currentToken->tokenId == tokenId)
- return BAD_CAST(currentToken->name);
- ++currentToken;
- }
-
- return 0;
-}
-
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSDXMLTokenMap.h b/src/lib/VSDXMLTokenMap.h
index 0fcb2ba..ee69f4d 100644
--- a/src/lib/VSDXMLTokenMap.h
+++ b/src/lib/VSDXMLTokenMap.h
@@ -40,7 +40,6 @@ class VSDXMLTokenMap
{
public:
static int getTokenId(const xmlChar *name);
- static const xmlChar *getTokenName(int tokenId);
};
} // namespace libvisio
commit ec016ece81f4a63b313adef249cddc2f3f547f2e
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Nov 6 11:28:26 2013 +0100
Ditch spec and zip files
Change-Id: I552f00cb2549f4127e89210be013a64b84c3c65d
diff --git a/Makefile.am b/Makefile.am
index 7e1cc85..fdddbeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,21 +14,11 @@ EXTRA_DIST = \
NEWS \
README \
autogen.sh \
- libvisio.pc.in \
- libvisio-zip.in \
- libvisio.spec \
- libvisio.spec.in
+ libvisio.pc.in
distclean-local:
rm -rf *.cache *~ *.out *.pc
-rpm: dist
- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
- @rm -f $(PACKAGE)-$(VERSION).tar.gz
-
-zip: all install
- sh libvisio-zip
-
dist-hook:
git log --date=short --pretty="format:@%cd %an <%ae>
[%H]%n%n%s%n%n%e%b" | sed -e "s|^\([^@]\)|\t\1|" -e "s|^@||"
>$(distdir)/ChangeLog
diff --git a/configure.ac b/configure.ac
index 969bc45..673af7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,8 +333,6 @@ build/win32/Makefile
docs/Makefile
docs/doxygen/Makefile
libvisio-$VSD_MAJOR_VERSION.$VSD_MINOR_VERSION.pc:libvisio.pc.in
-libvisio.spec
-libvisio-zip
])
AC_OUTPUT
diff --git a/libvisio-zip.in b/libvisio-zip.in
deleted file mode 100644
index 3b337ad..0000000
--- a/libvisio-zip.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# Build runtime and developer zipfiles for libvisio on Win32.
-
-ZIP=libvisio-@vsd_vers...@-mingw.zip
-DEVZIP=libvisio-devel-@vsd_vers...@-mingw.zip
-TOOLSZIP=libvisio-tools-@VSD_VERSION@.zip
-
-cd $DESTDIR@prefix@
-
-DLLDIR=lib
-[ -f bin/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.dll ] && \
-DLLDIR=bin
-
-@STRIP@ --strip-unneeded \
-$DLLDIR/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.dll
-
-@STRIP@ --strip-all \
-bin/vsd2raw.exe \
-bin/vsd2xhtml.exe
-
-upx -qqq --best \
-$DLLDIR/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.dll \
-bin/vsd2raw.exe \
-bin/vsd2xhtml.exe
-
-rm -f $ZIP
-zip -q -r $ZIP -@ <<EOF
-$DLLDIR/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.dll
-EOF
-
-rm -f $DEVZIP
-zip -q -r $DEVZIP -@ <<EOF
-include/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
-lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.dll.a
-lib/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.a
-lib/pkgconfig/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.pc
-EOF
-
-rm -f $TOOLSZIP
-zip -q -r -j $TOOLSZIP -@ <<EOF
-bin/vsd2raw.exe
-bin/vsd2xhtml.exe
-EOF
diff --git a/libvisio.spec.in b/libvisio.spec.in
deleted file mode 100644
index 875e948..0000000
--- a/libvisio.spec.in
+++ /dev/null
@@ -1,100 +0,0 @@
-%define name libvisio
-%define version @VERSION@
-%define RELEASE 1
-%define release %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-
-Name: %{name}
-Summary: Library for parsing the visio file format structure
-Version: %{version}
-Release: %{release}
-Source: %{name}-%{version}.tar.gz
-Group: System Environment/Libraries
-URL: http://libvisio.sf.net/
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-BuildRequires: librevenge-devel >= 0.9.0, gcc-c++, libstdc++-devel, pkgconfig
>= 0.9.0
-License: LGPL
-Prefix: %{prefix}
-
-%description
-libvisio is a library for parsing the visio file format structure
-
-%package tools
-Requires: libvisio
-Tools to convert Visio documents into other formats.
-Group: Applications/Publishing
-
-%description tools
-Tools to convert Visio documents into other formats.
-Currently supported: raw xhtml (with embedded svg pages)
-
-%package devel
-Requires: %{name} >= %{version}
-Requires: librevenge-devel >= 0.9.0
-Summary: Files for developing with libvisio.
-Group: Development/Libraries
-
-%description devel
-Includes and definitions for developing with libvisio.
-
-%if %{!?_without_docs:1}%{?_without_docs:0}
-%package docs
-Requires: %{name} >= %{version}
-BuildRequires: doxygen
-Summary: Documentation of libvisio API
-Group: Development/Documentation
-
-%description docs
-Documentation of libvisio API for developing with libvisio
-%endif
-
-%prep
-%__rm -rf $RPM_BUILD_ROOT
-
-%setup -q -n %{name}-%{version}
-
-%build
-%configure --prefix=%{_prefix} --libdir=%{_libdir} \
- %{?_with_debug:--enable-debug} \
-
-%__make
-
-%install
-umask 022
-
-%__make DESTDIR=$RPM_BUILD_ROOT install
-%__rm -rf $RPM_BUILD_ROOT/%{_libdir}/libvisio*.la
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
-
-%files
-%defattr(644,root,root,755)
-%{_libdir}/libvisio*.so.*
-%doc ChangeLog README COPYING AUTHORS
-
-%files tools
-%defattr(755,root,root,755)
-%{_bindir}/visio2*
-
-%files devel
-%defattr(644,root,root,755)
-%{_libdir}/libvisio*.so
-%{_libdir}/pkgconfig/libvisio*.pc
-%{_includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@/libvisio
-
-%if %{!?_without_docs:1}%{?_without_docs:0}
-%files docs
-%{_datadir}/*
-%endif
-
-%changelog
-* Web Aug 10 2011 Rene Engelhard <r...@debian.org>
-- fix up descriptions
-
-* Fri Apr 20 2007 Fridrich Strba <fridrich.st...@bluewin.ch>
-- Add documentation packaging
-- Make doc and stream optional
-
-* Tue Jan 27 2004 Fridrich Strba <fridrich.st...@bluewin.ch>
-- Create rpm spec according to the rpm spec of libwpD
-- of Rui M. Seabra
commit 61795c6bf7c86135324994e4f26aa88b8464ecf4
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Nov 6 11:27:22 2013 +0100
Ditch libtoken.a
Change-Id: I2bf6d364340396cff530f429d27530abcbda80d0
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 41b74a2..5831340 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -5,20 +5,24 @@ version_info = -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
endif
lib_LTLIBRARIES = libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la
-noinst_LTLIBRARIES = libtokenmap.la
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_includedir =
$(includedir)/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@/libvisio
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_include_HEADERS = \
$(top_srcdir)/inc/libvisio/libvisio.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)
+AM_CXXFLAGS = \
+ -I$(top_srcdir)/inc \
+ -I$(top_srcdir)/src/lib \
+ -I$(top_builddir)/src/lib \
+ $(LIBVISIO_CXXFLAGS) \
+ $(DEBUG_CXXFLAGS)
generated_files = \
$(top_builddir)/src/lib/tokens.h \
$(top_builddir)/src/lib/tokenhash.h
-libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = libtokenmap.la
$(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@
-libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES =
@LIBVISIO_WIN32_RESOURCE@ libtokenmap.la
+libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = $(LIBVISIO_LIBS)
@LIBVISIO_WIN32_RESOURCE@
+libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES =
@LIBVISIO_WIN32_RESOURCE@
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info)
-export-dynamic -no-undefined
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES = \
libvisio_utils.cpp \
@@ -58,9 +62,8 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES =
\
VSDStyles.h \
VSDStylesCollector.h \
VSDTypes.h \
- VSDXMLHelper.h
-
-libtokenmap_la_SOURCES = \
+ VSDXMLHelper.h \
+ \
VDXParser.cpp \
VDXParser.h \
VSDXMLParserBase.cpp \
@@ -74,7 +77,7 @@ libtokenmap_la_SOURCES = \
$(generated_files)
-$(libtokenmap_la_OBJECTS) : $(generated_files)
+$(libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_OBJECTS) :
$(generated_files)
$(top_builddir)/src/lib/tokens.h : $(top_builddir)/src/lib/tokens.gperf
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
