[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/source

[Luboš Luňák]

 sw/source/core/access/accpara.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a4d05b95bd65ed2374a20ebf2a86a16d21a20a94
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Wed Jun 18 12:36:26 2014 +0200

    add missing code from 0761f816
    
    This couldn't be merged into cp-4.2 by the time I did the print-comments
    backport because the IAccessible2 backport wasn't complete yet.
    
    Change-Id: I9d8d041194fae6742393cd3252de0307b0171b82

diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 1fca127..b4baca3 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1578,12 +1578,16 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
             for( sal_uInt16 i = 0; i < nSize; ++i )
             {
                 const SwTxtAttr* pHt = (*pSwpHints)[i];
-                if (pHt->Which() == RES_TXTATR_FIELD && (nFldIndex-- == 0))
+                if ( ( pHt->Which() == RES_TXTATR_FIELD
+                       || pHt->Which() == RES_TXTATR_ANNOTATION
+                       || pHt->Which() == RES_TXTATR_INPUTFIELD )
+                     && (nFldIndex-- == 0))
                 {
                     pTxtFld = (SwTxtFld *)pHt;
                     break;
                 }
-                else if (pHt->Which() == RES_TXTATR_REFMARK && (nFldIndex-- == 0))
+                else if (pHt->Which() == RES_TXTATR_REFMARK
+                         && (nFldIndex-- == 0))
                     strTypeName = "set reference";
             }
         }