summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-28 19:06:19 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-28 19:09:25 +0100
commit51ec44fe04de4cad43a6bbd8dae4411a763c1e7e (patch)
treea1cd4bde7d2e1888ecb2287a9060aa7d045f44ef /sd/source/ui
parent8dee9e90f76b5b0906520f4eccde7ae4897c1c41 (diff)
Clean up C-style casts from pointers to void
Change-Id: I57277cd1356a99ee7c806d84a9446936d13a87c0
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/app/optsitem.cxx138
-rw-r--r--sd/source/ui/app/sddll.cxx2
-rw-r--r--sd/source/ui/app/sdmod.cxx2
-rw-r--r--sd/source/ui/app/sdmod1.cxx2
-rw-r--r--sd/source/ui/app/sdxfer.cxx4
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx26
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx2
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx2
-rw-r--r--sd/source/ui/remotecontrol/BufferedStreamSocket.cxx2
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx2
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
13 files changed, 95 insertions, 95 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index fdee1af5a3d2..f16a6af69c9e 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -235,13 +235,13 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
bool SdOptionsLayout::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetRulerVisible( *(sal_Bool*) pValues[ 0 ].getValue() );
- if( pValues[1].hasValue() ) SetHandlesBezier( *(sal_Bool*) pValues[ 1 ].getValue() );
- if( pValues[2].hasValue() ) SetMoveOutline( *(sal_Bool*) pValues[ 2 ].getValue() );
- if( pValues[3].hasValue() ) SetDragStripes( *(sal_Bool*) pValues[ 3 ].getValue() );
- if( pValues[4].hasValue() ) SetHelplines( *(sal_Bool*) pValues[ 4 ].getValue() );
- if( pValues[5].hasValue() ) SetMetric( (sal_uInt16) *(sal_Int32*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetDefTab( (sal_uInt16) *(sal_Int32*) pValues[ 6 ].getValue() );
+ if( pValues[0].hasValue() ) SetRulerVisible( *static_cast<sal_Bool const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) SetHandlesBezier( *static_cast<sal_Bool const *>(pValues[ 1 ].getValue()) );
+ if( pValues[2].hasValue() ) SetMoveOutline( *static_cast<sal_Bool const *>(pValues[ 2 ].getValue()) );
+ if( pValues[3].hasValue() ) SetDragStripes( *static_cast<sal_Bool const *>(pValues[ 3 ].getValue()) );
+ if( pValues[4].hasValue() ) SetHelplines( *static_cast<sal_Bool const *>(pValues[ 4 ].getValue()) );
+ if( pValues[5].hasValue() ) SetMetric( (sal_uInt16) *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
+ if( pValues[6].hasValue() ) SetDefTab( (sal_uInt16) *static_cast<sal_Int32 const *>(pValues[ 6 ].getValue()) );
return true;
}
@@ -522,46 +522,46 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
bool SdOptionsMisc::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() );
- if( pValues[1].hasValue() ) SetCrookNoContortion( *(sal_Bool*) pValues[ 1 ].getValue() );
- if( pValues[2].hasValue() ) SetQuickEdit( *(sal_Bool*)pValues[ 2 ].getValue() );
- if( pValues[3].hasValue() ) SetMasterPagePaintCaching( *(sal_Bool*) pValues[ 3 ].getValue() );
- if( pValues[4].hasValue() ) SetDragWithCopy( *(sal_Bool*) pValues[ 4 ].getValue() );
- if( pValues[5].hasValue() ) SetPickThrough( *(sal_Bool*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 6 ].getValue() );
- if( pValues[7].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 7 ].getValue() );
- if( pValues[9].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 9 ].getValue() );
- if( pValues[10].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 10 ].getValue() );
- if( pValues[11].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 11 ].getValue() );
- if( pValues[12].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 12 ].getValue() );
+ if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *static_cast<sal_Bool const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) SetCrookNoContortion( *static_cast<sal_Bool const *>(pValues[ 1 ].getValue()) );
+ if( pValues[2].hasValue() ) SetQuickEdit( *static_cast<sal_Bool const *>(pValues[ 2 ].getValue()) );
+ if( pValues[3].hasValue() ) SetMasterPagePaintCaching( *static_cast<sal_Bool const *>(pValues[ 3 ].getValue()) );
+ if( pValues[4].hasValue() ) SetDragWithCopy( *static_cast<sal_Bool const *>(pValues[ 4 ].getValue()) );
+ if( pValues[5].hasValue() ) SetPickThrough( *static_cast<sal_Bool const *>(pValues[ 5 ].getValue()) );
+ if( pValues[6].hasValue() ) SetDoubleClickTextEdit( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
+ if( pValues[7].hasValue() ) SetClickChangeRotation( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) );
+ if( pValues[9].hasValue() ) SetSolidDragging( *static_cast<sal_Bool const *>(pValues[ 9 ].getValue()) );
+ if( pValues[10].hasValue() ) SetDefaultObjectSizeWidth( *static_cast<sal_uInt32 const *>(pValues[ 10 ].getValue()) );
+ if( pValues[11].hasValue() ) SetDefaultObjectSizeHeight( *static_cast<sal_uInt32 const *>(pValues[ 11 ].getValue()) );
+ if( pValues[12].hasValue() ) SetPrinterIndependentLayout( *static_cast<sal_uInt16 const *>(pValues[ 12 ].getValue()) );
if( pValues[13].hasValue() )
- SetShowComments( *(sal_Bool*) pValues[ 13 ].getValue() );
+ SetShowComments( *static_cast<sal_Bool const *>(pValues[ 13 ].getValue()) );
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
if( pValues[14].hasValue() )
- SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
+ SetStartWithTemplate( *static_cast<sal_Bool const *>(pValues[ 14 ].getValue()) );
if( pValues[15].hasValue() )
- SetSummationOfParagraphs( *(sal_Bool*) pValues[ 15 ].getValue() );
+ SetSummationOfParagraphs( *static_cast<sal_Bool const *>(pValues[ 15 ].getValue()) );
if( pValues[16].hasValue() )
- SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 16 ].getValue() );
+ SetShowUndoDeleteWarning( *static_cast<sal_Bool const *>(pValues[ 16 ].getValue()) );
if( pValues[17].hasValue() )
- SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 17 ].getValue());
+ SetSlideshowRespectZOrder(*static_cast<sal_Bool const *>(pValues[ 17 ].getValue()));
if( pValues[18].hasValue() )
- SetPreviewNewEffects(*(sal_Bool*) pValues[ 18 ].getValue());
+ SetPreviewNewEffects(*static_cast<sal_Bool const *>(pValues[ 18 ].getValue()));
if( pValues[19].hasValue() )
- SetPreviewChangedEffects(*(sal_Bool*) pValues[ 19 ].getValue());
+ SetPreviewChangedEffects(*static_cast<sal_Bool const *>(pValues[ 19 ].getValue()));
if( pValues[20].hasValue() )
- SetPreviewTransitions(*(sal_Bool*) pValues[ 20 ].getValue());
+ SetPreviewTransitions(*static_cast<sal_Bool const *>(pValues[ 20 ].getValue()));
if( pValues[21].hasValue() )
- SetDisplay(*(sal_Int32*) pValues[ 21 ].getValue());
+ SetDisplay(*static_cast<sal_Int32 const *>(pValues[ 21 ].getValue()));
if( pValues[22].hasValue() )
SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 22 ] ) );
@@ -570,10 +570,10 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
SetPresentationPenWidth( getSafeValue< double >( pValues[ 23 ] ) );
if( pValues[24].hasValue() )
- SetEnableSdremote( *(sal_Bool*) pValues[ 24 ].getValue() );
+ SetEnableSdremote( *static_cast<sal_Bool const *>(pValues[ 24 ].getValue()) );
if( pValues[25].hasValue() )
- SetEnablePresenterScreen( *(sal_Bool*) pValues[ 25 ].getValue() );
+ SetEnablePresenterScreen( *static_cast<sal_Bool const *>(pValues[ 25 ].getValue()) );
}
return true;
@@ -799,16 +799,16 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
bool SdOptionsSnap::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() );
- if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() );
- if( pValues[2].hasValue() ) SetSnapFrame( *(sal_Bool*) pValues[ 2 ].getValue() );
- if( pValues[3].hasValue() ) SetSnapPoints( *(sal_Bool*) pValues[ 3 ].getValue() );
- if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() );
- if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() );
- if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *(sal_Int32*) pValues[ 7 ].getValue() );
- if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*) pValues[ 8 ].getValue() );
- if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() );
+ if( pValues[0].hasValue() ) SetSnapHelplines( *static_cast<sal_Bool const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) SetSnapBorder( *static_cast<sal_Bool const *>(pValues[ 1 ].getValue()) );
+ if( pValues[2].hasValue() ) SetSnapFrame( *static_cast<sal_Bool const *>(pValues[ 2 ].getValue()) );
+ if( pValues[3].hasValue() ) SetSnapPoints( *static_cast<sal_Bool const *>(pValues[ 3 ].getValue()) );
+ if( pValues[4].hasValue() ) SetOrtho( *static_cast<sal_Bool const *>(pValues[ 4 ].getValue()) );
+ if( pValues[5].hasValue() ) SetBigOrtho( *static_cast<sal_Bool const *>(pValues[ 5 ].getValue()) );
+ if( pValues[6].hasValue() ) SetRotate( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
+ if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *static_cast<sal_Int32 const *>(pValues[ 7 ].getValue()) );
+ if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *static_cast<sal_Int32 const *>(pValues[ 8 ].getValue()) );
+ if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (sal_Int16) *static_cast<sal_Int32 const *>(pValues[ 9 ].getValue()) );
return true;
}
@@ -946,8 +946,8 @@ bool SdOptionsZoom::ReadData( const Any* pValues )
{
sal_Int32 x = 1, y = 1;
- if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() );
- if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() );
+ if( pValues[0].hasValue() ) x = ( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) y = ( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
SetScale( x, y );
@@ -1060,27 +1060,27 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
bool SdOptionsGrid::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() );
- if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() );
+ if( pValues[0].hasValue() ) SetFldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) SetFldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
if( pValues[2].hasValue() )
{
- const sal_uInt32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() );
+ const sal_uInt32 nDivX = FRound( *static_cast<double const *>(pValues[ 2 ].getValue()) );
SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) );
}
if( pValues[3].hasValue() )
{
- const sal_uInt32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() );
+ const sal_uInt32 nDivY = FRound( *static_cast<double const *>(pValues[ 3 ].getValue()) );
SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) );
}
- if( pValues[4].hasValue() ) SetFldSnapX( *(sal_Int32*) pValues[ 4 ].getValue() );
- if( pValues[5].hasValue() ) SetFldSnapY( *(sal_Int32*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetUseGridSnap( *(sal_Bool*) pValues[ 6 ].getValue() );
- if( pValues[7].hasValue() ) SetSynchronize( *(sal_Bool*) pValues[ 7 ].getValue() );
- if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() );
- if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() );
+ if( pValues[4].hasValue() ) SetFldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
+ if( pValues[5].hasValue() ) SetFldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
+ if( pValues[6].hasValue() ) SetUseGridSnap( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
+ if( pValues[7].hasValue() ) SetSynchronize( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) );
+ if( pValues[8].hasValue() ) SetGridVisible( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) );
+ if( pValues[9].hasValue() ) SetEqualGrid( *static_cast<sal_Bool const *>(pValues[ 9 ].getValue()) );
return true;
}
@@ -1272,27 +1272,27 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
bool SdOptionsPrint::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() );
- if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() );
- if( pValues[2].hasValue() ) SetPagename( *(sal_Bool*) pValues[ 2 ].getValue() );
- if( pValues[3].hasValue() ) SetHiddenPages( *(sal_Bool*) pValues[ 3 ].getValue() );
- if( pValues[4].hasValue() ) SetPagesize( *(sal_Bool*) pValues[ 4 ].getValue() );
- if( pValues[5].hasValue() ) SetPagetile( *(sal_Bool*) pValues[ 5 ].getValue() );
- if( pValues[6].hasValue() ) SetBooklet( *(sal_Bool*) pValues[ 6 ].getValue() );
- if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() );
- if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() );
- if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() );
- if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16) *(sal_Int32*) pValues[ 10 ].getValue() );
- if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() );
+ if( pValues[0].hasValue() ) SetDate( *static_cast<sal_Bool const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) SetTime( *static_cast<sal_Bool const *>(pValues[ 1 ].getValue()) );
+ if( pValues[2].hasValue() ) SetPagename( *static_cast<sal_Bool const *>(pValues[ 2 ].getValue()) );
+ if( pValues[3].hasValue() ) SetHiddenPages( *static_cast<sal_Bool const *>(pValues[ 3 ].getValue()) );
+ if( pValues[4].hasValue() ) SetPagesize( *static_cast<sal_Bool const *>(pValues[ 4 ].getValue()) );
+ if( pValues[5].hasValue() ) SetPagetile( *static_cast<sal_Bool const *>(pValues[ 5 ].getValue()) );
+ if( pValues[6].hasValue() ) SetBooklet( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
+ if( pValues[7].hasValue() ) SetFrontPage( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) );
+ if( pValues[8].hasValue() ) SetBackPage( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) );
+ if( pValues[9].hasValue() ) SetPaperbin( *static_cast<sal_Bool const *>(pValues[ 9 ].getValue()) );
+ if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16) *static_cast<sal_Int32 const *>(pValues[ 10 ].getValue()) );
+ if( pValues[11].hasValue() ) SetDraw( *static_cast<sal_Bool const *>(pValues[ 11 ].getValue()) );
// just for impress
if( GetConfigId() == SDCFG_IMPRESS )
{
- if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() );
- if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() );
- if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() );
- if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() );
- if( pValues[16].hasValue() ) SetHandoutPages( (sal_uInt16)*(sal_Int32*) pValues[16].getValue() );
+ if( pValues[12].hasValue() ) SetNotes( *static_cast<sal_Bool const *>(pValues[ 12 ].getValue()) );
+ if( pValues[13].hasValue() ) SetHandout( *static_cast<sal_Bool const *>(pValues[ 13 ].getValue()) );
+ if( pValues[14].hasValue() ) SetOutline( *static_cast<sal_Bool const *>(pValues[ 14 ].getValue()) );
+ if( pValues[15].hasValue() ) SetHandoutHorizontal( *static_cast<sal_Bool const *>(pValues[15].getValue()) );
+ if( pValues[16].hasValue() ) SetHandoutPages( (sal_uInt16)*static_cast<sal_Int32 const *>(pValues[16].getValue()) );
}
return true;
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 6485138b4f0a..7da803a3ab44 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -287,7 +287,7 @@ void SdDLL::Init()
pDrawFact = &::sd::GraphicDocShell::Factory();
// the SdModule must be created
- SdModule** ppShlPtr = (SdModule**) GetAppData(SHL_DRAW);
+ SdModule** ppShlPtr = reinterpret_cast<SdModule**>(GetAppData(SHL_DRAW));
// #i46427#
// The SfxModule::SfxModule stops when the first given factory
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index f7fb1c270938..b982264de845 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -114,7 +114,7 @@ SdModule::~SdModule()
mpResourceContainer.reset();
// Mark the module in the global AppData structure as deleted.
- SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW);
+ SdModule** ppShellPointer = reinterpret_cast<SdModule**>(GetAppData(SHL_DRAW));
if (ppShellPointer != NULL)
(*ppShellPointer) = NULL;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 8df6940b7d76..a0e2880b7004 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -420,7 +420,7 @@ IMPL_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent )
{
if( pEvent && (pEvent->GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(pEvent)->GetData() )
{
- const CommandEvent& rEvent = *(const CommandEvent*)static_cast<VclWindowEvent*>(pEvent)->GetData();
+ const CommandEvent& rEvent = *static_cast<const CommandEvent*>(static_cast<VclWindowEvent*>(pEvent)->GetData());
if( rEvent.GetCommand() == COMMAND_MEDIA )
{
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index dc1ec49cc6b7..67170e969f4a 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -584,7 +584,7 @@ bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, So
try
{
static const bool bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL );
- SdDrawDocument* pDoc = (SdDrawDocument*) pObject;
+ SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(pObject);
if ( !bDontBurnInStyleSheet )
pDoc->BurnInStyleSheetAttributes();
rxOStm->SetBufferSize( 16348 );
@@ -611,7 +611,7 @@ bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, So
case( SDTRANSFER_OBJECTTYPE_DRAWOLE ):
{
- SfxObjectShell* pEmbObj = (SfxObjectShell*) pObject;
+ SfxObjectShell* pEmbObj = static_cast<SfxObjectShell*>(pObject);
::utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 9b7d571c8dd2..5a62f7207fad 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
OUString sUrl;
for( sal_Int16 i = 0; i < pImagesLst->GetEntryCount(); ++i )
{
- OUString* pData = (OUString*) pImagesLst->GetEntryData(i);
+ OUString const * pData = static_cast<OUString const *>(pImagesLst->GetEntryData(i));
sUrl = *pData;
Reference< drawing::XDrawPage > xSlide = appendNewSlide(AUTOLAYOUT_NONE, xDrawPages);
@@ -163,7 +163,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
for( sal_Int32 i = 0; i < pImagesLst->GetEntryCount(); i+=2 )
{
- OUString* pData = NULL;
+ OUString const * pData = NULL;
// create the slide
Reference< drawing::XDrawPage > xSlide = appendNewSlide(AUTOLAYOUT_NONE, xDrawPages);
@@ -178,11 +178,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
// grab the left one
void* pD1 = pImagesLst->GetEntryData(i);
- pData = (OUString*) pD1;
+ pData = static_cast<OUString const *>(pD1);
sUrl1 = pData ? OUString(*pData) : "";
// grab the right one
void* pD2 = pImagesLst->GetEntryData(i+1);
- pData = (OUString*) pD2;
+ pData = static_cast<OUString const *>(pD2);
sUrl2 = pData ? OUString(*pData) : "";
if( !sUrl1.isEmpty() )
@@ -283,22 +283,22 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
// grab the upper left one
void* pD1 = pImagesLst->GetEntryData(i);
- pData = (OUString*) pD1;
+ pData = static_cast<OUString*>(pD1);
sUrl1 = pData ? OUString(*pData) : "";
// grab the upper right one
void* pD2 = pImagesLst->GetEntryData(i+1);
- pData = (OUString*) pD2;
+ pData = static_cast<OUString *>(pD2);
sUrl2 = pData ? OUString(*pData) : "";
// grab the lower left one
void* pD3 = pImagesLst->GetEntryData(i+2);
- pData = (OUString*) pD3;
+ pData = static_cast<OUString*>(pD3);
sUrl3 = pData ? OUString(*pData) : "";
// grab the lower right one
void* pD4 = pImagesLst->GetEntryData(i+3);
- pData = (OUString*) pD4;
+ pData = static_cast<OUString*>(pD4);
sUrl4 = pData ? OUString(*pData) : "";
if( !sUrl1.isEmpty() )
@@ -504,12 +504,12 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos();
OUString sActEntry( pImagesLst->GetEntry(nActPos) );
// actual data
- OUString* pActData = (OUString*) pImagesLst->GetEntryData(nActPos);
+ OUString* pActData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos));
OUString sAct(*pActData);
OUString sUpperEntry( pImagesLst->GetEntry(nActPos - 1) );
// upper data
- OUString* pUpperData = (OUString*) pImagesLst->GetEntryData(nActPos - 1);
+ OUString* pUpperData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos - 1));
OUString sUpper(*pUpperData);
pImagesLst->RemoveEntry( sActEntry );
@@ -534,11 +534,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl)
if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
{
OUString sActEntry( pImagesLst->GetSelectEntry() );
- OUString* pActData = (OUString*) pImagesLst->GetSelectEntryData();
+ OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
OUString sAct(*pActData);
OUString sDownEntry( pImagesLst->GetEntry(nActPos + 1) );
- OUString* pDownData = (OUString*) pImagesLst->GetEntryData(nActPos + 1);
+ OUString* pDownData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos + 1));
OUString sDown(*pDownData);
pImagesLst->RemoveEntry( sActEntry );
@@ -568,7 +568,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl)
IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
{
- OUString* pData = (OUString*) pImagesLst->GetSelectEntryData();
+ OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
OUString sImgUrl = pData ? OUString(*pData) : "";
if (sImgUrl != SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX))
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 6e996ddcdfa5..d1c023e9b387 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -441,7 +441,7 @@ void SdDefineCustomShowDlg::CheckCustomShow()
pEntry != NULL;
pEntry = m_pLbCustomPages->Next( pEntry ) )
{
- SdPage* pPage = (SdPage*) pEntry->GetUserData();
+ SdPage* pPage = static_cast<SdPage*>(pEntry->GetUserData());
rpCustomShow->PagesVector().push_back( pPage );
}
bModified = true;
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 648b60bb30b6..7a2120b4e5ff 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -930,7 +930,7 @@ DBusHandlerResult ProfileMessageFunction
int nDescriptor;
dbus_message_iter_get_basic(&it, &nDescriptor);
- std::vector<Communicator*>* pCommunicators = (std::vector<Communicator*>*) user_data;
+ std::vector<Communicator*>* pCommunicators = static_cast<std::vector<Communicator*>*>(user_data);
// Bluez gives us non-blocking sockets, but our code relies
// on blocking behaviour.
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 7633283f3237..9b756fe76012 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -56,7 +56,7 @@ sal_Int32 BufferedStreamSocket::write( const void* pBuffer, sal_uInt32 n )
if ( !usingCSocket )
return StreamSocket::write( pBuffer, n );
else
- return ::send( mSocket, (const char *) pBuffer, (size_t) n, 0 );
+ return ::send( mSocket, pBuffer, (size_t) n, 0 );
}
void BufferedStreamSocket::close()
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 34924a66e302..5e01b5fa66e4 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -277,7 +277,7 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
case sd::tools::EventMultiplexerEvent::EID_SHAPE_CHANGED:
case sd::tools::EventMultiplexerEvent::EID_SHAPE_INSERTED:
case sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED:
- InvalidatePreview((const SdPage*)pEvent->mpUserData);
+ InvalidatePreview(static_cast<const SdPage*>(pEvent->mpUserData));
break;
}
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 38eee1f0f680..4879b51bd339 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2029,7 +2029,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent )
if( pEvent && (pEvent->GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(pEvent)->GetData() )
{
- const CommandEvent& rEvent = *(const CommandEvent*)static_cast<VclWindowEvent*>(pEvent)->GetData();
+ const CommandEvent& rEvent = *static_cast<const CommandEvent*>(static_cast<VclWindowEvent*>(pEvent)->GetData());
if( rEvent.GetCommand() == COMMAND_MEDIA )
{
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index 94bf10085b44..dcb3f669731c 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -153,7 +153,7 @@ public:
{}
virtual ~PngReplacement (void)
{
- delete [] (char*)mpData;
+ delete [] static_cast<char*>(mpData);
}
virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE
{
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index e6b828dc3db3..16817235eb87 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1122,7 +1122,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
SvMemoryStream aDestStrm( 65535, 65535 );
ConvertGDIMetaFileToWMF( *xMetaFile, aDestStrm, NULL, false );
- Sequence<sal_Int8> aSeq( (sal_Int8*)aDestStrm.GetData(), aDestStrm.Tell() );
+ Sequence<sal_Int8> aSeq( static_cast<sal_Int8 const *>(aDestStrm.GetData()), aDestStrm.Tell() );
aAny <<= aSeq;
}
}
@@ -1152,7 +1152,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SvMemoryStream aMemStream;
WriteDIB(aBitmap.GetBitmap(), aMemStream, false, false);
- uno::Sequence<sal_Int8> aSeq( (sal_Int8*)aMemStream.GetData(), aMemStream.Tell() );
+ uno::Sequence<sal_Int8> aSeq( static_cast<sal_Int8 const *>(aMemStream.GetData()), aMemStream.Tell() );
aAny <<= aSeq;
}
}