diff options
41 files changed, 98 insertions, 98 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index cf9f9b181055..e014280b7c71 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -500,7 +500,7 @@ CustomAnimationPresetPtr CustomAnimationPresets::getEffectDescriptor( const OUSt } else { - return CustomAnimationPresetPtr((CustomAnimationPreset*)0); + return CustomAnimationPresetPtr(nullptr); } } diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 3f966e8aaee9..cdd094cddc4f 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -996,7 +996,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( if (rBookmarkList.empty()) { - pBMView = new ::sd::View(*pBookmarkDoc, (OutputDevice*) NULL); + pBMView = new ::sd::View(*pBookmarkDoc, nullptr); pBMView->EndListening(*pBookmarkDoc); pBMView->MarkAll(); } @@ -1023,7 +1023,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( if (!pBMView) { // Create View for the first time - pBMView = new ::sd::View(*pBookmarkDoc, (OutputDevice*) NULL); + pBMView = new ::sd::View(*pBookmarkDoc, nullptr); pBMView->EndListening(*pBookmarkDoc); } @@ -1048,7 +1048,7 @@ bool SdDrawDocument::InsertBookmarkAsObject( if (pBMView) { // Insert selected objects - ::sd::View* pView = new ::sd::View(*this, (OutputDevice*) NULL); + ::sd::View* pView = new ::sd::View(*this, nullptr); pView->EndListening(*this); // Look for the page into which the objects are supposed to be inserted diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index f454540323c7..ff020e054096 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2159,7 +2159,7 @@ uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() t uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< XComponentContext > & rxCtxt ) throw( uno::Exception ) { - return (cppu::OWeakObject*)new PowerPointExport( rxCtxt ); + return static_cast<cppu::OWeakObject*>(new PowerPointExport( rxCtxt )); } OUString PowerPointExport::getImplementationName() throw (css::uno::RuntimeException, std::exception) diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 8b1eee62063b..f38243e6b5fd 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -562,7 +562,7 @@ bool ImplSdPPTImport::Import() ePgKind = PK_HANDOUT; pPage->SetPageKind( ePgKind ); - pSdrModel->InsertMasterPage( (SdrPage*)pPage ); + pSdrModel->InsertMasterPage( static_cast<SdrPage*>(pPage) ); if ( bNotesMaster && bStarDrawFiller ) pPage->SetAutoLayout( AUTOLAYOUT_NOTES, true ); if ( nMasterNum ) @@ -773,7 +773,7 @@ bool ImplSdPPTImport::Import() { Rectangle aEmpty; aHd2.SeekToBegOfRecord( rStCtrl ); - SdrObject* pImpObj = ImportObj( rStCtrl, (void*)&aProcessData, aEmpty, aEmpty ); + SdrObject* pImpObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty ); if ( pImpObj ) { pImpObj->SetLayer( mnBackgroundObjectsLayerID ); @@ -1391,7 +1391,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide bVisible = false; rStCtrl.Seek( nPosition ); ProcessData aProcessData( rSlidePersist, SdPageCapsule(pPage) ); - SdrObject* pObj = ImportObj( rStCtrl, (void*)&aProcessData, aEmpty, aEmpty ); + SdrObject* pObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty ); if ( pObj ) pPage->NbcInsertObject( pObj, 0 ); } @@ -2157,7 +2157,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); + static_cast<SdrAttrObj*>(pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" ); } break; @@ -2165,7 +2165,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); + static_cast<SdrAttrObj*>(pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for subtitleobject (SJ)" ); } break; @@ -2185,7 +2185,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for outlinerobject (SJ)" ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); + static_cast<SdrAttrObj*>(pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); ppStyleSheetAry = &pStyleSheetAry[ 0 ]; } break; @@ -2196,7 +2196,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); + static_cast<SdrAttrObj*>(pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" ); } else @@ -2204,7 +2204,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_NOTES ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for notesobj (SJ)" ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); + static_cast<SdrAttrObj*>(pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true ); } } break; diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index e2864220ca63..fccafcdbcfa1 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -28,7 +28,7 @@ PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize mnTextEnc ( nTextEnc ), mpBuf ( new sal_uInt8[ nBufSize ] ) { - memcpy( (void*)mpBuf, (void*)pBuf, nBufSize ); + memcpy( static_cast<void*>(mpBuf), static_cast<void const *>(pBuf), nBufSize ); }; PropEntry::PropEntry( const PropEntry& rProp ) : @@ -37,7 +37,7 @@ PropEntry::PropEntry( const PropEntry& rProp ) : mnTextEnc ( rProp.mnTextEnc ), mpBuf ( new sal_uInt8[ mnSize ] ) { - memcpy( (void*)mpBuf, (void*)rProp.mpBuf, mnSize ); + memcpy( static_cast<void*>(mpBuf), static_cast<void const *>(rProp.mpBuf), mnSize ); }; PropEntry& PropEntry::operator=(const PropEntry& rPropEntry) @@ -49,7 +49,7 @@ PropEntry& PropEntry::operator=(const PropEntry& rPropEntry) mnSize = rPropEntry.mnSize; mnTextEnc = rPropEntry.mnTextEnc; mpBuf = new sal_uInt8[ mnSize ]; - memcpy( (void*)mpBuf, (void*)rPropEntry.mpBuf, mnSize ); + memcpy( static_cast<void*>(mpBuf), static_cast<void const *>(rPropEntry.mpBuf), mnSize ); } return *this; } @@ -493,7 +493,7 @@ Section& Section::operator=( const Section& rSection ) { if ( this != &rSection ) { - memcpy( (void*)aFMTID, (void*)rSection.aFMTID, 16 ); + memcpy( static_cast<void*>(aFMTID), static_cast<void const *>(rSection.aFMTID), 16 ); maEntries = rSection.maEntries.clone(); } diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index b7c627a30b8a..18951ce56d81 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -232,7 +232,7 @@ sal_Int32 ReadThroughComponent( { // sax parser sends wrapped exceptions, // try to find the original one - xml::sax::SAXException aSaxEx = *(xml::sax::SAXException*)(&r); + xml::sax::SAXException aSaxEx = *static_cast<xml::sax::SAXException const *>(&r); bool bTryChild = true; while( bTryChild ) diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 69b7dabdac06..132b501f9a12 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -252,7 +252,7 @@ void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( if (IsDisposed()) { - uno::Reference<uno::XInterface> x ((lang::XComponent *)this, uno::UNO_QUERY); + uno::Reference<uno::XInterface> x (static_cast<lang::XComponent *>(this), uno::UNO_QUERY); rxListener->disposing (lang::EventObject (x)); } else diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index b6531ee17f27..7520787b4fc7 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -340,7 +340,7 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( if (IsDisposed()) { - uno::Reference<uno::XInterface> x ((lang::XComponent *)this, uno::UNO_QUERY); + uno::Reference<uno::XInterface> x (static_cast<lang::XComponent *>(this), uno::UNO_QUERY); rxListener->disposing (lang::EventObject (x)); } else diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index ca19853a4c0a..0ff1b9705503 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -113,19 +113,19 @@ void fillDurationComboBox( ListBox* pBox ) static const double gdVeryFast = 0.5; OUString aVerySlow( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_VERY_SLOW ) ); - pBox->SetEntryData( pBox->InsertEntry( aVerySlow ), (void*)&gdVerySlow ); + pBox->SetEntryData( pBox->InsertEntry( aVerySlow ), const_cast<double *>(&gdVerySlow) ); OUString aSlow( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_SLOW ) ); - pBox->SetEntryData( pBox->InsertEntry( aSlow ), (void*)&gdSlow ); + pBox->SetEntryData( pBox->InsertEntry( aSlow ), const_cast<double *>(&gdSlow) ); OUString aNormal( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_NORMAL ) ); - pBox->SetEntryData( pBox->InsertEntry( aNormal ), (void*)&gdNormal ); + pBox->SetEntryData( pBox->InsertEntry( aNormal ), const_cast<double *>(&gdNormal) ); OUString aFast( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_FAST ) ); - pBox->SetEntryData( pBox->InsertEntry( aFast ), (void*)&gdFast ); + pBox->SetEntryData( pBox->InsertEntry( aFast ), const_cast<double *>(&gdFast) ); OUString aVeryFast( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_VERY_FAST ) ); - pBox->SetEntryData( pBox->InsertEntry( aVeryFast ), (void*)&gdVeryFast ); + pBox->SetEntryData( pBox->InsertEntry( aVeryFast ), const_cast<double *>(&gdVeryFast) ); } void fillRepeatComboBox( ListBox* pBox ) diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index da40225e5eb8..f226d86505ad 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -724,7 +724,7 @@ void AnnotationWindow::MouseButtonDown( const MouseEvent& rMEvt ) { // context menu Rectangle aRect(LogicToPixel(maRectMetaButton.BottomLeft()),LogicToPixel(maRectMetaButton.BottomLeft())); - mrManager.ExecuteAnnotationContextMenu( mxAnnotation, (vcl::Window*)this, aRect, true ); + mrManager.ExecuteAnnotationContextMenu( mxAnnotation, static_cast<vcl::Window*>(this), aRect, true ); } } diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index da621f689b55..35ff9ceb33a8 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -500,7 +500,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) sal_Int32 nY; if( pDocSh ) { - SdrPage* pPage = (SdrPage*) pDoc->GetSdPage(0, PK_STANDARD); + SdrPage* pPage = static_cast<SdrPage*>(pDoc->GetSdPage(0, PK_STANDARD)); Size aSize(pPage->GetSize()); nW = aSize.Width(); nH = aSize.Height(); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 2da799145ff3..c42060b7989e 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -281,7 +281,7 @@ bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() { - return (vcl::Window*)pDlg; + return static_cast<vcl::Window*>(pDlg); } std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index bed2fd7b4e97..3b568abd2f70 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -343,7 +343,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) WaitObject* pWait = NULL; if( mpViewShell ) - pWait = new WaitObject( (vcl::Window*) mpViewShell->GetActiveWindow() ); + pWait = new WaitObject( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) ); mpDoc->NewOrLoadCompleted( NEW_DOC ); mpDoc->CreateFirstPages(); diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index e2ecae03f79d..54f526ebab8b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -136,7 +136,7 @@ void SAL_CALL ConfigurationController::disposing() // Release the listeners. lang::EventObject aEvent; - aEvent.Source = uno::Reference<uno::XInterface>((cppu::OWeakObject*)this); + aEvent.Source = uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(this)); { const SolarMutexGuard aSolarGuard; diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 9692d6b65b1c..c9746f4e7bd9 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -41,7 +41,7 @@ ChildWindowPane::ChildWindowPane ( sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::unique_ptr<SfxShell> && pShell) - : ChildWindowPaneInterfaceBase(rxPaneId,(vcl::Window*)NULL), + : ChildWindowPaneInterfaceBase(rxPaneId,nullptr), mnChildWindowId(nChildWindowId), mrViewShellBase(rViewShellBase), mpShell(std::move(pShell)), diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index b266637737c7..6ab57c6b234e 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -312,7 +312,7 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) E3dCompoundObject* p3DObj = NULL; - WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) ); p3DObj = ImpCreateBasic3DShape(); E3dScene* pScene = mpView->SetCurrent3DObj(p3DObj); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index cc7d3769f0e0..d6b887010c94 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -111,7 +111,7 @@ bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); + mpView->BegCreateObj(aPnt, nullptr, nDrgLog); SdrObject* pObj = mpView->GetCreateObj(); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 03c1ad5e0b9e..bf49a373fa80 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -117,7 +117,7 @@ bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->CaptureMouse(); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); + mpView->BegCreateObj(aPnt, nullptr, nDrgLog); SdrObject* pObj = mpView->GetCreateObj(); if ( pObj ) diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 9dec24693992..8d5ec3893d67 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -192,11 +192,11 @@ bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) { Size aCaptionSize(846, 846); // (4x2)cm bReturn = mpView->BegCreateCaptionObj(aPnt, aCaptionSize, - (OutputDevice*) NULL, nDrgLog); + nullptr, nDrgLog); } else { - mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); + mpView->BegCreateObj(aPnt, nullptr, nDrgLog); } SdrObject* pObj = mpView->GetCreateObj(); diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 9edd9bc866a2..610297948e02 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -89,7 +89,7 @@ bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) if ( pHdl != NULL || mpView->IsMarkedHit(aMDPos, nHitLog) ) { sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); bReturn = true; } else if ( mpView->AreObjectsMarked() ) diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index df901883103d..47e64b4617b8 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -89,7 +89,7 @@ bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); + mpView->BegCreateObj(aPnt, nullptr, nDrgLog); bReturn = true; } return bReturn; diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index b50fe2c87836..db0725f096d9 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -376,7 +376,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) pIPClient->SetSdrGrafObj(NULL); // wait-mousepointer while deleting object - WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) ); // delete object mpView->DeleteMarked(); } @@ -944,9 +944,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); if (Help::IsBalloonHelpEnabled()) - Help::ShowBalloon( (vcl::Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); + Help::ShowBalloon( static_cast<vcl::Window*>(mpWindow), rPosPixel, aScreenRect, aHelpText); else if (Help::IsQuickHelpEnabled()) - Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); + Help::ShowQuickHelp( static_cast<vcl::Window*>(mpWindow), aScreenRect, aHelpText); } return bSet; diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 8d0169eb6ee5..bfa94a26c9a6 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -115,7 +115,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) if (pHdl) { // drag handle - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog); } } else if (eHit == SDRHIT_MARKEDOBJECT && mpView->IsInsGluePointMode()) @@ -134,7 +134,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2()) { // move object - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, NULL, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, NULL, nDrgLog); } else if (eHit == SDRHIT_GLUEPOINT) { @@ -147,7 +147,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) if (pHdl) { - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); } } else @@ -176,7 +176,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) (!rMEvt.IsShift() || eHit == SDRHIT_MARKEDOBJECT)) { // move object - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog); } else if (mpView->AreObjectsMarked()) { diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 83146e4b1a21..75a58f2ac47e 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -384,7 +384,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) if( mbMasterPage ) { - StyleSheetUndoAction* pAction = new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyleSheet, &(*pTempSet.get())); + StyleSheetUndoAction* pAction = new StyleSheetUndoAction(mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), &(*pTempSet.get())); mpDocSh->GetUndoManager()->AddUndoAction(pAction); pStyleSheet->GetItemSet().Put( *(pTempSet.get()) ); sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() ); @@ -406,7 +406,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) SdStyleSheet *pStyle = pMasterPage->getPresentationStyle(HID_PSEUDOSHEET_BACKGROUND); StyleSheetUndoAction* pAction = - new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyle, &(*pTempSet.get())); + new StyleSheetUndoAction(mpDoc, static_cast<SfxStyleSheet*>(pStyle), &(*pTempSet.get())); pUndoGroup->AddAction(pAction); pStyle->GetItemSet().Put( *(pTempSet.get()) ); sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() ); diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 6578b585d643..3946dc7fc4e5 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -79,7 +79,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) bool bUnique = false; sal_Int16 nDepth, nTmp; OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView()); - OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow ); + OutlinerView* pOutlinerView = pOlView->GetViewByWindow( static_cast<Window*>(mpWindow) ); ::Outliner* pOutl = pOutlinerView->GetOutliner(); std::vector<Paragraph*> aSelList; diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 9c965f7622a5..dd63708501ac 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -233,7 +233,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } if ( ! rMEvt.IsRight()) - if (mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog)) + if (mpView->BegDragObj(aMDPos, nullptr, pHdl, nDrgLog)) mpView->GetDragMethod()->SetShiftPressed( rMEvt.IsShift() ); bReturn = true; } @@ -408,7 +408,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pHdl=mpView->PickHandle(aMDPos); if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); } else { @@ -446,7 +446,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) * Drag Handle ******************************************************************/ if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog); } else if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT) { @@ -472,7 +472,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) * Move object ******************************************************************/ if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, NULL, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, NULL, nDrgLog); } else if (eHit == SDRHIT_HANDLE) { @@ -503,7 +503,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { mpView->MarkPoint(*pHdl); if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); } } @@ -514,7 +514,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pHdl = mpView->PickHandle(aMDPos); if(pHdl) if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*)NULL, pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); } } else @@ -546,7 +546,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // Move object if ( ! rMEvt.IsRight()) - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog); } else if (mpView->AreObjectsMarked()) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 33e5339392b0..e308e2ef6da8 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -404,7 +404,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) ) { sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); + mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog); } } bReturn = true; @@ -417,7 +417,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); + mpView->BegCreateObj(aMDPos, nullptr, nDrgLog); } else { @@ -759,7 +759,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); + mpView->BegCreateObj(aMDPos, nullptr, nDrgLog); bool bSnapEnabled = mpView->IsSnapEnabled(); @@ -1188,11 +1188,11 @@ bool FuText::RequestHelp(const HelpEvent& rHEvt) if (Help::IsBalloonHelpEnabled()) { - bReturn = Help::ShowBalloon( (vcl::Window*)mpWindow, rHEvt.GetMousePosPixel(), aScreenRect, aHelpText); + bReturn = Help::ShowBalloon( static_cast<vcl::Window*>(mpWindow), rHEvt.GetMousePosPixel(), aScreenRect, aHelpText); } else if (Help::IsQuickHelpEnabled()) { - bReturn = Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); + bReturn = Help::ShowQuickHelp( static_cast<vcl::Window*>(mpWindow), aScreenRect, aHelpText); } } } diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 51ea22c892ec..0de7b9a8c74e 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -524,7 +524,7 @@ sal_Int32 OSXBluetoothWrapper::write( const void* pBuffer, sal_uInt32 n ) toWrite = toWrite <= mnMTU ? toWrite : mnMTU; if ( [mpChannel writeSync:const_cast<char *>(ptr) length:toWrite] != kIOReturnSuccess ) { - SAL_INFO( "sdremote.bluetooth", " [mpChannel writeSync:" << (void *) ptr << " length:" << toWrite << "] returned error, total written " << nBytesWritten ); + SAL_INFO( "sdremote.bluetooth", " [mpChannel writeSync:" << static_cast<void const *>(ptr) << " length:" << toWrite << "] returned error, total written " << nBytesWritten ); return nBytesWritten; } ptr += toWrite; diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index bd3a13a62784..c2e64d8e6951 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -35,7 +35,7 @@ NavigatorWrapper::NavigatorWrapper ( mrViewShellBase(rViewShellBase), maNavigator(VclPtr<SdNavigatorWin>::Create( this, - (::sd::NavigatorChildWindow*)NULL, + nullptr, SdResId(FLT_NAVIGATOR), pBindings)) { diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index fed8f315d8c9..015da1726b02 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -374,7 +374,7 @@ void DrawController::FireSelectionChangeListener() throw() m_aSelectionTypeIdentifier); if( pLC ) { - Reference< XInterface > xSource( (XWeak*)this ); + Reference< XInterface > xSource( static_cast<XWeak*>(this) ); const lang::EventObject aEvent( xSource ); // iterate over all listeners and send events diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 2e00c231b758..e55be9d19a18 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -126,7 +126,7 @@ namespace sd throw () { DBG_ASSERT( pModel, "I need a model for the DocumentSettings!" ); - return (XWeak*)new DocumentSettings( pModel ); + return static_cast<XWeak*>(new DocumentSettings( pModel )); } enum SdDocumentSettingsPropertyHandles diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 0d182b3b295d..f800e85e7fa0 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow ) { - return (cppu::OWeakObject*)new SdXCustomPresentation( pShow, NULL ); + return static_cast<cppu::OWeakObject*>(new SdXCustomPresentation( pShow, NULL )); } SdXCustomPresentation::SdXCustomPresentation() throw() @@ -200,7 +200,7 @@ uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) throw lang::IndexOutOfBoundsException(); uno::Any aAny; - SdrPage* pPage = (SdrPage*)mpSdCustomShow->PagesVector()[Index]; + SdrPage * pPage = static_cast<SdrPage*>(const_cast<SdPage *>(mpSdCustomShow->PagesVector()[Index])); if( pPage ) { @@ -248,7 +248,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std: bDisposing = true; - uno::Reference< uno::XInterface > xSource( (cppu::OWeakObject*)this ); + uno::Reference< uno::XInterface > xSource( static_cast<cppu::OWeakObject*>(this) ); lang::EventObject aEvt; aEvt.Source = xSource; @@ -311,7 +311,7 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServ uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstance() throw(uno::Exception, uno::RuntimeException, std::exception) { - uno::Reference< uno::XInterface > xRef( (::cppu::OWeakObject*)new SdXCustomPresentation() ); + uno::Reference< uno::XInterface > xRef( static_cast<cppu::OWeakObject*>(new SdXCustomPresentation()) ); return xRef; } diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index f4e294818d14..e3b59f101234 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -764,7 +764,7 @@ uno::Reference<drawing::XLayer> SdLayerManager::GetLayer (SdrLayer* pLayer) uno::Reference<drawing::XLayer> xLayer; // Search existing xLayer for the given pLayer. - if (mpLayers->findRef (xRef, (void*)pLayer, compare_layers)) + if (mpLayers->findRef (xRef, static_cast<void*>(pLayer), compare_layers)) xLayer = uno::Reference<drawing::XLayer> (xRef, uno::UNO_QUERY); // Create the xLayer if necessary. diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 998df51a2ed3..d64c2b6b1b37 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -720,7 +720,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages( if( !xDrawPages.is() ) { initializeDocument(); - mxDrawPagesAccess = xDrawPages = (drawing::XDrawPages*)new SdDrawPagesAccess(*this); + mxDrawPagesAccess = xDrawPages = static_cast<drawing::XDrawPages*>(new SdDrawPagesAccess(*this)); } return xDrawPages; @@ -910,31 +910,31 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( if( aServiceSpecifier == "com.sun.star.text.TextField.DateTime" || aServiceSpecifier == "com.sun.star.text.textfield.DateTime" ) { - return (::cppu::OWeakObject * )new SvxUnoTextField( text::textfield::Type::DATE ); + return static_cast<cppu::OWeakObject *>(new SvxUnoTextField( text::textfield::Type::DATE )); } if( aServiceSpecifier == "com.sun.star.presentation.TextField.Header" || aServiceSpecifier == "com.sun.star.presentation.textfield.Header" ) { - return (::cppu::OWeakObject * )new SvxUnoTextField( text::textfield::Type::PRESENTATION_HEADER ); + return static_cast<cppu::OWeakObject *>(new SvxUnoTextField( text::textfield::Type::PRESENTATION_HEADER )); } if( aServiceSpecifier == "com.sun.star.presentation.TextField.Footer" || aServiceSpecifier == "com.sun.star.presentation.textfield.Footer" ) { - return (::cppu::OWeakObject * )new SvxUnoTextField( text::textfield::Type::PRESENTATION_FOOTER ); + return static_cast<cppu::OWeakObject *>(new SvxUnoTextField( text::textfield::Type::PRESENTATION_FOOTER )); } if( aServiceSpecifier == "com.sun.star.presentation.TextField.DateTime" || aServiceSpecifier == "com.sun.star.presentation.textfield.DateTime" ) { - return (::cppu::OWeakObject * )new SvxUnoTextField( text::textfield::Type::PRESENTATION_DATE_TIME ); + return static_cast<cppu::OWeakObject *>(new SvxUnoTextField( text::textfield::Type::PRESENTATION_DATE_TIME )); } if( aServiceSpecifier == "com.sun.star.text.TextField.PageName" || aServiceSpecifier == "com.sun.star.text.textfield.PageName" ) { - return (::cppu::OWeakObject * )new SvxUnoTextField( text::textfield::Type::PAGE_NAME ); + return static_cast<cppu::OWeakObject *>(new SvxUnoTextField( text::textfield::Type::PAGE_NAME )); } if( aServiceSpecifier == "com.sun.star.xml.NamespaceMap" ) @@ -947,12 +947,12 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( // Support creation of GraphicObjectResolver and EmbeddedObjectResolver if( aServiceSpecifier == "com.sun.star.document.ExportGraphicObjectResolver" ) { - return (::cppu::OWeakObject * )new SvXMLGraphicHelper( GRAPHICHELPER_MODE_WRITE ); + return static_cast<cppu::OWeakObject *>(new SvXMLGraphicHelper( GRAPHICHELPER_MODE_WRITE )); } if( aServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" ) { - return (::cppu::OWeakObject * )new SvXMLGraphicHelper( GRAPHICHELPER_MODE_READ ); + return static_cast<cppu::OWeakObject *>(new SvXMLGraphicHelper( GRAPHICHELPER_MODE_READ )); } if( aServiceSpecifier == "com.sun.star.document.ExportEmbeddedObjectResolver" ) @@ -961,7 +961,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( if( NULL == pPersist ) throw lang::DisposedException(); - return (::cppu::OWeakObject * )new SvXMLEmbeddedObjectHelper( *pPersist, EMBEDDEDOBJECTHELPER_MODE_WRITE ); + return static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pPersist, EMBEDDEDOBJECTHELPER_MODE_WRITE )); } if( aServiceSpecifier == "com.sun.star.document.ImportEmbeddedObjectResolver" ) @@ -970,7 +970,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( if( NULL == pPersist ) throw lang::DisposedException(); - return (::cppu::OWeakObject * )new SvXMLEmbeddedObjectHelper( *pPersist, EMBEDDEDOBJECTHELPER_MODE_READ ); + return static_cast<cppu::OWeakObject *>(new SvXMLEmbeddedObjectHelper( *pPersist, EMBEDDEDOBJECTHELPER_MODE_READ )); } uno::Reference< uno::XInterface > xRet; @@ -1062,7 +1062,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( if( pShape && !mbClipBoard ) pShape->SetShapeType(aServiceSpecifier); - xRet = (uno::XWeak*)pShape; + xRet = static_cast<uno::XWeak*>(pShape); } else if ( aServiceSpecifier == "com.sun.star.drawing.TableShape" ) { @@ -1070,7 +1070,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( if( pShape && !mbClipBoard ) pShape->SetShapeType(aServiceSpecifier); - xRet = (uno::XWeak*)pShape; + xRet = static_cast<uno::XWeak*>(pShape); } else { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 382d4ac1f362..9f1237f79bca 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -340,7 +340,7 @@ sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno: } SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPage, const SvxItemPropertySet* _pSet ) throw() -: SvxFmDrawPage( (SdrPage*) pInPage ), +: SvxFmDrawPage( static_cast<SdrPage*>(pInPage) ), SdUnoSearchReplaceShape(this), mpModel ( _pModel ), mpSdrModel(0), @@ -1115,8 +1115,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { Point aPoint; Size aSize( GetPage()->GetSize() ); - xMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, true ), 0 ); - xMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); + xMetaFile->AddAction( static_cast<MetaAction*>(new MetaFillColorAction( COL_WHITE, true )), 0 ); + xMetaFile->AddAction( static_cast<MetaAction*>(new MetaRectAction( Rectangle( aPoint, aSize ) )), 1 ); xMetaFile->SetPrefMapMode( MAP_100TH_MM ); xMetaFile->SetPrefSize( aSize ); @@ -2512,7 +2512,7 @@ void SdDrawPage::setBackground( const Any& rValue ) SdUnoPageBackground* pBackground = new SdUnoPageBackground(); Reference< beans::XPropertySetInfo > xSetInfo( xSet->getPropertySetInfo() ); - Reference< beans::XPropertySet > xDestSet( (beans::XPropertySet*)pBackground ); + Reference< beans::XPropertySet > xDestSet( static_cast<beans::XPropertySet*>(pBackground) ); Reference< beans::XPropertySetInfo > xDestSetInfo( xDestSet->getPropertySetInfo() ); Sequence< beans::Property > aProperties( xDestSetInfo->getProperties() ); @@ -2700,9 +2700,9 @@ Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType ) uno::Any aAny; if( rType == cppu::UnoType<container::XIndexAccess>::get() ) - aAny <<= Reference< container::XIndexAccess >((presentation::XPresentationPage*)(this)); + aAny <<= Reference< container::XIndexAccess >(static_cast<presentation::XPresentationPage*>(this)); else if( rType == cppu::UnoType<container::XElementAccess>::get() ) - aAny <<= Reference< container::XElementAccess >((presentation::XPresentationPage*)(this)); + aAny <<= Reference< container::XElementAccess >(static_cast<presentation::XPresentationPage*>(this)); else if( rType == cppu::UnoType<container::XNamed>::get() ) aAny <<= Reference< container::XNamed >(this); else if( rType == cppu::UnoType<presentation::XPresentationPage>::get() && @@ -2904,7 +2904,7 @@ void SdMasterPage::setBackground( const Any& rValue ) SdUnoPageBackground* pBackground = new SdUnoPageBackground(); Reference< beans::XPropertySetInfo > xInputSetInfo( xInputSet->getPropertySetInfo(), UNO_QUERY_THROW ); - Reference< beans::XPropertySet > xDestSet( (beans::XPropertySet*)pBackground ); + Reference< beans::XPropertySet > xDestSet( static_cast<beans::XPropertySet*>(pBackground) ); Reference< beans::XPropertySetInfo > xDestSetInfo( xDestSet->getPropertySetInfo(), UNO_QUERY_THROW ); uno::Sequence< beans::Property> aProperties( xDestSetInfo->getProperties() ); @@ -3130,11 +3130,11 @@ Reference< uno::XInterface > createUnoPageImpl( SdPage* pPage ) { if( pPage->IsMasterPage() ) { - xPage = (::cppu::OWeakObject*)new SdMasterPage( pModel, pPage ); + xPage = static_cast<cppu::OWeakObject*>(new SdMasterPage( pModel, pPage )); } else { - xPage = (::cppu::OWeakObject*)new SdDrawPage( pModel, pPage ); + xPage = static_cast<cppu::OWeakObject*>(new SdDrawPage( pModel, pPage )); } } } diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index ba08ffff52d2..2ff105a8b569 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -86,7 +86,7 @@ void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEnt uno::Reference< uno::XInterface > SdUnoCreatePool( SdDrawDocument* pDrawModel ) { - return (uno::XAggregation*)new SdUnoDrawPool( pDrawModel ); + return static_cast<uno::XAggregation*>(new SdUnoDrawPool( pDrawModel )); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index ddd7e36671d8..535dd54b503d 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -294,7 +294,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( pNewObj->IsLinkedGraphic() ) { - ScopedVclPtrInstance< MessageDialog > aQueryBox( (vcl::Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); + ScopedVclPtrInstance< MessageDialog > aQueryBox( static_cast<vcl::Window*>(GetActiveWindow()),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); if (RET_YES == aQueryBox->Execute()) pNewObj->ReleaseGraphicLink(); diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index ad5283574b9b..839cdd405968 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -56,7 +56,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); SvxIMapDlg* pDlg = ViewShell::Implementation::GetImageMapDialog(); - if ( pDlg->GetEditingObject() == (void*) pSdrObj ) + if ( pDlg->GetEditingObject() == static_cast<void*>(pSdrObj) ) { const ImageMap& rImageMap = pDlg->GetImageMap(); SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj ); @@ -87,7 +87,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) SvxIMapDlg* pImageMapDialog = ViewShell::Implementation::GetImageMapDialog(); if ( ( pObj->ISA( SdrGrafObj ) /*|| pObj->ISA( SdrOle2Obj )*/ ) && pImageMapDialog!=NULL - && ( pImageMapDialog->GetEditingObject() == (void*) pObj ) ) + && ( pImageMapDialog->GetEditingObject() == static_cast<void const *>(pObj) ) ) { bDisable = false; } diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index fe12af267d53..79ee37a28040 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -51,7 +51,7 @@ using namespace ::std; namespace sd { FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK */) - : SdrView(pDrawDoc, (OutputDevice*) NULL), + : SdrView(pDrawDoc, nullptr), mnRefCount(0), mnPresViewShellId(SID_VIEWSHELL0), mnSlotId(SID_OBJECT_SELECT), diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index a9aac3f4412f..291accf4d6bc 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -667,7 +667,7 @@ bool View::SdrBeginTextEdit( bool bMasterPage = pPage && pPage->IsMasterPage(); GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent( - sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, (void*)pObj ); + sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, static_cast<void*>(pObj) ); if( pOutl==NULL && pObj ) pOutl = SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pObj->GetModel()); @@ -792,7 +792,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally) GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent( sd::tools::EventMultiplexerEvent::EID_END_TEXT_EDIT, - (void*)xObj.get() ); + static_cast<void*>(xObj.get()) ); if( xObj.is() ) { diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index d26436cce50b..8e871374f3a5 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -742,7 +742,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi CommandWheelData aWheelData( pData->GetDelta(),pData->GetNotchDelta(), nScrollLines,pData->GetMode(),pData->GetModifier(),pData->IsHorz() ); CommandEvent aReWrite( rCEvt.GetMousePosPixel(),rCEvt.GetCommand(), - rCEvt.IsMouseEvent(),(const void *) &aWheelData ); + rCEvt.IsMouseEvent(),static_cast<const void *>(&aWheelData) ); bDone = pWin->HandleScrollCommand( aReWrite, mpHorizontalScrollBar.get(), mpVerticalScrollBar.get()); |