diff options
Diffstat (limited to 'toolkit/source/controls/grid')
| -rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 18 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.hxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/defaultgriddatamodel.cxx | 36 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/defaultgriddatamodel.hxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/gridcolumn.cxx | 28 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/gridcolumn.hxx | 18 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/gridcontrol.cxx | 7 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/gridcontrol.hxx | 4 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/initguard.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/sortablegriddatamodel.cxx | 20 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/sortablegriddatamodel.hxx | 6 |
11 files changed, 75 insertions, 76 deletions
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index d114fb5a4c0e..37e8b8fb6a0e 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -152,7 +152,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_columnIndex < 0 ) || ( size_t( i_columnIndex ) >= m_aColumns.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); Columns::iterator const pos = m_aColumns.begin() + i_columnIndex; Reference< XGridColumn > const xColumn( *pos ); @@ -242,7 +242,7 @@ namespace toolkit { ::rtl::Reference< GridColumn > const pGridColumn = new GridColumn(); Reference< XGridColumn > const xColumn( pGridColumn.get() ); - ::rtl::OUStringBuffer colTitle; + OUStringBuffer colTitle; colTitle.appendAscii( "Column " ); colTitle.append( i + 1 ); pGridColumn->setTitle( colTitle.makeStringAndClear() ); @@ -299,15 +299,15 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.toolkit.DefaultGridColumnModel" ); + return OUString( "org.openoffice.comp.toolkit.DefaultGridColumnModel" ); } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException) + sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); for ( sal_Int32 i=0; i<aServiceNames.getLength(); ++i ) if ( aServiceNames[i] == i_serviceName ) return sal_True; @@ -315,10 +315,10 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException) { - const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_DefaultGridColumnModel ) ); - const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridColumnModel ) ); + const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 83b4f1ed75e8..859235e3f8d3 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -55,9 +55,9 @@ public: virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index b486d6c7eab3..e59078e6374c 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -106,7 +106,7 @@ namespace toolkit if ( ( i_row < 0 ) || ( size_t( i_row ) > m_aData.size() ) || ( i_column < 0 ) || ( i_column > m_nColumnCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< DefaultGridDataModel* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< DefaultGridDataModel* >( this ) ); RowData const & rRow( m_aData[ i_row ] ); if ( size_t( i_column ) < rRow.size() ) @@ -121,7 +121,7 @@ namespace toolkit { OSL_ENSURE( i_requiredColumnCount <= size_t( m_nColumnCount ), "DefaultGridDataModel::impl_getRowDataAccess_throw: invalid column count!" ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); RowData& rRowData( m_aData[ i_rowIndex ] ); if ( rRowData.size() < i_requiredColumnCount ) @@ -133,7 +133,7 @@ namespace toolkit DefaultGridDataModel::CellData& DefaultGridDataModel::impl_getCellDataAccess_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex ) { if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= m_nColumnCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); RowData& rRowData( impl_getRowDataAccess_throw( i_rowIndex, size_t( i_columnIndex + 1 ) ) ); return rRowData[ i_columnIndex ]; @@ -159,7 +159,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_row < 0 ) || ( size_t( i_row ) >= m_aRowHeaders.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); return m_aRowHeaders[ i_row ]; } @@ -214,7 +214,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_index < 0 ) || ( i_index > impl_getRowCount_nolck() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); // actually insert the row impl_insertRow( i_index, i_heading, i_data ); @@ -235,12 +235,12 @@ namespace toolkit void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException) { if ( i_headings.getLength() != i_data.getLength() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, -1 ); + throw IllegalArgumentException( OUString(), *this, -1 ); ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_index < 0 ) || ( i_index > impl_getRowCount_nolck() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); sal_Int32 const rowCount = i_headings.getLength(); if ( rowCount == 0 ) @@ -276,7 +276,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); m_aRowHeaders.erase( m_aRowHeaders.begin() + i_rowIndex ); m_aData.erase( m_aData.begin() + i_rowIndex ); @@ -323,10 +323,10 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); if ( i_columnIndexes.getLength() != i_values.getLength() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); sal_Int32 const columnCount = i_columnIndexes.getLength(); if ( columnCount == 0 ) @@ -335,7 +335,7 @@ namespace toolkit for ( sal_Int32 col = 0; col < columnCount; ++col ) { if ( ( i_columnIndexes[col] < 0 ) || ( i_columnIndexes[col] > m_nColumnCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); } RowData& rDataRow = m_aData[ i_rowIndex ]; @@ -363,7 +363,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aRowHeaders.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); m_aRowHeaders[ i_rowIndex ] = i_heading; @@ -421,23 +421,23 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException) { - static const ::rtl::OUString aImplName( "toolkit.DefaultGridDataModel" ); + static const OUString aImplName( "toolkit.DefaultGridDataModel" ); return aImplName; } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) { return ServiceName.equalsAscii( szServiceName_DefaultGridDataModel ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) { - static const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_DefaultGridDataModel ) ); - static const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 ); + static const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridDataModel ) ); + static const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx index 82fd47021e9a..e58c81dbd8cc 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx @@ -84,9 +84,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); private: typedef ::std::pair< Any, Any > CellData; diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index a0b26c96c09f..10c796b5f495 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -80,7 +80,7 @@ namespace toolkit { Reference< XInterface > const xSource( static_cast< ::cppu::OWeakObject* >( this ) ); GridColumnEvent const aEvent( - xSource, ::rtl::OUString::createFromAscii( i_asciiAttributeName ), + xSource, OUString::createFromAscii( i_asciiAttributeName ), i_oldValue, i_newValue, m_nIndex ); @@ -145,27 +145,27 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sTitle; } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL GridColumn::setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_sTitle, value, "Title" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException) + OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sHelpText; } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL GridColumn::setHelpText( const ::rtl::OUString & value ) throw (RuntimeException) + void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException) { impl_set( m_sHelpText, value, "HelpText" ); } @@ -194,7 +194,7 @@ namespace toolkit void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException) { if ( i_value < 0 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); impl_set( m_nFlexibility, i_value, "Flexibility" ); } @@ -228,7 +228,7 @@ namespace toolkit { ::osl::MutexGuard aGuard( m_aMutex ); m_aIdentifier.clear(); - m_sTitle = m_sHelpText = ::rtl::OUString(); + m_sTitle = m_sHelpText = OUString(); } //------------------------------------------------------------------------------------------------------------------ @@ -259,15 +259,15 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.toolkit.GridColumn" ); + return OUString( "org.openoffice.comp.toolkit.GridColumn" ); } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL GridColumn::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException) + sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); for ( sal_Int32 i=0; i<aServiceNames.getLength(); ++i ) if ( aServiceNames[i] == i_serviceName ) return sal_True; @@ -275,10 +275,10 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException) + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException) { - const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_GridColumn ) ); - const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( OUString::createFromAscii( szServiceName_GridColumn ) ); + const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index cd4d1e038ad7..8a287608a389 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -60,10 +60,10 @@ public: virtual void SAL_CALL setResizeable(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getFlexibility() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpText(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpText(const OUString & value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getIndex() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -79,9 +79,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XUnoTunnel and friends virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& i_identifier ) throw(::com::sun::star::uno::RuntimeException); @@ -119,8 +119,8 @@ private: sal_Int32 m_nMinWidth; sal_Int32 m_nFlexibility; sal_Bool m_bResizeable; - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sHelpText; + OUString m_sTitle; + OUString m_sHelpText; ::com::sun::star::style::HorizontalAlignment m_eHorizontalAlign; }; diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index bf169595abaf..e7de2d50facf 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -35,7 +35,6 @@ #include <tools/diagnose_ex.h> #include <tools/color.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -219,7 +218,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const switch( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_GridControl ) ); case BASEPROPERTY_GRID_SELECTIONMODE: return uno::makeAny( SelectionType(1) ); case BASEPROPERTY_GRID_SHOWROWHEADER: @@ -319,7 +318,7 @@ namespace try { Reference< XContainer > const xColModel( - xModelProps->getPropertyValue( ::rtl::OUString( "ColumnModel" ) ), + xModelProps->getPropertyValue( OUString( "ColumnModel" ) ), UNO_QUERY_THROW ); if ( i_add ) xColModel->addContainerListener( i_listener.get() ); @@ -327,7 +326,7 @@ namespace xColModel->removeContainerListener( i_listener.get() ); Reference< XGridDataModel > const xDataModel( - xModelProps->getPropertyValue( ::rtl::OUString( "GridDataModel" ) ), + xModelProps->getPropertyValue( OUString( "GridDataModel" ) ), UNO_QUERY_THROW ); Reference< XMutableGridDataModel > const xMutableDataModel( xDataModel, UNO_QUERY ); diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 607d4552fe98..3bc402bdfcb8 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -59,7 +59,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // OPropertySetHelper void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); @@ -80,7 +80,7 @@ class UnoGridControl : public UnoGridControl_Base { public: UnoGridControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx index f4c96cb719d0..176229ac32f8 100644 --- a/toolkit/source/controls/grid/initguard.hxx +++ b/toolkit/source/controls/grid/initguard.hxx @@ -40,7 +40,7 @@ namespace toolkit :comphelper::ComponentGuard( i_component, i_broadcastHelper ) { if ( !i_component.isInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), *&i_component ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), *&i_component ); } ~InitGuard() diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 870c8e6aa4a8..d4a218c80172 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -228,7 +228,7 @@ namespace toolkit DBG_CHECK_ME(); if ( m_delegator.is() ) - throw AlreadyInitializedException( ::rtl::OUString(), *this ); + throw AlreadyInitializedException( OUString(), *this ); Reference< XMutableGridDataModel > xDelegator; Reference< XCollator > xCollator; @@ -243,11 +243,11 @@ namespace toolkit xDelegator.set( i_arguments[0], UNO_QUERY ); xCollator.set( i_arguments[1], UNO_QUERY ); if ( !xCollator.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); break; } if ( !xDelegator.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); m_delegator = xDelegator; m_collator = xCollator; @@ -521,7 +521,7 @@ namespace toolkit DBG_CHECK_ME(); if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= getColumnCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); if ( !impl_reIndex_nothrow( i_columnIndex, i_sortAscending ) ) return; @@ -834,9 +834,9 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > const aServiceNames( getSupportedServiceNames() ); + Sequence< OUString > const aServiceNames( getSupportedServiceNames() ); for ( sal_Int32 i=0; i<aServiceNames.getLength(); ++i ) if ( aServiceNames[i] == i_serviceName ) return sal_True; @@ -844,10 +844,10 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_SortableGridDataModel ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString::createFromAscii( szServiceName_SortableGridDataModel ); return aServiceNames; } @@ -855,7 +855,7 @@ namespace toolkit ::sal_Int32 SortableGridDataModel::impl_getPrivateRowIndex_throw( ::sal_Int32 const i_publicRowIndex ) const { if ( ( i_publicRowIndex < 0 ) || ( i_publicRowIndex >= m_delegator->getRowCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SortableGridDataModel* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< SortableGridDataModel* >( this ) ); if ( !impl_isSorted_nothrow() ) // no need to translate anything diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx b/toolkit/source/controls/grid/sortablegriddatamodel.hxx index 85c5abd56c19..b9cdfb5a00ca 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx @@ -103,9 +103,9 @@ namespace toolkit virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); |