summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-09-30 16:10:07 +0200
committerOliver Specht <oliver.specht@cib.de>2015-10-06 07:29:37 +0000
commit89d39bc100aabf5dccbe77c0b5c0c85736e85b39 (patch)
tree871a91210913ecee91530c95392534bf18f80f3f /starmath
parent32b9901dae7403453d773f5904de15551a323595 (diff)
tdf#94559: 4th step to remove rtti.hxx
replaced use of PTR_CAST, IS_TYPE, ISA in idl, editeng, sc, sd, sw, sfx2, sot, starmath Change-Id: I4a5bba4fdc4829099618c09b690c83f876a3d653 Reviewed-on: https://gerrit.libreoffice.org/19132 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/ElementsDockingWindow.cxx2
-rw-r--r--starmath/source/edit.cxx4
-rw-r--r--starmath/source/smmod.cxx3
-rw-r--r--starmath/source/unomodel.cxx7
-rw-r--r--starmath/source/utility.cxx2
-rw-r--r--starmath/source/view.cxx4
6 files changed, 10 insertions, 12 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index fbea9403064e..ae493da6c0a6 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -743,7 +743,7 @@ IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox*, pList)
SmViewShell* SmElementsDockingWindow::GetView()
{
SfxViewShell* pView = GetBindings().GetDispatcher()->GetFrame()->GetViewShell();
- return PTR_CAST(SmViewShell, pView);
+ return dynamic_cast<SmViewShell*>( pView);
}
void SmElementsDockingWindow::Resize()
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index d7d7d0e2e805..e7806a41723e 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -414,7 +414,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
{
bool bCallBase = true;
SfxViewShell* pViewShell = GetView();
- if ( pViewShell && pViewShell->ISA(SmViewShell) )
+ if ( pViewShell && dynamic_cast<const SmViewShell *>(pViewShell) != nullptr )
{
// Terminate possible InPlace mode
bCallBase = !pViewShell->Escape();
@@ -482,7 +482,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
// SFX has maybe called a slot of the view and thus (because of a hack in SFX)
// set the focus to the view
SfxViewShell* pVShell = GetView();
- if ( pVShell && pVShell->ISA(SmViewShell) &&
+ if ( pVShell && dynamic_cast<const SmViewShell *>(pVShell) != nullptr &&
static_cast<SmViewShell*>(pVShell)->GetGraphicWindow().HasFocus() )
{
GrabFocus();
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 771528a0552d..d6c7f7e09d63 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -180,11 +180,10 @@ SmModule::~SmModule()
void SmModule::ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg )
{
//invalidate all graphic and edit windows
- const TypeId aSmViewTypeId = TYPE(SmViewShell);
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while (pViewShell)
{
- if ((pViewShell->IsA(aSmViewTypeId)))
+ if ((dynamic_cast<const SmViewShell *>(pViewShell) != nullptr))
{
SmViewShell *pSmView = static_cast<SmViewShell *>(pViewShell);
pSmView->GetGraphicWindow().ApplyColorConfigValues( rColorCfg );
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 0f52e97b815e..fe292eb264bb 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -1033,11 +1033,10 @@ void SAL_CALL SmModel::render(
{
//!! when called via API we may not have an active view
//!! thus we go and look for a view that can be used.
- const TypeId aTypeId = TYPE( SmViewShell );
- SfxViewShell* pViewSh = SfxViewShell::GetFirst( &aTypeId, false /* search non-visible views as well*/ );
+ SfxViewShell* pViewSh = SfxViewShell::GetFirst( false /* search non-visible views as well*/, checkSfxViewShell<SmViewShell> );
while (pViewSh && pViewSh->GetObjectShell() != pDocSh)
- pViewSh = SfxViewShell::GetNext( *pViewSh, &aTypeId, false /* search non-visible views as well*/ );
- SmViewShell *pView = PTR_CAST( SmViewShell, pViewSh );
+ pViewSh = SfxViewShell::GetNext( *pViewSh, false /* search non-visible views as well*/, checkSfxViewShell<SmViewShell> );
+ SmViewShell *pView = dynamic_cast< SmViewShell *>( pViewSh );
SAL_WARN_IF( !pView, "starmath", "SmModel::render : no SmViewShell found" );
if (pView)
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index f575600e8fd2..5083cbbda90f 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -42,7 +42,7 @@
SmViewShell * SmGetActiveView()
{
SfxViewShell *pView = SfxViewShell::Current();
- return PTR_CAST(SmViewShell, pView);
+ return dynamic_cast<SmViewShell*>( pView);
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d548b61d2925..ad512b1d50d8 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -694,7 +694,7 @@ SmEditController::~SmEditController()
void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState)
{
- const SfxStringItem *pItem = PTR_CAST(SfxStringItem, pState);
+ const SfxStringItem *pItem = dynamic_cast<const SfxStringItem*>( pState);
if ((pItem != NULL) && (rEdit.GetText() != OUString(pItem->GetValue())))
rEdit.SetText(pItem->GetValue());
@@ -737,7 +737,7 @@ SmViewShell * SmCmdBoxWindow::GetView()
{
SfxDispatcher *pDispatcher = GetBindings().GetDispatcher();
SfxViewShell *pView = pDispatcher ? pDispatcher->GetFrame()->GetViewShell() : NULL;
- return PTR_CAST(SmViewShell, pView);
+ return dynamic_cast<SmViewShell*>( pView);
}
void SmCmdBoxWindow::Resize()