summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-17 15:43:45 +0200
committerNoel Grandin <noel@peralex.com>2014-10-20 13:33:57 +0200
commitefa7f1a549ebf2580d50f6f0bb96e294a5fce670 (patch)
tree7e8cccc2a6e0a5585c4c2eabc36400337f0bcc52 /svx/source/form
parentb0509439d9fa664be8f94b557d83ea3a2891c31f (diff)
loplugin: cstylecast
Change-Id: Idb6337bed1c32444f9644d54eba5240f09c13ef6
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/datanavi.cxx6
-rw-r--r--svx/source/form/fmexpl.cxx8
-rw-r--r--svx/source/form/fmitems.cxx2
-rw-r--r--svx/source/form/fmmodel.cxx4
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/form/fmpage.cxx6
-rw-r--r--svx/source/form/fmpgeimp.cxx4
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx8
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/fmview.cxx4
-rw-r--r--svx/source/form/fmvwimp.cxx6
-rw-r--r--svx/source/form/formcontroller.cxx12
-rw-r--r--svx/source/form/navigatortree.cxx18
-rw-r--r--svx/source/form/navigatortreemodel.cxx30
15 files changed, 58 insertions, 58 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 92b3552a0e21..2a0baed9638f 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -293,7 +293,7 @@ namespace svxform
extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDataTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
- return new DataTreeListBox((XFormsPage*)pParent, WB_BORDER);
+ return new DataTreeListBox(static_cast<XFormsPage*>(pParent), WB_BORDER);
}
XFormsPage::XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) :
@@ -2164,7 +2164,7 @@ namespace svxform
if ( eState >= SfxItemState::DEFAULT )
{
- FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() );
+ FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() );
Update( pShell );
}
else
@@ -2242,7 +2242,7 @@ namespace svxform
pWindow = new DataNavigator( _pBindings, this, _pParent );
eChildAlignment = SFX_ALIGN_RIGHT;
pWindow->SetSizePixel( Size( 250, 400 ) );
- ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo );
+ static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo );
}
AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode* _pNode,
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 7bb5193e4ab4..b708dfa6ae9b 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -309,7 +309,7 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
return true;
if( !pEntryData->ISA(FmFormData) )
return false;
- FmFormData* pFormData = (FmFormData*)pEntryData;
+ FmFormData* pFormData = static_cast<FmFormData*>(pEntryData);
if( (XForm*)m_xForm.get() != (XForm*)pFormData->GetFormIface().get() )
return false;
@@ -473,7 +473,7 @@ bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
if( !pEntryData->ISA(FmControlData) )
return false;
- FmControlData* pControlData = (FmControlData*)pEntryData;
+ FmControlData* pControlData = static_cast<FmControlData*>(pEntryData);
if( (XFormComponent*)m_xFormComponent.get() != (XFormComponent*)pControlData->GetFormComponent().get() )
return false;
@@ -531,7 +531,7 @@ namespace svxform
if( eState >= SfxItemState::DEFAULT )
{
- FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() );
+ FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() );
UpdateContent( pShell );
}
else
@@ -609,7 +609,7 @@ namespace svxform
{
pWindow = new NavigatorFrame( _pBindings, this, _pParent );
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- ((SfxDockingWindow*)pWindow)->Initialize( _pInfo );
+ static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo );
}
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index ce88ba7381af..440ec5c40593 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -31,7 +31,7 @@ TYPEINIT1(FmInterfaceItem, SfxPoolItem);
bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
- return( xInterface == ((FmInterfaceItem&)rAttr).GetInterface() );
+ return( xInterface == static_cast<const FmInterfaceItem&>(rAttr).GetInterface() );
}
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index e21271702c9b..11fe2380bafb 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -140,7 +140,7 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
m_pImpl->pUndoEnv->RemoveForms( xForms );
}
- FmFormPage* pRemovedPage = (FmFormPage*)SdrModel::RemovePage(nPgNum);
+ FmFormPage* pRemovedPage = static_cast<FmFormPage*>(SdrModel::RemovePage(nPgNum));
OSL_ENSURE( pRemovedPage == pToBeRemovedPage, "FmFormModel::RemovePage: inconsistency!" );
return pRemovedPage;
}
@@ -156,7 +156,7 @@ void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum)
{
- FmFormPage* pPage = (FmFormPage*)SdrModel::RemoveMasterPage(nPgNum);
+ FmFormPage* pPage = static_cast<FmFormPage*>(SdrModel::RemoveMasterPage(nPgNum));
if ( pPage )
{
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index e5293b74e4ae..7a42951c65f4 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -431,7 +431,7 @@ namespace
sReturn = sCurrentIndex;
// travel up
- if (::comphelper::query_interface((Reference< XInterface >)xParent,xChild))
+ if (::comphelper::query_interface(Reference< XInterface >(xParent),xChild))
xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY);
}
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index fdb4176b148a..3c31af00cf1c 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -97,7 +97,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel)
{
// we want to keep the current collection, just reset the model
// with which it's associated.
- FmFormModel* pDrawModel = (FmFormModel*) GetModel();
+ FmFormModel* pDrawModel = static_cast<FmFormModel*>( GetModel() );
SfxObjectShell* pObjShell = pDrawModel->GetObjectShell();
if ( pObjShell )
xForms->setParent( pObjShell->GetModel() );
@@ -123,7 +123,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, size_t nPos,
{
SdrPage::InsertObject( pObj, nPos, pReason );
if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING))
- ((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj);
+ static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Inserted(pObj);
}
@@ -209,7 +209,7 @@ SdrObject* FmFormPage::RemoveObject(size_t nObjNum)
{
SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
if (pObj && GetModel())
- ((FmFormModel*)GetModel())->GetUndoEnv().Removed(pObj);
+ static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Removed(pObj);
return pObj;
}
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index dd67c04b9887..90446ea97332 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -431,7 +431,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
if( pModel->IsUndoEnabled() )
{
- pModel->AddUndo(new FmUndoContainerAction(*(FmFormModel*)pModel,
+ pModel->AddUndo(new FmUndoContainerAction(*static_cast<FmFormModel*>(pModel),
FmUndoContainerAction::Inserted,
xForms,
xForm,
@@ -528,7 +528,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
if( bUndo )
{
Reference< ::com::sun::star::container::XIndexContainer > xContainer( getForms(), UNO_QUERY );
- pModel->AddUndo(new FmUndoContainerAction(*(FmFormModel*)pModel,
+ pModel->AddUndo(new FmUndoContainerAction(*static_cast<FmFormModel*>(pModel),
FmUndoContainerAction::Inserted,
xContainer,
xForm,
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 1744605a3e44..c9f95466cdd0 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1206,7 +1206,7 @@ void FmFormShell::SetView( FmFormView* _pView )
m_pFormView = _pView;
m_pFormView->SetFormShell( this, FmFormView::FormShellAccess() );
- m_pFormModel = (FmFormModel*)m_pFormView->GetModel();
+ m_pFormModel = static_cast<FmFormModel*>(m_pFormView->GetModel());
impl_setDesignMode( m_pFormView->IsDesignMode() );
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 080f5cbd07fb..b080786558a5 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1046,7 +1046,7 @@ namespace svx
{
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::formActivated: 0x" );
- sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 );
+ sTrace += OString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
@@ -1074,7 +1074,7 @@ namespace svx
{
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
- sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 );
+ sTrace += OString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
(void)_rxController;
@@ -1327,7 +1327,7 @@ namespace svx
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::focusGained: 0x" );
- sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 );
+ sTrace += OString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
@@ -1343,7 +1343,7 @@ namespace svx
#if OSL_DEBUG_LEVEL > 0
OString sTrace( "FmTextControlShell::focusLost: 0x" );
- sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 );
+ sTrace += OString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 6d0e16747ebd..eeaa5330c8de 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -976,7 +976,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
void FmUndoPropertyAction::Undo()
{
- FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
+ FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv();
if (xObj.is() && !rEnv.IsLocked())
{
@@ -996,7 +996,7 @@ void FmUndoPropertyAction::Undo()
void FmUndoPropertyAction::Redo()
{
- FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
+ FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv();
if (xObj.is() && !rEnv.IsLocked())
{
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index b62e8eb4ceef..5926389c48eb 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -102,7 +102,7 @@ void FmFormView::Init()
DBG_ASSERT( pModel->ISA(FmFormModel), "Falsches Model" );
if( !pModel->ISA(FmFormModel) ) return;
- FmFormModel* pFormModel = (FmFormModel*)pModel;
+ FmFormModel* pFormModel = static_cast<FmFormModel*>(pModel);
// DesignMode vom Model holen
@@ -125,7 +125,7 @@ void FmFormView::Init()
const SfxPoolItem *pItem=0;
if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, false, &pItem ) == SfxItemState::SET )
{
- ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() );
+ ::comphelper::NamedValueCollection aComponentData( static_cast<const SfxUnoAnyItem*>(pItem)->GetValue() );
bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode );
}
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index d9ed7a042cef..e0b06c2e8412 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1406,11 +1406,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
// The service name decides which control should be created
sal_uInt16 nOBJID = OBJ_FM_EDIT;
- if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_NUMERICFIELD))
+ if(OUString(_rDesc.szServiceName).equals(FM_SUN_COMPONENT_NUMERICFIELD))
nOBJID = OBJ_FM_NUMERICFIELD;
- if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_CHECKBOX))
+ if(OUString(_rDesc.szServiceName).equals(FM_SUN_COMPONENT_CHECKBOX))
nOBJID = OBJ_FM_CHECKBOX;
- if(OUString(_rDesc.szServiceName).equals((OUString)FM_COMPONENT_COMMANDBUTTON))
+ if(OUString(_rDesc.szServiceName).equals(FM_COMPONENT_COMMANDBUTTON))
nOBJID = OBJ_FM_BUTTON;
typedef ::com::sun::star::form::submission::XSubmission XSubmission_t;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 41391c4222d3..91330e11ea81 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3684,7 +3684,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
{
RowChangeEvent aEvt( _rEvent );
aEvt.Source = *this;
- bValid = ((XRowSetApproveListener*)aIter.next())->approveRowChange(aEvt);
+ bValid = static_cast<XRowSetApproveListener*>(aIter.next())->approveRowChange(aEvt);
}
if ( !bValid )
@@ -3771,7 +3771,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th
{
EventObject aEvt(event);
aEvt.Source = *this;
- return ((XRowSetApproveListener*)aIter.next())->approveCursorMove(aEvt);
+ return static_cast<XRowSetApproveListener*>(aIter.next())->approveCursorMove(aEvt);
}
return sal_True;
@@ -3788,7 +3788,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event)
{
EventObject aEvt(event);
aEvt.Source = *this;
- return ((XRowSetApproveListener*)aIter.next())->approveRowSetChange(aEvt);
+ return static_cast<XRowSetApproveListener*>(aIter.next())->approveRowSetChange(aEvt);
}
return sal_True;
@@ -3825,7 +3825,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R
{
SQLErrorEvent aEvt(aEvent);
aEvt.Source = *this;
- ((XSQLErrorListener*)aIter.next())->errorOccured(aEvt);
+ static_cast<XSQLErrorListener*>(aIter.next())->errorOccured(aEvt);
}
else
{
@@ -3898,7 +3898,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent&
{
DatabaseParameterEvent aEvt(aEvent);
aEvt.Source = *this;
- return ((XDatabaseParameterListener*)aIter.next())->approveParameter(aEvt);
+ return static_cast<XDatabaseParameterListener*>(aIter.next())->approveParameter(aEvt);
}
else
{
@@ -3994,7 +3994,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
{
RowChangeEvent aEvt(aEvent);
aEvt.Source = *this;
- return ((XConfirmDeleteListener*)aIter.next())->confirmDelete(aEvt);
+ return static_cast<XConfirmDeleteListener*>(aIter.next())->confirmDelete(aEvt);
}
// default handling: instantiate an interaction handler and let it handle the request
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index a1867c7e49e0..ab83348b0964 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1063,7 +1063,7 @@ namespace svxform
Reference< XChild > xCurrentChild(pCurrentUserData->GetChildIFace(), UNO_QUERY);
Reference< XIndexContainer > xContainer(xCurrentChild->getParent(), UNO_QUERY);
- FmFormData* pCurrentParentUserData = (FmFormData*)pCurrentUserData->GetParent();
+ FmFormData* pCurrentParentUserData = static_cast<FmFormData*>(pCurrentUserData->GetParent());
DBG_ASSERT(pCurrentParentUserData == NULL || pCurrentParentUserData->ISA(FmFormData), "NavigatorTree::implExecuteDataTransfer: ungueltiges Parent");
// beim Vater austragen
@@ -1403,7 +1403,7 @@ namespace svxform
// Namen setzen
FmFormView* pFormView = GetNavModel()->GetFormShell()->GetFormView();
SdrPageView* pPageView = pFormView->GetSdrPageView();
- FmFormPage* pPage = (FmFormPage*)pPageView->GetPage();
+ FmFormPage* pPage = static_cast<FmFormPage*>(pPageView->GetPage());
OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm );
@@ -1442,7 +1442,7 @@ namespace svxform
// Neuen Namen erstellen
- FmFormData* pFormParentData = (FmFormData*)pEntryData->GetParent();
+ FmFormData* pFormParentData = static_cast<FmFormData*>(pEntryData->GetParent());
for( sal_Int32 i=0; i<nMaxCount; i++ )
{
@@ -1716,7 +1716,7 @@ namespace svxform
for (SvLBoxEntrySortedArray::reverse_iterator it = m_arrCurrentSelection.rbegin();
it != m_arrCurrentSelection.rend(); )
{
- FmEntryData* pCurrent = (FmEntryData*)((*it)->GetUserData());
+ FmEntryData* pCurrent = static_cast<FmEntryData*>((*it)->GetUserData());
// eine Form ?
bool bIsForm = pCurrent->ISA(FmFormData);
@@ -1725,7 +1725,7 @@ namespace svxform
// einem makierten Formular nur die direkt, nicht die indirekt abhaengigen Controls markiert werden, muss ich das hier
// noch nachholen
if (bIsForm)
- MarkViewObj((FmFormData*)pCurrent, true, true); // das zweite sal_True heisst "deep"
+ MarkViewObj(static_cast<FmFormData*>(pCurrent), true, true); // das zweite sal_True heisst "deep"
// ein hidden control ?
bool bIsHidden = IsHiddenControl(pCurrent);
@@ -2102,7 +2102,7 @@ namespace svxform
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() )
{
- pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev );
+ pFormView->MakeVisible( aMarkRect, static_cast<vcl::Window&>(rOutDev) );
}
} // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
}
@@ -2118,11 +2118,11 @@ namespace svxform
pEntryData = pChildList->at( i );
if( pEntryData->ISA(FmControlData) )
{
- pControlData = (FmControlData*)pEntryData;
+ pControlData = static_cast<FmControlData*>(pEntryData);
_rObjects.insert(pControlData->GetFormComponent());
} // if( pEntryData->ISA(FmControlData) )
else if (bDeep && (pEntryData->ISA(FmFormData)))
- CollectObjects((FmFormData*)pEntryData,bDeep,_rObjects);
+ CollectObjects(static_cast<FmFormData*>(pEntryData), bDeep, _rObjects);
} // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
}
@@ -2175,7 +2175,7 @@ namespace svxform
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
if ( OUTDEV_WINDOW == rOutDev.GetOutDevType() )
{
- pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev );
+ pFormView->MakeVisible( aMarkRect, static_cast<vcl::Window&>(rOutDev) );
}
} // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
}
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 215060641680..2c6b7ce55f7f 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -261,7 +261,7 @@ namespace svxform
EndListening(*m_pFormModel);
m_pPropChangeList->Lock();
- FmFormData* pFolder = (FmFormData*) pEntry->GetParent();
+ FmFormData* pFolder = static_cast<FmFormData*>( pEntry->GetParent() );
Reference< XChild > xElement( pEntry->GetChildIFace() );
if (bAlterModel)
{
@@ -367,7 +367,7 @@ namespace svxform
const bool bUndo = m_pFormModel->IsUndoEnabled();
m_pPropChangeList->Lock();
- FmFormData* pFolder = (FmFormData*) pEntry->GetParent();
+ FmFormData* pFolder = static_cast<FmFormData*>( pEntry->GetParent() );
Reference< XChild > xElement ( pEntry->GetChildIFace() );
if (bAlterModel)
{
@@ -387,9 +387,9 @@ namespace svxform
// jetzt die eigentliche Entfernung der Daten aus dem Model
if (pEntry->ISA(FmFormData))
- RemoveForm((FmFormData*)pEntry);
+ RemoveForm(static_cast<FmFormData*>(pEntry));
else
- RemoveFormComponent((FmControlData*)pEntry);
+ RemoveFormComponent(static_cast<FmControlData*>(pEntry));
if (bAlterModel)
@@ -459,9 +459,9 @@ namespace svxform
// Child ist Form -> rekursiver Aufruf
if( pEntryData->ISA(FmFormData) )
- RemoveForm( (FmFormData*)pEntryData);
+ RemoveForm( static_cast<FmFormData*>(pEntryData));
else if( pEntryData->ISA(FmControlData) )
- RemoveFormComponent((FmControlData*) pEntryData);
+ RemoveFormComponent(static_cast<FmControlData*>(pEntryData));
}
@@ -501,7 +501,7 @@ namespace svxform
{
FmEntryData* pChildData = pChildList->at( --i );
if( pChildData->ISA(FmFormData) )
- ClearBranch( (FmFormData*)pChildData );
+ ClearBranch( static_cast<FmFormData*>(pChildData) );
pChildList->remove( pChildData );
}
@@ -574,7 +574,7 @@ namespace svxform
void NavigatorTreeModel::InsertForm(const Reference< XForm > & xForm, sal_uInt32 nRelPos)
{
- FmFormData* pFormData = (FmFormData*)FindData( xForm, GetRootList() );
+ FmFormData* pFormData = static_cast<FmFormData*>(FindData( xForm, GetRootList() ));
if (pFormData)
return;
@@ -584,7 +584,7 @@ namespace svxform
Reference< XForm > xParentForm(xIFace, UNO_QUERY);
FmFormData* pParentData = NULL;
if (xParentForm.is())
- pParentData = (FmFormData*)FindData( xParentForm, GetRootList() );
+ pParentData = static_cast<FmFormData*>(FindData( xParentForm, GetRootList() ));
pFormData = new FmFormData( xForm, m_aNormalImages, pParentData );
Insert( pFormData, nRelPos );
@@ -600,7 +600,7 @@ namespace svxform
if (!xForm.is())
return;
- FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() );
+ FmFormData* pParentData = static_cast<FmFormData*>(FindData( xForm, GetRootList() ));
if( !pParentData )
{
pParentData = new FmFormData( xForm, m_aNormalImages, NULL );
@@ -629,7 +629,7 @@ namespace svxform
assert(pData && pData->ISA(FmControlData)); //NavigatorTreeModel::ReplaceFormComponent : invalid argument
if (!pData || !pData->ISA(FmControlData))
return;
- ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
+ static_cast<FmControlData*>(pData)->ModelReplaced( xNew, m_aNormalImages );
FmNavModelReplacedHint aReplacedHint( pData );
Broadcast( aReplacedHint );
@@ -679,7 +679,7 @@ namespace svxform
if( bRecurs && pEntryData->ISA(FmFormData) )
{
- pChildData = FindData( rText, (FmFormData*)pEntryData );
+ pChildData = FindData( rText, static_cast<FmFormData*>(pEntryData) );
if( pChildData )
return pChildData;
}
@@ -775,7 +775,7 @@ namespace svxform
{
if ( pObject->ISA(SdrObjGroup) )
{ // rekursiv absteigen
- const SdrObjList *pChildren = ((SdrObjGroup*)pObject)->GetSubList();
+ const SdrObjList *pChildren = static_cast<SdrObjGroup*>(pObject)->GetSubList();
for ( size_t i=0; i<pChildren->GetObjCount(); ++i )
{
SdrObject* pCurrent = pChildren->GetObj(i);
@@ -917,14 +917,14 @@ namespace svxform
if( pEntryData->ISA(FmFormData) )
{
- FmFormData* pFormData = (FmFormData*)pEntryData;
+ FmFormData* pFormData = static_cast<FmFormData*>(pEntryData);
Reference< XForm > xForm( pFormData->GetFormIface());
xFormComponent = xForm;
}
if( pEntryData->ISA(FmControlData) )
{
- FmControlData* pControlData = (FmControlData*)pEntryData;
+ FmControlData* pControlData = static_cast<FmControlData*>(pEntryData);
xFormComponent = pControlData->GetFormComponent();
}