diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:00:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:09:19 +0100 |
commit | 170012948c063521499ab685906354f184ac33be (patch) | |
tree | a13e756e8e85b0fb2b8795f5d0f60bed98836b22 /cui/source | |
parent | e97b3272668ecbe5454ffc7f394680dbcae27395 (diff) |
Clean up C-style casts from pointers to void
Change-Id: I544fc582d375d1e49f84309e722f669d734cf029
Diffstat (limited to 'cui/source')
23 files changed, 147 insertions, 147 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 94f7d79f1926..f2df5f26f9e3 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -650,7 +650,7 @@ void SfxAccCfgLBoxString_Impl::Paint( if (!pEntry) return; - TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pEntry->GetUserData()); if (!pUserData) return; @@ -705,7 +705,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey) SvTreeListEntry* pEntry = First(); while (pEntry) { - TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pEntry->GetUserData()); if (pUserData) { sal_uInt16 nCode2 = pUserData->m_aKey.GetCode(); @@ -818,7 +818,7 @@ SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage() SvTreeListEntry* pEntry = m_pEntriesBox->First(); while (pEntry) { - TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pEntry->GetUserData()); if (pUserData) delete pUserData; pEntry = m_pEntriesBox->Next(pEntry); @@ -827,7 +827,7 @@ SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage() pEntry = m_pKeyBox->First(); while (pEntry) { - TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pEntry->GetUserData()); if (pUserData) delete pUserData; pEntry = m_pKeyBox->Next(pEntry); @@ -959,7 +959,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler m_pEntriesBox->SetEntryText(sLabel, nPos, nCol); SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos); - TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData(); + TAccInfo* pEntry = static_cast<TAccInfo*>(pLBEntry->GetUserData()); pEntry->m_bIsConfigurable = true; pEntry->m_sCommand = sCommand; @@ -979,7 +979,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler // Hardcoded function mapped so no ID possible and mark entry as not changeable SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos); - TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData(); + TAccInfo* pEntry = static_cast<TAccInfo*>(pLBEntry->GetUserData()); pEntry->m_bIsConfigurable = false; CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), OUString()); @@ -998,7 +998,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele SvTreeListEntry* pEntry = m_pEntriesBox->First(); while (pEntry) { - TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pEntry->GetUserData()); OUString sCommand ; css::awt::KeyEvent aAWTKey ; @@ -1066,7 +1066,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl) { sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( m_pEntriesBox->FirstSelected() ); - TAccInfo* pEntry = (TAccInfo*)m_pEntriesBox->GetEntry(0, nPos)->GetUserData(); + TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData()); OUString sNewCommand = m_pFunctionBox->GetCurCommand(); OUString sLabel = m_pFunctionBox->GetCurLabel(); if (sLabel.isEmpty()) @@ -1085,7 +1085,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) { // get selected entry sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( m_pEntriesBox->FirstSelected() ); - TAccInfo* pEntry = (TAccInfo*)m_pEntriesBox->GetEntry(0, nPos)->GetUserData(); + TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData()); // remove function name from selected entry sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1; @@ -1104,7 +1104,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) if (pListBox == m_pEntriesBox) { sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( m_pEntriesBox->FirstSelected() ); - TAccInfo* pEntry = (TAccInfo*)m_pEntriesBox->GetEntry(0, nPos)->GetUserData(); + TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData()); OUString sPossibleNewCommand = m_pFunctionBox->GetCurCommand(); m_pRemoveButton->Enable( false ); @@ -1133,7 +1133,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) if ( pLBEntry != 0 ) { sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( pLBEntry ); - TAccInfo* pEntry = (TAccInfo*)m_pEntriesBox->GetEntry(0, nPos)->GetUserData(); + TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData()); OUString sPossibleNewCommand = m_pFunctionBox->GetCurCommand(); if (pEntry->m_bIsConfigurable) @@ -1148,7 +1148,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) SvTreeListEntry* pIt = m_pEntriesBox->First(); while ( pIt ) { - TAccInfo* pUserData = (TAccInfo*)pIt->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pIt->GetUserData()); if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand ) { TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey); @@ -1170,7 +1170,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) pE2 = m_pKeyBox->FirstSelected(); if (pE2) - pU2 = (TAccInfo*)pE2->GetUserData(); + pU2 = static_cast<TAccInfo*>(pE2->GetUserData()); if (pU2) nP2 = MapKeyCodeToPos(pU2->m_aKey); if (nP2 != TREELIST_ENTRY_NOTFOUND) @@ -1491,7 +1491,7 @@ sal_uLong SfxAcceleratorConfigPage::MapKeyCodeToPos(const vcl::KeyCode& aKey) co while (pEntry) { - TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData(); + TAccInfo* pUserData = static_cast<TAccInfo*>(pEntry->GetUserData()); if (pUserData) { sal_uInt16 nCode2 = pUserData->m_aKey.GetCode()+pUserData->m_aKey.GetModifier(); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 26d0c3574cb1..19831a59a029 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1831,7 +1831,7 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* ) for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) { SaveInData* pData = - (SaveInData*) m_pSaveInListBox->GetEntryData( i ); + static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( i )); result = pData->Apply(); } @@ -1842,8 +1842,8 @@ IMPL_LINK( SvxConfigPage, SelectSaveInLocation, ListBox *, pBox ) { (void)pBox; - pCurrentSaveInData = (SaveInData*) m_pSaveInListBox->GetEntryData( - m_pSaveInListBox->GetSelectEntryPos()); + pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( + m_pSaveInListBox->GetSelectEntryPos())); Init(); return 1; @@ -2003,7 +2003,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntry( else { SvxConfigEntry* pEntryData = - (SvxConfigEntry*) pCurEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pCurEntry->GetUserData()); SvxEntries::iterator iter = pEntries->begin(); SvxEntries::const_iterator end = pEntries->end(); @@ -2144,10 +2144,10 @@ bool SvxConfigPage::MoveEntryData( SvxEntries* pEntries = GetTopLevelSelection()->GetEntries(); SvxConfigEntry* pSourceData = - (SvxConfigEntry*) pSourceEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pSourceEntry->GetUserData()); SvxConfigEntry* pTargetData = - (SvxConfigEntry*) pTargetEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pTargetEntry->GetUserData()); if ( pSourceData != NULL && pTargetData != NULL ) { @@ -2229,7 +2229,7 @@ SvxMenuConfigPage::~SvxMenuConfigPage() for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) { MenuSaveInData* pData = - (MenuSaveInData*) m_pSaveInListBox->GetEntryData( i ); + static_cast<MenuSaveInData*>(m_pSaveInListBox->GetEntryData( i )); delete pData; } @@ -2275,7 +2275,7 @@ void SvxMenuConfigPage::UpdateButtonStates() m_pMoveDownButton->Enable( selection != last ); SvxConfigEntry* pEntryData = - (SvxConfigEntry*) selection->GetUserData(); + static_cast<SvxConfigEntry*>(selection->GetUserData()); if ( pEntryData->IsSeparator() ) { @@ -2318,7 +2318,7 @@ bool SvxMenuConfigPage::DeleteSelectedContent() { // get currently selected menu entry SvxConfigEntry* pMenuEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); // get currently selected menu SvxConfigEntry* pMenu = GetTopLevelSelection(); @@ -2479,7 +2479,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) { SvTreeListEntry* pActEntry = m_pContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); OUString aNewName( stripHotKey( pEntry->GetName() ) ); OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME ); @@ -2666,7 +2666,7 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) } SvxConfigEntry* pNewEntryData = - (SvxConfigEntry*) pNewMenuEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pNewMenuEntry->GetUserData()); pNewEntryData->SetName(m_pMenuNameEdit->GetText()); @@ -2721,9 +2721,9 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) if ( pSourceEntry != NULL && pTargetEntry != NULL ) { SvxConfigEntry* pSourceData = - (SvxConfigEntry*) pSourceEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pSourceEntry->GetUserData()); SvxConfigEntry* pTargetData = - (SvxConfigEntry*) pTargetEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pTargetEntry->GetUserData()); SvxEntries::iterator iter1 = GetEntries()->begin(); SvxEntries::iterator iter2 = GetEntries()->begin(); @@ -2755,7 +2755,7 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry() { - return (SvxConfigEntry*)m_pMenuListBox->FirstSelected()->GetUserData(); + return static_cast<SvxConfigEntry*>(m_pMenuListBox->FirstSelected()->GetUserData()); } const OUString& @@ -2919,7 +2919,7 @@ SvxToolbarConfigPage::~SvxToolbarConfigPage() for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) { ToolbarSaveInData* pData = - (ToolbarSaveInData*) m_pSaveInListBox->GetEntryData( i ); + static_cast<ToolbarSaveInData*>(m_pSaveInListBox->GetEntryData( i )); delete pData; } @@ -2971,7 +2971,7 @@ bool SvxToolbarConfigPage::DeleteSelectedContent() { // get currently selected entry SvxConfigEntry* pEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); SvxConfigEntry* pToolbar = GetTopLevelSelection(); @@ -3034,7 +3034,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); SvxConfigEntry* pToolbar = - (SvxConfigEntry*)m_pTopLevelListBox->GetEntryData( nSelectionPos ); + static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos )); ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() ); @@ -3132,7 +3132,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) { SvTreeListEntry* pActEntry = m_pContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); OUString aNewName( stripHotKey( pEntry->GetName() ) ); OUString aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME ); @@ -3155,7 +3155,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) { SvTreeListEntry* pActEntry = m_pContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); sal_uInt16 nSelectionPos = 0; @@ -3253,7 +3253,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) { SvTreeListEntry* pActEntry = m_pContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); sal_uInt16 nSelectionPos = 0; @@ -3331,7 +3331,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) { SvTreeListEntry* pActEntry = m_pContentsListBox->GetCurEntry(); SvxConfigEntry* pEntry = - (SvxConfigEntry*) pActEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); sal_uInt16 nSelectionPos = 0; @@ -3411,7 +3411,7 @@ void SvxToolbarConfigPage::Init() for ( sal_uInt16 i = 0 ; i < m_pTopLevelListBox->GetEntryCount(); ++i ) { SvxConfigEntry* pData = - (SvxConfigEntry*) m_pTopLevelListBox->GetEntryData( i ); + static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( i )); if ( pData->GetCommand().equals( m_aURLToSelect ) ) { @@ -4272,7 +4272,7 @@ void SvxToolbarConfigPage::UpdateButtonStates() return; } - SvxConfigEntry* pEntryData = (SvxConfigEntry*) selection->GetUserData(); + SvxConfigEntry* pEntryData = static_cast<SvxConfigEntry*>(selection->GetUserData()); if ( pEntryData->IsSeparator() ) pPopup->EnableItem( ID_DELETE, true ); else @@ -4401,7 +4401,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i ) { SaveInData* pData = - (SaveInData*) m_pSaveInListBox->GetEntryData( i ); + static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( i )); nInsertPos = pNameDialog->m_pSaveInListBox->InsertEntry( m_pSaveInListBox->GetEntry( i ) ); @@ -4418,8 +4418,8 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos(); - ToolbarSaveInData* pData = (ToolbarSaveInData*) - pNameDialog->m_pSaveInListBox->GetEntryData( nInsertPos ); + ToolbarSaveInData* pData = static_cast<ToolbarSaveInData*>( + pNameDialog->m_pSaveInListBox->GetEntryData( nInsertPos )); if ( GetSaveInData() != pData ) { @@ -4486,7 +4486,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction( SvTreeListEntry* pNewLBEntry = SvxConfigPage::AddFunction( pTarget, bFront, bAllowDuplicates ); - SvxConfigEntry* pEntry = (SvxConfigEntry*) pNewLBEntry->GetUserData(); + SvxConfigEntry* pEntry = static_cast<SvxConfigEntry*>(pNewLBEntry->GetUserData()); if ( pEntry->IsBinding() ) { @@ -4600,7 +4600,7 @@ void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry ) if ( pEntry != NULL ) { SvxConfigEntry* pEntryData = - (SvxConfigEntry*) pEntry->GetUserData(); + static_cast<SvxConfigEntry*>(pEntry->GetUserData()); if ( pEntryData->IsBinding() ) { diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 54be990c1d3b..9dc928527999 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -307,7 +307,7 @@ void SfxConfigFunctionListBox::ClearAll() if ( pData->nKind == SFX_CFGFUNCTION_SCRIPT ) { - OUString* pScriptURI = (OUString*)pData->pObject; + OUString* pScriptURI = static_cast<OUString*>(pData->pObject); delete pScriptURI; } @@ -330,9 +330,9 @@ OUString SfxConfigFunctionListBox::GetSelectedScriptURI() SvTreeListEntry *pEntry = FirstSelected(); if ( pEntry ) { - SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); + SfxGroupInfo_Impl *pData = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData()); if ( pData && ( pData->nKind == SFX_CFGFUNCTION_SCRIPT ) ) - return *(OUString*)pData->pObject; + return *static_cast<OUString*>(pData->pObject); } return OUString(); } @@ -342,7 +342,7 @@ OUString SfxConfigFunctionListBox::GetCurCommand() SvTreeListEntry *pEntry = FirstSelected(); if (!pEntry) return OUString(); - SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); + SfxGroupInfo_Impl *pData = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData()); if (!pData) return OUString(); return pData->sCommand; @@ -353,7 +353,7 @@ OUString SfxConfigFunctionListBox::GetCurLabel() SvTreeListEntry *pEntry = FirstSelected(); if (!pEntry) return OUString(); - SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData(); + SfxGroupInfo_Impl *pData = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData()); if (!pData) return OUString(); if (!pData->sLabel.isEmpty()) @@ -838,7 +838,7 @@ void SfxConfigGroupListBox::GroupSelected() */ { SvTreeListEntry *pEntry = FirstSelected(); - SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData(); + SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData()); pFunctionListBox->SetUpdateMode(false); pFunctionListBox->ClearAll(); if ( pInfo->nKind != SFX_CFGGROUP_FUNCTION && @@ -930,7 +930,7 @@ void SfxConfigGroupListBox::GroupSelected() case SFX_CFGGROUP_STYLES : { - SfxStyleInfo_Impl* pFamily = (SfxStyleInfo_Impl*)(pInfo->pObject); + SfxStyleInfo_Impl* pFamily = static_cast<SfxStyleInfo_Impl*>(pInfo->pObject); if (pFamily) { const ::std::vector< SfxStyleInfo_Impl > lStyles = pStylesInfo->getStyles(pFamily->sFamily); @@ -997,7 +997,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) A basic or a library is opened. */ { - SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData(); + SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(pEntry->GetUserData()); pInfo->bWasOpened = true; switch ( pInfo->nKind ) { diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index bee41ccf336d..eb474ff4a58a 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -108,7 +108,7 @@ SvxEventConfigPage::~SvxEventConfigPage() SvTreeListEntry* pE = rListBox.GetEntry( 0 ); while( pE ) { - OUString* pEventName = (OUString*)pE->GetUserData(); + OUString const * pEventName = static_cast<OUString const *>(pE->GetUserData()); delete pEventName; pE->SetUserData((void*)0); pE = rListBox.NextSibling( pE ); @@ -165,8 +165,8 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) { (void)pBox; - bool* bApp = (bool*) m_pSaveInListBox->GetEntryData( - m_pSaveInListBox->GetSelectEntryPos()); + bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData( + m_pSaveInListBox->GetSelectEntryPos())); mpImpl->pEventLB->SetUpdateMode( false ); bAppConfig = *bApp; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index ea52b32e1d84..5f83f286784f 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -599,7 +599,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* const bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled(); - OUString* pEventName = (OUString*)pE->GetUserData(); + OUString* pEventName = static_cast<OUString*>(pE->GetUserData()); OUString sEventURL; OUString sEventType; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 4bb467a41b6c..1701d60386af 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -148,7 +148,7 @@ void SvxConfigFunctionListBox::ClearAll() OUString SvxConfigFunctionListBox::GetHelpText( SvTreeListEntry *pEntry ) { SvxGroupInfo_Impl *pInfo = - pEntry ? (SvxGroupInfo_Impl*) pEntry->GetUserData(): 0; + pEntry ? static_cast<SvxGroupInfo_Impl*>(pEntry->GetUserData()): 0; if ( pInfo ) { @@ -622,7 +622,7 @@ SvxConfigGroupListBox::getDocumentModel( void SvxConfigGroupListBox::GroupSelected() { SvTreeListEntry *pEntry = FirstSelected(); - SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData(); + SvxGroupInfo_Impl *pInfo = static_cast<SvxGroupInfo_Impl*>(pEntry->GetUserData()); pFunctionListBox->SetUpdateMode(false); pFunctionListBox->ClearAll(); if ( pInfo->nKind != SVX_CFGGROUP_FUNCTION && @@ -640,7 +640,7 @@ void SvxConfigGroupListBox::GroupSelected() if ( _pEntry != NULL ) { SvxGroupInfo_Impl *_pInfo = - (SvxGroupInfo_Impl*) _pEntry->GetUserData(); + static_cast<SvxGroupInfo_Impl*>(_pEntry->GetUserData()); Reference< frame::XDispatchInformationProvider > xDIP( m_xFrame, UNO_QUERY ); @@ -830,7 +830,7 @@ bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) { - SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData(); + SvxGroupInfo_Impl *pInfo = static_cast<SvxGroupInfo_Impl*>(pEntry->GetUserData()); pInfo->bWasOpened = true; switch ( pInfo->nKind ) { @@ -1014,7 +1014,7 @@ SvxScriptSelectorDialog::GetScriptURL() const SvTreeListEntry *pEntry = const_cast< SvxScriptSelectorDialog* >( this )->m_pCommands->GetLastSelectedEntry(); if ( pEntry ) { - SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData(); + SvxGroupInfo_Impl *pData = static_cast<SvxGroupInfo_Impl*>(pEntry->GetUserData()); if ( ( pData->nKind == SVX_CFGFUNCTION_SLOT ) || ( pData->nKind == SVX_CFGFUNCTION_SCRIPT ) ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 04ec63edcd93..e80f41854b6a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1128,7 +1128,7 @@ namespace svx SvTreeListEntry* pEntry = m_pDictsLB->First(); while( pEntry ) { - OUString* pDel = ( OUString* ) pEntry->GetUserData(); + OUString const * pDel = static_cast<OUString const *>(pEntry->GetUserData()); if( pDel ) delete pDel; pEntry = m_pDictsLB->Next( pEntry ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index e981ea402ca1..2686b482c54c 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -84,7 +84,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri { sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - aURLObject.SetExtension( ((DocumentTypeData*)m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); + aURLObject.SetExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } } @@ -131,8 +131,8 @@ SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp () { for ( sal_uInt16 n=0; n<m_pLbDocTypes->GetEntryCount(); n++ ) { - DocumentTypeData* pTypeData = (DocumentTypeData*) - m_pLbDocTypes->GetEntryData ( n ); + DocumentTypeData* pTypeData = static_cast<DocumentTypeData*>( + m_pLbDocTypes->GetEntryData ( n )); delete pTypeData; } } @@ -326,8 +326,8 @@ void SvxHyperlinkNewDocTp::DoApply () sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos=0; - OUString aStrDocName ( ( ( DocumentTypeData* ) - m_pLbDocTypes->GetEntryData( nPos ) )->aStrURL ); + OUString aStrDocName ( static_cast<DocumentTypeData*>( + m_pLbDocTypes->GetEntryData( nPos ))->aStrURL ); // create items SfxStringItem aName( SID_FILE_NAME, aStrDocName ); @@ -439,7 +439,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) { // get private-url sal_uInt16 nPos = m_pLbDocTypes->GetSelectEntryPos(); - aNewURL.setExtension( ( ( DocumentTypeData* ) m_pLbDocTypes->GetEntryData( nPos ) )->aStrExt ); + aNewURL.setExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } if( aNewURL.GetProtocol() == INET_PROT_FILE ) diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 4892f0edc956..bd3584743e03 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -487,7 +487,7 @@ void SvxHlinkDlgMarkWnd::ClearTree() while ( pEntry ) { - TargetData* pUserData = ( TargetData * ) pEntry->GetUserData(); + TargetData* pUserData = static_cast<TargetData *>(pEntry->GetUserData()); delete pUserData; pEntry = mpLbTree->Next( pEntry ); @@ -509,7 +509,7 @@ SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (const OUString& aStrName) while ( pEntry && !bFound ) { - TargetData* pUserData = ( TargetData * ) pEntry->GetUserData (); + TargetData* pUserData = static_cast<TargetData *>(pEntry->GetUserData ()); if (aStrName == pUserData->aUStrLinkname) bFound = true; else @@ -547,7 +547,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) if ( pEntry ) { - TargetData *pData = ( TargetData * )pEntry->GetUserData(); + TargetData *pData = static_cast<TargetData *>(pEntry->GetUserData()); if ( pData->bIsTarget ) { @@ -569,7 +569,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl) SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); if ( pEntry ) { - TargetData* pUserData = (TargetData *) pEntry->GetUserData(); + TargetData* pUserData = static_cast<TargetData *>(pEntry->GetUserData()); OUString sLastSelectedMark = pUserData->aUStrLinkname; std::deque<OUString> aLastSelectedPath; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index f33f839d2527..1c999e3cde65 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -240,7 +240,7 @@ IconChoiceDialog ::~IconChoiceDialog () for ( sal_uLong i=0; i < m_pIconCtrl->GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i ); - sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); + sal_uInt16* pUserData = static_cast<sal_uInt16*>(pEntry->GetUserData()); delete pUserData; } @@ -341,7 +341,7 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) if ( !pEntry ) pEntry = m_pIconCtrl->GetCursor( ); - sal_uInt16 *pId = (sal_uInt16*)pEntry->GetUserData (); + sal_uInt16 *pId = static_cast<sal_uInt16*>(pEntry->GetUserData ()); if( *pId != mnCurrentPageId ) { @@ -821,7 +821,7 @@ void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) for ( sal_uInt16 i=0; i<m_pIconCtrl->GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i ); - sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); + sal_uInt16* pUserData = static_cast<sal_uInt16*>(pEntry->GetUserData()); if ( pUserData && *pUserData == nId ) { diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index b66020d1b9a7..fc0c4d67cf58 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -160,7 +160,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) SvTreeListEntry* pEntry = 0; SvBaseLink* pLink = 0; pEntry = pSvTabListBox->GetHdlEntry(); - pLink = (SvBaseLink*)pEntry->GetUserData(); + pLink = static_cast<SvBaseLink*>(pEntry->GetUserData()); sal_uInt16 nObjectType = pLink->GetObjType(); if((OBJECT_CLIENT_FILE & nObjectType) != OBJECT_CLIENT_FILE) { @@ -177,7 +177,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) DBG_ASSERT(pEntry, "Wo ist der Entry?"); if (!pEntry) continue; - pLink = (SvBaseLink*)pEntry->GetUserData(); + pLink = static_cast<SvBaseLink*>(pEntry->GetUserData()); DBG_ASSERT(pLink, "Wo ist der Link?"); if (!pLink) continue; @@ -358,7 +358,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) OUString sType, sFile, sLinkName; OUString sFilter; SvTreeListEntry* pEntry = m_pTbLinks->FirstSelected(); - SvBaseLink* pLink = (SvBaseLink*)pEntry->GetUserData(); + SvBaseLink* pLink = static_cast<SvBaseLink*>(pEntry->GetUserData()); pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 ); INetURLObject aUrl(sFile); if(aUrl.GetProtocol() == INET_PROT_FILE) @@ -380,7 +380,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) DBG_ASSERT(pEntry,"Where is the entry?"); if (!pEntry) continue; - pLink = (SvBaseLink*)pEntry->GetUserData(); + pLink = static_cast<SvBaseLink*>(pEntry->GetUserData()); DBG_ASSERT(pLink,"Where is the link?"); if (!pLink) continue; @@ -470,7 +470,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) { void * pUD = pEntry->GetUserData(); if( pUD ) - aLinkList.push_back( (SvBaseLink*)pUD ); + aLinkList.push_back( static_cast<SvBaseLink*>(pUD) ); pEntry = m_pTbLinks->NextSelected(pEntry); } m_pTbLinks->RemoveSelection(); @@ -515,7 +515,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) for( sal_uLong nPos = m_pTbLinks->GetEntryCount(); nPos; ) { SvTreeListEntry* pBox = m_pTbLinks->GetEntry( --nPos ); - SvBaseLinkRef xLink( (SvBaseLink*)pBox->GetUserData() ); + SvBaseLinkRef xLink( static_cast<SvBaseLink*>(pBox->GetUserData()) ); if( xLink.Is() ) { OUString sCur( ImplGetStateStr( *xLink ) ), @@ -677,7 +677,7 @@ SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uLong* pPos ) if( pPos ) *pPos = nPos; - return (SvBaseLink*)pE->GetUserData(); + return static_cast<SvBaseLink*>(pE->GetUserData()); } return 0; } diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 1685afb527e7..b4dd69fa6c65 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -133,7 +133,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl) IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) { SvTreeListEntry* pEntry = m_pRadioLB->FirstSelected(); - delete (OUString*)pEntry->GetUserData(); + delete static_cast<OUString*>(pEntry->GetUserData()); bool bChecked = m_pRadioLB->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED; sal_uLong nPos = m_pRadioLB->GetEntryPos( pEntry ); m_pRadioLB->RemoveEntry( pEntry ); @@ -228,7 +228,7 @@ SvxMultiPathDialog::~SvxMultiPathDialog() while ( nPos-- ) { SvTreeListEntry* pEntry = m_pRadioLB->GetEntry( nPos ); - delete (OUString*)pEntry->GetUserData(); + delete static_cast<OUString*>(pEntry->GetUserData()); } delete m_pRadioLB; @@ -238,7 +238,7 @@ SvxPathSelectDialog::~SvxPathSelectDialog() { sal_uInt16 nPos = m_pPathLB->GetEntryCount(); while ( nPos-- ) - delete (OUString*)m_pPathLB->GetEntryData(nPos); + delete static_cast<OUString*>(m_pPathLB->GetEntryData(nPos)); } OUString SvxMultiPathDialog::GetPath() const @@ -251,12 +251,12 @@ OUString SvxMultiPathDialog::GetPath() const { SvTreeListEntry* pEntry = m_pRadioLB->GetEntry(i); if ( m_pRadioLB->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) - sWritable = *(OUString*)pEntry->GetUserData(); + sWritable = *static_cast<OUString*>(pEntry->GetUserData()); else { if ( !sNewPath.isEmpty() ) sNewPath += OUString(cDelim); - sNewPath += *(OUString*)pEntry->GetUserData(); + sNewPath += *static_cast<OUString*>(pEntry->GetUserData()); } } if ( !sNewPath.isEmpty() ) @@ -275,7 +275,7 @@ OUString SvxPathSelectDialog::GetPath() const { if ( !sNewPath.isEmpty() ) sNewPath += OUString(cDelim); - sNewPath += *(OUString*)m_pPathLB->GetEntryData(i); + sNewPath += *static_cast<OUString*>(m_pPathLB->GetEntryData(i)); } return sNewPath; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 801f94980cf1..0a2004860933 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -108,7 +108,7 @@ void SFTreeListBox::delUserData( SvTreeListEntry* pEntry ) { if ( pEntry ) { - SFEntry* pUserData = (SFEntry*)pEntry->GetUserData(); + SFEntry* pUserData = static_cast<SFEntry*>(pEntry->GetUserData()); if ( pUserData ) { delete pUserData; @@ -392,7 +392,7 @@ void SFTreeListBox::RequestingChildren( SvTreeListEntry* pEntry ) { return; } - userData = (SFEntry*)pEntry->GetUserData(); + userData = static_cast<SFEntry*>(pEntry->GetUserData()); Reference< browse::XBrowseNode > node; Reference< XModel > model; @@ -610,7 +610,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) { return 0; } - userData = (SFEntry*)pEntry->GetUserData(); + userData = static_cast<SFEntry*>(pEntry->GetUserData()); Reference< browse::XBrowseNode > node; if ( userData ) @@ -644,7 +644,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) { return 0; } - userData = (SFEntry*)pEntry->GetUserData(); + userData = static_cast<SFEntry*>(pEntry->GetUserData()); if ( userData ) { Reference< browse::XBrowseNode > node; @@ -687,7 +687,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) SvTreeListEntry* pParent = m_pScriptsBox->GetParent( pEntry ); while ( pParent && !mspNode.is() ) { - SFEntry* mspUserData = (SFEntry*)pParent->GetUserData(); + SFEntry* mspUserData = static_cast<SFEntry*>(pParent->GetUserData()); mspNode.set( mspUserData->GetNode() , UNO_QUERY ); pParent = m_pScriptsBox->GetParent( pParent ); } @@ -776,7 +776,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvTreeListEn Reference< browse::XBrowseNode > node; if ( pEntry ) { - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = static_cast<SFEntry*>(pEntry->GetUserData()); if ( userData ) { node = userData->GetNode(); @@ -791,7 +791,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvTreeListEntry* pEntry ) Reference< XModel > model; if ( pEntry ) { - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = static_cast<SFEntry*>(pEntry->GetUserData()); if ( userData ) { model = userData->GetModel(); @@ -960,7 +960,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) // loaded, this will prevent RequestingChildren ( called // from vcl via RequestingChildren ) from // creating new ( duplicate ) children - SFEntry* userData = (SFEntry*)pEntry->GetUserData(); + SFEntry* userData = static_cast<SFEntry*>(pEntry->GetUserData()); if ( userData && !userData->isLoaded() ) { userData->setLoaded(); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 2079666c9f51..58505ff614e2 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -444,8 +444,8 @@ public: SvxConfigEntry* GetTopLevelSelection() { - return (SvxConfigEntry*) m_pTopLevelListBox->GetEntryData( - m_pTopLevelListBox->GetSelectEntryPos() ); + return static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( + m_pTopLevelListBox->GetSelectEntryPos() )); } /** identifies the module in the given frame. If the frame is <NULL/>, a default diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 2a2336afd9d1..136fe18ab8da 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -249,7 +249,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet* ) if(pImpl->xPrSetInfo->hasPropertyByName(sPunct)) { Any aVal = pImpl->xPrSet->getPropertyValue(sPunct); - bKernWesternText = !*(sal_Bool*)aVal.getValue(); + bKernWesternText = !*static_cast<sal_Bool const *>(aVal.getValue()); } } else diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index a4474744e73b..75869bc6c3c1 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1345,7 +1345,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default. OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); - const NfCurrencyEntry* pCurr = (const NfCurrencyEntry*) m_pCurrencyLB->GetSelectEntryData(); + const NfCurrencyEntry* pCurr = static_cast<const NfCurrencyEntry*>(m_pCurrencyLB->GetSelectEntryData()); OUString sNewCurr; if ( pCurr ) sNewCurr = SvtSysLocaleOptions::CreateCurrencyConfigString( diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3c01c4fe01fa..03fe25b2b1bf 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -666,7 +666,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) { Sequence< OUString > aParamList = m_pParamDlg->GetParameters(); sal_Int32 i, nSize = aParamList.getLength(); - rtl_uString** pParamArr = (rtl_uString**)rtl_allocateMemory( sizeof(rtl_uString*) * nSize ); + rtl_uString** pParamArr = static_cast<rtl_uString**>(rtl_allocateMemory( sizeof(rtl_uString*) * nSize )); rtl_uString** pParamArrIter = pParamArr; const OUString* pList = aParamList.getConstArray(); for ( i = 0; i < nSize; ++i ) diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index c43af1c7e335..1c7df8c7c879 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -105,9 +105,9 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) SvxOpenCLTabPage::~SvxOpenCLTabPage() { for ( sal_uInt16 i = 0; i < mpBlackList->GetEntryCount(); ++i ) - delete (OpenCLConfig::ImplMatcher*)mpBlackList->GetEntry(i)->GetUserData(); + delete static_cast<OpenCLConfig::ImplMatcher*>(mpBlackList->GetEntry(i)->GetUserData()); for ( sal_uInt16 i = 0; i < mpWhiteList->GetEntryCount(); ++i ) - delete (OpenCLConfig::ImplMatcher*)mpWhiteList->GetEntry(i)->GetUserData(); + delete static_cast<OpenCLConfig::ImplMatcher*>(mpWhiteList->GetEntry(i)->GetUserData()); delete mpBlackList; delete mpWhiteList; } @@ -153,7 +153,7 @@ void fillListBox(SvSimpleTable* pListBox, const OpenCLConfig::ImplMatcherSet& rS pListBox->SetUpdateMode(false); // kill added UserData to treeitem for ( sal_uInt16 i = 0; i < pListBox->GetEntryCount(); ++i ) - delete (OpenCLConfig::ImplMatcher*)pListBox->GetEntry(i)->GetUserData(); + delete static_cast<OpenCLConfig::ImplMatcher*>(pListBox->GetEntry(i)->GetUserData()); pListBox->Clear(); for (auto i = rSet.cbegin(); i != rSet.cend(); ++i) @@ -278,7 +278,7 @@ const OpenCLConfig::ImplMatcher& findCurrentEntry(OpenCLConfig::ImplMatcherSet& { SvTreeListEntry* pEntry = pListBox->FirstSelected() ; - const OpenCLConfig::ImplMatcher* pSet = (OpenCLConfig::ImplMatcher*)pEntry->GetUserData(); + const OpenCLConfig::ImplMatcher* pSet = static_cast<OpenCLConfig::ImplMatcher*>(pEntry->GetUserData()); for (auto i = rSet.cbegin(); i != rSet.cend(); ++i) { diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index a92f7896523a..747b310bf612 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -248,7 +248,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) SvxPathTabPage::~SvxPathTabPage() { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) - delete (PathUserData_Impl*)pPathBox->GetEntry(i)->GetUserData(); + delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData()); delete pPathBox; delete pImpl; } @@ -267,7 +267,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) { - PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pPathBox->GetEntry(i)->GetUserData(); + PathUserData_Impl* pPathImpl = static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData()); sal_uInt16 nRealId = pPathImpl->nRealId; if ( pPathImpl->eState == SfxItemState::SET ) SetPathList( nRealId, pPathImpl->sUserPath, pPathImpl->sWritablePath ); @@ -412,7 +412,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) SvTreeListEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) { - PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); + PathUserData_Impl* pPathImpl = static_cast<PathUserData_Impl*>(pEntry->GetUserData()); OUString aOldPath = pImpl->m_aDefOpt.GetDefaultPath( pPathImpl->nRealId ); if ( !aOldPath.isEmpty() ) @@ -473,7 +473,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } OUString sInternal, sUser, sWritable; - PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); + PathUserData_Impl* pPathImpl = static_cast<PathUserData_Impl*>(pEntry->GetUserData()); bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sUser = pPathImpl->sUserPath; @@ -502,7 +502,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) { pPathBox->SetEntryText( Convert_Impl( sNewPathStr ), pEntry, 1 ); nPos = (sal_uInt16)pPathBox->GetModel()->GetAbsPos( pEntry ); - pPathImpl = (PathUserData_Impl*)pPathBox->GetEntry(nPos)->GetUserData(); + pPathImpl = static_cast<PathUserData_Impl*>(pPathBox->GetEntry(nPos)->GetUserData()); pPathImpl->eState = SfxItemState::SET; pPathImpl->sWritablePath = sNewPathStr; if ( SvtPathOptions::PATH_WORK == pPathImpl->nRealId ) @@ -531,11 +531,11 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); - sal_uInt16 nPos = ( pEntry != NULL ) ? ( (PathUserData_Impl*)pEntry->GetUserData() )->nRealId : 0; + sal_uInt16 nPos = ( pEntry != NULL ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0; OUString sInternal, sUser, sWritable; if ( pEntry ) { - PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); + PathUserData_Impl* pPathImpl = static_cast<PathUserData_Impl*>(pEntry->GetUserData()); bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sUser = pPathImpl->sUserPath; @@ -593,7 +593,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) pPathBox->SetEntryText( Convert_Impl( sFullPath ), pEntry, 1 ); // save modified flag - PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); + PathUserData_Impl* pPathImpl = static_cast<PathUserData_Impl*>(pEntry->GetUserData()); pPathImpl->eState = SfxItemState::SET; pPathImpl->sUserPath = sUser; pPathImpl->sWritablePath = sWritable; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index a8b005d3cf6e..36d63573a9f1 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -560,7 +560,7 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog() // if Child (has parent), then OptionsPageInfo if(pTreeLB->GetParent(pEntry)) { - OptionsPageInfo *pPageInfo = (OptionsPageInfo *)pEntry->GetUserData(); + OptionsPageInfo *pPageInfo = static_cast<OptionsPageInfo *>(pEntry->GetUserData()); if(pPageInfo->m_pPage) { pPageInfo->m_pPage->FillUserData(); @@ -596,7 +596,7 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog() { if(!pTreeLB->GetParent(pEntry)) { - OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)pEntry->GetUserData(); + OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData()); if ( pGroupInfo && pGroupInfo->m_pExtPage ) delete pGroupInfo->m_pExtPage; delete pGroupInfo; @@ -649,11 +649,11 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) { if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) { - OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pCurrentPageEntry->GetUserData(); + OptionsPageInfo* pPageInfo = static_cast<OptionsPageInfo*>(pCurrentPageEntry->GetUserData()); if ( pPageInfo->m_pPage ) { OptionsGroupInfo* pGroupInfo = - (OptionsGroupInfo*)pTreeLB->GetParent( pCurrentPageEntry )->GetUserData(); + static_cast<OptionsGroupInfo*>(pTreeLB->GetParent( pCurrentPageEntry )->GetUserData()); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) pPageInfo->m_pPage->Reset( pColorPageItemSet ); else @@ -670,11 +670,11 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) pTreeLB->EndSelection(); if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) { - OptionsPageInfo* pPageInfo = (OptionsPageInfo *)pCurrentPageEntry->GetUserData(); + OptionsPageInfo* pPageInfo = static_cast<OptionsPageInfo *>(pCurrentPageEntry->GetUserData()); if ( pPageInfo->m_pPage ) { OptionsGroupInfo* pGroupInfo = - (OptionsGroupInfo *)pTreeLB->GetParent(pCurrentPageEntry)->GetUserData(); + static_cast<OptionsGroupInfo *>(pTreeLB->GetParent(pCurrentPageEntry)->GetUserData()); if ( RID_SVXPAGE_COLOR != pPageInfo->m_nPageId && pPageInfo->m_pPage->HasExchangeSupport() ) { @@ -695,11 +695,11 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) { if ( pTreeLB->GetParent( pEntry ) ) { - OptionsPageInfo* pPageInfo = (OptionsPageInfo *)pEntry->GetUserData(); + OptionsPageInfo* pPageInfo = static_cast<OptionsPageInfo *>(pEntry->GetUserData()); if ( pPageInfo->m_pPage && !pPageInfo->m_pPage->HasExchangeSupport() ) { OptionsGroupInfo* pGroupInfo = - (OptionsGroupInfo*)pTreeLB->GetParent(pEntry)->GetUserData(); + static_cast<OptionsGroupInfo*>(pTreeLB->GetParent(pEntry)->GetUserData()); pPageInfo->m_pPage->FillItemSet(pGroupInfo->m_pOutItemSet); } @@ -757,7 +757,7 @@ void OfaTreeOptionsDialog::ApplyItemSets() { if(!pTreeLB->GetParent(pEntry)) { - OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo *)pEntry->GetUserData(); + OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo *>(pEntry->GetUserData()); if(pGroupInfo->m_pOutItemSet) { if(pGroupInfo->m_pShell) @@ -838,7 +838,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() // restore only selection of a leaf if ( pTreeLB->GetParent( pTemp ) && pTemp->GetUserData() ) { - OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pTemp->GetUserData(); + OptionsPageInfo* pPageInfo = static_cast<OptionsPageInfo*>(pTemp->GetUserData()); OUString sPageURL = pPageInfo->m_sPageURL; if ( bMustExpand ) { @@ -939,12 +939,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() TabPage* pOldPage = NULL; TabPage* pNewPage = NULL; OptionsPageInfo* pOptPageInfo = ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) - ? (OptionsPageInfo*)pCurrentPageEntry->GetUserData() : NULL; + ? static_cast<OptionsPageInfo*>(pCurrentPageEntry->GetUserData()) : NULL; if ( pOptPageInfo && pOptPageInfo->m_pPage && pOptPageInfo->m_pPage->IsVisible() ) { pOldPage = pOptPageInfo->m_pPage; - OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)pTreeLB->GetParent(pCurrentPageEntry)->GetUserData(); + OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pTreeLB->GetParent(pCurrentPageEntry)->GetUserData()); int nLeave = SfxTabPage::LEAVE_PAGE; if ( RID_SVXPAGE_COLOR != pOptPageInfo->m_nPageId && pOptPageInfo->m_pPage->HasExchangeSupport() ) nLeave = pOptPageInfo->m_pPage->DeactivatePage( pGroupInfo->m_pOutItemSet ); @@ -965,7 +965,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() } else if ( pCurrentPageEntry && !pTreeLB->GetParent( pCurrentPageEntry ) ) { - OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)pCurrentPageEntry->GetUserData(); + OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pCurrentPageEntry->GetUserData()); if ( pGroupInfo && pGroupInfo->m_pExtPage ) { pGroupInfo->m_pExtPage->Hide(); @@ -973,8 +973,8 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() } } - OptionsPageInfo *pPageInfo = (OptionsPageInfo *)pEntry->GetUserData(); - OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo *)pParent->GetUserData(); + OptionsPageInfo *pPageInfo = static_cast<OptionsPageInfo *>(pEntry->GetUserData()); + OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo *>(pParent->GetUserData()); if(!pPageInfo->m_pPage && pPageInfo->m_nPageId > 0) { if(pGroupInfo->m_bLoadError) @@ -1014,7 +1014,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() { if(!pTreeLB->GetParent(pTemp) && pTemp != pEntry) { - OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pTemp->GetUserData(); + OptionsGroupInfo* pTGInfo = static_cast<OptionsGroupInfo *>(pTemp->GetUserData()); if(pTGInfo->m_pModule == pOldModule) { pTGInfo->m_pModule = pGroupInfo->m_pModule; @@ -1572,7 +1572,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) || aFactory == "com.sun.star.text.WebDocument" || aFactory == "com.sun.star.text.GlobalDocument" ) { - SfxModule* pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER)); + SfxModule* pSwMod = *reinterpret_cast<SfxModule**>(GetAppData(SHL_WRITER)); if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { if ( aFactory == "com.sun.star.text.WebDocument" ) @@ -1621,7 +1621,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rCalcArray = aDlgResource.GetCalcArray(); - SfxModule* pScMod = ( *( SfxModule** ) GetAppData( SHL_CALC ) ); + SfxModule* pScMod = *reinterpret_cast<SfxModule**>(GetAppData( SHL_CALC )); setGroupName( "Calc", rCalcArray.GetString(0) ); nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS ); const sal_uInt16 nCount = static_cast< const sal_uInt16 >( rCalcArray.Count() ); @@ -1638,7 +1638,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) } // Impress options - SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) ); + SfxModule* pSdMod = *reinterpret_cast<SfxModule**>(GetAppData( SHL_DRAW )); if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) { if ( aFactory == "com.sun.star.presentation.PresentationDocument" ) @@ -1692,7 +1692,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) ) { ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray(); - SfxModule* pSmMod = (*(SfxModule**) GetAppData(SHL_SM)); + SfxModule* pSmMod = *reinterpret_cast<SfxModule**>(GetAppData(SHL_SM)); setGroupName( "Math", rStarMathArray.GetString(0) ); nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); for ( i = 1; i < rStarMathArray.Count(); ++i ) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 95ecf0505770..ca6c61ffce4d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -320,7 +320,7 @@ void OfaImpBrwString::Paint( rDev.DrawText( rPos, GetText() ); if(pEntry->GetUserData()) { - ImpUserData* pUserData = (ImpUserData* )pEntry->GetUserData(); + ImpUserData* pUserData = static_cast<ImpUserData*>(pEntry->GetUserData()); Point aNewPos(rPos); aNewPos.X() += rDev.GetTextWidth(GetText()); vcl::Font aOldFont( rDev.GetFont()); @@ -469,9 +469,9 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16 OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() { - delete (ImpUserData*) m_pCheckLB->GetUserData( REPLACE_BULLETS ); - delete (ImpUserData*) m_pCheckLB->GetUserData( APPLY_NUMBERING ); - delete (ImpUserData*) m_pCheckLB->GetUserData( MERGE_SINGLE_LINE_PARA ); + delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( REPLACE_BULLETS )); + delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( APPLY_NUMBERING )); + delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( MERGE_SINGLE_LINE_PARA )); delete pCheckButtonData; delete m_pCheckLB; } @@ -695,7 +695,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) nSelEntryPos == APPLY_NUMBERING) { boost::scoped_ptr<SvxCharacterMap> pMapDlg(new SvxCharacterMap(this)); - ImpUserData* pUserData = (ImpUserData*)m_pCheckLB->FirstSelected()->GetUserData(); + ImpUserData* pUserData = static_cast<ImpUserData*>(m_pCheckLB->FirstSelected()->GetUserData()); pMapDlg->SetCharFont(*pUserData->pFont); pMapDlg->SetChar( (*pUserData->pString)[0] ); if(RET_OK == pMapDlg->Execute()) @@ -849,7 +849,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, get(m_pReplaceTLB, "tabview"); m_pReplaceTLB->set_height_request(16 * GetTextHeight()); - SfxModule *pMod = *(SfxModule**)GetAppData(SHL_WRITER); + SfxModule *pMod = *reinterpret_cast<SfxModule**>(GetAppData(SHL_WRITER)); bSWriter = pMod == SfxModule::GetActiveModule(); LanguageTag aLanguageTag( eLastDialogLanguage ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 070763e07a99..67c13dd69447 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1154,8 +1154,8 @@ IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox ) if ( m_pWestFontNameLB == pNameBox || m_pEastFontNameLB == pNameBox || m_pCTLFontNameLB == pNameBox ) { - FillStyleBox_Impl( (FontNameBox*)pNameBox ); - FillSizeBox_Impl( (FontNameBox*)pNameBox ); + FillStyleBox_Impl( static_cast<FontNameBox*>(pNameBox) ); + FillSizeBox_Impl( static_cast<FontNameBox*>(pNameBox) ); } return 0; } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 401cc6b4b537..b1fb6102f323 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1281,7 +1281,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) { if (pRelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) - nRel = ((RelationMap *)pRelLB->GetSelectEntryData())->nRelation; + nRel = static_cast<RelationMap *>(pRelLB->GetSelectEntryData())->nRelation; FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT); } @@ -1388,7 +1388,7 @@ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) if (nPos != LISTBOX_ENTRY_NOTFOUND) { - RelationMap *pEntry = (RelationMap *)rRelationLB.GetEntryData(nPos); + RelationMap *pEntry = static_cast<RelationMap *>(rRelationLB.GetEntryData(nPos)); nRel = pEntry->nRelation; } @@ -1406,7 +1406,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo { if (rRelationLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) { - sal_uLong nRel = ((RelationMap *)rRelationLB.GetSelectEntryData())->nLBRelation; + sal_uLong nRel = static_cast<RelationMap *>(rRelationLB.GetSelectEntryData())->nLBRelation; std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap); SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId; @@ -1476,7 +1476,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, m_nOldV = m_pVMap[nPos].nAlign; nPos = m_pVertToLB->GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) - m_nOldVRel = ((RelationMap *)m_pVertToLB->GetEntryData(nPos))->nRelation; + m_nOldVRel = static_cast<RelationMap *>(m_pVertToLB->GetEntryData(nPos))->nRelation; } nPos = m_pHoriLB->GetSelectEntryPos(); @@ -1486,7 +1486,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nPos = m_pHoriToLB->GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) - m_nOldHRel = ((RelationMap *)m_pHoriToLB->GetEntryData(nPos))->nRelation; + m_nOldHRel = static_cast<RelationMap *>(m_pHoriToLB->GetEntryData(nPos))->nRelation; } bool bEnable = true; @@ -1694,7 +1694,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u { for (sal_Int32 i = 0; i < rLB.GetEntryCount(); i++) { - RelationMap *pEntry = (RelationMap *)rLB.GetEntryData(i); + RelationMap *pEntry = static_cast<RelationMap *>(rLB.GetEntryData(i)); if (pEntry->nLBRelation == LB_REL_CHAR) // Default { rLB.SelectEntryPos(i); @@ -1761,7 +1761,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u default: if (rLB.GetEntryCount()) { - RelationMap *pEntry = (RelationMap *)rLB.GetEntryData(rLB.GetEntryCount() - 1); + RelationMap *pEntry = static_cast<RelationMap *>(rLB.GetEntryData(rLB.GetEntryCount() - 1)); nRel = pEntry->nRelation; } break; @@ -1769,7 +1769,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u for (sal_Int32 i = 0; i < rLB.GetEntryCount(); i++) { - RelationMap *pEntry = (RelationMap *)rLB.GetEntryData(i); + RelationMap *pEntry = static_cast<RelationMap *>(rLB.GetEntryData(i)); if (pEntry->nRelation == nRel) { rLB.SelectEntryPos(i); |