summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-29 15:58:11 +0200
committerMichael Stahl <mstahl@redhat.com>2014-04-29 16:22:43 +0200
commitccfbc9e1791dd764bb06b87b3c65a7d2b76a35f2 (patch)
treee2570cc56cf80860454df4a2445ab664ddad7159
parent68075a61c28a5c72429f78776a822ed45fdcb4a7 (diff)
fdo#76696: CurTOXType::GetFlatIndex(): fix inverted conditional
(regression from 6af1e845baa0ec63ce16f25868e5e3313bd647bb) Change-Id: I22dd77fe9bb03f2cf4ce4518ef12c566aad66785
-rw-r--r--sw/source/ui/index/cnttab.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 0e44b976f11c..c3d04ef6268b 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -205,7 +205,7 @@ public:
sal_uInt16 CurTOXType::GetFlatIndex() const
{
return static_cast< sal_uInt16 >( (eType == TOX_USER && nIndex)
- ? eType : TOX_AUTHORITIES + nIndex );
+ ? TOX_AUTHORITIES + nIndex : eType );
}
#define EDIT_MINWIDTH 15
@@ -369,9 +369,9 @@ short SwMultiTOXTabDialog::Ok()
SwTOXBase aNewDef(*rSh.GetDefaultTOXBase( eCurrentTOXType.eType, true ));
const sal_uInt16 nIndex = static_cast< sal_uInt16 >(
- eCurrentTOXType.eType == TOX_USER && eCurrentTOXType.nIndex
- ? eCurrentTOXType.eType
- : TOX_AUTHORITIES + eCurrentTOXType.nIndex );
+ (eCurrentTOXType.eType == TOX_USER && eCurrentTOXType.nIndex)
+ ? TOX_AUTHORITIES + eCurrentTOXType.nIndex
+ : eCurrentTOXType.eType);
if(pFormArr[nIndex])
{