diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:25:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:25:20 +0200 |
| commit | 648cf9a56dcb11d2674c48e77672cc124aad1bce (patch) | |
| tree | f7cb916c7bbe774dff20830d4014e3e5ab94dc09 /formula | |
| parent | 885bf7c68ce5355a1b4d447aeddc1bd40d6be503 (diff) | |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I035d84d2de99c4cf790aab6202559e2b35117b64
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 6 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 134961eb35bb..dbcf06c6ca5e 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -79,7 +79,7 @@ FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManage for(sal_uInt32 j= 0; j < nCategoryCount; ++j) { const IFunctionCategory* pCategory = m_pFunctionManager->getCategory(j); - m_pLbCategory->SetEntryData(m_pLbCategory->InsertEntry(pCategory->getName()),(void*)pCategory); + m_pLbCategory->SetEntryData(m_pLbCategory->InsertEntry(pCategory->getName()),const_cast<IFunctionCategory *>(pCategory)); } m_pLbCategory->SelectEntryPos(1); @@ -108,7 +108,7 @@ void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory) { TFunctionDesc pDesc(_pCategory->getFunction(i)); m_pLbFunction->SetEntryData( - m_pLbFunction->InsertEntry(pDesc->getFunctionName() ),(void*)pDesc ); + m_pLbFunction->InsertEntry(pDesc->getFunctionName() ),const_cast<IFunctionDescription *>(pDesc) ); } } @@ -147,7 +147,7 @@ void FuncPage::UpdateFunctionList() if (pDesc) // may be null if a function is no longer available { m_pLbFunction->SetEntryData( - m_pLbFunction->InsertEntry( pDesc->getFunctionName() ), (void*)pDesc ); + m_pLbFunction->InsertEntry( pDesc->getFunctionName() ), const_cast<IFunctionDescription *>(pDesc) ); } } } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index f990deae1472..e59566b51b0f 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -458,8 +458,8 @@ void ParaWin::SetArgumentOffset(sal_uInt16 nOffset) OUString aString; aArgInput[i].SetArgVal(aString); aArgInput[i].GetArgEdPtr()->Init( - (i==0) ? (ArgEdit *)NULL : aArgInput[i-1].GetArgEdPtr(), - (i==3 || i==nArgs-1) ? (ArgEdit *)NULL : aArgInput[i+1].GetArgEdPtr(), + (i==0) ? nullptr : aArgInput[i-1].GetArgEdPtr(), + (i==3 || i==nArgs-1) ? nullptr : aArgInput[i+1].GetArgEdPtr(), *m_pSlider, nArgs ); } } |