summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-08 16:29:34 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-08 16:29:34 +0200
commit9f356d3e66127bf14fe957962e8451dbd27c8ac8 (patch)
tree015db94871c0915b1894239bc58732388578305e /unotools
parent63082134bfa79da7b5251284fe5a3c516ba41171 (diff)
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: Ic05bc081ec190cc80d8821630e94f51c8db225b6
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/configvaluecontainer.cxx2
-rw-r--r--unotools/source/misc/fontcvt.cxx2
-rw-r--r--unotools/source/streaming/streamhelper.cxx2
-rw-r--r--unotools/source/streaming/streamwrap.cxx2
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx8
5 files changed, 8 insertions, 8 deletions
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 6ec6913eb38a..13b9df0d6d24 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -105,7 +105,7 @@ namespace utl
bool bSuccess = uno_type_assignData(
_rAccessor.getLocation(), _rAccessor.getDataType().getTypeLibType(),
const_cast< void* >( _rData.getValue() ), _rData.getValueType().getTypeLibType(),
- (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release
+ cpp_queryInterface, cpp_acquire, cpp_release
);
SAL_WARN_IF(!bSuccess, "unotools.config",
"::utl::lcl_copyData( Accessor, Any ): could not assign the data (node path: \"" << _rAccessor.getPath() << "\"");
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index c2761278b1d7..29a783e58494 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1485,7 +1485,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName,
pCvt = &aImplStarSymbolCvt;
}
- return (FontToSubsFontConverter)pCvt;
+ return const_cast<ConvertChar *>(pCvt);
}
void DestroyFontToSubsFontConverter(
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 1206cf0c81a6..5c74aeb00d10 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -45,7 +45,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >&
aData.realloc(nBytesToRead);
sal_Size nRead(0);
- ErrCode nError = m_xLockBytes->ReadAt(m_nActPos, (void*)aData.getArray(), nBytesToRead, &nRead);
+ ErrCode nError = m_xLockBytes->ReadAt(m_nActPos, static_cast<void*>(aData.getArray()), nBytesToRead, &nRead);
m_nActPos += nRead;
if (nError != ERRCODE_NONE)
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 0c96bec87e0d..83275822d80f 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -57,7 +57,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >
aData.realloc(nBytesToRead);
- sal_uInt32 nRead = m_pSvStream->Read((void*)aData.getArray(), nBytesToRead);
+ sal_uInt32 nRead = m_pSvStream->Read(static_cast<void*>(aData.getArray()), nBytesToRead);
checkError();
// Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 513757e5e09e..caf0898d26d1 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -546,12 +546,12 @@ Moderator::Moderator(
Reference < XActiveDataSink > xActiveSink(*pxSink,UNO_QUERY);
if(xActiveSink.is())
*pxSink = Reference<XInterface>(
- (cppu::OWeakObject*)new ModeratorsActiveDataSink(*this));
+ static_cast<cppu::OWeakObject*>(new ModeratorsActiveDataSink(*this)));
Reference<XActiveDataStreamer> xStreamer( *pxSink, UNO_QUERY );
if ( xStreamer.is() )
*pxSink = Reference<XInterface>(
- (cppu::OWeakObject*)new ModeratorsActiveDataStreamer(*this));
+ static_cast<cppu::OWeakObject*>(new ModeratorsActiveDataStreamer(*this)));
if(dec == 0)
m_aArg.Argument <<= aPostArg;
@@ -1407,9 +1407,9 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
xLockBytes->SetSynchronMode( !pHandler );
Reference< XActiveDataControl > xSink;
if ( eOpenMode & StreamMode::WRITE )
- xSink = (XActiveDataControl*) new UcbStreamer_Impl( xLockBytes );
+ xSink = static_cast<XActiveDataControl*>(new UcbStreamer_Impl( xLockBytes ));
else
- xSink = (XActiveDataControl*) new UcbDataSink_Impl( xLockBytes );
+ xSink = static_cast<XActiveDataControl*>(new UcbDataSink_Impl( xLockBytes ));
if ( rProps.getLength() )
{