diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 18:57:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:09:17 +0100 |
commit | 989f0ec5739ca00873d1c7b2b1617b1f354215f4 (patch) | |
tree | 871f80e9f92953edf65fd6d8705b97efa08a643e /basctl/source | |
parent | 03621417bff91364a83a50d6b7ea7db228bbec09 (diff) |
Clean up C-style casts from pointers to void
Change-Id: I0db5c02e9fbc09fe7d85e46f1434c86b5b5b4853
Diffstat (limited to 'basctl/source')
-rw-r--r-- | basctl/source/basicide/basicbox.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/basobj3.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/managelang.cxx | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 8abae513fe10..d4cbae63aa88 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -444,7 +444,7 @@ void LanguageBox::ClearBox() sal_Int32 nCount = GetEntryCount(); for ( sal_Int32 i = 0; i < nCount; ++i ) { - LanguageEntry* pEntry = (LanguageEntry*)GetEntryData(i); + LanguageEntry* pEntry = static_cast<LanguageEntry*>(GetEntryData(i)); delete pEntry; } ListBox::Clear(); @@ -452,7 +452,7 @@ void LanguageBox::ClearBox() void LanguageBox::SetLanguage() { - LanguageEntry* pEntry = (LanguageEntry*)GetSelectEntryData(); + LanguageEntry* pEntry = static_cast<LanguageEntry*>(GetSelectEntryData()); if ( pEntry ) GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale ); } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index ca647a855a90..4cb705d730f7 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -100,7 +100,7 @@ OUString getTextEngineText (ExtTextEngine& rEngine) aMemStream.SetLineDelimiter( LINEEND_LF ); rEngine.Write( aMemStream ); sal_Size nSize = aMemStream.Tell(); - OUString aText( (const sal_Char*)aMemStream.GetData(), + OUString aText( static_cast<const sal_Char*>(aMemStream.GetData()), nSize, RTL_TEXTENCODING_UTF8 ); return aText; } diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 25a876878aed..87f5790e2765 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::container; extern "C" { SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void* pPtr ) { - return HandleBasicError( (StarBASIC*)pPtr ); + return HandleBasicError( static_cast<StarBASIC*>(pPtr) ); } } diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 786574e8365c..4f2b2c55014b 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -479,7 +479,7 @@ LibPage::~LibPage() sal_uInt16 nCount = m_pBasicsBox->GetEntryCount(); for ( sal_uInt16 i = 0; i < nCount; ++i ) { - DocumentEntry* pEntry = (DocumentEntry*)m_pBasicsBox->GetEntryData( i ); + DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( i )); delete pEntry; } } @@ -1350,7 +1350,7 @@ void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocati void LibPage::SetCurLib() { sal_uInt16 nSelPos = m_pBasicsBox->GetSelectEntryPos(); - DocumentEntry* pEntry = (DocumentEntry*)m_pBasicsBox->GetEntryData( nSelPos ); + DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( nSelPos )); if ( pEntry ) { ScriptDocument aDocument( pEntry->GetDocument() ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index b34dbeb1b040..57b9e110a9cc 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -706,7 +706,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) SvTreeListEntry* pParentEntry = m_pBasicBox->GetParent( pCurEntry ); if ( pParentEntry ) { - DocumentEntry* pDocumentEntry = (DocumentEntry*)pParentEntry->GetUserData(); + DocumentEntry* pDocumentEntry = static_cast<DocumentEntry*>(pParentEntry->GetUserData()); if (pDocumentEntry) aDocument = pDocumentEntry->GetDocument(); } diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 41ac41484bed..fb513dc637db 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -128,7 +128,7 @@ void ManageLanguageDialog::ClearLanguageBox() sal_uInt16 i, nCount = m_pLanguageLB->GetEntryCount(); for ( i = 0; i < nCount; ++i ) { - LanguageEntry* pEntry = (LanguageEntry*)( m_pLanguageLB->GetEntryData(i) ); + LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData(i)); delete pEntry; } m_pLanguageLB->Clear(); @@ -164,7 +164,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) for ( i = 0; i < nCount; ++i ) { sal_uInt16 nSelPos = m_pLanguageLB->GetSelectEntryPos(i); - LanguageEntry* pEntry = (LanguageEntry*)( m_pLanguageLB->GetEntryData( nSelPos ) ); + LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nSelPos )); if ( pEntry ) aLocaleSeq[i] = pEntry->m_aLocale; } @@ -185,7 +185,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) { sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); - LanguageEntry* pSelectEntry = (LanguageEntry*)( m_pLanguageLB->GetEntryData( nPos ) ); + LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos )); if ( pSelectEntry && !pSelectEntry->m_bIsDefault ) { // set new default entry |