[Libreoffice-commits] core.git: 2 commits - sw/source

[Michael Stahl]

 sw/source/ui/index/cnttab.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 1a18c27bfbaec32520f2a03b40ae09c9e44c59b8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 29 16:07:55 2014 +0200

    sw: actually why does this not simply call FlatIndex()?
    
    Change-Id: I74f5e25a05ca3c4c0259dd7f33da57a9e0790caa

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c3d04ef..31bcf37 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -368,11 +368,7 @@ short SwMultiTOXTabDialog::Ok()
     SwTOXDescription& rDesc = GetTOXDescription(eCurrentTOXType);
     SwTOXBase aNewDef(*rSh.GetDefaultTOXBase( eCurrentTOXType.eType, true ));
 
-    const sal_uInt16 nIndex = static_cast< sal_uInt16 >(
-        (eCurrentTOXType.eType == TOX_USER && eCurrentTOXType.nIndex)
-        ? TOX_AUTHORITIES + eCurrentTOXType.nIndex
-        : eCurrentTOXType.eType);
-
+    const sal_uInt16 nIndex = eCurrentTOXType.GetFlatIndex();
     if(pFormArr[nIndex])
     {
         rDesc.SetForm(*pFormArr[nIndex]);
commit ccfbc9e1791dd764bb06b87b3c65a7d2b76a35f2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 29 15:58:11 2014 +0200

    fdo#76696: CurTOXType::GetFlatIndex(): fix inverted conditional
    
    (regression from 6af1e845baa0ec63ce16f25868e5e3313bd647bb)
    
    Change-Id: I22dd77fe9bb03f2cf4ce4518ef12c566aad66785

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 0e44b97..c3d04ef 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])
     {