From 2828d92eee63a4a5306ef64482bc7d1db3459406 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 28 Mar 2015 19:07:45 +0100 Subject: Clean up C-style casts from pointers to void Change-Id: I2ec58d0bfe13fae4fc2141f9b017b5a72e0ba2c2 --- sw/source/ui/misc/glosbib.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sw/source/ui/misc/glosbib.cxx') diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 385ce257cfeb..11a3666236bb 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -131,7 +131,7 @@ void SwGlossaryGroupDlg::Apply() if(m_pGroupTLB->GetEntryCount()) { SvTreeListEntry* pFirst = m_pGroupTLB->First(); - GlosBibUserData* pUserData = (GlosBibUserData*)pFirst->GetUserData(); + GlosBibUserData* pUserData = static_cast(pFirst->GetUserData()); pGlosHdl->SetCurGroup(pUserData->sGroupName); } } @@ -177,7 +177,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected(); if(pFirstEntry) { - GlosBibUserData* pUserData = (GlosBibUserData*)pFirstEntry->GetUserData(); + GlosBibUserData* pUserData = static_cast(pFirstEntry->GetUserData()); OUString sEntry(pUserData->sGroupName); OUString sName(m_pNameED->GetText()); bool bExists = false; @@ -185,7 +185,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) if( 0xffffffff > nPos) { SvTreeListEntry* pEntry = m_pGroupTLB->GetEntry(nPos); - GlosBibUserData* pFoundData = (GlosBibUserData*)pEntry->GetUserData(); + GlosBibUserData* pFoundData = static_cast(pEntry->GetUserData()); bExists = pFoundData->sGroupName == sEntry; } @@ -224,7 +224,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) pButton->Enable(false); return 0; } - GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); + GlosBibUserData* pUserData = static_cast(pEntry->GetUserData()); OUString const sEntry(pUserData->sGroupName); // if the name to be deleted is among the new ones - get rid of it bool bDelete = true; @@ -269,7 +269,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); - GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); + GlosBibUserData* pUserData = static_cast(pEntry->GetUserData()); OUString sEntry(pUserData->sGroupName); const OUString sNewTitle(m_pNameED->GetText()); @@ -297,7 +297,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) + OUStringLiteral1() + sNewTitle; m_RenamedArr.push_back(sEntry); } - delete (GlosBibUserData*)pEntry->GetUserData(); + delete static_cast(pEntry->GetUserData()); m_pGroupTLB->GetModel()->Remove(pEntry); pEntry = m_pGroupTLB->InsertEntry(m_pNameED->GetText() + "\t" + m_pPathLB->GetSelectEntry()); @@ -354,7 +354,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl) SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); if(pEntry) { - GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); + GlosBibUserData* pUserData = static_cast(pEntry->GetUserData()); bEnableDel = IsDeleteAllowed(pUserData->sGroupName); } @@ -418,7 +418,7 @@ void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) aSize.Width() = GetSizePixel().Width() - aPos.X(); aPos = OutputToScreenPixel(aPos); Rectangle aItemRect( aPos, aSize ); - GlosBibUserData* pData = (GlosBibUserData*)pEntry->GetUserData(); + GlosBibUserData* pData = static_cast(pEntry->GetUserData()); const OUString sMsg = pData->sPath + "/" + pData->sGroupName.getToken(0, GLOS_DELIM) + SwGlossaries::GetExtension(); -- cgit