[Libreoffice-commits] core.git: vcl/osx vcl/quartz
Stephan Bergmann
sbergman at redhat.com
Sun May 17 11:43:56 PDT 2015
vcl/osx/salinst.cxx | 4 ++--
vcl/quartz/salgdicommon.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c54e2d95bfe34b5f18be7226c719f8356488e9fd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun May 17 20:43:30 2015 +0200
loplugin:cstylecast
Change-Id: I7bfd93746dee16cd8ef31de339cccef23fe72c2b
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index fa4bb30..c337680 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -295,7 +295,7 @@ bool SalYieldMutex::tryToAcquire()
bool ImplSalYieldMutexTryToAcquire()
{
- AquaSalInstance* pInst = (AquaSalInstance*) GetSalData()->mpFirstInstance;
+ AquaSalInstance* pInst = GetSalData()->mpFirstInstance;
if ( pInst )
return pInst->mpSalYieldMutex->tryToAcquire();
else
@@ -304,7 +304,7 @@ bool ImplSalYieldMutexTryToAcquire()
void ImplSalYieldMutexRelease()
{
- AquaSalInstance* pInst = (AquaSalInstance*) GetSalData()->mpFirstInstance;
+ AquaSalInstance* pInst = GetSalData()->mpFirstInstance;
if ( pInst )
pInst->mpSalYieldMutex->release();
}
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index d0be52a..453ae5c 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -805,7 +805,7 @@ bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
void* pEpsData, sal_uLong nByteCount )
{
// convert the raw data to an NSImageRef
- NSData* xNSData = [NSData dataWithBytes:(void*)pEpsData length:(int)nByteCount];
+ NSData* xNSData = [NSData dataWithBytes:pEpsData length:(int)nByteCount];
NSImageRep* xEpsImage = [NSEPSImageRep imageRepWithData: xNSData];
if( !xEpsImage )
{
More information about the Libreoffice-commits
mailing list