diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-02 15:42:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-05 12:47:48 +0200 |
commit | 4f9b21248ffdf55cef9f3f9d1da76778ee000775 (patch) | |
tree | b059d288339a68aa4c3901f1100e99b04d05a23d /sc/source/ui/dbgui | |
parent | b4107411900f5bb4c215e2d9db09fc2b2b82939b (diff) |
simplify ternary conditions "xxx ? yyy : false"
Look for code like:
xxx ? yyy : false;
Which can be simplified to:
xxx && yyy
Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
Diffstat (limited to 'sc/source/ui/dbgui')
-rw-r--r-- | sc/source/ui/dbgui/asciiopt.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/dbgui/imoptdlg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 268e1949dbd8..ef39fdf1d3de 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -272,14 +272,14 @@ void ScAsciiOptions::ReadFromString( const OUString& rString ) if (nCount >= 7) { aToken = rString.getToken(6, ','); - bQuotedFieldAsText = aToken.equalsAscii("true") ? true : false; + bQuotedFieldAsText = aToken.equalsAscii("true"); } // Detect special numbers. if (nCount >= 8) { aToken = rString.getToken(7, ','); - bDetectSpecialNumber = aToken.equalsAscii("true") ? true : false; + bDetectSpecialNumber = aToken.equalsAscii("true"); } else bDetectSpecialNumber = true; // default of versions that didn't add the parameter diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 4dbc1d45b5d4..39c44a3d702b 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -60,7 +60,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) if ( nTokenCount == 4 ) { // compatibility with old options string: "Save as shown" as 4th token, numeric - bSaveAsShown = (rStr.getToken( 3, ',' ).toInt32() ? sal_True : false); + bSaveAsShown = (rStr.getToken( 3, ',' ).toInt32() ? true : false); bQuoteAllText = true; // use old default then } else |