diff options
author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-09-07 03:36:42 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-09-07 12:26:19 +0000 |
commit | e1276e83e0e914eab8966a189948d2238c82a1b6 (patch) | |
tree | 7c010d0d9fcf5d43e53e638c535f44048b8ef571 /accessibility/source/extended | |
parent | 346cf4ee5d2f82b59900de1f71160c0d90ffab41 (diff) |
OUString cleanup in accessibility
Change-Id: Ie4e51632bf81053f0d32428bb7ef5b01ec301ccc
Reviewed-on: https://gerrit.libreoffice.org/579
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'accessibility/source/extended')
29 files changed, 260 insertions, 306 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 06201e8fcfb4..bd56b697ba7b 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -31,8 +31,6 @@ namespace accessibility // ============================================================================ -using ::rtl::OUString; - using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -211,7 +209,7 @@ Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding() OUString SAL_CALL AccessibleBrowseBox::getImplementationName() throw ( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBox" ) ); + return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBox" ); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index de953a9f109f..b60dc0bd3bd7 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -36,8 +36,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -80,8 +78,8 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase( IAccessibleTableProvider& rBrowseBox, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType, - const ::rtl::OUString& rName, - const ::rtl::OUString& rDescription ) : + const OUString& rName, + const OUString& rDescription ) : AccessibleBrowseBoxImplHelper( m_aMutex ), mxParent( rxParent ), mpBrowseBox( &rBrowseBox ), @@ -369,7 +367,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService( Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames() throw ( uno::RuntimeException ) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) ); + const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &aServiceName, 1 ); } @@ -620,7 +618,7 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccess // ---------------------------------------------------------------------------- BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox, const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType, - const ::rtl::OUString& rName, const ::rtl::OUString& rDescription ) + const OUString& rName, const OUString& rDescription ) :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription ) { } diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index a5331c31e04b..7e35230abeae 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -133,9 +133,9 @@ namespace accessibility throw ::com::sun::star::lang::IndexOutOfBoundsException(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) + OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.TableCheckBoxCell" ) ); + return OUString( "com.sun.star.comp.svtools.TableCheckBoxCell" ); } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent() diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 5fb72842da6c..b59ad51d85f6 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -32,8 +32,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -333,7 +331,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::release() throw () OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName() throw ( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ) ); + return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ); } namespace diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 4315c707f8ce..925aa5538930 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -112,10 +112,10 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() /** @return The name of this class. */ -::rtl::OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() +OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" ) ); + return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" ); } // ----------------------------------------------------------------------------- namespace diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 319e7377f03d..d5cf0ef1c6ee 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -31,8 +31,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -225,7 +223,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected( OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName() throw ( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxTable" ) ); + return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTable" ); } // internal virtual methods --------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 95115a3582b8..cebe6681775d 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -34,8 +34,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -316,7 +314,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow ) { if( nRow >= implGetRowCount() ) throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this ); + OUString( "row index is invalid" ), *this ); } void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn ) @@ -324,7 +322,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn ) { if( nColumn >= implGetColumnCount() ) throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this ); + OUString( "column index is invalid" ), *this ); } void AccessibleBrowseBoxTableBase::ensureIsValidAddress( @@ -340,7 +338,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) { if( nChildIndex >= implGetChildCount() ) throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this ); + OUString( "child index is invalid" ), *this ); } // ============================================================================ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 72bc72f3e21a..9d0f65e61bc6 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -38,7 +38,7 @@ namespace accessibility { namespace { - static void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) + static void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) { if ( _nIndex >= _sText.getLength() ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); @@ -52,7 +52,6 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace utl; using namespace comphelper; - using ::rtl::OUString; using ::accessibility::AccessibleBrowseBox; using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; @@ -61,7 +60,7 @@ namespace accessibility // implementation of a table cell - ::rtl::OUString AccessibleBrowseBoxTableCell::implGetText() + OUString AccessibleBrowseBoxTableCell::implGetText() { ensureIsAlive(); return mpBrowseBox->GetAccessibleCellText( getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); @@ -97,7 +96,7 @@ namespace accessibility xComponent->addEventListener(static_cast< XEventListener *> (this)); } - void AccessibleBrowseBoxTableCell::nameChanged( const ::rtl::OUString& rNewName, const ::rtl::OUString& rOldName ) + void AccessibleBrowseBoxTableCell::nameChanged( const OUString& rNewName, const OUString& rOldName ) { implSetName( rNewName ); Any aOldValue, aNewValue; @@ -164,10 +163,10 @@ namespace accessibility /** @return The name of this class. */ - ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getImplementationName() + OUString SAL_CALL AccessibleBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxTableCell" ) ); + return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTableCell" ); } /** @return The count of visible children. */ @@ -255,12 +254,12 @@ namespace accessibility ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -274,7 +273,7 @@ namespace accessibility return OCommonAccessibleText::getCharacterCount( ); } - ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -301,13 +300,13 @@ namespace accessibility return sal_False; } - ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getText( ); } - ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -335,7 +334,7 @@ namespace accessibility { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); - ::rtl::OUString sText = implGetText(); + OUString sText = implGetText(); checkIndex_Impl( nStartIndex, sText ); checkIndex_Impl( nEndIndex, sText ); diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index a1a5c2cb147a..a093318ffd3a 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -40,8 +40,6 @@ namespace accessibility // ============================================================================ -using ::rtl::OUString; - using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -227,7 +225,7 @@ Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding() OUString SAL_CALL AccessibleGridControl::getImplementationName() throw ( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControl" ) ); + return OUString( "com.sun.star.accessibility.AccessibleGridControl" ); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 6bf0ea7352b5..c092e4872997 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -36,8 +36,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -308,7 +306,7 @@ sal_Bool SAL_CALL AccessibleGridControlBase::supportsService( Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames() throw ( uno::RuntimeException ) { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) ); + const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &aServiceName, 1 ); } // internal virtual methods --------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 205f7517d02e..27dfb6084d18 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -35,8 +35,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -219,7 +217,7 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected( OUString SAL_CALL AccessibleGridControlHeader::getImplementationName() throw ( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlHeader" ) ); + return OUString( "com.sun.star.accessibility.AccessibleGridControlHeader" ); } namespace diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 4e1e52e04f94..e0fb0c10695d 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -137,10 +137,10 @@ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() /** @return The name of this class. */ -::rtl::OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() +OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" ) ); + return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" ); } // ----------------------------------------------------------------------------- Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox() diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index a491a32ff6fa..55b204d05ebc 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -32,8 +32,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -327,7 +325,7 @@ void SAL_CALL AccessibleGridControlTable::release() throw () OUString SAL_CALL AccessibleGridControlTable::getImplementationName() throw ( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlTable" ) ); + return OUString( "com.sun.star.accessibility.AccessibleGridControlTable" ); } // internal virtual methods --------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 9ceef9127c61..a869352eb2f9 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -34,8 +34,6 @@ // ============================================================================ -using ::rtl::OUString; - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -254,7 +252,7 @@ void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow ) { if( nRow >= m_aTable.GetRowCount() ) throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this ); + OUString( "row index is invalid" ), *this ); } void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn ) @@ -262,7 +260,7 @@ void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn ) { if( nColumn >= m_aTable.GetColumnCount() ) throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this ); + OUString( "column index is invalid" ), *this ); } void AccessibleGridControlTableBase::ensureIsValidAddress( @@ -278,7 +276,7 @@ void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) { if( nChildIndex >= implGetChildCount() ) throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this ); + OUString( "child index is invalid" ), *this ); } // ============================================================================ diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 200996b39b4c..caef437f341f 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -40,7 +40,7 @@ namespace accessibility { // FIXME this is a copy'n'paste from // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that... - static void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) + static void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) { if ( _nIndex >= _sText.getLength() ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); @@ -49,7 +49,6 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace utl; using namespace comphelper; - using ::rtl::OUString; using ::accessibility::AccessibleGridControl; using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; @@ -71,7 +70,7 @@ namespace accessibility { // set accessible name here, because for that we need the position of the cell // and so the base class isn't capable of doing this - ::rtl::OUString aAccName; + OUString aAccName; if(_eType == TCTYPE_TABLECELL) aAccName = _rTable.GetAccessibleObjectName( TCTYPE_TABLECELL, _nRowPos, _nColPos ); else if(_eType == TCTYPE_ROWHEADERCELL) @@ -95,7 +94,7 @@ namespace accessibility } //// ----------------------------------------------------------------------------- // implementation of a table cell - ::rtl::OUString AccessibleGridControlTableCell::implGetText() + OUString AccessibleGridControlTableCell::implGetText() { ensureIsAlive(); return m_aTable.GetAccessibleCellText( getRowPos(), getColumnPos() ); @@ -175,10 +174,10 @@ namespace accessibility /** @return The name of this class. */ - ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName() + OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlTableCell" ) ); + return OUString( "com.sun.star.accessibility.AccessibleGridControlTableCell" ); } /** @return The count of visible children. */ @@ -266,12 +265,12 @@ namespace accessibility ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -285,7 +284,7 @@ namespace accessibility return OCommonAccessibleText::getCharacterCount( ); } - ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -312,13 +311,13 @@ namespace accessibility return sal_False; } - ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleGridControlTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getText( ); } - ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -346,7 +345,7 @@ namespace accessibility { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); - ::rtl::OUString sText = implGetText(); + OUString sText = implGetText(); checkIndex_Impl( nStartIndex, sText ); checkIndex_Impl( nEndIndex, sText ); diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index 786a4b408a01..bba762fc2b19 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -170,7 +170,7 @@ namespace accessibility void AccessibleToolPanelDeck_Impl::checkDisposed() { if ( isDisposed() ) - throw DisposedException( ::rtl::OUString(), *&m_rAntiImpl ); + throw DisposedException( OUString(), *&m_rAntiImpl ); } //------------------------------------------------------------------------------------------------------------------ @@ -291,7 +291,7 @@ namespace accessibility const sal_Int32 nChildCount( getAccessibleChildCount() ); if ( ( i_nIndex < 0 ) || ( i_nIndex >= nChildCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); // first "n" children are provided by the layouter const size_t nLayouterCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() ); diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 6a58f99c88a1..896ebad79647 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -166,7 +166,7 @@ namespace accessibility void AccessibleToolPanelTabBar_Impl::checkDisposed() { if ( isDisposed() ) - throw DisposedException( ::rtl::OUString(), *&m_rAntiImpl ); + throw DisposedException( OUString(), *&m_rAntiImpl ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 87ef61eee5f9..998f83e20e58 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -110,7 +110,7 @@ namespace accessibility Reference< XAccessibleComponent > getParentAccessibleComponent() const; ::svt::IToolPanelDeck* getPanelDeck() const { return m_pPanelDeck; } - ::rtl::OUString getPanelDisplayName(); + OUString getPanelDisplayName(); private: void impl_notifyBoundRectChanges(); @@ -149,7 +149,7 @@ namespace accessibility void AccessibleToolPanelDeckTabBarItem_Impl::checkDisposed() const { if ( isDisposed() ) - throw DisposedException( ::rtl::OUString(), *&m_rAntiImpl ); + throw DisposedException( OUString(), *&m_rAntiImpl ); } //------------------------------------------------------------------------------------------------------------------ @@ -171,7 +171,7 @@ namespace accessibility } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString AccessibleToolPanelDeckTabBarItem_Impl::getPanelDisplayName() + OUString AccessibleToolPanelDeckTabBarItem_Impl::getPanelDisplayName() { const ::svt::PToolPanel pPanel( m_pPanelDeck->GetPanel( getItemPos() ) ); if ( pPanel.get() == NULL ) @@ -292,7 +292,7 @@ namespace accessibility Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { (void)i; - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); } //-------------------------------------------------------------------- @@ -309,14 +309,14 @@ namespace accessibility } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); @@ -405,15 +405,15 @@ namespace accessibility } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); // no support - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index 3d9e19215def..f0c49de44251 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -44,7 +44,7 @@ namespace accessibility // set accessible name here, because for that we need the position of the cell // and so the base class isn't capable of doing this sal_Int32 nPos = _nRowPos * _rBrowseBox.GetColumnCount() + _nColPos; - ::rtl::OUString aAccName = _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nPos ); + OUString aAccName = _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nPos ); implSetName( aAccName ); } diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index d11901f54a0f..dad1e74dcf32 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -71,9 +71,9 @@ namespace accessibility } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) + OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.TableCellProxy" ) ); + return OUString( "com.sun.star.comp.svtools.TableCellProxy" ); } // ----------------------------------------------------------------------------- @@ -116,26 +116,26 @@ namespace accessibility } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException ) + OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleDescription(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException ) + OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); // TODO: localize this! - rtl::OUStringBuffer sName(mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) )); + OUStringBuffer sName(mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) )); if ( 0 == sName.getLength() ) { - sName.appendAscii(RTL_CONSTASCII_STRINGPARAM("Column ")); + sName.appendAscii("Column "); sName.append(getColumnPos()); } - sName.appendAscii(RTL_CONSTASCII_STRINGPARAM(", Row ")); + sName.appendAscii(", Row "); sName.append(getRowPos()); return sName.makeStringAndClear(); diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 535fad71aedf..fd00e40e6c1c 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -110,21 +110,21 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported( getSupportedServiceNames() ); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported ) ; @@ -133,18 +133,18 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo - static methods // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) throw (RuntimeException) + Sequence< OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported(3); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") ); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") ); - aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleIconChoiceControl") ); + Sequence< OUString > aSupported(3); + aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; + aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; + aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControl"; return aSupported; } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleIconChoiceCtrl::getImplementationName_Static(void) throw (RuntimeException) + OUString AccessibleIconChoiceCtrl::getImplementationName_Static(void) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleIconChoiceControl") ); + return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControl" ); } // ----------------------------------------------------------------------------- // XAccessible @@ -191,7 +191,7 @@ namespace accessibility return AccessibleRole::TREE; } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -199,15 +199,15 @@ namespace accessibility return getCtrl()->GetAccessibleDescription(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); ensureAlive(); - ::rtl::OUString sName = getCtrl()->GetAccessibleName(); + OUString sName = getCtrl()->GetAccessibleName(); if ( sName.isEmpty() ) - sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) ); + sName = "IconChoiceControl"; return sName; } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index a08d2d7d7793..9f847f47baef 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -181,9 +181,9 @@ throw(RuntimeException) throw lang::DisposedException(); } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleIconChoiceCtrlEntry::implGetText() + OUString AccessibleIconChoiceCtrlEntry::implGetText() { - ::rtl::OUString sRet; + OUString sRet; SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex ); if ( pEntry ) sRet = pEntry->GetDisplayText(); @@ -247,21 +247,21 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported( getSupportedServiceNames() ); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported ) ; @@ -270,18 +270,18 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- // XServiceInfo - static methods // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(3); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") ); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") ); - aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleIconChoiceControlEntry") ); + Sequence< OUString > aSupported(3); + aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; + aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; + aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControlEntry"; return aSupported; } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static(void) throw( RuntimeException ) + OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry") ); + return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry" ); } // ----------------------------------------------------------------------------- // XAccessible @@ -324,13 +324,13 @@ throw(RuntimeException) return AccessibleRole::LABEL; } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) throw (RuntimeException) { // no description for every item - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -574,13 +574,13 @@ throw(RuntimeException) EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -595,7 +595,7 @@ throw(RuntimeException) return OCommonAccessibleText::getCharacterCount( ); } - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -627,14 +627,14 @@ throw(RuntimeException) return sal_False; } - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -695,7 +695,7 @@ throw(RuntimeException) return bRet; } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -703,7 +703,7 @@ throw(RuntimeException) checkActionIndex_Impl( nIndex ); EnsureIsAlive(); - static const ::rtl::OUString sActionDesc( RTL_CONSTASCII_USTRINGPARAM( "Select" ) ); + static const OUString sActionDesc( "Select" ); return sActionDesc; } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index d3fa4c6f1c08..e9a719cd6690 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -176,21 +176,21 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException) + OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL AccessibleListBox::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported( getSupportedServiceNames() ); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported ) ; @@ -199,18 +199,18 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo - static methods // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(3); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") ); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") ); - aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTreeListBox") ); + Sequence< OUString > aSupported(3); + aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; + aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; + aSupported[2] = "com.sun.star.awt.AccessibleTreeListBox"; return aSupported; } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleListBox::getImplementationName_Static(void) throw( RuntimeException ) + OUString AccessibleListBox::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleTreeListBox") ); + return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBox" ); } // ----------------------------------------------------------------------------- // XAccessible @@ -262,7 +262,7 @@ namespace accessibility return AccessibleRole::TREE; } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -270,7 +270,7 @@ namespace accessibility return getListBox()->GetAccessibleDescription(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBox::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBox::getAccessibleName( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index af9c3cc615ac..2d5081293a3e 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -178,9 +178,9 @@ namespace accessibility throw lang::DisposedException(); } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleListBoxEntry::implGetText() + OUString AccessibleListBoxEntry::implGetText() { - ::rtl::OUString sRet; + OUString sRet; SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) sRet = getListBox()->SearchEntryText( pEntry ); @@ -256,21 +256,21 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported( getSupportedServiceNames() ); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported ) ; @@ -279,18 +279,18 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo - static methods // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(3); - aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") ); - aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") ); - aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTreeListBoxEntry") ); + Sequence< OUString > aSupported(3); + aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; + aSupported[1] = "com.sun.star.accessibility.AccessibleComponent"; + aSupported[2] = "com.sun.star.awt.AccessibleTreeListBoxEntry"; return aSupported; } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleListBoxEntry::getImplementationName_Static(void) throw( RuntimeException ) + OUString AccessibleListBoxEntry::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleTreeListBoxEntry") ); + return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBoxEntry" ); } // ----------------------------------------------------------------------------- // XAccessible @@ -389,13 +389,13 @@ namespace accessibility return AccessibleRole::LABEL; } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException) { // no description for every item - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -671,7 +671,7 @@ namespace accessibility return bRet; } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -679,7 +679,7 @@ namespace accessibility checkActionIndex_Impl( nIndex ); EnsureIsAlive(); - static const ::rtl::OUString sActionDesc( RTL_CONSTASCII_USTRINGPARAM( "toggleExpand" ) ); + static const OUString sActionDesc( "toggleExpand" ); return sActionDesc; } // ----------------------------------------------------------------------------- @@ -857,13 +857,13 @@ namespace accessibility EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -878,7 +878,7 @@ namespace accessibility return OCommonAccessibleText::getCharacterCount( ); } - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -910,14 +910,14 @@ namespace accessibility return sal_False; } - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } - ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index e9ccbdf7e280..0f01b164426c 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -199,18 +199,18 @@ namespace accessibility // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBar::getImplementationName() throw (RuntimeException) + OUString AccessibleTabBar::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabBar" )); + return OUString( "com.sun.star.comp.svtools.AccessibleTabBar" ); } // ----------------------------------------------------------------------------- - sal_Bool AccessibleTabBar::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -219,10 +219,10 @@ namespace accessibility // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabBar" )); + Sequence< OUString > aNames(1); + aNames[0] = "com.sun.star.awt.AccessibleTabBar"; return aNames; } @@ -338,11 +338,11 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException) + OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sDescription; + OUString sDescription; if ( m_pTabBar ) sDescription = m_pTabBar->GetAccessibleDescription(); @@ -351,11 +351,11 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException) + OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sName; + OUString sName; if ( m_pTabBar ) sName = m_pTabBar->GetAccessibleName(); @@ -517,11 +517,11 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException) + OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sText; + OUString sText; if ( m_pTabBar ) sText = m_pTabBar->GetText(); @@ -530,11 +530,11 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException) + OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sText; + OUString sText; if ( m_pTabBar ) sText = m_pTabBar->GetQuickHelpText(); diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 70da3e84a037..1d991d0e5dde 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -166,7 +166,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - void AccessibleTabBarPage::SetPageText( const ::rtl::OUString& sPageText ) + void AccessibleTabBarPage::SetPageText( const OUString& sPageText ) { if ( !m_sPageText.equals( sPageText ) ) { @@ -249,25 +249,25 @@ namespace accessibility void AccessibleTabBarPage::disposing() { AccessibleTabBarBase::disposing(); - m_sPageText = ::rtl::OUString(); + m_sPageText = OUString(); } // ----------------------------------------------------------------------------- // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException) + OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabBarPage" )); + return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPage" ); } // ----------------------------------------------------------------------------- - sal_Bool AccessibleTabBarPage::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -276,10 +276,10 @@ namespace accessibility // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabBarPage" )); + Sequence< OUString > aNames(1); + aNames[0] = "com.sun.star.awt.AccessibleTabBarPage"; return aNames; } @@ -350,11 +350,11 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sDescription; + OUString sDescription; if ( m_pTabBar ) sDescription = m_pTabBar->GetHelpText( m_nPageId ); @@ -363,7 +363,7 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -496,11 +496,11 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index a856fc2e8795..b85c8a8d9963 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -131,7 +131,7 @@ namespace accessibility { if ( m_pTabBar ) { - ::rtl::OUString sPageText = m_pTabBar->GetPageText( m_pTabBar->GetPageId( (sal_uInt16)i ) ); + OUString sPageText = m_pTabBar->GetPageText( m_pTabBar->GetPageId( (sal_uInt16)i ) ); pAccessibleTabBarPage->SetPageText( sPageText ); } } @@ -419,18 +419,18 @@ namespace accessibility // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException) + OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabBarPageList" )); + return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPageList" ); } // ----------------------------------------------------------------------------- - sal_Bool AccessibleTabBarPageList::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -439,10 +439,10 @@ namespace accessibility // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabBarPageList" )); + Sequence< OUString > aNames(1); + aNames[0] = "com.sun.star.awt.AccessibleTabBarPageList"; return aNames; } @@ -527,20 +527,20 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- @@ -680,20 +680,20 @@ namespace accessibility // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 803bd412c4ff..1c252177c537 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -178,8 +178,8 @@ namespace accessibility Reference< XAccessible > xChild = m_pTabListBox->CreateAccessibleCell( nRow, nCol ); uno::Any aOldValue, aNewValue; - aOldValue <<= ::rtl::OUString( pData->m_sOldText ); - ::rtl::OUString sNewText( m_pTabListBox->GetCellText( nRow, nCol ) ); + aOldValue <<= OUString( pData->m_sOldText ); + OUString sNewText( m_pTabListBox->GetCellText( nRow, nCol ) ); aNewValue <<= sNewText; TriState eState = STATE_DONTKNOW; @@ -273,9 +273,9 @@ namespace accessibility // ----------------------------------------------------------------------------- // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException) + OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" )); + return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" ); } // ----------------------------------------------------------------------------- // XAccessibleSelection diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 865a31d59f5e..3fb4c8f6cd35 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -108,7 +108,7 @@ ParagraphImpl::numberChanged(bool bIncremented) void ParagraphImpl::textChanged() { - ::rtl::OUString aParagraphText = implGetText(); + OUString aParagraphText = implGetText(); ::css::uno::Any aOldValue, aNewValue; if ( implInitTextChangedEvent( m_aParagraphText, aParagraphText, aOldValue, aNewValue ) ) { @@ -153,10 +153,8 @@ ParagraphImpl::getAccessibleChild(::sal_Int32) { checkDisposed(); throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " ParagraphImpl::getAccessibleChild")), + "textwindowaccessibility.cxx:" + " ParagraphImpl::getAccessibleChild", static_cast< ::css::uno::XWeak * >(this)); } @@ -186,19 +184,19 @@ ParagraphImpl::getAccessibleParent() } // virtual -::rtl::OUString SAL_CALL ParagraphImpl::getAccessibleDescription() +OUString SAL_CALL ParagraphImpl::getAccessibleDescription() throw (::css::uno::RuntimeException) { checkDisposed(); - return ::rtl::OUString(); + return OUString(); } // virtual -::rtl::OUString SAL_CALL ParagraphImpl::getAccessibleName() +OUString SAL_CALL ParagraphImpl::getAccessibleName() throw (::css::uno::RuntimeException) { checkDisposed(); - return ::rtl::OUString(); + return OUString(); } // virtual @@ -308,7 +306,7 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) OSL_TRACE( "textwindowaccessibility.cxx: ParagraphImpl::grabFocus:" " caught unexpected %s\n", - ::rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_UTF8). + OUStringToOString(rEx.Message, RTL_TEXTENCODING_UTF8). getStr()); } } @@ -364,7 +362,7 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException) // virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL -ParagraphImpl::getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes) +ParagraphImpl::getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes) throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) { @@ -408,7 +406,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) } // virtual -::rtl::OUString SAL_CALL ParagraphImpl::getSelectedText() +OUString SAL_CALL ParagraphImpl::getSelectedText() throw (::css::uno::RuntimeException) { checkDisposed(); @@ -444,7 +442,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) } // virtual -::rtl::OUString SAL_CALL ParagraphImpl::getText() +OUString SAL_CALL ParagraphImpl::getText() throw (::css::uno::RuntimeException) { checkDisposed(); @@ -452,7 +450,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) } // virtual -::rtl::OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, +OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) @@ -501,7 +499,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, true, false, - ::rtl::OUString()); + OUString()); return true; } @@ -512,7 +510,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, true, - ::rtl::OUString()); + OUString()); return true; } @@ -524,12 +522,12 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, - ::rtl::OUString()); + OUString()); return true; } // virtual -::sal_Bool SAL_CALL ParagraphImpl::insertText(::rtl::OUString const & rText, +::sal_Bool SAL_CALL ParagraphImpl::insertText(OUString const & rText, ::sal_Int32 nIndex) throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) @@ -542,7 +540,7 @@ ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint) // virtual ::sal_Bool SAL_CALL ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, - ::rtl::OUString const & rReplacement) + OUString const & rReplacement) throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) { @@ -566,7 +564,7 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, } // virtual -::sal_Bool SAL_CALL ParagraphImpl::setText(::rtl::OUString const & rText) +::sal_Bool SAL_CALL ParagraphImpl::setText(OUString const & rText) throw (::css::uno::RuntimeException) { checkDisposed(); @@ -576,7 +574,7 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, // virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL -ParagraphImpl::getDefaultAttributes(const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes) +ParagraphImpl::getDefaultAttributes(const ::css::uno::Sequence< OUString >& RequestedAttributes) throw (::css::uno::RuntimeException) { checkDisposed(); @@ -585,7 +583,7 @@ ParagraphImpl::getDefaultAttributes(const ::css::uno::Sequence< ::rtl::OUString // virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL -ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes) +ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< OUString >& RequestedAttributes) throw (::css::lang::IndexOutOfBoundsException, ::css::uno::RuntimeException) { @@ -634,10 +632,8 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< : ::css::accessibility::TextSegment(); } catch (const ::css::lang::IndexOutOfBoundsException&) { throw ::css::uno::RuntimeException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " ParagraphImpl::getTextAtLineWithCaret") ), + "textwindowaccessibility.cxx:" + " ParagraphImpl::getTextAtLineWithCaret", static_cast< ::css::uno::XWeak * >( this ) ); } } @@ -715,7 +711,7 @@ void SAL_CALL ParagraphImpl::disposing() } // virtual -::rtl::OUString ParagraphImpl::implGetText() +OUString ParagraphImpl::implGetText() { return m_xDocument->retrieveParagraphText(this); } @@ -737,7 +733,7 @@ void ParagraphImpl::implGetSelection(::sal_Int32 & rStartIndex, void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); ::sal_Int32 nLength = sText.getLength(); if ( implIsValidIndex( nIndex, nLength ) ) @@ -756,7 +752,7 @@ void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary, void ParagraphImpl::implGetLineBoundary( ::css::i18n::Boundary& rBoundary, ::sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); ::sal_Int32 nLength = sText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) @@ -780,7 +776,7 @@ void ParagraphImpl::checkDisposed() if (!(rBHelper.bDisposed || rBHelper.bInDispose)) return; throw ::css::lang::DisposedException( - ::rtl::OUString(), static_cast< ::css::uno::XWeak * >(this)); + OUString(), static_cast< ::css::uno::XWeak * >(this)); } Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, @@ -889,7 +885,7 @@ Document::retrieveParagraphBounds(ParagraphImpl const * pParagraph, // XXX numeric overflow (3x) } -::rtl::OUString +OUString Document::retrieveParagraphText(ParagraphImpl const * pParagraph) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); @@ -955,10 +951,8 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, // XXX numeric overflow if (nIndex < 0 || nIndex > nLength) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::retrieveCharacterAttributes")), + "textwindowaccessibility.cxx:" + " Document::retrieveCharacterAttributes", static_cast< ::css::uno::XWeak * >(this)); ::css::awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( nIndex == nLength ) @@ -1015,7 +1009,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph, ::css::uno::Sequence< ::css::beans::PropertyValue > Document::retrieveCharacterAttributes( ParagraphImpl const * pParagraph, ::sal_Int32 nIndex, - const ::css::uno::Sequence< ::rtl::OUString >& aRequestedAttributes) + const ::css::uno::Sequence< OUString >& aRequestedAttributes) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); ::osl::MutexGuard aInternalGuard(GetMutex()); @@ -1023,10 +1017,8 @@ Document::retrieveCharacterAttributes( // XXX numeric overflow if (nIndex < 0 || nIndex >= m_rEngine.GetText(nNumber).Len()) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::retrieveCharacterAttributes")), + "textwindowaccessibility.cxx:" + " Document::retrieveCharacterAttributes", static_cast< ::css::uno::XWeak * >(this)); // retrieve default attributes @@ -1050,7 +1042,7 @@ Document::retrieveCharacterAttributes( void Document::retrieveDefaultAttributesImpl( ParagraphImpl const * pParagraph, - const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes, + const ::css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rDefAttrSeq) { // default attributes are not supported by text engine @@ -1062,7 +1054,7 @@ void Document::retrieveDefaultAttributesImpl( ::css::uno::Sequence< ::css::beans::PropertyValue > Document::retrieveDefaultAttributes( ParagraphImpl const * pParagraph, - const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes) + const ::css::uno::Sequence< OUString >& RequestedAttributes) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() ); ::osl::MutexGuard aInternalGuard( GetMutex() ); @@ -1091,7 +1083,7 @@ Document::convertHashMapToSequence(tPropValMap& rAttrSeq) void Document::retrieveRunAttributesImpl( ParagraphImpl const * pParagraph, ::sal_Int32 Index, - const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes, + const ::css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rRunAttrSeq) { ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); @@ -1108,8 +1100,7 @@ void Document::retrieveRunAttributesImpl( if ( pColor ) { ::css::beans::PropertyValue aPropVal; - aPropVal.Name = - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ); + aPropVal.Name = "CharColor"; aPropVal.Handle = -1; aPropVal.Value = mapFontColor( pColor->GetColor() ); aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE; @@ -1118,8 +1109,7 @@ void Document::retrieveRunAttributesImpl( if ( pWeight ) { ::css::beans::PropertyValue aPropVal; - aPropVal.Name = - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ); + aPropVal.Name = "CharWeight"; aPropVal.Handle = -1; aPropVal.Value = mapFontWeight( pWeight->getFontWeight() ); aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE; @@ -1131,7 +1121,7 @@ void Document::retrieveRunAttributesImpl( } else { - const ::rtl::OUString* pReqAttrs = RequestedAttributes.getConstArray(); + const OUString* pReqAttrs = RequestedAttributes.getConstArray(); const ::sal_Int32 nLength = RequestedAttributes.getLength(); for ( ::sal_Int32 i = 0; i < nLength; ++i ) { @@ -1147,7 +1137,7 @@ void Document::retrieveRunAttributesImpl( ::css::uno::Sequence< ::css::beans::PropertyValue > Document::retrieveRunAttributes( ParagraphImpl const * pParagraph, ::sal_Int32 Index, - const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes) + const ::css::uno::Sequence< OUString >& RequestedAttributes) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() ); ::osl::MutexGuard aInternalGuard( GetMutex() ); @@ -1155,10 +1145,8 @@ Document::retrieveRunAttributes( // XXX numeric overflow if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).Len() ) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::retrieveRunAttributes") ), + "textwindowaccessibility.cxx:" + " Document::retrieveRunAttributes", static_cast< ::css::uno::XWeak * >( this ) ); tPropValMap aRunAttrSeq; @@ -1167,7 +1155,7 @@ Document::retrieveRunAttributes( } void Document::changeParagraphText(ParagraphImpl * pParagraph, - ::rtl::OUString const & rText) + OUString const & rText) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); { @@ -1182,7 +1170,7 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph, void Document::changeParagraphText(ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd, bool bCut, bool bPaste, - ::rtl::OUString const & rText) + OUString const & rText) { ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock()); { @@ -1192,10 +1180,8 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph, if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::changeParagraphText")), + "textwindowaccessibility.cxx:" + " Document::changeParagraphText", static_cast< ::css::uno::XWeak * >(this)); changeParagraphText(nNumber, static_cast< ::sal_uInt16 >(nBegin), static_cast< ::sal_uInt16 >(nEnd), bCut, bPaste, rText); @@ -1214,9 +1200,8 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph, if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::copyParagraphText")), + "textwindowaccessibility.cxx:" + " Document::copyParagraphText", static_cast< ::css::uno::XWeak * >(this)); m_rView.SetSelection( ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)), @@ -1238,10 +1223,8 @@ void Document::changeParagraphAttributes( if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::changeParagraphAttributes")), + "textwindowaccessibility.cxx:" + " Document::changeParagraphAttributes", static_cast< ::css::uno::XWeak * >(this)); // FIXME The new attributes are added to any attributes already set, @@ -1274,9 +1257,8 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph, if (nBegin < 0 || nBegin > nEnd || nEnd > m_rEngine.GetText(nNumber).Len()) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::changeParagraphSelection")), + "textwindowaccessibility.cxx:" + " Document::changeParagraphSelection", static_cast< ::css::uno::XWeak * >(this)); m_rView.SetSelection( ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)), @@ -1299,10 +1281,8 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph, ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); if ( nIndex < 0 || nIndex > m_rEngine.GetText( nNumber ).Len() ) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::retrieveParagraphLineBoundary" ) ), + "textwindowaccessibility.cxx:" + " Document::retrieveParagraphLineBoundary", static_cast< ::css::uno::XWeak * >( this ) ); ::sal_Int32 nLineStart = 0; ::sal_Int32 nLineEnd = 0; @@ -1341,10 +1321,8 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph, ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() ); if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) ) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::retrieveParagraphBoundaryOfLine" ) ), + "textwindowaccessibility.cxx:" + " Document::retrieveParagraphBoundaryOfLine", static_cast< ::css::uno::XWeak * >( this ) ); ::sal_Int32 nLineStart = 0; ::sal_Int32 nLineEnd = 0; @@ -1442,10 +1420,8 @@ Document::getAccessibleChild(::sal_Int32 i) init(); if (i < 0 || i >= m_aVisibleEnd - m_aVisibleBegin) throw ::css::lang::IndexOutOfBoundsException( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "textwindowaccessibility.cxx:" - " Document::getAccessibleChild")), + "textwindowaccessibility.cxx:" + " Document::getAccessibleChild", static_cast< ::css::uno::XWeak * >(this)); return getAccessibleChild(m_aVisibleBegin + static_cast< Paragraphs::size_type >(i)); @@ -1786,7 +1762,7 @@ void Document::notifyVisibleRangeChanges( void Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd, bool bCut, bool bPaste, - ::rtl::OUString const & rText) + OUString const & rText) { m_rView.SetSelection(::TextSelection(::TextPaM(nNumber, nBegin), ::TextPaM(nNumber, nEnd))); |