diff options
Diffstat (limited to 'toolkit/source/controls')
| -rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/gridcolumn.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/stdtabcontroller.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 5815810cebca..d93d10c5b2c9 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -115,7 +115,7 @@ private: Reference< css::util::XCloneable > const xCloneable( *col, UNO_QUERY_THROW ); Reference< XGridColumn > const xClone( xCloneable->createClone(), UNO_QUERY_THROW ); - GridColumn* const pGridColumn = comphelper::getUnoTunnelImplementation<GridColumn>( xClone ); + GridColumn* const pGridColumn = comphelper::getFromUnoTunnel<GridColumn>( xClone ); if ( pGridColumn == nullptr ) throw RuntimeException( "invalid clone source implementation", *this ); // that's indeed a RuntimeException, not an IllegalArgumentException or some such: @@ -151,7 +151,7 @@ private: { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); - GridColumn* const pGridColumn = comphelper::getUnoTunnelImplementation<GridColumn>( i_column ); + GridColumn* const pGridColumn = comphelper::getFromUnoTunnel<GridColumn>( i_column ); if ( pGridColumn == nullptr ) throw css::lang::IllegalArgumentException( "invalid column implementation", *this, 1 ); @@ -190,7 +190,7 @@ private: ++updatePos, ++columnIndex ) { - GridColumn* pColumnImpl = comphelper::getUnoTunnelImplementation<GridColumn>( *updatePos ); + GridColumn* pColumnImpl = comphelper::getFromUnoTunnel<GridColumn>( *updatePos ); if ( !pColumnImpl ) { SAL_WARN( "toolkit.controls", "DefaultGridColumnModel::removeColumn: invalid column implementation!" ); diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 1952c1faa31d..af61a578d135 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -285,7 +285,7 @@ namespace toolkit sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) { - if ( isUnoTunnelId<GridColumn>(i_identifier) ) + if ( comphelper::isUnoTunnelId<GridColumn>(i_identifier) ) return ::sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ) ); return 0; } diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index f762ff805c0d..d4f5d64b04ef 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -142,7 +142,7 @@ void StdTabController::ImplActivateControl( bool bFirst ) const Reference< XWindowPeer > xCP = pControls[nCtrl]->getPeer(); if ( xCP.is() ) { - VCLXWindow* pC = comphelper::getUnoTunnelImplementation<VCLXWindow>( xCP ); + VCLXWindow* pC = comphelper::getFromUnoTunnel<VCLXWindow>( xCP ); if ( pC && pC->GetWindow() && ( pC->GetWindow()->GetStyle() & WB_TABSTOP ) ) { pC->GetWindow()->GrabFocus(); diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 44ff22c53efe..c30c5c6b3788 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -423,13 +423,13 @@ css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType ) const css::uno::Sequence< sal_Int8 >& UnoControlModel::getUnoTunnelId() noexcept { - static const UnoTunnelIdInit theUnoControlModelUnoTunnelId; + static const comphelper::UnoIdInit theUnoControlModelUnoTunnelId; return theUnoControlModelUnoTunnelId.getSeq(); } sal_Int64 UnoControlModel::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) { - if( isUnoTunnelId<UnoControlModel>(rIdentifier) ) + if( comphelper::isUnoTunnelId<UnoControlModel>(rIdentifier) ) return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); return 0; |