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

[Niklas Johansson]

 sw/source/core/access/accpara.cxx     |   25 -------------------------
 sw/source/core/access/accportions.cxx |    9 +++------
 2 files changed, 3 insertions(+), 31 deletions(-)

New commits:
commit e2ff5810f1578794aa2617e8d0b44d64642f8eca
Author: Niklas Johansson <sleeping.pillow at gmail.com>
Date:   Sat Oct 3 00:25:48 2015 +0200

    tdf#93139 Orca Screen Reader does not read bullet part 2
    
    Since we now expose the bullet character to accessible text we should
    not also expose the attributes, that will make NVDA read the bullet
    twice. We can also remove some special cases for the fact that the bullet
    earlier was not apart of the accessible text.
    
    Change-Id: I5a8b84f92c32da7ffabdd5136655d88a2d149e75
    Reviewed-on: https://gerrit.libreoffice.org/19106
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 7d0934c..4822556 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1683,14 +1683,6 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
 
         pValues = aValues.getArray();
 
-        const SwTextNode* pTextNode( GetTextNode() );
-        PropertyValue& rValue = pValues[aValues.getLength() - 1 ];
-        rValue.Name = "NumberingPrefix";
-        OUString sNumBullet = pTextNode->GetNumString();
-        rValue.Value <<= sNumBullet;
-        rValue.Handle = -1;
-        rValue.State = PropertyState_DIRECT_VALUE;
-
         OUString strTypeName = GetFieldTypeNameAtIndex(nIndex);
         if (!strTypeName.isEmpty())
         {
@@ -2364,23 +2356,6 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
             continue;
         }
 
-        //number bullet
-        if (rValue.Name == UNO_NAME_NUMBERING_RULES)
-        {
-            if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
-            {
-                uno::Any aVal;
-                SwNumRule* pNumRule = pTextNode->GetNumRule();
-                if (pNumRule)
-                {
-                    uno::Reference< container::XIndexReplace >  xNum = new SwXNumberingRules(*pNumRule);
-                    aVal.setValue(&xNum, cppu::UnoType<container::XIndexReplace>::get());
-                }
-                rValue.Value <<= aVal;
-            }
-            continue;
-        }
-
         //footnote & endnote
         if (rValue.Name == UNO_NAME_CHAR_ESCAPEMENT)
         {
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 1fb823c..ec6eb87 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -148,13 +148,9 @@ void SwAccessiblePortionData::Special(
     switch( nType )
     {
         case POR_POSTITS:
-            sDisplay = OUString(sal_Unicode(0xfffc));
-            break;
         case POR_FLYCNT:
             sDisplay = OUString(sal_Unicode(0xfffc));
             break;
-        case POR_GRFNUM:
-            break;
         case POR_FLD:
         case POR_HIDDEN:
         case POR_COMBINED:
@@ -180,10 +176,11 @@ void SwAccessiblePortionData::Special(
             break;
         case POR_NUMBER:
         case POR_BULLET:
-        {
             sDisplay = rText + " ";
             break;
-        }
+        // There should probably be some special treatment to graphical bullets
+        case POR_GRFNUM:
+            break;
         // #i111768# - apply patch from kstribley:
         // Include the control characters.
         case POR_CONTROLCHAR: