16 files changed, 97 insertions, 97 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 05519e2ee832..9f57e69b18d9 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -176,7 +176,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
             ++i
         )
     {
-        FmFilterItem* pCondition = PTR_CAST( FmFilterItem, *i );
+        FmFilterItem* pCondition = dynamic_cast<FmFilterItem*>( *i  );
         DBG_ASSERT( pCondition, "FmFilterItems::Find: Wrong element in container!" );
         if ( _nFilterComponentIndex == pCondition->GetComponentIndex() )
             return pCondition;
@@ -349,7 +349,7 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos,
                               const FmFilterItem* pFilterItem,
                               const OUString& rText)
 {
-    FmFormItem* pFormItem = PTR_CAST( FmFormItem, pFilterItem->GetParent()->GetParent() );
+    FmFormItem* pFormItem = dynamic_cast<FmFormItem*>( pFilterItem->GetParent()->GetParent()  );
 
     try
     {
@@ -424,7 +424,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
 
     const sal_Int32 nActiveTerm( xFilterController->getActiveTerm() );
 
-    FmFilterItems* pFilter = PTR_CAST( FmFilterItems, pFormItem->GetChildren()[ nActiveTerm ] );
+    FmFilterItems* pFilter = dynamic_cast<FmFilterItems*>( pFormItem->GetChildren()[ nActiveTerm ]  );
     FmFilterItem* pFilterItem = pFilter->Find( _Event.FilterComponent );
     if ( pFilterItem )
     {
@@ -666,7 +666,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
          i != rItems.end(); ++i)
     {
-        FmFormItem* pForm = PTR_CAST(FmFormItem,*i);
+        FmFormItem* pForm = dynamic_cast<FmFormItem*>( *i );
         if (pForm)
         {
             if ( xController == pForm->GetController() )
@@ -688,7 +688,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
          i != rItems.end(); ++i)
     {
-        FmFormItem* pForm = PTR_CAST(FmFormItem,*i);
+        FmFormItem* pForm = dynamic_cast<FmFormItem*>( *i );
         if (pForm)
         {
             if (xForm == pForm->GetController()->getModel())
@@ -741,7 +741,7 @@ void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem )
             ++iter
         )
     {
-        if ((*iter)->ISA(FmFilterItems))
+        if (dynamic_cast<const FmFilterItems*>(*iter) !=  nullptr)
             break;
     }
 
@@ -790,7 +790,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
     DBG_ASSERT(i != rItems.end(), "FmFilterModel::Remove(): unknown Item");
     // position within the parent
     sal_Int32 nPos = i - rItems.begin();
-    if (pData->ISA(FmFilterItems))
+    if (dynamic_cast<const FmFilterItems*>( pData) !=  nullptr)
     {
         FmFormItem* pFormItem = static_cast<FmFormItem*>(pParent);
 
@@ -806,7 +806,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
                 while ( !rChildren.empty() )
                 {
                     ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1;
-                    FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos );
+                    FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( *removePos  );
                     FmFilterAdapter::setText( nPos, pFilterItem, OUString() );
                     Remove( removePos );
                 }
@@ -823,7 +823,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
     }
     else // FormItems can not be deleted
     {
-        FmFilterItem* pFilterItem = PTR_CAST(FmFilterItem, pData);
+        FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( pData );
 
         // if its the last condition remove the parent
         if (rItems.size() == 1)
@@ -860,7 +860,7 @@ void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos )
 
 bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const
 {
-    FmFormItem* pFormItem = PTR_CAST( FmFormItem, pItem->GetParent()->GetParent() );
+    FmFormItem* pFormItem = dynamic_cast<FmFormItem*>( pItem->GetParent()->GetParent()  );
     try
     {
         Reference< XFormController > xFormController( pFormItem->GetController() );
@@ -977,21 +977,21 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
 {
     // checks whether for each form there's one free level for input
     ::std::vector< FmFilterData* >& rChildren = _rItem.GetChildren();
-    bool bAppendLevel = _rItem.ISA( FmFormItem );
+    bool bAppendLevel = dynamic_cast<const FmFormItem*>(&_rItem) !=  nullptr;
 
     for (   ::std::vector<FmFilterData*>::iterator i = rChildren.begin();
             i != rChildren.end();
             ++i
         )
     {
-        FmFilterItems* pItems = PTR_CAST(FmFilterItems, *i);
+        FmFilterItems* pItems = dynamic_cast<FmFilterItems*>( *i );
         if ( pItems && pItems->GetChildren().empty() )
         {
             bAppendLevel = false;
             break;
         }
 
-        FmFormItem* pFormItem = PTR_CAST(FmFormItem, *i);
+        FmFormItem* pFormItem = dynamic_cast<FmFormItem*>( *i );
         if (pFormItem)
         {
             EnsureEmptyFilterRows( *pFormItem );
@@ -1001,7 +1001,7 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
 
     if ( bAppendLevel )
     {
-        FmFormItem* pFormItem = PTR_CAST( FmFormItem, &_rItem );
+        FmFormItem* pFormItem = dynamic_cast<FmFormItem*>( &_rItem  );
         OSL_ENSURE( pFormItem, "FmFilterModel::EnsureEmptyFilterRows: no FmFormItem, but a FmFilterItems child?" );
         if ( pFormItem )
             AppendFilterItems( *pFormItem );
@@ -1193,7 +1193,7 @@ bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelec
     if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
         return false;
 
-    return pEntry && static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItem);
+    return pEntry && dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) == nullptr;
 }
 
 
@@ -1205,7 +1205,7 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN
     if (EditingCanceled())
         return true;
 
-    DBG_ASSERT(static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItem),
+    DBG_ASSERT(dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr,
                     "FmFilterNavigator::EditedEntry() wrong entry");
 
     OUString aText(comphelper::string::strip(rNewText, ' '));
@@ -1347,15 +1347,15 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
 
     FmFilterData* pData = static_cast<FmFilterData*>(pDropTarget->GetUserData());
     FmFormItem* pForm = NULL;
-    if (pData->ISA(FmFilterItem))
+    if (dynamic_cast<const FmFilterItem*>(pData) !=  nullptr)
     {
-        pForm = PTR_CAST(FmFormItem,pData->GetParent()->GetParent());
+        pForm = dynamic_cast<FmFormItem*>( pData->GetParent()->GetParent() );
         if (pForm != m_aControlExchange->getFormItem())
             return DND_ACTION_NONE;
     }
-    else if (pData->ISA(FmFilterItems))
+    else if (dynamic_cast<const FmFilterItems*>( pData) !=  nullptr)
     {
-        pForm = PTR_CAST(FmFormItem,pData->GetParent());
+        pForm = dynamic_cast<FmFormItem*>( pData->GetParent() );
         if (pForm != m_aControlExchange->getFormItem())
             return DND_ACTION_NONE;
     }
@@ -1413,10 +1413,10 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     std::unique_ptr<SvLBoxString> pString;
 
-    if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItem))
+    if (dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
         pString.reset(new FmFilterString(pEntry, 0, rStr,
             static_cast<FmFilterItem*>(pEntry->GetUserData())->GetFieldName()));
-    else if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItems))
+    else if (dynamic_cast<const FmFilterItems*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
         pString.reset(new FmFilterItemsString(pEntry, 0, rStr));
 
     if (pString)
@@ -1434,21 +1434,21 @@ bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, bool bSelect )
         if (bSelect)
         {
             FmFormItem* pFormItem = NULL;
-            if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItem))
+            if ( dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
                 pFormItem = static_cast<FmFormItem*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()->GetParent());
-            else if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItems))
+            else if (dynamic_cast<const FmFilterItems*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
                 pFormItem = static_cast<FmFormItem*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()->GetParent());
