Silence some unreachable code warnings

This commit is contained in:
Fridrich Štrba 2011-04-01 15:40:20 +02:00
parent 2ee4f9ee01
commit cd6a251f97
2 changed files with 34 additions and 1 deletions

View file

@ -0,0 +1,32 @@
--- misc/libwpd-0.9.1/src/lib/libwpd_internal.cpp
+++ misc/build/libwpd-0.9.1/src/lib/libwpd_internal.cpp
@@ -998,21 +998,25 @@ _WPXColumnProperties::_WPXColumnProperties()
// HACK: this function is really cheesey
int _extractNumericValueFromRoman(const char romanChar)
{
+ int retValue = 0;
switch (romanChar)
{
case 'I':
case 'i':
- return 1;
+ retValue = 1;
+ break;
case 'V':
case 'v':
- return 5;
+ retValue = 5;
+ break;
case 'X':
case 'x':
- return 10;
+ retValue = 10;
+ break;
default:
throw ParseException();
}
- return 1;
+ return retValue;
}
// _extractDisplayReferenceNumberFromBuf: given a nuWP6_DEFAULT_FONT_SIZEmber string in UCS2 represented

View file

@ -44,7 +44,8 @@ TARGET=wpd
TARFILE_NAME=libwpd-0.9.1
TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c
PATCH_FILES=libwpd.gcc460.patch \
libwpd.corruptedprefix.patch
libwpd.corruptedprefix.patch \
libwpd.warnings.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib