Kaydet (Commit) cd546700 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Norbert Thiebaud

OUString cleanup in editeng/acessibility

Change-Id: I5f8b73aab1e67a5ac071427574fa943a844fbf96
Reviewed-on: https://gerrit.libreoffice.org/1469Reviewed-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Tested-by: 's avatarThomas Arnhold <thomas@arnhold.org>
Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst 0e028d6c
...@@ -185,7 +185,7 @@ namespace accessibility ...@@ -185,7 +185,7 @@ namespace accessibility
uno::Reference< XAccessible > xChild( static_cast< ::cppu::OWeakObject* > (pChild), uno::UNO_QUERY ); uno::Reference< XAccessible > xChild( static_cast< ::cppu::OWeakObject* > (pChild), uno::UNO_QUERY );
if( !xChild.is() ) if( !xChild.is() )
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Child creation failed")), xFrontEnd); throw uno::RuntimeException("Child creation failed", xFrontEnd);
aChild = WeakPara::HardRefType( xChild, pChild ); aChild = WeakPara::HardRefType( xChild, pChild );
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <editeng/AccessibleSelectionBase.hxx> #include <editeng/AccessibleSelectionBase.hxx>
using namespace ::rtl;
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::accessibility;
......
...@@ -300,8 +300,7 @@ namespace accessibility ...@@ -300,8 +300,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( !mpTextParagraph ) if( !mpTextParagraph )
throw lang::DisposedException ( throw lang::DisposedException ("object has been already disposed", mxThis );
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), mxThis );
// TODO: Have a differnt method on AccessibleEditableTextPara // TODO: Have a differnt method on AccessibleEditableTextPara
// that does not care about state changes // that does not care about state changes
...@@ -353,7 +352,7 @@ namespace accessibility ...@@ -353,7 +352,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( nFlatIndex < 0 ) if( nFlatIndex < 0 )
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds")), throw lang::IndexOutOfBoundsException("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds",
mxThis); mxThis);
// gratuitously accepting larger indices here, AccessibleEditableTextPara will throw eventually // gratuitously accepting larger indices here, AccessibleEditableTextPara will throw eventually
...@@ -386,7 +385,7 @@ namespace accessibility ...@@ -386,7 +385,7 @@ namespace accessibility
} }
// not found? Out of bounds // not found? Out of bounds
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds")), throw lang::IndexOutOfBoundsException("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds",
mxThis); mxThis);
} }
...@@ -643,7 +642,7 @@ namespace accessibility ...@@ -643,7 +642,7 @@ namespace accessibility
return mpImpl->GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex ); return mpImpl->GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex );
} }
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -709,7 +708,7 @@ namespace accessibility ...@@ -709,7 +708,7 @@ namespace accessibility
return -1; return -1;
} }
::rtl::OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw (uno::RuntimeException) OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw (uno::RuntimeException)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -718,7 +717,7 @@ namespace accessibility ...@@ -718,7 +717,7 @@ namespace accessibility
// #104481# Return the empty string for 'no selection' // #104481# Return the empty string for 'no selection'
if( nStart < 0 || nEnd < 0 ) if( nStart < 0 || nEnd < 0 )
return ::rtl::OUString(); return OUString();
return getTextRange( nStart, nEnd ); return getTextRange( nStart, nEnd );
} }
...@@ -762,19 +761,19 @@ namespace accessibility ...@@ -762,19 +761,19 @@ namespace accessibility
aEndIndex.nPara, aEndIndex.nIndex ); aEndIndex.nPara, aEndIndex.nIndex );
} }
::rtl::OUString SAL_CALL AccessibleStaticTextBase::getText() throw (uno::RuntimeException) OUString SAL_CALL AccessibleStaticTextBase::getText() throw (uno::RuntimeException)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
sal_Int32 i, nParas; sal_Int32 i, nParas;
::rtl::OUString aRes; OUString aRes;
for( i=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i ) for( i=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
aRes += mpImpl->GetParagraph(i).getText(); aRes += mpImpl->GetParagraph(i).getText();
return aRes; return aRes;
} }
::rtl::OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -792,7 +791,7 @@ namespace accessibility ...@@ -792,7 +791,7 @@ namespace accessibility
else else
{ {
sal_Int32 i( aStartIndex.nPara ); sal_Int32 i( aStartIndex.nPara );
::rtl::OUString aRes( mpImpl->GetParagraph(i).getTextRange( aStartIndex.nIndex, OUString aRes( mpImpl->GetParagraph(i).getTextRange( aStartIndex.nIndex,
mpImpl->GetParagraph(i).getCharacterCount()-1) ); mpImpl->GetParagraph(i).getCharacterCount()-1) );
++i; ++i;
...@@ -931,7 +930,7 @@ namespace accessibility ...@@ -931,7 +930,7 @@ namespace accessibility
} }
// XAccessibleTextAttributes // XAccessibleTextAttributes
uno::Sequence< beans::PropertyValue > AccessibleStaticTextBase::getDefaultAttributes( const uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (uno::RuntimeException) uno::Sequence< beans::PropertyValue > AccessibleStaticTextBase::getDefaultAttributes( const uno::Sequence< OUString >& RequestedAttributes ) throw (uno::RuntimeException)
{ {
// get the intersection of the default attributes of all paragraphs // get the intersection of the default attributes of all paragraphs
...@@ -968,7 +967,7 @@ namespace accessibility ...@@ -968,7 +967,7 @@ namespace accessibility
return aDefAttrVec.getAsConstList(); return aDefAttrVec.getAsConstList();
} }
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{ {
// get those default attributes of the paragraph, which are not part // get those default attributes of the paragraph, which are not part
// of the intersection of all paragraphs and add them to the run attributes // of the intersection of all paragraphs and add them to the run attributes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment