diff options
Diffstat (limited to 'sc/source/ui/miscdlgs')
-rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/anyrefdg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/mvtabdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/tabopdlg.cxx | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index ceb73ce51289..f7453f02ba9f 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -368,7 +368,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeAction( OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; - pNewData->pData=(void *)pScChangeAction; + pNewData->pData=const_cast<ScChangeAction *>(pScChangeAction); pNewData->nActionNo=pScChangeAction->GetActionNumber(); pNewData->bIsAcceptable=pScChangeAction->IsClickable(); pNewData->bIsRejectable=pScChangeAction->IsRejectable(); @@ -545,7 +545,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertFilteredAction( OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; - pNewData->pData=(void *)pScChangeAction; + pNewData->pData=const_cast<ScChangeAction *>(pScChangeAction); pNewData->nActionNo=pScChangeAction->GetActionNumber(); pNewData->bIsAcceptable=pScChangeAction->IsClickable(); pNewData->bIsRejectable=pScChangeAction->IsRejectable(); @@ -733,7 +733,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC ScRedlinData* pNewData=new ScRedlinData; pNewData->nInfo=nSpecial; - pNewData->pData=(void *)pScChangeAction; + pNewData->pData=const_cast<ScChangeActionContent *>(pScChangeAction); pNewData->nActionNo=pScChangeAction->GetActionNumber(); pNewData->bIsAcceptable=pScChangeAction->IsClickable(); pNewData->bIsRejectable=false; @@ -1181,7 +1181,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvTreeL { bTheTestFlag=false; ScRedlinData *pParentData=static_cast<ScRedlinData *>(pOriginal->GetUserData()); - pParentData->pData=(void *)pScChangeAction; + pParentData->pData=const_cast<ScChangeAction *>(pScChangeAction); pParentData->nActionNo=pScChangeAction->GetActionNumber(); pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value pParentData->bIsRejectable=false; @@ -1209,7 +1209,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvTreeL { bTheTestFlag=false; ScRedlinData *pParentData=static_cast<ScRedlinData *>(pEntry->GetUserData()); - pParentData->pData=(void *)pScChangeAction; + pParentData->pData=const_cast<ScChangeAction *>(pScChangeAction); pParentData->nActionNo=pScChangeAction->GetActionNumber(); pParentData->bIsAcceptable=pScChangeAction->IsClickable(); pParentData->bIsRejectable=false; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 078d8c08a625..45f93b2fcda7 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -493,7 +493,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: pChild = pChild->GetWindow(GetWindowType::Next)) { vcl::Window *pWin = pChild->GetWindow(GetWindowType::Client); - if (pWin == (vcl::Window*)pRefEdit || pWin == (vcl::Window*)pRefBtn) + if (pWin == static_cast<vcl::Window*>(pRefEdit) || pWin == static_cast<vcl::Window*>(pRefBtn)) continue; // do nothing else if (pWin->IsVisible()) { diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 9bfa8571f08c..dc188dd35d6d 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -811,9 +811,9 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) { - if( (pCtrl == (Control*)pEdAssign) || (pCtrl == (Control*)pRbAssign) ) + if( (pCtrl == static_cast<Control*>(pEdAssign)) || (pCtrl == static_cast<Control*>(pRbAssign)) ) pEdActive = pEdAssign; - else if( (pCtrl == (Control*)pEdAssign2) || (pCtrl == (Control*)pRbAssign2) ) + else if( (pCtrl == static_cast<Control*>(pEdAssign2)) || (pCtrl == static_cast<Control*>(pRbAssign2)) ) pEdActive = pEdAssign2; else pEdActive = NULL; diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 995aa7267e49..b589a592f5a0 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -249,7 +249,7 @@ void ScMoveTableDlg::InitDocListBox() } pLbDoc->InsertEntry( aEntryName, i ); - pLbDoc->SetEntryData( i, (void*)&pScSh->GetDocument() ); + pLbDoc->SetEntryData( i, static_cast<void*>(&pScSh->GetDocument()) ); i++; } diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 511a3413637c..019c3ea4d686 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -118,7 +118,7 @@ void ScRetypePassDlg::SetDataFromDocument(const ScDocument& rDoc) pFtSheetStatus->Show(true); pFtSheetStatus->SetStyle(WB_VCENTER); - VclPtr<PushButton> pBtnSheet = VclPtr<PushButton>::Create((vcl::Window*)pSheet); + VclPtr<PushButton> pBtnSheet = VclPtr<PushButton>::Create(static_cast<vcl::Window*>(pSheet)); pBtnSheet->SetText(ScResId(STR_RETYPE)); pBtnSheet->SetClickHdl(LINK(this, ScRetypePassDlg, RetypeBtnHdl)); pBtnSheet->Disable(); diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index e8904376f098..09d0fa1cea88 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -262,11 +262,11 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) Edit* pEdit = NULL; pEdActive = NULL; - if( (pCtrl == (Control*)m_pEdFormulaCell) || (pCtrl == (Control*)m_pRBFormulaCell) ) + if( (pCtrl == static_cast<Control*>(m_pEdFormulaCell)) || (pCtrl == static_cast<Control*>(m_pRBFormulaCell)) ) pEdit = pEdActive = m_pEdFormulaCell; - else if( (pCtrl == (Control*)m_pEdVariableCell) || (pCtrl == (Control*)m_pRBVariableCell) ) + else if( (pCtrl == static_cast<Control*>(m_pEdVariableCell)) || (pCtrl == static_cast<Control*>(m_pRBVariableCell)) ) pEdit = pEdActive = m_pEdVariableCell; - else if( pCtrl == (Control*)m_pEdTargetVal ) + else if( pCtrl == static_cast<Control*>(m_pEdTargetVal) ) pEdit = m_pEdTargetVal; if( pEdit ) diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 3706a34edced..5ff6903d29f2 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -326,11 +326,11 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) { - if( (pCtrl == (Control*)m_pEdFormulaRange) || (pCtrl == (Control*)m_pRBFormulaRange) ) + if( (pCtrl == static_cast<Control*>(m_pEdFormulaRange)) || (pCtrl == static_cast<Control*>(m_pRBFormulaRange)) ) pEdActive = m_pEdFormulaRange; - else if( (pCtrl == (Control*)m_pEdRowCell) || (pCtrl == (Control*)m_pRBRowCell) ) + else if( (pCtrl == static_cast<Control*>(m_pEdRowCell)) || (pCtrl == static_cast<Control*>(m_pRBRowCell)) ) pEdActive = m_pEdRowCell; - else if( (pCtrl == (Control*)m_pEdColCell) || (pCtrl == (Control*)m_pRBColCell) ) + else if( (pCtrl == static_cast<Control*>(m_pEdColCell)) || (pCtrl == static_cast<Control*>(m_pRBColCell)) ) pEdActive = m_pEdColCell; else pEdActive = NULL; |