diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-11-10 01:08:39 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-11-16 16:54:42 +0100 |
| commit | 93193e23750c2739f4e929cb28149509d97a4d8b (patch) | |
| tree | b1b35355c2f51fd6abacb54300ed40c509a8c7cf /sw/source/uibase/uiview | |
| parent | f2eb1eabd5d8e107eb2e6b65d7eec2ff6cbb906f (diff) | |
sw: convert 'a ? b : sal_False' to 'a && b'
Change-Id: I4b7829a1abe1459f2e4915159588fd3e16a14eea
Diffstat (limited to 'sw/source/uibase/uiview')
| -rw-r--r-- | sw/source/uibase/uiview/viewling.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewprt.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 68ff90b860c3..8a880767c819 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -269,7 +269,7 @@ void SwView::SpellStart( SvxSpellArea eWhich, SwConversionArgs *pConvArgs ) { Reference< XLinguProperties > xProp = ::GetLinguPropertySet(); - bool bIsWrapReverse = (!pConvArgs && xProp.is()) ? xProp->getIsWrapReverse() : sal_False; + bool bIsWrapReverse = !pConvArgs && xProp.is() && xProp->getIsWrapReverse(); SwDocPositions eStart = DOCPOS_START; SwDocPositions eEnde = DOCPOS_END; @@ -449,7 +449,7 @@ void SwView::HyphenateDocument() m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later - bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False; + bool bHyphSpecial = xProp.is() && xProp->getIsHyphSpecial(); bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection() || m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext(); bool bOther = m_pWrtShell->HasOtherCnt() && bHyphSpecial && !bSelection; diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 3d64f8b8b834..59f18ac037c4 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -191,11 +191,11 @@ void SwView::ExecutePrint(SfxRequest& rReq) { SwWrtShell* pSh = &GetWrtShell(); SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false); - bool bSilent = pSilentItem ? pSilentItem->GetValue() : sal_False; + bool bSilent = pSilentItem && pSilentItem->GetValue(); SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, false); if(pPrintFromMergeItem) rReq.RemoveItem(FN_QRY_MERGE); - bool bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : sal_False; + bool bFromMerge = pPrintFromMergeItem && pPrintFromMergeItem->GetValue(); SwMiscConfig aMiscConfig; bool bPrintSelection = false; if(!bSilent && !bFromMerge && |