diff options
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/multipat.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 16 |
7 files changed, 35 insertions, 35 deletions
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(); |