-            else if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFormItem))
+            else if (dynamic_cast<const FmFormItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
                 pFormItem = static_cast<FmFormItem*>(pEntry->GetUserData());
 
             if (pFormItem)
             {
                 // will the controller be exchanged?
-                if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItem))
+                if (dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
                     m_pModel->SetCurrentItems(static_cast<FmFilterItems*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()));
-                else if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItems))
+                else if (dynamic_cast<const FmFilterItems*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
                     m_pModel->SetCurrentItems(static_cast<FmFilterItems*>(pEntry->GetUserData()));
-                else if (static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFormItem))
+                else if (dynamic_cast<const FmFormItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
                     m_pModel->SetCurrentController(static_cast<FmFormItem*>(pEntry->GetUserData())->GetController());
             }
         }
@@ -1539,10 +1539,10 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
          bHandled && pEntry != NULL;
          pEntry = NextSelected(pEntry))
     {
-        FmFilterItem* pFilter = PTR_CAST(FmFilterItem, static_cast<FmFilterData*>(pEntry->GetUserData()));
+        FmFilterItem* pFilter = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pEntry->GetUserData()) );
         if (pFilter)
         {
-            FmFormItem* pForm = PTR_CAST(FmFormItem,pFilter->GetParent()->GetParent());
+            FmFormItem* pForm = dynamic_cast<FmFormItem*>( pFilter->GetParent()->GetParent() );
             if (!pForm)
                 bHandled = false;
             else if (!pFirstItem)
@@ -1648,14 +1648,14 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
                  pEntry = NextSelected(pEntry))
             {
                 // don't delete forms
-                FmFormItem* pForm = PTR_CAST(FmFormItem, static_cast<FmFilterData*>(pEntry->GetUserData()));
+                FmFormItem* pForm = dynamic_cast<FmFormItem*>( static_cast<FmFilterData*>(pEntry->GetUserData()) );
                 if (!pForm)
                     aSelectList.push_back(static_cast<FmFilterData*>(pEntry->GetUserData()));
             }
             if (aSelectList.size() == 1)
             {
                 // don't delete the only empty row of a form
-                FmFilterItems* pFilterItems = PTR_CAST(FmFilterItems, aSelectList[0]);
+                FmFilterItems* pFilterItems = dynamic_cast<FmFilterItems*>( aSelectList[0] );
                 if (pFilterItems && pFilterItems->GetChildren().empty()
                     && pFilterItems->GetParent()->GetChildren().size() == 1)
                     aSelectList.clear();
@@ -1667,7 +1667,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
             aContextMenu.EnableItem( SID_FM_DELETE, !aSelectList.empty() );
 
 
-            bool bEdit = PTR_CAST(FmFilterItem, static_cast<FmFilterData*>(pClicked->GetUserData())) != NULL &&
+            bool bEdit = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pClicked->GetUserData()) ) != NULL &&
                 IsSelected(pClicked) && GetSelectionCount() == 1;
 
             aContextMenu.EnableItem( SID_FM_FILTER_EDIT,
@@ -1832,11 +1832,11 @@ void FmFilterNavigator::DeleteSelection()
          pEntry != NULL;
          pEntry = NextSelected(pEntry))
     {
-        FmFilterItem* pFilterItem = PTR_CAST(FmFilterItem, static_cast<FmFilterData*>(pEntry->GetUserData()));
+        FmFilterItem* pFilterItem = dynamic_cast<FmFilterItem*>( static_cast<FmFilterData*>(pEntry->GetUserData()) );
         if (pFilterItem && IsSelected(GetParent(pEntry)))
             continue;
 
-        FmFormItem* pForm = PTR_CAST(FmFormItem, static_cast<FmFilterData*>(pEntry->GetUserData()));
+        FmFormItem* pForm = dynamic_cast<FmFormItem*>( static_cast<FmFilterData*>(pEntry->GetUserData()) );
         if (!pForm)
             aEntryList.push_back(pEntry);
     }
