summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-07 12:27:49 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-07 16:26:43 +0000
commit42e749429d6f01863d5af1e42fce583494e41212 (patch)
tree1af5f701df9b8464ce2b5237b8d269f9d6b92ab8
parentade9581cda79733e9762e4f49808bb82fbf594f2 (diff)
coverity#704369 Logically dead code
Change-Id: I2fb01f407eee9a8bb4c63f2dda70e5088c80e4cf
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx15
1 files changed, 1 insertions, 14 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 0aa98a42fac2..1a12a17e61ce 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3185,20 +3185,8 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short
// 3 = double, 4 = dotted, 5 = hidden
// 6 = thick, 7 = dash, 8 = dot(not used)
// 9 = dotdash 10 = dotdotdash 11 = wave
-
- // pruefe auf Sonderfall "fett+unterstrichen"
- bool bAlsoBold = /*( 6 == b )*/ false;
- // erst mal ggfs. *bold* einschalten!
- if( bAlsoBold )
- {
- sal_uInt8 nOn = 1;
- Read_BoldUsw( 0x0835, &nOn, nLen );
- eUnderline = UNDERLINE_SINGLE;
- }
- else
+ switch( *pData )
{
- switch( *pData )
- {
case 2: bWordLine = true; // no break;
case 1: eUnderline = (FontUnderline)UNDERLINE_SINGLE; break;
case 3: eUnderline = (FontUnderline)UNDERLINE_DOUBLE; break;
@@ -3216,7 +3204,6 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short
case 26:eUnderline = (FontUnderline)UNDERLINE_BOLDDASHDOTDOT;break;
case 27:eUnderline = (FontUnderline)UNDERLINE_BOLDWAVE; break;
case 43:eUnderline = (FontUnderline)UNDERLINE_DOUBLEWAVE; break;
- }
}
}