summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx4
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx2
-rw-r--r--svx/source/dialog/connctrl.cxx2
-rw-r--r--svx/source/dialog/contwnd.cxx6
-rw-r--r--svx/source/dialog/imapwnd.cxx6
-rw-r--r--svx/source/dialog/optgrid.cxx6
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdedxv.cxx4
-rw-r--r--svx/source/svdraw/svdoedge.cxx6
-rw-r--r--svx/source/svdraw/svdopath.cxx2
-rw-r--r--svx/source/svdraw/svdpagv.cxx4
11 files changed, 23 insertions, 23 deletions
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 85164cb10923..e0b8fc92e3d0 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -80,7 +80,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
{
mpModel = mpControl->GetSdrModel();
if (mpModel != NULL)
- mpPage = (SdrPage*)mpModel->GetPage( 0 );
+ mpPage = mpModel->GetPage( 0 );
mpView = mpControl->GetSdrView();
if( mpModel == NULL || mpPage == NULL || mpView == NULL )
@@ -665,7 +665,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
mpModel = pModel;
if (mpModel != NULL)
- mpPage = (SdrPage*)mpModel->GetPage( 0 );
+ mpPage = mpModel->GetPage( 0 );
mpView = pView;
if (mpModel == NULL || mpPage == NULL || mpView == NULL)
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 0360ea2e4b0a..48f763a7d791 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -401,7 +401,7 @@ SdrGrafObj* CompressGraphicsDialog::GetCompressedSdrGrafObj()
{
if ( m_dResolution > 0.0 )
{
- SdrGrafObj* pNewObject = (SdrGrafObj*) m_pGraphicObj->Clone();
+ SdrGrafObj* pNewObject = m_pGraphicObj->Clone();
if ( m_pReduceResolutionCB->IsChecked() )
{
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 47772831534c..e7b8c416498c 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -166,7 +166,7 @@ void SvxXConnectionPreview::Construct()
{
bFound = true;
const SdrEdgeObj* pTmpEdgeObj = static_cast<const SdrEdgeObj*>(pObj);
- pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone();
+ pEdgeObj = pTmpEdgeObj->Clone();
SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( true );
SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( false );
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 49e47aae18e5..d883417d0a48 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -45,7 +45,7 @@ ContourWindow::ContourWindow( vcl::Window* pParent, WinBits nBits ) :
void ContourWindow::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly )
{
- SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
+ SdrPage* pPage = pModel->GetPage( 0 );
const sal_uInt16 nPolyCount = rPolyPoly.Count();
// First delete all drawing objects
@@ -87,7 +87,7 @@ const tools::PolyPolygon& ContourWindow::GetPolyPolygon()
{
if ( pModel->IsChanged() )
{
- SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
+ SdrPage* pPage = pModel->GetPage( 0 );
aPolyPoly = tools::PolyPolygon();
@@ -126,7 +126,7 @@ void ContourWindow::SdrObjCreated( const SdrObject& )
bool ContourWindow::IsContourChanged() const
{
- SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
+ SdrPage* pPage = pModel->GetPage( 0 );
bool bRet = false;
if ( pPage && pPage->GetObjCount() )
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 1b7fed9b042f..3ae813705a88 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -153,7 +153,7 @@ const ImageMap& IMapWindow::GetImageMap()
{
if ( pModel->IsChanged() )
{
- SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
+ SdrPage* pPage = pModel->GetPage( 0 );
if ( pPage )
{
@@ -434,7 +434,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) )
{
- SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
+ SdrPage* pPage = pModel->GetPage( 0 );
if ( pPage )
{
for ( size_t i = pPage->GetObjCount(); i > 0; )
@@ -826,7 +826,7 @@ void IMapWindow::KeyInput( const KeyEvent& rKEvt )
void IMapWindow::SelectFirstObject()
{
- SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
+ SdrPage* pPage = pModel->GetPage( 0 );
if( pPage->GetObjCount() != 0 )
{
GrabFocus();
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 14efaed2b004..2d2fca69b106 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -239,7 +239,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet )
const SfxPoolItem* pAttr = 0;
if( SfxItemState::SET == rSet->GetItemState( SID_ATTR_GRID_OPTIONS , false,
- (const SfxPoolItem**)&pAttr ))
+ &pAttr ))
{
const SvxGridItem* pGridAttr = static_cast<const SvxGridItem*>(pAttr);
pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap );
@@ -265,7 +265,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
{
const SfxPoolItem* pAttr = NULL;
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false,
- (const SfxPoolItem**)&pAttr ))
+ &pAttr ))
{
const SvxGridItem* pGridAttr = static_cast<const SvxGridItem*>(pAttr);
pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap );
@@ -276,7 +276,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
// Metric Change if necessary (as TabPage is in the dialog, where the
// metric can be set
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC , false,
- (const SfxPoolItem**)&pAttr ))
+ &pAttr ))
{
const SfxUInt16Item* pItem = static_cast<const SfxUInt16Item*>(pAttr);
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 8b03862b90b1..f62a81ab95e5 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -311,7 +311,7 @@ void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedir
// set PaintingPageView
const SdrView& rView = mpImpl->mrPageView.GetView();
- SdrModel& rModel = *((SdrModel*)rView.GetModel());
+ SdrModel& rModel = *(rView.GetModel());
// get to be processed layers
const bool bPrinter(GetPaintWindow().OutputToPrinter());
@@ -363,7 +363,7 @@ void SdrPageWindow::RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObject
// set PaintingPageView
const SdrView& rView = mpImpl->mrPageView.GetView();
- SdrModel& rModel = *((SdrModel*)rView.GetModel());
+ SdrModel& rModel = *(rView.GetModel());
// get the layers to process
const bool bPrinter(GetPaintWindow().OutputToPrinter());
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 4899c4b97947..6c116cf58709 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -919,7 +919,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
pTEObj->EndTextEdit(*pTEOutliner);
- if( (pTEObj->GetRotateAngle() != 0) || (pTEObj && pTEObj->ISA(SdrTextObj) && ((SdrTextObj*)pTEObj)->IsFontwork()) )
+ if( (pTEObj->GetRotateAngle() != 0) || (pTEObj && pTEObj->ISA(SdrTextObj) && pTEObj->IsFontwork()) )
{
pTEObj->ActionChanged();
}
@@ -989,7 +989,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// Switch on any TextAnimation again after TextEdit
if(pTEObj->ISA(SdrTextObj))
{
- ((SdrTextObj*)pTEObj)->SetTextAnimationAllowed(true);
+ pTEObj->SetTextAnimationAllowed(true);
}
// #i72757#
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index f51a391d97aa..55d6968838d4 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1585,7 +1585,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
SdrTextObj::Notify(rBC,rHint);
if (nNotifyingCount==0) { // a locking flag
- ((SdrEdgeObj*)this)->nNotifyingCount++;
+ nNotifyingCount++;
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
if (bDataChg) { // StyleSheet changed
ImpSetAttrToEdgeInfo(); // when changing templates, copy values from Pool to aEdgeInfo
@@ -1604,7 +1604,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
- ((SdrEdgeObj*)this)->nNotifyingCount--;
+ nNotifyingCount--;
}
}
@@ -1819,7 +1819,7 @@ bool SdrEdgeObj::hasSpecialDrag() const
SdrObject* SdrEdgeObj::getFullDragClone() const
{
// use Clone operator
- SdrEdgeObj* pRetval = (SdrEdgeObj*)Clone();
+ SdrEdgeObj* pRetval = Clone();
// copy connections for clone, SdrEdgeObj::operator= does not do this
pRetval->ConnectToNode(true, GetConnectedNode(true));
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 262223694d50..71d3c15ea6a4 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2718,7 +2718,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
basegfx::B2DPolygon aSplitPolyA(aCandidate, 0L, nPnt + 1L);
SetPathPoly(basegfx::B2DPolyPolygon(aSplitPolyA));
- pNewObj = (SdrPathObj*)Clone();
+ pNewObj = Clone();
basegfx::B2DPolygon aSplitPolyB(aCandidate, nPnt, nPointCount - nPnt);
pNewObj->SetPathPoly(basegfx::B2DPolyPolygon(aSplitPolyB));
}
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 29b3b5f2bdac..a6461cae64b3 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -292,7 +292,7 @@ void SdrPageView::CompleteRedraw(
if(!pPageWindow)
{
// create temp PageWindow
- pPageWindow = new SdrPageWindow(*((SdrPageView*)this), rPaintWindow);
+ pPageWindow = new SdrPageWindow(*this, rPaintWindow);
bIsTempTarget = true;
}
@@ -376,7 +376,7 @@ void SdrPageView::DrawLayer( SdrLayerID nID, OutputDevice* pGivenTarget, sdr::co
// None of the known OutputDevices is the target of this paint, use
// a temporary SdrPageWindow for this Redraw.
SdrPaintWindow aTemporaryPaintWindow(mrView, *pGivenTarget);
- SdrPageWindow aTemporaryPageWindow(*((SdrPageView*)this), aTemporaryPaintWindow);
+ SdrPageWindow aTemporaryPageWindow(*this, aTemporaryPaintWindow);
// #i72752#
// Copy existing paint region if other PageWindows exist, this was created by