@@ -1913,7 +1913,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c
 
     if( eState >= SfxItemState::DEFAULT )
     {
-        FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() );
+        FmFormShell* pShell = dynamic_cast<FmFormShell*>( static_cast<const SfxObjectItem*>(pState)->GetShell()  );
         UpdateContent( pShell );
     }
     else
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 8f2c2a0e5628..fda30fdbdb41 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -632,7 +632,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool
     {
         if (eState >= SfxItemState::DEFAULT)
         {
-            FmFormShell* pShell = PTR_CAST(FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell());
+            FmFormShell* pShell = dynamic_cast<FmFormShell*>( static_cast<const SfxObjectItem*>(pState)->GetShell() );
             InterfaceBag aSelection;
             if ( pShell )
                 pShell->GetImpl()->getCurrentSelection( aSelection );
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 83311247c4a9..56668dada57a 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -96,7 +96,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >  xForms;
 
-    FmFormPage *pFmPage = PTR_CAST( FmFormPage, GetSdrPage() );
+    FmFormPage *pFmPage = dynamic_cast<FmFormPage*>( GetSdrPage()  );
     if( pFmPage )
         xForms.set( pFmPage->GetForms(), css::uno::UNO_QUERY_THROW );
 
@@ -107,7 +107,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen
 sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception )
 {
     bool bHas = false;
-    FmFormPage* pFormPage = PTR_CAST( FmFormPage, GetSdrPage() );
+    FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetSdrPage()  );
     if ( pFormPage )
         bHas = pFormPage->GetForms( false ).is();
     return bHas;
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index e237963b1af7..d84890f404d5 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -307,7 +307,7 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 {
     if(this == pEntryData)
         return true;
-    if( !pEntryData->ISA(FmFormData) )
+    if( dynamic_cast<const FmFormData*>( pEntryData) ==  nullptr )
         return false;
     FmFormData* pFormData = static_cast<FmFormData*>(pEntryData);
     if( m_xForm.get() != pFormData->GetFormIface().get() )
@@ -471,7 +471,7 @@ bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
     if(this == pEntryData)
         return true;
 
-    if( !pEntryData->ISA(FmControlData) )
+    if( dynamic_cast<const FmControlData*>( pEntryData) ==  nullptr )
         return false;
     FmControlData* pControlData = static_cast<FmControlData*>(pEntryData);
 
@@ -538,7 +538,7 @@ namespace svxform
 
         if( eState >= SfxItemState::DEFAULT )
         {
-            FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() );
+            FmFormShell* pShell = dynamic_cast<FmFormShell*>( static_cast<const SfxObjectItem*>(pState)->GetShell()  );
             UpdateContent( pShell );
         }
         else
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 4246ca47e4fb..cd977a4beab0 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -107,7 +107,7 @@ void FmFormObj::ClearObjEnv()
 
 void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
 {
-    const FmFormModel* pFormModel = PTR_CAST( FmFormModel, GetModel() );
+    const FmFormModel* pFormModel = dynamic_cast<FmFormModel*>( GetModel()  );
     if ( !pFormModel || !pFormModel->ControlsUseRefDevice() )
         return;
 
@@ -174,11 +174,11 @@ void FmFormObj::SetPage(SdrPage* _pNewPage)
         return;
     }
 
-    FmFormPage* pOldFormPage = PTR_CAST( FmFormPage, GetPage() );
+    FmFormPage* pOldFormPage = dynamic_cast<FmFormPage*>( GetPage()  );
     if ( pOldFormPage )
         pOldFormPage->GetImpl().formObjectRemoved( *this );
 
-    FmFormPage* pNewFormPage = PTR_CAST( FmFormPage, _pNewPage );
+    FmFormPage* pNewFormPage = dynamic_cast<FmFormPage*>( _pNewPage  );
     if ( !pNewFormPage )
     {   // Maybe it makes sense to create an environment history here : if somebody set's our page to NULL, and we have a valid page before,
         // me may want to remember our place within the old page. For this we could create a new m_xEnvironmentHistory to store it.
@@ -623,7 +623,7 @@ void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XContr
 {
     SdrUnoObj::SetUnoControlModel( _rxModel );
 
-    FmFormPage* pFormPage = PTR_CAST( FmFormPage, GetPage() );
+    FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetPage()  );
     if ( pFormPage )
         pFormPage->GetImpl().formModelAssigned( *this );
 
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index c0ca4739fe64..2a2aa6b98a37 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -319,7 +319,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea
             m_aFormsCreationHdl.Call( *this );
         }
 
-        FmFormModel* pFormsModel = PTR_CAST( FmFormModel, m_rPage.GetModel() );
+        FmFormModel* pFormsModel = dynamic_cast<FmFormModel*>( m_rPage.GetModel()  );
 
         // give the newly created collection a place in the universe
         SfxObjectShell* pObjShell = pFormsModel ? pFormsModel->GetObjectShell() : NULL;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 05437f8f42a6..7ff0123a55f1 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -742,7 +742,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 const SfxPoolItem* pItem;
                 if ( ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) ) == SfxItemState::SET )
                 {
-                    const SfxInt32Item* pTypedItem = PTR_CAST( SfxInt32Item, pItem );
+                    const SfxInt32Item* pTypedItem = dynamic_cast<const SfxInt32Item* >( pItem );
                     if ( pTypedItem )
                         nRecord = std::max( pTypedItem->GetValue(), sal_Int32(0) );
                 }
