diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-02 11:26:25 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-02 11:26:25 +0200 |
commit | 5e2fe8f2a0743e6e0fe587fe0f36d4bc9e0329b6 (patch) | |
tree | 0b61e7b1b18c5b0943de279cdb567cdffb266c57 /extensions | |
parent | 2e2a46fc651e8a030434e11ca35d2b1bab423c9a (diff) |
loplugin:cstylecast: deal with those that are (technically) const_cast
Change-Id: I636c05a34afc857c75a35e4c6fefedbce3e99c06
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 4 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/taborder.cxx | 2 | ||||
-rw-r--r-- | extensions/source/scanner/sane.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index ddedd34ec9da..65952f08f24c 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -98,7 +98,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS pToolBar->ClearSourceList(); Sequence<OUString> const * pStringSeq = static_cast<Sequence<OUString> const *>(aState.getValue()); - const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); + const OUString* pStringArray = pStringSeq->getConstArray(); sal_uInt32 nCount = pStringSeq->getLength(); OUString aEntry; @@ -136,7 +136,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) pToolBar->ClearFilterMenu(); Sequence<OUString> const * pStringSeq = static_cast<Sequence<OUString> const *>(aState.getValue()); - const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); + const OUString* pStringArray = pStringSeq->getConstArray(); sal_uInt32 nCount = pStringSeq->getLength(); for( sal_uInt32 i=0; i<nCount; i++ ) diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 9933739cddca..c7c062191e1d 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -565,8 +565,8 @@ void XPlugin_Impl::loadPlugin() &getNPPInstance(), m_aPluginMode == PluginMode::FULL ? NP_FULL : NP_EMBED, ::sal::static_int_cast< int16_t, int >( m_nArgs ), - (char**)(m_nArgs ? m_pArgn : NULL), - (char**)(m_nArgs ? m_pArgv : NULL), + const_cast<char**>(m_nArgs ? m_pArgn : NULL), + const_cast<char**>(m_nArgs ? m_pArgv : NULL), NULL ); #ifdef MACOSX // m_aNPWindow is set up in the MacPluginComm from the view diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 08c6670a69a4..caaff6c412e8 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -277,7 +277,7 @@ namespace pcr for( sal_Int32 j=0; j<aControlModels.getLength(); j++ ) { Reference< XPropertySet > xSet(pControlModels[j], UNO_QUERY); - if ((XPropertySet*)xSet.get() == static_cast<XPropertySet*>(pEntry->GetUserData())) + if (xSet.get() == static_cast<XPropertySet*>(pEntry->GetUserData())) { pSortedControlModels[i] = pControlModels[j]; break; diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 2df5bc75b2ce..164dac1950d3 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -226,7 +226,7 @@ void Sane::Init() { SANE_Status nStatus = p_init( &nVersion, 0 ); FAIL_SHUTDOWN_STATE( nStatus, "sane_init", ); - nStatus = p_get_devices( (const SANE_Device***)&ppDevices, + nStatus = p_get_devices( const_cast<const SANE_Device***>(&ppDevices), SANE_FALSE ); FAIL_SHUTDOWN_STATE( nStatus, "sane_get_devices", ); for( nDevices = 0 ; ppDevices[ nDevices ]; nDevices++ ) ; @@ -286,7 +286,7 @@ void Sane::ReloadOptions() bool Sane::Open( const char* name ) { - SANE_Status nStatus = p_open( (SANE_String_Const)name, &maHandle ); + SANE_Status nStatus = p_open( reinterpret_cast<SANE_String_Const>(name), &maHandle ); FAIL_STATE( nStatus, "sane_open", false ); ReloadOptions(); |