diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-04-01 15:40:20 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-04-01 15:40:46 +0200 |
| commit | 696214c97ca5a01fc723d88cb1e8e7616fc5bf2b (patch) | |
| tree | c5cfdfad27bd707177447841671e71b96c585bc4 /libwpd | |
| parent | b8eb5d0cdf402129cb236ffaea87ceaeac3319df (diff) | |
Silence some unreachable code warnings
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/libwpd.warnings.patch | 32 | ||||
| -rw-r--r-- | libwpd/makefile.mk | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/libwpd/libwpd.warnings.patch b/libwpd/libwpd.warnings.patch new file mode 100644 index 000000000000..ebc86dc93ca5 --- /dev/null +++ b/libwpd/libwpd.warnings.patch @@ -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 diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index 717facb07f6e..6ecbbfaddacd 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -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 |