summaryrefslogtreecommitdiffstats
path: root/cui/source/options
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-28 19:00:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-28 19:09:19 +0100
commit170012948c063521499ab685906354f184ac33be (patch)
treea13e756e8e85b0fb2b8795f5d0f60bed98836b22 /cui/source/options
parentClean up C-style casts from pointers to void (diff)
downloadcore-170012948c063521499ab685906354f184ac33be.tar.gz
core-170012948c063521499ab685906354f184ac33be.zip
Clean up C-style casts from pointers to void
Change-Id: I544fc582d375d1e49f84309e722f669d734cf029
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/optasian.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx2
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optopencl.cxx8
-rw-r--r--cui/source/options/optpath.cxx16
-rw-r--r--cui/source/options/treeopt.cxx40
6 files changed, 35 insertions, 35 deletions
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 )