diff options
| -rw-r--r-- | sw/source/core/access/accpara.cxx | 25 | ||||
| -rw-r--r-- | sw/source/core/access/accportions.cxx | 9 |
2 files changed, 3 insertions, 31 deletions
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 7d0934c2001a..48225567d4c0 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 1fb823cf96cd..ec6eb87ae886 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: |