basctl/source/accessibility/accessibledialogcontrolshape.cxx | 44 +++++------ basctl/source/accessibility/accessibledialogwindow.cxx | 36 ++++----- 2 files changed, 40 insertions(+), 40 deletions(-)
New commits: commit 57d2f9b7744eea76496af1f4101398ec4f6caf70 Author: Ricardo Montania <rica...@linuxafundo.com.br> Date: Sun Sep 23 15:05:17 2012 -0300 ::rtl::OUString to OUString in basctl Change-Id: I3fc3d463fbaefe31b3541502c9f3dfbd4d1db4f9 Reviewed-on: https://gerrit.libreoffice.org/678 Reviewed-by: Noel Power <noel.po...@suse.com> Tested-by: Noel Power <noel.po...@suse.com> diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 6e720ea..afc4558 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -59,7 +59,7 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo m_xControlModel = Reference< XPropertySet >( m_pDlgEdObj->GetUnoControlModel(), UNO_QUERY ); if ( m_xControlModel.is() ) - m_xControlModel->addPropertyChangeListener( ::rtl::OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); + m_xControlModel->addPropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); m_bFocused = IsFocused(); m_bSelected = IsSelected(); @@ -71,7 +71,7 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo AccessibleDialogControlShape::~AccessibleDialogControlShape() { if ( m_xControlModel.is() ) - m_xControlModel->removePropertyChangeListener( ::rtl::OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); + m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); delete m_pExternalLock; m_pExternalLock = NULL; @@ -191,15 +191,15 @@ Window* AccessibleDialogControlShape::GetWindow() const // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName ) +OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName ) { - ::rtl::OUString sReturn; + OUString sReturn; try { if ( m_xControlModel.is() ) { - ::rtl::OUString sPropertyName( ::rtl::OUString::createFromAscii( pPropertyName ) ); + OUString sPropertyName( OUString::createFromAscii( pPropertyName ) ); Reference< XPropertySetInfo > xInfo = m_xControlModel->getPropertySetInfo(); if ( xInfo.is() && xInfo->hasPropertyByName( sPropertyName ) ) m_xControlModel->getPropertyValue( sPropertyName ) >>= sReturn; @@ -269,7 +269,7 @@ void AccessibleDialogControlShape::disposing() m_pDlgEdObj = NULL; if ( m_xControlModel.is() ) - m_xControlModel->removePropertyChangeListener( ::rtl::OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); + m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); m_xControlModel.clear(); } @@ -280,7 +280,7 @@ void AccessibleDialogControlShape::disposing() void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException) { if ( m_xControlModel.is() ) - m_xControlModel->removePropertyChangeListener( ::rtl::OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); + m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); m_xControlModel.clear(); } @@ -313,18 +313,18 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException) +OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.basctl.AccessibleShape" )); + return OUString( "com.sun.star.comp.basctl.AccessibleShape" ); } // ----------------------------------------------------------------------------- -sal_Bool AccessibleDialogControlShape::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool AccessibleDialogControlShape::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 ) ; @@ -333,10 +333,10 @@ sal_Bool AccessibleDialogControlShape::supportsService( const ::rtl::OUString& r // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.AccessibleShape" )); + Sequence< OUString > aNames(1); + aNames[0] = "com.sun.star.drawing.AccessibleShape" ; return aNames; } @@ -430,7 +430,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -439,7 +439,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -581,20 +581,20 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sText; + OUString sText; Window* pWindow = GetWindow(); if ( pWindow ) sText = pWindow->GetQuickHelpText(); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 0b12b8d..d360799 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -224,7 +224,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) const SdrLayer* pSdrLayer = rLayerAdmin.GetLayerPerID( nLayerId ); if ( pSdrLayer ) { - ::rtl::OUString aLayerName = pSdrLayer->GetName(); + OUString aLayerName = pSdrLayer->GetName(); SdrView& rView = m_pDialogWindow->GetView(); if (rView.IsLayerVisible(aLayerName)) { @@ -607,18 +607,18 @@ void AccessibleDialogWindow::disposing() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException) +OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.basctl.AccessibleWindow" )); + return OUString( "com.sun.star.comp.basctl.AccessibleWindow" ); } // ----------------------------------------------------------------------------- -sal_Bool AccessibleDialogWindow::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool AccessibleDialogWindow::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 ) ; @@ -627,10 +627,10 @@ sal_Bool AccessibleDialogWindow::supportsService( const ::rtl::OUString& rServic // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleWindow" )); + Sequence< OUString > aNames(1); + aNames[0] = "com.sun.star.awt.AccessibleWindow" ; return aNames; } @@ -739,11 +739,11 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sDescription; + OUString sDescription; if ( m_pDialogWindow ) sDescription = m_pDialogWindow->GetAccessibleDescription(); @@ -752,11 +752,11 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException) // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sName; + OUString sName; if ( m_pDialogWindow ) sName = m_pDialogWindow->GetAccessibleName(); @@ -918,20 +918,20 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeExcept // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sText; + OUString sText; if ( m_pDialogWindow ) sText = m_pDialogWindow->GetQuickHelpText(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits