diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-27 16:07:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-27 16:07:10 +0200 |
commit | 4ab979fce0f92733da568b5ef58b4272738740f5 (patch) | |
tree | 84b68a830e820a5f8f5df2b0d5999895444accbd /accessibility/source | |
parent | a4a1467bc47b81ad68ecad0d5e2e163670582919 (diff) |
Document::retrieveDefaultAttributesImpl did nothing
...ever since dac3b388798e78803a5df77894bfd30cddeb77c3 "INTEGRATION: CWS
a11ysep"
Change-Id: I1bba12e9f6ab69cf561a7eda010cefba91c47a49
Diffstat (limited to 'accessibility/source')
-rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 43 |
1 files changed, 4 insertions, 39 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 322118940159..9d0e19931131 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -489,10 +489,10 @@ sal_Bool SAL_CALL Paragraph::setText(OUString const & rText) // virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL -Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) +Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >&) { checkDisposed(); - return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes ); + return {}; // default attributes are not supported by text engine } // virtual @@ -1017,21 +1017,10 @@ Document::retrieveCharacterAttributes( " Document::retrieveCharacterAttributes", static_cast< css::uno::XWeak * >(this)); - // retrieve default attributes - tPropValMap aCharAttrSeq; - retrieveDefaultAttributesImpl( pParagraph, aRequestedAttributes, aCharAttrSeq ); // retrieve run attributes - tPropValMap aRunAttrSeq; - retrieveRunAttributesImpl( pParagraph, nIndex, aRequestedAttributes, aRunAttrSeq ); - - // merge default and run attributes - for ( tPropValMap::const_iterator aRunIter = aRunAttrSeq.begin(); - aRunIter != aRunAttrSeq.end(); - ++aRunIter ) - { - aCharAttrSeq[ aRunIter->first ] = aRunIter->second; - } + tPropValMap aCharAttrSeq; + retrieveRunAttributesImpl( pParagraph, nIndex, aRequestedAttributes, aCharAttrSeq ); css::beans::PropertyValue* pValues = aAttribs.getArray(); for (i = 0; i < AttributeCount; i++,pValues++) @@ -1059,30 +1048,6 @@ Document::retrieveCharacterAttributes( return aNewValues; } -void Document::retrieveDefaultAttributesImpl( - Paragraph const * pParagraph, - const css::uno::Sequence< OUString >& RequestedAttributes, - tPropValMap& rDefAttrSeq) -{ - // default attributes are not supported by text engine - (void) pParagraph; - (void) RequestedAttributes; - (void) rDefAttrSeq; -} - -css::uno::Sequence< css::beans::PropertyValue > -Document::retrieveDefaultAttributes( - Paragraph const * pParagraph, - const css::uno::Sequence< OUString >& RequestedAttributes) -{ - SolarMutexGuard aGuard; - ::osl::MutexGuard aInternalGuard( GetMutex() ); - - tPropValMap aDefAttrSeq; - retrieveDefaultAttributesImpl( pParagraph, RequestedAttributes, aDefAttrSeq ); - return comphelper::mapValuesToSequence( aDefAttrSeq ); -} - void Document::retrieveRunAttributesImpl( Paragraph const * pParagraph, ::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes, |