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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/source/cfgitem.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/edit.cxx | 6 | ||||
| -rw-r--r-- | starmath/source/mathmlexport.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index 09201bf5c60a..7b40f8b619a4 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -136,7 +136,7 @@ protected: void SetFormatModified( bool bVal ); inline bool IsFormatModified() const { return bIsFormatModified; } void SetFontFormatListModified( bool bVal ); - inline bool IsFontFormatListModified() const { return pFontFormatList ? pFontFormatList->IsModified(): false; } + inline bool IsFontFormatListModified() const { return pFontFormatList && pFontFormatList->IsModified(); } SmFontFormatList & GetFontFormatList(); const SmFontFormatList & GetFontFormatList() const diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index ca437e621baa..4376b7ad8fb6 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -79,7 +79,7 @@ void SmGetLeftSelectionPart(const ESelection &rSel, bool SmEditWindow::IsInlineEditEnabled() { SmViewShell *pView = GetView(); - return pView ? pView->IsInlineEditEnabled() : false; + return pView && pView->IsInlineEditEnabled(); } @@ -947,13 +947,13 @@ void SmEditWindow::SetSelection(const ESelection &rSel) bool SmEditWindow::IsEmpty() const { EditEngine *pEditEngine = ((SmEditWindow *) this)->GetEditEngine(); - bool bEmpty = ( pEditEngine ? pEditEngine->GetTextLen() == 0 : false); + bool bEmpty = ( pEditEngine && pEditEngine->GetTextLen() == 0 ); return bEmpty; } bool SmEditWindow::IsSelected() const { - return pEditView ? pEditView->HasSelection() : false; + return pEditView && pEditView->HasSelection(); } diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 9a8170546dad..57547dd49c7c 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -669,7 +669,7 @@ void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps) if (pProps) { SmConfig *pConfig = SM_MOD()->GetConfig(); - const bool bUsedSymbolsOnly = pConfig ? pConfig->IsSaveOnlyUsedSymbols() : false; + const bool bUsedSymbolsOnly = pConfig && pConfig->IsSaveOnlyUsedSymbols(); const OUString sFormula ( "Formula" ); const OUString sBasicLibraries ( "BasicLibraries" ); |