From 84958e1a1bd9a3019300f558c66e468f8accf279 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sun, 25 Mar 2018 13:49:42 +0200 Subject: accessibility: more simplifiation in OCommonAccessibleText. Change-Id: If1284f2e50be08372dda08a8250263c9ec435923 Reviewed-on: https://gerrit.libreoffice.org/51825 Tested-by: Jenkins Tested-by: Arnaud Versini Reviewed-by: Noel Grandin --- accessibility/inc/extended/textwindowaccessibility.hxx | 6 ++++-- accessibility/source/extended/textwindowaccessibility.cxx | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'accessibility') diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 8487da9d9da7..7299b3954a9f 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -161,9 +161,11 @@ public: private: // OCommonAccessibleText - virtual void implGetParagraphBoundary( css::i18n::Boundary& rBoundary, + virtual void implGetParagraphBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) override; - virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary, + virtual void implGetLineBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 4c5309795867..50ea92f78238 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -634,10 +634,11 @@ void Paragraph::implGetSelection(::sal_Int32 & rStartIndex, } // virtual -void Paragraph::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, - ::sal_Int32 nIndex ) +void Paragraph::implGetParagraphBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, + ::sal_Int32 nIndex ) { - ::sal_Int32 nLength = implGetText().getLength(); + ::sal_Int32 nLength = rText.getLength(); if ( implIsValidIndex( nIndex, nLength ) ) { @@ -652,10 +653,11 @@ void Paragraph::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, } // virtual -void Paragraph::implGetLineBoundary( css::i18n::Boundary& rBoundary, - ::sal_Int32 nIndex ) +void Paragraph::implGetLineBoundary( const OUString& rText, + css::i18n::Boundary& rBoundary, + ::sal_Int32 nIndex ) { - ::sal_Int32 nLength = implGetText().getLength(); + ::sal_Int32 nLength = rText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) { -- cgit