@@ -1185,7 +1185,7 @@ FmFormPage* FmFormShell::GetCurPage() const
 {
     FmFormPage* pP = NULL;
     if (m_pFormView && m_pFormView->GetSdrPageView())
-        pP = PTR_CAST(FmFormPage,m_pFormView->GetSdrPageView()->GetPage());
+        pP = dynamic_cast<FmFormPage*>( m_pFormView->GetSdrPageView()->GetPage() );
     return pP;
 }
 
@@ -1301,7 +1301,7 @@ namespace
         while ( aIter.IsMore() )
         {
             SdrObject* pObject = aIter.Next();
-            SdrUnoObj* pUnoObject = pObject ? PTR_CAST( SdrUnoObj, pObject ) : NULL;
+            SdrUnoObj* pUnoObject = pObject ? dynamic_cast<SdrUnoObj*>( pObject  ) : NULL;
             if ( !pUnoObject )
                 continue;
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 80b90a1f70bd..554bcf0cd3b1 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -564,7 +564,7 @@ bool isControlList(const SdrMarkList& rMarkList)
     for (size_t i = 0; i < nMarkCount && bControlList; ++i)
     {
         SdrObject *pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-        E3dObject* pAs3DObject = PTR_CAST(E3dObject, pObj);
+        E3dObject* pAs3DObject = dynamic_cast< E3dObject* >( pObj);
         // E3dObject's do not contain any 2D-objects (by definition)
         // we need this extra check here : an E3dObject->IsGroupObject says "YES", but an SdrObjListIter working
         // with an E3dObject doesn't give me any Nodes (E3dObject has a sub list, but no members in that list,
@@ -3658,7 +3658,7 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, bool _bSyncAction /
         // first-time initializations for the views
         if ( !_rCurrentView.GetImpl()->hasEverBeenActivated( ) )
         {
-            _rCurrentView.GetImpl()->onFirstViewActivation( PTR_CAST( FmFormModel, _rCurrentView.GetModel() ) );
+            _rCurrentView.GetImpl()->onFirstViewActivation( dynamic_cast<FmFormModel*>( _rCurrentView.GetModel() )  );
             _rCurrentView.GetImpl()->setHasBeenActivated( );
         }
 
@@ -3842,7 +3842,7 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /
     {
         // lock the undo env so the forms can change non-transient properties while loading
         // (without this my doc's modified flag would be set)
-        FmFormModel* pModel = PTR_CAST( FmFormModel, _pPage->GetModel() );
+        FmFormModel* pModel = dynamic_cast<FmFormModel*>( _pPage->GetModel()  );
         DBG_ASSERT( pModel, "FmXFormShell::loadForms: invalid model!" );
         if ( pModel )
             pModel->GetUndoEnv().Lock();
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index f3f24a5c3e77..b236e9ca8e91 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -637,7 +637,7 @@ namespace svx
 
     void FmTextControlShell::executeAttributeDialog( AttributeSet _eSet, SfxRequest& _rReq )
     {
-        const SvxFontListItem* pFontList = PTR_CAST( SvxFontListItem, m_pViewFrame->GetObjectShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) );
+        const SvxFontListItem* pFontList = dynamic_cast<const SvxFontListItem*>( m_pViewFrame->GetObjectShell()->GetItem( SID_ATTR_CHAR_FONTLIST )  );
         DBG_ASSERT( pFontList, "FmTextControlShell::executeAttributeDialog: no font list item!" );
         if ( !pFontList )
             return;
@@ -710,7 +710,7 @@ namespace svx
                             // handle them
                             DBG_ASSERT( aArgs.getLength() == 0, "FmTextControlShell::executeAttributeDialog: these are no UNO slots - are they?" );
 
-                            const SfxBoolItem* pBoolItem = PTR_CAST( SfxBoolItem, pModifiedItem );
+                            const SfxBoolItem* pBoolItem = dynamic_cast<const SfxBoolItem*>( pModifiedItem  );
                             DBG_ASSERT( pBoolItem, "FmTextControlShell::executeAttributeDialog: no bool item?!" );
                             if ( pBoolItem )
                             {
@@ -862,7 +862,7 @@ namespace svx
                 const SfxPoolItem* pItem = aToggled.GetItem( nWhich );
                 if ( ( SID_ATTR_CHAR_UNDERLINE == nSlot ) || ( SID_ATTR_CHAR_OVERLINE == nSlot ) )
                 {
-                    const SvxOverlineItem* pTextLine = PTR_CAST( SvxOverlineItem, pItem );
+                    const SvxOverlineItem* pTextLine = dynamic_cast<const SvxOverlineItem*>( pItem  );
                     DBG_ASSERT( pTextLine, "FmTextControlShell::ExecuteTextAttribute: ooops - no underline/overline item!" );
                     if ( pTextLine )
                     {
@@ -876,7 +876,7 @@ namespace svx
                 }
                 else
                 {
-                    const SvxCrossedOutItem* pCrossedOut = PTR_CAST( SvxCrossedOutItem, pItem );
+                    const SvxCrossedOutItem* pCrossedOut = dynamic_cast<const SvxCrossedOutItem*>( pItem  );
                     DBG_ASSERT( pCrossedOut, "FmTextControlShell::ExecuteTextAttribute: ooops - no CrossedOut item!" );
                     if ( pCrossedOut )
                     {
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index ae9d25137fc1..1281a81fb33c 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -208,7 +208,7 @@ void FmXUndoEnvironment::dispose()
     sal_uInt16 i;
     for (i = 0; i < nCount; i++)
     {
-        FmFormPage* pPage = PTR_CAST( FmFormPage, rModel.GetPage(i) );
+        FmFormPage* pPage = dynamic_cast<FmFormPage*>( rModel.GetPage(i)  );
         if ( pPage )
         {
             Reference< css::form::XForms > xForms = pPage->GetForms( false ).get();
@@ -220,7 +220,7 @@ void FmXUndoEnvironment::dispose()
     nCount = rModel.GetMasterPageCount();
     for (i = 0; i < nCount; i++)
     {
-        FmFormPage* pPage = PTR_CAST( FmFormPage, rModel.GetMasterPage(i) );
+        FmFormPage* pPage = dynamic_cast<FmFormPage*>( rModel.GetMasterPage(i)  );
         if ( pPage )
         {
             Reference< css::form::XForms > xForms = pPage->GetForms( false ).get();
@@ -258,7 +258,7 @@ void FmXUndoEnvironment::ModeChanged()
         sal_uInt16 i;
         for (i = 0; i < nCount; i++)
         {
-            FmFormPage* pPage = PTR_CAST( FmFormPage, rModel.GetPage(i) );
+            FmFormPage* pPage = dynamic_cast<FmFormPage*>( rModel.GetPage(i)  );
             if ( pPage )
             {
                 Reference< css::form::XForms > xForms = pPage->GetForms( false ).get();
@@ -270,7 +270,7 @@ void FmXUndoEnvironment::ModeChanged()
         nCount = rModel.GetMasterPageCount();
         for (i = 0; i < nCount; i++)
         {
-            FmFormPage* pPage = PTR_CAST( FmFormPage, rModel.GetMasterPage(i) );
+            FmFormPage* pPage = dynamic_cast<FmFormPage*>( rModel.GetMasterPage(i)  );
             if ( pPage )
             {
                 Reference< css::form::XForms > xForms = pPage->GetForms( false ).get();
@@ -340,7 +340,7 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
 {
     if (pObj->GetObjInventor() == FmFormInventor)
     {
-        FmFormObj* pFormObj = PTR_CAST(FmFormObj, pObj);
+        FmFormObj* pFormObj = dynamic_cast<FmFormObj*>( pObj );
         Inserted( pFormObj );
     }
     else if (pObj->IsGroupObject())
@@ -454,7 +454,7 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj)
 
     if (pObj->GetObjInventor() == FmFormInventor)
     {
-        FmFormObj* pFormObj = PTR_CAST(FmFormObj, pObj);
+        FmFormObj* pFormObj = dynamic_cast<FmFormObj*>( pObj );
         Removed(pFormObj);
     }
     else if (pObj->IsGroupObject())
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index a175699c05b3..62a6d77c7a61 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -100,8 +100,8 @@ void FmFormView::Init()
     // Model setzen
     SdrModel* pModel = GetModel();
 
-    DBG_ASSERT( pModel->ISA(FmFormModel), "Falsches Model" );
-    if( !pModel->ISA(FmFormModel) ) return;
+    DBG_ASSERT( dynamic_cast<const FmFormModel*>( pModel) !=  nullptr, "Falsches Model" );
+    if( dynamic_cast<const FmFormModel*>( pModel) ==  nullptr ) return;
     FmFormModel* pFormModel = static_cast<FmFormModel*>(pModel);
 
 
@@ -150,7 +150,7 @@ FmFormView::~FmFormView()
 FmFormPage* FmFormView::GetCurPage()
 {
     SdrPageView* pPageView = GetSdrPageView();
-    FmFormPage*  pCurPage = pPageView ? PTR_CAST( FmFormPage, pPageView->GetPage() ) : NULL;
+    FmFormPage*  pCurPage = pPageView ? dynamic_cast<FmFormPage*>( pPageView->GetPage()  ) : NULL;
     return pCurPage;
 }
 
@@ -229,7 +229,7 @@ void FmFormView::ChangeDesignMode(bool bDesign)
     if (bDesign == IsDesignMode())
         return;
 
-    FmFormModel* pModel = PTR_CAST(FmFormModel, GetModel());
+    FmFormModel* pModel = dynamic_cast<FmFormModel*>( GetModel() );
     if (pModel)
     {   // fuer die Zeit des Uebergangs das Undo-Environment ausschalten, das sichert, dass man dort auch nicht-transiente
         // Properties mal eben aendern kann (sollte allerdings mit Vorsicht genossen und beim Rueckschalten des Modes
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index eba86b2b0eaf..97d2ed038e52 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -549,7 +549,7 @@ PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlCon
 
 void FmXFormView::addWindow(const SdrPageWindow& rWindow)
 {
-    FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() );
+    FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( rWindow.GetPageView().GetPage()  );
     if ( !pFormPage )
         return;
 
@@ -963,7 +963,7 @@ IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void)
     SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL;
     SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL;
     // get the forms collection of the page we belong to
-    FmFormPage* pPage = PTR_CAST( FmFormPage, pSdrPage );
+    FmFormPage* pPage = dynamic_cast<FmFormPage*>( pSdrPage  );
     Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() );
 
     const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 88b1850fcf76..835beff0f406 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -687,14 +687,14 @@ namespace svxform
     bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry )
     {
         FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData());
-        return !pEntryData || pEntryData->ISA(FmFormData);
+        return !pEntryData || dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr;
     }
 
 
     bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry )
     {
         FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData());
-        return pEntryData && pEntryData->ISA(FmControlData);
+        return pEntryData && dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr;
     }
 
 
@@ -1071,7 +1071,7 @@ namespace svxform
             Reference< XIndexContainer >  xContainer(xCurrentChild->getParent(), UNO_QUERY);
 
             FmFormData* pCurrentParentUserData = static_cast<FmFormData*>(pCurrentUserData->GetParent());
-            DBG_ASSERT(pCurrentParentUserData == NULL || pCurrentParentUserData->ISA(FmFormData), "NavigatorTree::implExecuteDataTransfer: invalid parent");
+            DBG_ASSERT(pCurrentParentUserData == NULL || dynamic_cast<const FmFormData*>( pCurrentParentUserData) !=  nullptr, "NavigatorTree::implExecuteDataTransfer: invalid parent");
 
             // remove from parent
             if (pCurrentParentUserData)
@@ -1438,9 +1438,9 @@ namespace svxform
 
         // create base name
         OUString aBaseName;
-        if( pEntryData->ISA(FmFormData) )
+        if( dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr )
             aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME );
-        else if( pEntryData->ISA(FmControlData) )
+        else if( dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr )
             aBaseName = SVX_RESSTR( RID_STR_CONTROL );
 
 
@@ -1714,7 +1714,7 @@ namespace svxform
             FmEntryData* pCurrent = static_cast<FmEntryData*>((*it)->GetUserData());
 
             // a form ?
-            bool bIsForm = pCurrent->ISA(FmFormData);
+            bool bIsForm = dynamic_cast<const FmFormData*>( pCurrent) !=  nullptr;
 
             // because deletion is done by the view, and i build on its MarkList,
             // but normally only direct controls, no indirect ones, are marked in a marked form,
@@ -1791,7 +1791,7 @@ namespace svxform
 
             // one remaining subtile problem, before deleting it : if it's a form and the shell
             // knows it as CurrentObject, i have to tell it something else
-            if (pCurrent->ISA(FmFormData))
+            if (dynamic_cast<const FmFormData*>( pCurrent) !=  nullptr)
             {
                 Reference< XForm >  xCurrentForm( static_cast< FmFormData* >( pCurrent )->GetFormIface() );
                 if ( pFormShell->GetImpl()->getCurrentForm() == xCurrentForm )  // shell knows form to be deleted ?
@@ -2009,7 +2009,7 @@ namespace svxform
         // but mechanism doesn't work, if form is empty for example
         if ((m_arrCurrentSelection.size() == 1) && (m_nFormsSelected == 1))
         {
-            FmFormData* pSingleSelectionData = PTR_CAST( FmFormData, static_cast< FmEntryData* >( FirstSelected()->GetUserData() ) );
+            FmFormData* pSingleSelectionData = dynamic_cast<FmFormData*>( static_cast< FmEntryData* >( FirstSelected()->GetUserData() )  );
             DBG_ASSERT( pSingleSelectionData, "NavigatorTree::SynchronizeMarkList: invalid selected form!" );
             if ( pSingleSelectionData )
             {
@@ -2108,12 +2108,12 @@ namespace svxform
         for( size_t i = 0; i < pChildList->size(); ++i )
         {
             FmEntryData* pEntryData = pChildList->at( i );
-            if( pEntryData->ISA(FmControlData) )
+            if( dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr )
             {
                 pControlData = static_cast<FmControlData*>(pEntryData);
                 _rObjects.insert(pControlData->GetFormComponent());
-            } // if( pEntryData->ISA(FmControlData) )
-            else if (bDeep && (pEntryData->ISA(FmFormData)))
+            } // if( dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr )
+            else if (bDeep && (dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr))
                 CollectObjects(static_cast<FmFormData*>(pEntryData), bDeep, _rObjects);
         } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
     }
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index b0c2071c16fd..87d0670562d9 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -144,7 +144,7 @@ namespace svxform
         FmEntryData* pEntryData = m_pNavModel->FindData(xReplaced, m_pNavModel->GetRootList());
         if (pEntryData)
         {
-            if (pEntryData->ISA(FmControlData))
+            if (dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr)
             {
                 Reference< XFormComponent >  xComp;
                 evt.Element >>= xComp;
@@ -152,7 +152,7 @@ namespace svxform
                     // FmControlData should be coupled with XFormComponent
                 m_pNavModel->ReplaceFormComponent(xReplaced, xComp);
             }
-            else if (pEntryData->ISA(FmFormData))
+            else if (dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr)
             {
                 OSL_FAIL("replacing forms not implemented yet !");
             }
@@ -266,7 +266,7 @@ namespace svxform
         if (bAlterModel)
         {
             OUString aStr;
-            if (pEntry->ISA(FmFormData))
+            if (dynamic_cast<const FmFormData*>( pEntry) !=  nullptr)
                 aStr = SVX_RESSTR(RID_STR_FORM);
             else
                 aStr = SVX_RESSTR(RID_STR_CONTROL);
@@ -330,7 +330,7 @@ namespace svxform
 
 
         // Remove data from model
-        if (pEntry->ISA(FmFormData))
+        if (dynamic_cast<const FmFormData*>( pEntry) !=  nullptr)
         {
             Reference< XContainer >  xContainer(xElement, UNO_QUERY);
             if (xContainer.is())
@@ -371,7 +371,7 @@ namespace svxform
         if (bAlterModel)
         {
             OUString        aStr;
-            if (pEntry->ISA(FmFormData))
+            if (dynamic_cast<const FmFormData*>( pEntry) !=  nullptr)
                 aStr = SVX_RESSTR(RID_STR_FORM);
             else
                 aStr = SVX_RESSTR(RID_STR_CONTROL);
@@ -385,7 +385,7 @@ namespace svxform
         }
 
         // now real deletion of data form model
-        if (pEntry->ISA(FmFormData))
+        if (dynamic_cast<const FmFormData*>( pEntry) !=  nullptr)
             RemoveForm(static_cast<FmFormData*>(pEntry));
         else
             RemoveFormComponent(static_cast<FmControlData*>(pEntry));
@@ -457,9 +457,9 @@ namespace svxform
 
 
             // Child is form -> recursive call
-            if( pEntryData->ISA(FmFormData) )
+            if( dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr )
                 RemoveForm( static_cast<FmFormData*>(pEntryData));
-            else if( pEntryData->ISA(FmControlData) )
+            else if( dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr )
                 RemoveFormComponent(static_cast<FmControlData*>(pEntryData));
         }
 
@@ -499,7 +499,7 @@ namespace svxform
         for( size_t i = pChildList->size(); i > 0; )
         {
             FmEntryData* pChildData = pChildList->at( --i );
-            if( pChildData->ISA(FmFormData) )
+            if( dynamic_cast<const FmFormData*>( pChildData) !=  nullptr )
                 ClearBranch( static_cast<FmFormData*>(pChildData) );
 
             pChildList->remove( pChildData );
@@ -624,8 +624,8 @@ namespace svxform
     )
     {
         FmEntryData* pData = FindData(xOld, GetRootList());
-        assert(pData && pData->ISA(FmControlData)); //NavigatorTreeModel::ReplaceFormComponent : invalid argument
-        if (!pData || !pData->ISA(FmControlData))
+        assert(pData && dynamic_cast<const FmControlData*>( pData) !=  nullptr); //NavigatorTreeModel::ReplaceFormComponent : invalid argument
+        if (!pData || dynamic_cast<const FmControlData*>( pData) ==  nullptr)
             return;
         static_cast<FmControlData*>(pData)->ModelReplaced( xNew, m_aNormalImages );
 
@@ -675,7 +675,7 @@ namespace svxform
             if (rText == aEntryText)
                 return pEntryData;
 
-            if( bRecurs && pEntryData->ISA(FmFormData) )
+            if( bRecurs && dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr )
             {
                 pChildData = FindData( rText, static_cast<FmFormData*>(pEntryData) );
                 if( pChildData )
@@ -771,7 +771,7 @@ namespace svxform
 
     bool NavigatorTreeModel::InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject)
     {
-        if ( pObject->ISA(SdrObjGroup) )
+        if ( dynamic_cast<const SdrObjGroup*>( pObject) !=  nullptr )
         {   // descend recursively
             const SdrObjList *pChildren = static_cast<SdrObjGroup*>(pObject)->GetSubList();
             for ( size_t i=0; i<pChildren->GetObjCount(); ++i )
@@ -913,14 +913,14 @@ namespace svxform
         // get PropertySet
         Reference< XFormComponent >  xFormComponent;
 
-        if( pEntryData->ISA(FmFormData) )
+        if( dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr )
         {
             FmFormData* pFormData = static_cast<FmFormData*>(pEntryData);
             Reference< XForm >  xForm( pFormData->GetFormIface());
             xFormComponent = xForm;
         }
 
-        if( pEntryData->ISA(FmControlData) )
+        if( dynamic_cast<const FmControlData*>( pEntryData) !=  nullptr )
         {
             FmControlData* pControlData = static_cast<FmControlData*>(pEntryData);
             xFormComponent = pControlData->GetFormComponent();
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 778cfe444fc2..cc3f76b7ed0c 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -292,7 +292,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo
 
     if (eState >= SfxItemState::DEFAULT)
     {
-        FmFormShell* pShell = PTR_CAST(FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell());
+        FmFormShell* pShell = dynamic_cast<FmFormShell*>( static_cast<const SfxObjectItem*>(pState)->GetShell() );
         UpdateContent(pShell);
     }
     else
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index a8ea0b9db228..dd8f6ace33f5 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -123,7 +123,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons
 
     if (pState)
     {
-        const SfxInt32Item* pItem = PTR_CAST( SfxInt32Item, pState );
+        const SfxInt32Item* pItem = dynamic_cast< const SfxInt32Item* >( pState );
         DBG_ASSERT( pItem, "SvxFmTbxCtlAbsRec::StateChanged: invalid item!" );
         pWin->SetValue( pItem ? pItem->GetValue() : -1 );
     }