diff options
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 8 | ||||
-rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/sdpage2.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/present.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews6.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews9.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 12 |
22 files changed, 44 insertions, 44 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 43faa83c1265..c6dcbde8b3da 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -887,15 +887,15 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) sal_uInt16 nOldOutlMode = pOutl->GetMode(); sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; - if (((SdrTextObj*) pObj)->GetObjInventor() == SdrInventor && - ((SdrTextObj*) pObj)->GetObjIdentifier() == OBJ_OUTLINETEXT) + if (pObj->GetObjInventor() == SdrInventor && + pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { nOutlMode = OUTLINERMODE_OUTLINEOBJECT; } pOutl->Init( nOutlMode ); // Put text into the outliner - pOutl->SetText(*((SdrTextObj*) pObj)->GetOutlinerParaObject()); + pOutl->SetText(*pObj->GetOutlinerParaObject()); if (!mpOnlineSearchItem || pOutl->HasText(*mpOnlineSearchItem)) { @@ -913,7 +913,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) pModel->setLock(true); } // taking text from the outliner - ((SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() ); + pObj->SetOutlinerParaObject( pOutl->CreateParaObject() ); pObj->BroadcastObjectChange(); if ( pModel ) diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 261dcbf60ac9..3c8e33b0958a 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2491,7 +2491,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO if( !aString.isEmpty() ) pOutl->SetText( aString, pOutl->GetParagraph( 0 ) ); - ( (SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() ); + pObj->SetOutlinerParaObject( pOutl->CreateParaObject() ); if (!pOutliner) { diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index cd02cdea2c48..f3a1336aea5e 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -185,7 +185,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, } else { - OutlinerParaObject* pOPO = ((SdrTextObj*)pObj)->GetOutlinerParaObject(); + OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if( pOPO ) pOPO->SetStyleSheets( i, aFullName, SD_STYLE_FAMILY_MASTERPAGE ); @@ -217,7 +217,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, ++iterOldOut; } - OutlinerParaObject* pOPO = ((SdrTextObj*)pObj)->GetOutlinerParaObject(); + OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( bReplaceStyleSheets && pOPO ) { boost::ptr_vector<StyleReplaceData>::const_iterator it = aReplList.begin(); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index d20b491f5778..8b1eee62063b 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2248,7 +2248,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( pTextObj->GetInstance() == TSS_TYPE_NOTES ) pOutl = GetDrawOutliner( pText ); if ( !aPresentationText.isEmpty() ) - pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText ); + pPage->SetObjText( pText, pOutl, ePresKind, aPresentationText ); if ( pPage->GetPageKind() != PK_NOTES && pPage->GetPageKind() != PK_HANDOUT) { diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index fac2dfc0f88e..5d87c78c288f 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -805,7 +805,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() ::sd::PresentationViewShell* pPresViewSh = static_cast< ::sd::PresentationViewShell*>(mpViewShell); SdPage* pCurrPge = pPresViewSh->getCurrentPage(); SdDrawDocument* pDoc = pPresViewSh->GetDoc(); - SdPage* pNotesPge = (SdPage*)pDoc->GetSdPage((pCurrPge->GetPageNum()-1)>>1, PK_NOTES); + SdPage* pNotesPge = pDoc->GetSdPage((pCurrPge->GetPageNum()-1)>>1, PK_NOTES); if (pNotesPge) { SdrObject* pNotesObj = pNotesPge->GetPresObj(PRESOBJ_NOTES); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 9e8ea11ddae4..5025cab3d5e4 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -554,7 +554,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) SdOptions* pOptions = GetSdOptions(eDocType); // Grid if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , - false, (const SfxPoolItem**) &pItem )) + false, &pItem )) { const SdOptionsGridItem* pGridItem = static_cast<const SdOptionsGridItem*>(pItem); pGridItem->SetOptions( pOptions ); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 587ead7f68ac..f90cac33d578 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -723,7 +723,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar if( pPage ) { - ( (SdrMarkView*) mpSdViewIntern )->MarkAllObj( (SdrPageView*) mpSdViewIntern->ShowSdrPage( pPage ) ); + ( (SdrMarkView*) mpSdViewIntern )->MarkAllObj( mpSdViewIntern->ShowSdrPage( pPage ) ); } } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 43f20a7e19b4..2137f5657574 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -802,7 +802,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) for( size_t nObject = 0; nObject < pObjList->GetObjCount(); ++nObject ) { - SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( nObject ); + SdrObject* pSnapShot = pObjList->GetObj( nObject ); BitmapEx *const pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index bbb49c6e6af9..dae2cd4f5a9e 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -214,9 +214,9 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) while( !bDifferent ) { bDifferent = true; - for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); + for( pCustomShow = pCustomShowList->First(); pCustomShow != NULL && bDifferent; - pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) + pCustomShow = pCustomShowList->Next() ) { if( aStr == pCustomShow->GetName() ) bDifferent = false; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index f00a422d9ae7..4b1a8b922259 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -454,7 +454,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) SdDrawDocument* pDoc = pDocShell->GetDoc(); if( !maTlbObjects->IsEqualToDoc( pDoc ) ) { - SdDrawDocument* pNonConstDoc = (SdDrawDocument*) pDoc; // const as const can... + SdDrawDocument* pNonConstDoc = pDoc; // const as const can... ::sd::DrawDocShell* pNCDocShell = pNonConstDoc->GetDocSh(); OUString aDocName = pNCDocShell->GetMedium()->GetName(); maTlbObjects->Clear(); diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 3c0d92667303..bd67c3766e34 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -95,9 +95,9 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos(); SdCustomShow* pCustomShow; // fill Listbox with CustomShows - for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); + for( pCustomShow = pCustomShowList->First(); pCustomShow != NULL; - pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) + pCustomShow = pCustomShowList->Next() ) { aLbCustomshow->InsertEntry( pCustomShow->GetName() ); } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 12f323f30900..d6c2bd3a1ea9 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -659,7 +659,7 @@ void SdPageObjsTLB::AddShapeList ( if( pSdNavigatorWin ) pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked = pSdDrawDocShell->IsMarked((SdrObject*)pObj); + bMarked = pSdDrawDocShell->IsMarked(pObj); if(pNewEntry) { if(bMarked) @@ -693,7 +693,7 @@ void SdPageObjsTLB::AddShapeList ( if( pSdNavigatorWin ) pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked = pSdDrawDocShell->IsMarked((SdrObject*)pObj); + bMarked = pSdDrawDocShell->IsMarked(pObj); if(pNewEntry) { if(bMarked) @@ -742,7 +742,7 @@ void SdPageObjsTLB::AddShapeList ( if( pSdNavigatorWin ) pSdDrawDocShell = SdNavigatorWin::GetDrawDocShell(mpDoc); if(pSdDrawDocShell) - bMarked = pSdDrawDocShell->IsMarked((SdrObject*)pObj); + bMarked = pSdDrawDocShell->IsMarked(pObj); if(pNewEntry) { if(bMarked) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 35c5cb3435af..9db0f1a6c57b 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -329,7 +329,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) // the metric is set) const SfxPoolItem* pAttr = NULL; if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC , false, - (const SfxPoolItem**)&pAttr )) + &pAttr )) { const SfxUInt16Item* pItem = static_cast<const SfxUInt16Item*>(pAttr); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index a0dd8586fa0b..a11e109dd197 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -664,7 +664,7 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() { - return (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool(); + return mpDoc->GetStyleSheetPool(); } bool DrawDocShell::GotoBookmark(const OUString& rBookmark) diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 13c69d1fe552..b201d9e63d8f 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -1065,7 +1065,7 @@ registerBluez5Profile(DBusConnection* pConnection, std::vector<Communicator*>* p bSuccess = false; SAL_WARN("sdremote.bluetooth", "Failed to register our Profile1 with bluez ProfileManager " - << (const char *)(aError.message ? aError.message : "<null>")); + << (aError.message ? aError.message : "<null>")); } dbus_error_free(&aError); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 68a617cb1ecd..f73d991de262 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1082,7 +1082,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( if (pShape) { xRet.clear(); - new SdXShape( pShape, (SdXImpressDocument*)this ); + new SdXShape( pShape, this ); xRet = xShape; xShape.clear(); } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index e43f4e94134b..382d4ac1f362 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1519,7 +1519,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) throw(uno::RuntimeException, std::exception) { - return new SdPageLinkTargets( (SdGenericDrawPage*)this ); + return new SdPageLinkTargets( this ); } void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException) @@ -2393,7 +2393,7 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& SvxFmDrawPage::mpPage->SetSize( pSdPage->GetSize() ); SvxFmDrawPage::mpPage->SetOrientation( pSdPage->GetOrientation() ); - static_cast<SdPage*>(SvxFmDrawPage::mpPage)->SetLayoutName( ( (SdPage*)pSdPage )->GetLayoutName() ); + static_cast<SdPage*>(SvxFmDrawPage::mpPage)->SetLayoutName( pSdPage->GetLayoutName() ); // set notes master also SdPage* pNotesPage = GetModel()->GetDoc()->GetSdPage( (SvxFmDrawPage::mpPage->GetPageNum()-1)>>1, PK_NOTES ); @@ -2401,7 +2401,7 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& pNotesPage->TRG_ClearMasterPage(); sal_uInt16 nNum = (SvxFmDrawPage::mpPage->TRG_GetMasterPage()).GetPageNum() + 1; pNotesPage->TRG_SetMasterPage(*SvxFmDrawPage::mpPage->GetModel()->GetMasterPage(nNum)); - pNotesPage->SetLayoutName( ( (SdPage*)pSdPage )->GetLayoutName() ); + pNotesPage->SetLayoutName( pSdPage->GetLayoutName() ); GetModel()->SetModified(); } @@ -2925,7 +2925,7 @@ void SdMasterPage::setBackground( const Any& rValue ) // if we find the background style, copy the set to the background SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(SvxFmDrawPage::mpPage->GetModel()); - SfxStyleSheetBasePool* pSSPool = (SfxStyleSheetBasePool*)pDoc->GetStyleSheetPool(); + SfxStyleSheetBasePool* pSSPool = pDoc->GetStyleSheetPool(); if(pSSPool) { OUString aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage )->GetLayoutName() ); @@ -2969,7 +2969,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw() else { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(SvxFmDrawPage::mpPage->GetModel()); - SfxStyleSheetBasePool* pSSPool = (SfxStyleSheetBasePool*)pDoc->GetStyleSheetPool(); + SfxStyleSheetBasePool* pSSPool = pDoc->GetStyleSheetPool(); if(pSSPool) { OUString aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName() ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9647e52c528f..f281b69449a1 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -304,7 +304,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pItem ) { SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); + bool bValue = pItem->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -805,7 +805,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ::Outliner* pOutl = mpDrawView->GetTextEditOutliner(); if (pOutl) { - pOutl->RemoveFields(true, (TypeId) SvxURLField::StaticType()); + pOutl->RemoveFields(true, SvxURLField::StaticType()); } pSet.reset(new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END )); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index c6bdfed2a8f0..ddd7e36671d8 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -289,7 +289,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if ( pObj && !mpDrawView->IsTextEdit() ) { - SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone(); + SdrGrafObj* pNewObj = pObj->Clone(); bool bCont = true; if( pNewObj->IsLinkedGraphic() ) diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index a45a1ede5b37..b6e814a4a048 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -150,7 +150,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) // the empty graphic object gets a new graphic bInsertNewObject = false; - SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone(); + SdrGrafObj* pNewGrafObj = pGrafObj->Clone(); pNewGrafObj->SetEmptyPresObj(false); pNewGrafObj->SetOutlinerParaObject(NULL); pNewGrafObj->SetGraphic(aGraphic); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index c5cda61d264c..15f462e5fa86 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -436,7 +436,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) **********************************************************************/ // this page is exemplary - SdPage* pExample = (SdPage*)mrDoc.GetSdPage((sal_uInt16)nExample, PK_STANDARD); + SdPage* pExample = mrDoc.GetSdPage((sal_uInt16)nExample, PK_STANDARD); SdPage* pPage = mrDoc.AllocSdPage(false); pPage->SetLayoutName(pExample->GetLayoutName()); @@ -473,7 +473,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) /********************************************************************** |* now the notes page \*********************************************************************/ - pExample = (SdPage*)mrDoc.GetSdPage((sal_uInt16)nExample, PK_NOTES); + pExample = mrDoc.GetSdPage((sal_uInt16)nExample, PK_NOTES); SdPage* pNotesPage = mrDoc.AllocSdPage(false); pNotesPage->SetLayoutName(pExample->GetLayoutName()); @@ -708,7 +708,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) if(nPos >= 0) { - SdPage*pPage = (SdPage*)mrDoc.GetSdPage( (sal_uInt16) nPos, PK_STANDARD); + SdPage*pPage = mrDoc.GetSdPage( (sal_uInt16) nPos, PK_STANDARD); if(pPage && pPage->GetPresObj(PRESOBJ_TEXT)) pOutliner->SetDepth( pPara, 0 ); @@ -728,7 +728,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) if( nPos >= 0 ) { - SdPage* pPage = (SdPage*) mrDoc.GetSdPage( (sal_uInt16) nPos, PK_STANDARD ); + SdPage* pPage = mrDoc.GetSdPage( (sal_uInt16) nPos, PK_STANDARD ); if( pPage ) { @@ -1091,7 +1091,7 @@ void OutlineView::FillOutliner() // fill outliner with paragraphs from slides title & (outlines|subtitles) for (sal_uInt16 nPage = 0; nPage < nPageCount; nPage++) { - SdPage* pPage = (SdPage*)mrDoc.GetSdPage(nPage, PK_STANDARD); + SdPage* pPage = mrDoc.GetSdPage(nPage, PK_STANDARD); Paragraph * pPara = NULL; // take text from title shape diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index eeb5f78b98bd..46c04a806e80 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -301,11 +301,11 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, // try to get own transfer data if( pImplementation ) { - if( SD_MOD()->pTransferClip == (SdTransferable*) pImplementation ) + if( SD_MOD()->pTransferClip == pImplementation ) pOwnData = SD_MOD()->pTransferClip; - else if( SD_MOD()->pTransferDrag == (SdTransferable*) pImplementation ) + else if( SD_MOD()->pTransferDrag == pImplementation ) pOwnData = SD_MOD()->pTransferDrag; - else if( SD_MOD()->pTransferSelection == (SdTransferable*) pImplementation ) + else if( SD_MOD()->pTransferSelection == pImplementation ) pOwnData = SD_MOD()->pTransferSelection; } @@ -625,7 +625,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, else { SdDrawDocument* pWorkModel = const_cast<SdDrawDocument*>(pOwnData->GetWorkDocument()); - SdPage* pWorkPage = (SdPage*) pWorkModel->GetSdPage( 0, PK_STANDARD ); + SdPage* pWorkPage = pWorkModel->GetSdPage( 0, PK_STANDARD ); pWorkPage->SetRectsDirty(); @@ -863,8 +863,8 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, SfxMedium *pMedium = new SfxMedium( xStore, OUString() ); if( xDocShRef->DoLoad( pMedium ) ) { - SdDrawDocument* pModel = (SdDrawDocument*) xDocShRef->GetDoc(); - SdPage* pWorkPage = (SdPage*) pModel->GetSdPage( 0, PK_STANDARD ); + SdDrawDocument* pModel = xDocShRef->GetDoc(); + SdPage* pWorkPage = pModel->GetSdPage( 0, PK_STANDARD ); pWorkPage->SetRectsDirty(); |