From bc2becdf1a12a1020584ee808c965e41f1837383 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 8 Jun 2015 16:28:40 +0200 Subject: loplugin:cstylecast: deal with remaining pointer casts Change-Id: I94b2fbbb00e9772b668128f31cf08115bdfb16b5 --- svx/source/fmcomp/fmgridcl.cxx | 2 +- svx/source/fmcomp/fmgridif.cxx | 24 ++++++++++++------------ svx/source/fmcomp/gridcols.cxx | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'svx/source/fmcomp') diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 29378409c3cf..b01c1f5d3c81 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1131,7 +1131,7 @@ void FmGridControl::DeleteSelectedRows() return; // try to confirm the delete - Reference< ::com::sun::star::frame::XDispatchProvider > xDispatcher = (::com::sun::star::frame::XDispatchProvider*)GetPeer(); + Reference< ::com::sun::star::frame::XDispatchProvider > xDispatcher = static_cast(GetPeer()); if (xDispatcher.is()) { ::com::sun::star::util::URL aUrl; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 48bd74eccf9d..db32ea8b5868 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1649,7 +1649,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( Reference< XReset > xColumnReset(m_xColumns, UNO_QUERY); if (xColumnReset.is()) - xColumnReset->removeResetListener((XResetListener*)this); + xColumnReset->removeResetListener(static_cast(this)); } if (Columns.is()) { @@ -1668,7 +1668,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( Reference< XReset > xColumnReset(Columns, UNO_QUERY); if (xColumnReset.is()) - xColumnReset->addResetListener((XResetListener*)this); + xColumnReset->addResetListener(static_cast(this)); } m_xColumns = Columns; if (pGrid) @@ -2411,7 +2411,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn) sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId()); Reference< ::com::sun::star::awt::XControl > xControl(pColumn->GetCell()); ContainerEvent aEvt; - aEvt.Source = (XContainer*)this; + aEvt.Source = static_cast(this); aEvt.Accessor <<= _nIndex; aEvt.Element <<= xControl; @@ -2426,7 +2426,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn) sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId()); Reference< ::com::sun::star::awt::XControl > xControl(pColumn->GetCell()); ContainerEvent aEvt; - aEvt.Source = (XContainer*)this; + aEvt.Source = static_cast(this); aEvt.Accessor <<= _nIndex; aEvt.Element <<= xControl; @@ -2489,12 +2489,12 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::su else { // it is the first interceptor; set ourself as slave - _xInterceptor->setSlaveDispatchProvider((::com::sun::star::frame::XDispatchProvider*)this); + _xInterceptor->setSlaveDispatchProvider(static_cast(this)); } // we are the master of the chain's first interceptor m_xFirstDispatchInterceptor = _xInterceptor; - m_xFirstDispatchInterceptor->setMasterDispatchProvider((::com::sun::star::frame::XDispatchProvider*)this); + m_xFirstDispatchInterceptor->setMasterDispatchProvider(static_cast(this)); // we have a new interceptor and we're alive ? if (!isDesignMode()) @@ -2539,13 +2539,13 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun xMaster->setSlaveDispatchProvider(Reference< ::com::sun::star::frame::XDispatchProvider >::query(xSlave)); else // it's the first interceptor of the chain, set ourself as slave - xMaster->setSlaveDispatchProvider((::com::sun::star::frame::XDispatchProvider*)this); + xMaster->setSlaveDispatchProvider(static_cast(this)); } else { // the chain's first element was removed, set ourself as new master of the second one if (xSlave.is()) - xSlave->setMasterDispatchProvider((::com::sun::star::frame::XDispatchProvider*)this); + xSlave->setMasterDispatchProvider(static_cast(this)); } } @@ -2722,10 +2722,10 @@ void FmXGridPeer::UpdateDispatches() if (xNewDispatch != m_pDispatchers[i]) { if (m_pDispatchers[i].is()) - m_pDispatchers[i]->removeStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs); + m_pDispatchers[i]->removeStatusListener(static_cast(this), *pSupportedURLs); m_pDispatchers[i] = xNewDispatch; if (m_pDispatchers[i].is()) - m_pDispatchers[i]->addStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs); + m_pDispatchers[i]->addStatusListener(static_cast(this), *pSupportedURLs); } if (m_pDispatchers[i].is()) ++nDispatchersGot; @@ -2764,7 +2764,7 @@ void FmXGridPeer::ConnectToDispatcher() m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0); if (m_pDispatchers[i].is()) { - m_pDispatchers[i]->addStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs); + m_pDispatchers[i]->addStatusListener(static_cast(this), *pSupportedURLs); ++nDispatchersGot; } } @@ -2790,7 +2790,7 @@ void FmXGridPeer::DisConnectFromDispatcher() for (sal_Int32 i=0; iremoveStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs); + m_pDispatchers[i]->removeStatusListener(static_cast(this), *pSupportedURLs); } delete[] m_pStateCache; diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 0f4669279431..23f3de93b60c 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -58,7 +58,7 @@ namespace sal_Int32 lcl_findPos(const OUString& aStr, const Sequence< OUString>& rList) { const OUString* pStrList = rList.getConstArray(); - OUString* pResult = static_cast(bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(OUString), + OUString* pResult = static_cast(bsearch(&aStr, static_cast(pStrList), rList.getLength(), sizeof(OUString), &NameCompare)); if (pResult) -- cgit