mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uploading libvisio-0.0.7

Browse Source
This commit is contained in:
Fridrich Štrba
2011-09-09 13:57:37 +02:00
parent 67d6de5c27
commit 392146b6b3
4 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libvisio/libvisio-0.0.6-crash.patch
View File

@@ -1,26 +0,0 @@
--- misc/libvisio-0.0.6/src/lib/VSDXContentCollector.cpp 2011-08-31 11:10:40.000000000 +0200
+++ misc/build/libvisio-0.0.6/src/lib/VSDXContentCollector.cpp 2011-09-03 00:15:39.134916000 +0200
@@ -893,7 +893,13 @@
// Get stencil geometry so as to find stencil NURBS data ID
VSDXGeometryListElement * element = m_stencilShape->m_geometries[m_currentGeometryCount-1].getElement(id);
- dataID = dynamic_cast<VSDXNURBSTo2*>(element)->m_dataID;
+ VSDXNURBSTo2* tmpElement = dynamic_cast<VSDXNURBSTo2*>(element);
+ if (!tmpElement)
+ {
+ _handleLevelChange(level);
+ return;
+ }
+ dataID = tmpElement->m_dataID;
iter = m_stencilShape->m_nurbsData.find(dataID);
}
else // No stencils involved, directly get dataID and fill in missing parts
@@ -903,7 +909,7 @@
if (iter != m_NURBSData.end())
{
- data = iter->second;
+ data = iter->second;;
data.knots.push_back(knot);
data.knots.push_back(data.lastKnot);
data.knots.insert(data.knots.begin(), knotPrev);

6
libvisio/libvisio-0.0.6.patch → libvisio/libvisio-0.0.7.patch
View File

@@ -1,6 +1,6 @@
--- misc/libvisio-0.0.6/src/lib/libvisio_utils.h
+++ misc/build/libvisio-0.0.6/src/lib/libvisio_utils.h
@@ -31,17 +31,8 @@
--- misc/libvisio-0.0.7/src/lib/libvisio_utils.h
+++ misc/build/libvisio-0.0.7/src/lib/libvisio_utils.h
@@ -41,17 +41,8 @@
#else

6
libvisio/makefile.mk
View File

@@ -54,11 +54,11 @@ INCPRE+=$(LIBWPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF
TARFILE_NAME=libvisio-0.0.6
TARFILE_MD5=8c50b6c3e4b323013164f4a6d8d74dc6
TARFILE_NAME=libvisio-0.0.7
TARFILE_MD5=cfb4259665fa96874deaa1b233d0b9c2
PATCH_FILES=\
libvisio-0.0.6.patch libvisio-0.0.6-crash.patch
libvisio-0.0.7.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)

2
ooo.lst.in
View File

@@ -88,7 +88,7 @@ d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
8c50b6c3e4b323013164f4a6d8d74dc6-libvisio-0.0.6.tar.bz2
cfb4259665fa96874deaa1b233d0b9c2-libvisio-0.0.7.tar.bz2
881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
@GOOGLE_DOCS_EXTENSION_PACK@
http://dev-www.libreoffice.org/extern