diff options
| author | jailletc36 <christophe.jaillet@wanadoo.fr> | 2012-11-11 10:42:37 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-12 10:58:57 +0000 |
| commit | 273a60af9aae1a0b87d2ff43bdfb0cd849b29d27 (patch) | |
| tree | 874ebb1484c2ac1e4f20f1bf2bd7f0942f2842be /sw/source/filter/ww8/ww8par5.cxx | |
| parent | WaE: declaration of īpPVī shadows a previous local (diff) | |
| download | core-273a60af9aae1a0b87d2ff43bdfb0cd849b29d27.tar.gz core-273a60af9aae1a0b87d2ff43bdfb0cd849b29d27.zip | |
cppCheck: clarifyCondition
Remove some warnings about:
Boolean result is used in bitwise operation
Suspicious condition (assignment + comparison)
Also reduce scope of a variable.
Change-Id: I553e5a09ed1d6276be61efbbb2c28d165a69af39
Signed-off-by: jailletc36 <christophe.jaillet@wanadoo.fr>
Reviewed-on: https://gerrit.libreoffice.org/1031
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'sw/source/filter/ww8/ww8par5.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index f53d35439645..037c4bed7c8f 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3464,12 +3464,12 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr ) String sURL, sTarget, sMark; bool bDataImport = false; //HYPERLINK "filename" [switches] - bool bOptions=false; rStr = comphelper::string::stripEnd(rStr, 1); if (!bDataImport) { + bool bOptions = false; long nRet; _ReadFieldParams aReadParam( rStr ); while( -1 != ( nRet = aReadParam.SkipToNextToken() )) @@ -3477,7 +3477,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr ) switch( nRet ) { case -2: - if (!sURL.Len() & !bOptions) + if (!sURL.Len() && !bOptions) ConvertFFileName(sURL, aReadParam.GetResult()); break; |