summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-08 16:27:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-08 16:27:52 +0200
commit7c874dede68a2bad917961f7d345401bbc6b5c34 (patch)
treeda3f53508a25931900a405f227b3a44d3ae6b3e1 /sdext
parent1234f96b963d3bc71736c29b455872447266f11c (diff)
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I8bd47784ae34ecd57f43b1e680ab863a6272c32f
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.cxx2
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx6
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx4
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 67e5613d0aed..312cf087a31b 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -171,7 +171,7 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new PPPOptimizerDialog( rSMgr );
+ return static_cast<cppu::OWeakObject*>(new PPPOptimizerDialog( rSMgr ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index c1395f82f5c6..9765086a333d 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -728,9 +728,9 @@ static void unzipToBuffer( char* pBegin, unsigned int nLen,
z_stream aZStr;
aZStr.next_in = reinterpret_cast<Bytef *>(pBegin);
aZStr.avail_in = nLen;
- aZStr.zalloc = ( alloc_func )0;
- aZStr.zfree = ( free_func )0;
- aZStr.opaque = ( voidpf )0;
+ aZStr.zalloc = nullptr;
+ aZStr.zfree = nullptr;
+ aZStr.opaque = nullptr;
int err = inflateInit(&aZStr);
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index ed4c65fda2d6..adb9b06348b1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -100,10 +100,10 @@ int main(int argc, char **argv)
? new GooString( aPwBuf )
: (ownerPassword[0] != '\001'
? new GooString(ownerPassword)
- : (GooString *)NULL ) );
+ : nullptr ) );
GooString* pUserPasswordStr( userPassword[0] != '\001'
? new GooString(userPassword)
- : (GooString *)NULL );
+ : nullptr );
if( outputFile[0] != '\001' )
g_binary_out = fopen(outputFile,"wb");
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index beb609a83ede..8f0097194486 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1352,7 +1352,7 @@ void PresenterAccessible::AccessibleObject::ThrowIfDisposed() const
throw (lang::DisposedException)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
- throw lang::DisposedException("object has already been disposed", uno::Reference<uno::XInterface>((uno::XWeak*)(this)));
+ throw lang::DisposedException("object has already been disposed", uno::Reference<uno::XInterface>(const_cast<uno::XWeak*>(static_cast<uno::XWeak const *>(this))));
}
//===== AccessibleStateSet ====================================================