mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:useuniqueptr in OfaLanguagesTabPage

Browse Source 
Change-Id: I9fcbac58f1b0a13b83dc24c8e2f256016b5f31b8
Reviewed-on: https://gerrit.libreoffice.org/60973
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-09-25 15:25:29 +02:00
parent 7f8167d04d
commit 08730055c9
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cui/source/options/optgdlg.cxx
View File

@@ -1313,7 +1313,7 @@ VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( TabPageParent pParent, const Sfx
return VclPtr<OfaLanguagesTabPage>::Create(pParent.pParent, *rAttrSet); return VclPtr<OfaLanguagesTabPage>::Create(pParent.pParent, *rAttrSet);
} }
static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) static void lcl_Update(std::unique_ptr<SfxVoidItem> pInvalidItems[], std::unique_ptr<SfxBoolItem> pBoolItems[], sal_uInt16 nCount)
{ {
SfxViewFrame* pCurrentFrm = SfxViewFrame::Current(); SfxViewFrame* pCurrentFrm = SfxViewFrame::Current();
SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst(); SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst();
@@ -1329,11 +1329,6 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
} }
pViewFrm = SfxViewFrame::GetNext(*pViewFrm); pViewFrm = SfxViewFrame::GetNext(*pViewFrm);
} }
for(sal_Int16 i = 0; i < nCount; i++)
{
delete pInvalidItems[i];
delete pBoolItems[i] ;
}
} }
bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
@@ -1533,15 +1528,15 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
//iterate over all bindings to invalidate vertical text direction //iterate over all bindings to invalidate vertical text direction
const sal_uInt16 STATE_COUNT = 2; const sal_uInt16 STATE_COUNT = 2;
SfxBoolItem* pBoolItems[STATE_COUNT]; std::unique_ptr<SfxBoolItem> pBoolItems[STATE_COUNT];
pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, false); pBoolItems[0].reset(new SfxBoolItem(SID_VERTICALTEXT_STATE, false));
pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, false); pBoolItems[1].reset(new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, false));
SfxVoidItem* pInvalidItems[STATE_COUNT]; std::unique_ptr<SfxVoidItem> pInvalidItems[STATE_COUNT];
pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE); pInvalidItems[0].reset(new SfxVoidItem(SID_VERTICALTEXT_STATE));
pInvalidItems[1] = new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL); pInvalidItems[1].reset(new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL));
lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT); lcl_Update(pInvalidItems, pBoolItems, STATE_COUNT);
} }
if ( m_pCTLSupportCB->IsValueChangedFromSaved() ) if ( m_pCTLSupportCB->IsValueChangedFromSaved() )
@@ -1553,11 +1548,11 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
pLangConfig->aLanguageOptions.SetCTLFontEnabled( m_pCTLSupportCB->IsChecked() ); pLangConfig->aLanguageOptions.SetCTLFontEnabled( m_pCTLSupportCB->IsChecked() );
const sal_uInt16 STATE_COUNT = 1; const sal_uInt16 STATE_COUNT = 1;
SfxBoolItem* pBoolItems[STATE_COUNT]; std::unique_ptr<SfxBoolItem> pBoolItems[STATE_COUNT];
pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, false); pBoolItems[0].reset(new SfxBoolItem(SID_CTLFONT_STATE, false));
SfxVoidItem* pInvalidItems[STATE_COUNT]; std::unique_ptr<SfxVoidItem> pInvalidItems[STATE_COUNT];
pInvalidItems[0] = new SfxVoidItem(SID_CTLFONT_STATE); pInvalidItems[0].reset(new SfxVoidItem(SID_CTLFONT_STATE));
lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT); lcl_Update(pInvalidItems, pBoolItems, STATE_COUNT);
} }
if ( pLangConfig->aSysLocaleOptions.IsModified() ) if ( pLangConfig->aSysLocaleOptions.IsModified() )