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

workaround error C2589: ´(´ : illegal token on right side of ´::´

Browse Source 
Change-Id: I3654a4eb4caa3a987f6d797c9bcb577c6fd6b426
This commit is contained in:
Caolán McNamara
2015-01-02 19:07:35 +00:00
parent 875d45d8bd
commit 1fc30a25e2
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/libvisio/UnpackedTarball_libvisio.mk vendored
View File

@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
external/libvisio/vsd-msvc-max.patch.1 \
))
# vim: set noet sw=4 ts=4:

19
external/libvisio/vsd-msvc-max.patch.1 vendored Normal file
View File

@@ -0,0 +1,19 @@
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2256,14 +2256,14 @@
styleProps.insert("draw:marker-start-viewbox", _linePropertiesMarkerViewbox(style.startMarker));
styleProps.insert("draw:marker-start-path", _linePropertiesMarkerPath(style.startMarker));
double w = m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
- styleProps.insert("draw:marker-start-width", std::max(w, 0.05));
+ styleProps.insert("draw:marker-start-width", (std::max)(w, 0.05));
}
if (style.endMarker > 0)
{
styleProps.insert("draw:marker-end-viewbox", _linePropertiesMarkerViewbox(style.endMarker));
styleProps.insert("draw:marker-end-path", _linePropertiesMarkerPath(style.endMarker));
double w = m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
- styleProps.insert("draw:marker-end-width", std::max(w, 0.05));
+ styleProps.insert("draw:marker-end-width", (std::max)(w, 0.05));
}
int dots1 = 0;