summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:13:27 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:22 +0100
commitb58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (patch)
treebc7dcc71437367b193cb18dc5011c98ceb8c2c8b /cui/source/options
parent5185569e502240a064ef78d06d9de7fbbd93f3b6 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I7257532b90e3e393d56d5349531c9ad397523bca
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/certpath.cxx2
-rw-r--r--cui/source/options/cfgchart.hxx2
-rw-r--r--cui/source/options/connpooloptions.cxx6
-rw-r--r--cui/source/options/connpoolsettings.hxx2
-rw-r--r--cui/source/options/dbregister.cxx12
-rw-r--r--cui/source/options/dbregistersettings.hxx2
-rw-r--r--cui/source/options/fontsubs.cxx12
-rw-r--r--cui/source/options/optaboutconfig.cxx2
-rw-r--r--cui/source/options/optaccessibility.cxx2
-rw-r--r--cui/source/options/optasian.cxx18
-rw-r--r--cui/source/options/optchart.cxx6
-rw-r--r--cui/source/options/optcolor.cxx14
-rw-r--r--cui/source/options/optdict.cxx10
-rw-r--r--cui/source/options/optfltr.cxx10
-rw-r--r--cui/source/options/optgdlg.cxx16
-rw-r--r--cui/source/options/optgdlg.hxx2
-rw-r--r--cui/source/options/optinet2.cxx8
-rw-r--r--cui/source/options/optinet2.hxx2
-rw-r--r--cui/source/options/optjava.cxx24
-rw-r--r--cui/source/options/optlingu.cxx38
-rw-r--r--cui/source/options/optmemory.hxx2
-rw-r--r--cui/source/options/optopencl.cxx2
-rw-r--r--cui/source/options/optpath.cxx10
-rw-r--r--cui/source/options/optsave.cxx10
-rw-r--r--cui/source/options/optupdt.cxx2
-rw-r--r--cui/source/options/personalization.cxx2
-rw-r--r--cui/source/options/radiobtnbox.cxx2
-rw-r--r--cui/source/options/treeopt.cxx104
-rw-r--r--cui/source/options/webconninfo.cxx8
29 files changed, 166 insertions, 166 deletions
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 08be91f1fb71..dc6bfc4dd413 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -136,7 +136,7 @@ IMPL_LINK_NOARG_TYPED(CertPathDialog, OKHdl_Impl, Button*, void)
OUString CertPathDialog::getDirectory() const
{
SvTreeListEntry* pEntry = m_pCertPathList->FirstSelected();
- void* pCertPath = pEntry ? pEntry->GetUserData() : NULL;
+ void* pCertPath = pEntry ? pEntry->GetUserData() : nullptr;
return pCertPath ? *static_cast<OUString*>(pCertPath) : OUString();
}
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 28b7f67361ed..8ef95e307e20 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -94,7 +94,7 @@ public:
SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& );
SvxChartColorTableItem( const SvxChartColorTableItem& );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void SetOptions( SvxChartOptions* pOpts ) const;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 6321f2aa019d..4f09494d9636 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -163,7 +163,7 @@ namespace offapp
if ( ( GetCurRow() >= 0 ) && ( GetCurRow() < m_aSettings.size() ) )
return &(*(m_aSettings.begin() + GetCurRow()));
- return NULL;
+ return nullptr;
}
@@ -247,7 +247,7 @@ namespace offapp
::svt::CellController* DriverListControl::GetController( long /*nRow*/, sal_uInt16 /*nCol*/ )
{
- return NULL;
+ return nullptr;
}
@@ -415,7 +415,7 @@ namespace offapp
IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnDriverRowChanged, const DriverPooling*, pDriverPos, void )
{
- bool bValidRow = (NULL != pDriverPos);
+ bool bValidRow = (nullptr != pDriverPos);
m_pDriverPoolingEnabled->Enable(bValidRow && m_pEnablePooling->IsChecked());
m_pTimeoutLabel->Enable(bValidRow);
m_pTimeout->Enable(bValidRow);
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 3c29a8db1bb7..3aafcae54a9a 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -78,7 +78,7 @@ namespace offapp
DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings );
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const DriverPoolingSettings& getSettings() const { return m_aSettings; }
};
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index fbec45943505..cd439f268497 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -103,8 +103,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
m_aTypeText ( CUI_RES( RID_SVXSTR_TYPE ) ),
m_aPathText ( CUI_RES( RID_SVXSTR_PATH ) ),
- m_pPathBox ( NULL ),
- m_pCurEntry ( NULL ),
+ m_pPathBox ( nullptr ),
+ m_pCurEntry ( nullptr ),
m_nOldCount ( 0 ),
m_bModified ( false )
{
@@ -292,7 +292,7 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void)
IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool)
{
- EditHdl(NULL);
+ EditHdl(nullptr);
return false;
}
@@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void)
OUString sOldName = SvTabListBox::GetEntryText(pEntry,0);
m_pCurEntry = pEntry;
openLinkDialog( sOldName, pOldRegistration->sLocation, pEntry );
- m_pCurEntry = NULL;
+ m_pCurEntry = nullptr;
}
@@ -397,7 +397,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS
aStr += "\t";
aStr += _sLocation;
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
if ( _bReadOnly )
{
Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) );
@@ -423,7 +423,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O
{
OUString sNewName,sNewLocation;
aDlg->getLink(sNewName,sNewLocation);
- if ( _pEntry == NULL || sNewName != _sOldName || sNewLocation != _sOldLocation )
+ if ( _pEntry == nullptr || sNewName != _sOldName || sNewLocation != _sOldLocation )
{
if ( _pEntry )
{
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index c8bcf65ed1be..12172c01a2d2 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -74,7 +74,7 @@ namespace svx
DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations );
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const DatabaseRegistrations&
getRegistrations() const { return m_aRegistrations; }
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9a9e5ebd82f7..2130435bef02 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -40,7 +40,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet)
, pConfig(new SvtFontSubstConfig)
- , pCheckButtonData(0)
+ , pCheckButtonData(nullptr)
{
get(m_pUseTableCB, "usetable");
get(m_pReplacements, "replacements");
@@ -147,9 +147,9 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
void SvxFontSubstTabPage::dispose()
{
delete pCheckButtonData;
- pCheckButtonData = NULL;
+ pCheckButtonData = nullptr;
delete pConfig;
- pConfig = NULL;
+ pConfig = nullptr;
m_pCheckLB.disposeAndClear();
m_pUseTableCB.clear();
m_pReplacements.clear();
@@ -322,7 +322,7 @@ void SvxFontSubstTabPage::SelectHdl(vcl::Window* pWin)
{
SvTreeListEntry* pEntry = m_pCheckLB->FirstSelected();
- if (m_pCheckLB->NextSelected(pEntry) == 0)
+ if (m_pCheckLB->NextSelected(pEntry) == nullptr)
{
m_pFont1CB->SetText(SvTabListBox::GetEntryText(pEntry, 0));
m_pFont2CB->SetText(SvTabListBox::GetEntryText(pEntry, 1));
@@ -387,12 +387,12 @@ void SvxFontSubstTabPage::CheckEnable()
bApply = false;
else if(m_pCheckLB->GetEntryPos(sEntry) != 0xffffffff)
bApply = false;
- else if(pEntry != 0 && m_pCheckLB->NextSelected(pEntry) != 0)
+ else if(pEntry != nullptr && m_pCheckLB->NextSelected(pEntry) != nullptr)
bApply = false;
else
bApply = true;
- bDelete = pEntry != 0;
+ bDelete = pEntry != nullptr;
m_pApply->Enable(bApply);
m_pDelete->Enable(bDelete);
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 3f003a7543a5..58838fc67505 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -576,7 +576,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void )
IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool )
{
- StandardHdl_Impl(NULL);
+ StandardHdl_Impl(nullptr);
return false;
}
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 4e12f54ae267..3509d76a73a1 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -60,7 +60,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
void SvxAccessibilityOptionsTabPage::dispose()
{
delete m_pImpl;
- m_pImpl = NULL;
+ m_pImpl = nullptr;
m_pAccessibilityTool.clear();
m_pTextSelectionInReadonly.clear();
m_pAnimatedGraphics.clear();
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 131ae70de066..5acd04abc3a8 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -97,7 +97,7 @@ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(Language
DBG_ASSERT( ( it != aChangedLanguagesMap.end() ), "language not available");
if( it != aChangedLanguagesMap.end() )
return it->second;
- return 0;
+ return nullptr;
}
void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
@@ -107,15 +107,15 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
if( itOld == aChangedLanguagesMap.end() )
{
SvxForbiddenChars_Impl* pChar = new SvxForbiddenChars_Impl;
- pChar->bRemoved = 0 == pForbidden;
- pChar->pCharacters = pForbidden ? new ForbiddenCharacters(*pForbidden) : 0;
+ pChar->bRemoved = nullptr == pForbidden;
+ pChar->pCharacters = pForbidden ? new ForbiddenCharacters(*pForbidden) : nullptr;
aChangedLanguagesMap.insert( ::std::make_pair( eLang, pChar ) );
}
else
{
- itOld->second->bRemoved = 0 == pForbidden;
+ itOld->second->bRemoved = nullptr == pForbidden;
delete itOld->second->pCharacters;
- itOld->second->pCharacters = pForbidden ? new ForbiddenCharacters(*pForbidden) : 0;
+ itOld->second->pCharacters = pForbidden ? new ForbiddenCharacters(*pForbidden) : nullptr;
}
}
@@ -157,7 +157,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
void SvxAsianLayoutPage::dispose()
{
delete pImpl;
- pImpl = NULL;
+ pImpl = nullptr;
m_pCharKerningRB.clear();
m_pCharPunctKerningRB.clear();
m_pNoCompressionRB.clear();
@@ -237,7 +237,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
void SvxAsianLayoutPage::Reset( const SfxItemSet* )
{
SfxViewFrame* pCurFrm = SfxViewFrame::Current();
- SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0;
+ SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : nullptr;
Reference< XModel > xModel;
if(pDocSh)
xModel = pDocSh->GetModel();
@@ -405,14 +405,14 @@ IMPL_LINK_TYPED(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void)
pImpl->addForbiddenCharacters(eSelectLanguage, &aSet);
}
else
- pImpl->addForbiddenCharacters(eSelectLanguage, 0);
+ pImpl->addForbiddenCharacters(eSelectLanguage, nullptr);
}
catch (const Exception&)
{
OSL_FAIL("exception in XForbiddenCharacters");
}
}
- pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0);
+ pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : nullptr, bEnable ? &sEnd : nullptr);
}
const sal_uInt16* SvxAsianLayoutPage::GetRanges()
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 44624ddcecb0..d743156bbc4f 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -65,7 +65,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxIt
pChartOptions = new SvxChartOptions;
pColorList = XColorList::CreateStdColorList();
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) == SfxItemState::SET )
{
pColorConfig = (static_cast< SvxChartColorTableItem* >(pItem->Clone()) );
@@ -95,9 +95,9 @@ void SvxDefaultColorOptPage::dispose()
pChartOptions->Commit();
delete pColorConfig;
- pColorConfig = NULL;
+ pColorConfig = nullptr;
delete pChartOptions;
- pChartOptions = NULL;
+ pChartOptions = nullptr;
}
m_pLbChartColors.clear();
m_pValSetColorBox.clear();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index b9656396dca8..825ee32cf82e 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -875,8 +875,8 @@ public:
ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
: VclVBox(pParent)
- , pColorConfig(0)
- , pExtColorConfig(0)
+ , pColorConfig(nullptr)
+ , pExtColorConfig(nullptr)
{
m_pHeaderHB = VclPtr<HeaderBar>::Create(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER);
@@ -979,7 +979,7 @@ void ColorConfigCtrl_Impl::Command( const CommandEvent& rCEvt )
const CommandWheelData* pWheelData = rCEvt.GetWheelData();
if(pWheelData && !pWheelData->IsHorz() && CommandWheelMode::ZOOM != pWheelData->GetMode())
{
- HandleScrollCommand(rCEvt, 0, m_pVScroll);
+ HandleScrollCommand(rCEvt, nullptr, m_pVScroll);
}
}
break;
@@ -1048,8 +1048,8 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet)
, bFillItemSetCalled(false)
- , pColorConfig(0)
- , pExtColorConfig(0)
+ , pColorConfig(nullptr)
+ , pExtColorConfig(nullptr)
{
get(m_pColorSchemeLB, "colorschemelb");
m_pColorSchemeLB->SetStyle(m_pColorSchemeLB->GetStyle() | WB_SORT);
@@ -1092,12 +1092,12 @@ void SvxColorOptionsTabPage::dispose()
pColorConfig->ClearModified();
pColorConfig->EnableBroadcast();
delete pColorConfig;
- pColorConfig = NULL;
+ pColorConfig = nullptr;
pExtColorConfig->ClearModified();
pExtColorConfig->EnableBroadcast();
delete pExtColorConfig;
- pExtColorConfig = NULL;
+ pExtColorConfig = nullptr;
}
m_pColorSchemeLB.clear();
m_pSaveSchemePB.clear();
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 106f634469d9..929179ee96cf 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -179,7 +179,7 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
}
catch(...)
{
- xNewDic = NULL;
+ xNewDic = nullptr;
// error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(),
@@ -417,7 +417,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry)
{
sal_Int32 nLBPos = pAllDictsLB->GetSelectEntryPos();
- if ( pEntry != NULL && nLBPos != LISTBOX_ENTRY_NOTFOUND )
+ if ( pEntry != nullptr && nLBPos != LISTBOX_ENTRY_NOTFOUND )
{
OUString sTmpShort(SvTabListBox::GetEntryText(pEntry, 0));
@@ -547,7 +547,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
aStr += "\t";
aStr += pEntry[i]->getReplacementText();
}
- pWordsLB->InsertEntry(aStr, 0, false, nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos);
+ pWordsLB->InsertEntry(aStr, nullptr, false, nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos);
}
if (pWordsLB->GetEntryCount())
@@ -661,7 +661,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn)
sEntry += aReplaceStr;
}
- SvTreeListEntry* pNewEntry = NULL;
+ SvTreeListEntry* pNewEntry = nullptr;
if(_pEntry) // entry selected in pWordsLB ie action = modify entry
{
pWordsLB->SetEntryText( sEntry, _pEntry );
@@ -670,7 +670,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn)
else
{
_nPos = GetLBInsertPos( aNewWord );
- SvTreeListEntry* pInsEntry = pWordsLB->InsertEntry(sEntry, 0, false,
+ SvTreeListEntry* pInsEntry = pWordsLB->InsertEntry(sEntry, nullptr, false,
_nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : _nPos);
pNewEntry = pInsEntry;
}
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 4f35b27cf43d..08a5eef252b9 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -150,7 +150,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet
sChgToFromCalc(CUI_RES(RID_SVXSTR_CHG_CALC)),
sChgToFromImpress(CUI_RES(RID_SVXSTR_CHG_IMPRESS)),
sChgToFromSmartArt(CUI_RES(RID_SVXSTR_CHG_SMARTART)),
- pCheckButtonData(0)
+ pCheckButtonData(nullptr)
{
get(m_pCheckLBContainer, "checklbcontainer");
@@ -182,7 +182,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
void OfaMSFilterTabPage2::dispose()
{
delete pCheckButtonData;
- pCheckButtonData = NULL;
+ pCheckButtonData = nullptr;
m_pCheckLB.disposeAndClear();
m_pCheckLBContainer.clear();
aHighlightingRB.clear();
@@ -224,7 +224,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
&SvtFilterOptions::SetImpress2PowerPoint },
{ SmartArt, &SvtFilterOptions::IsSmartArt2Shape,
&SvtFilterOptions::SetSmartArt2Shape },
- { InvalidCBEntry, 0, 0 }
+ { InvalidCBEntry, nullptr, nullptr }
};
bool bCheck, bFirst = true;
@@ -292,7 +292,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
{ Impress, &SvtFilterOptions::IsPowerPoint2Impress },
{ Impress, &SvtFilterOptions::IsImpress2PowerPoint },
{ SmartArt, &SvtFilterOptions::IsSmartArt2Shape },
- { InvalidCBEntry, NULL }
+ { InvalidCBEntry, nullptr }
};
bool bFirst = true;
@@ -362,7 +362,7 @@ SvTreeListEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const
return pEntry;
pEntry = m_pCheckLB->Next( pEntry );
}
- return NULL;
+ return nullptr;
}
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs()
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ca895cc5e9b6..dfb517f93667 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -396,7 +396,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_pDocStatusCB->Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed());
m_pDocStatusCB->SaveValue();
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
if ( SfxItemState::SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
{
m_pYearValueField->SetValue( static_cast<const SfxUInt16Item*>(pItem)->GetValue() );
@@ -690,11 +690,11 @@ OfaViewTabPage::~OfaViewTabPage()
void OfaViewTabPage::dispose()
{
delete mpDrawinglayerOpt;
- mpDrawinglayerOpt = NULL;
+ mpDrawinglayerOpt = nullptr;
delete pCanvasSettings;
- pCanvasSettings = NULL;
+ pCanvasSettings = nullptr;
delete pAppearanceCfg;
- pAppearanceCfg = NULL;
+ pAppearanceCfg = nullptr;
m_pWindowSizeMF.clear();
m_pIconSizeLB.clear();
m_pIconStyleLB.clear();
@@ -1056,7 +1056,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
SvtLanguageTable::GetLanguageString( Application::GetSettings().GetUILanguageTag().getLanguageType(), true );
m_pUserInterfaceLB->InsertEntry(aUILang);
- m_pUserInterfaceLB->SetEntryData(0, 0);
+ m_pUserInterfaceLB->SetEntryData(0, nullptr);
m_pUserInterfaceLB->SelectEntryPos(0);
try
{
@@ -1175,7 +1175,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
void OfaLanguagesTabPage::dispose()
{
delete pLangConfig;
- pLangConfig = NULL;
+ pLangConfig = nullptr;
m_pUserInterfaceLB.clear();
m_pLocaleSettingFT.clear();
m_pLocaleSettingLB.clear();
@@ -1487,7 +1487,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
// configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default
OUString aAbbrev;
LanguageType eLang;
- const NfCurrencyEntry* pCurr = NULL;
+ const NfCurrencyEntry* pCurr = nullptr;
sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
if ( !sLang.isEmpty() )
{
@@ -1612,7 +1612,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
#endif
// check the box "For the current document only"
// set the focus to the Western Language box
- const SfxPoolItem* pLang = 0;
+ const SfxPoolItem* pLang = nullptr;
if ( SfxItemState::SET == rSet->GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && static_cast<const SfxBoolItem*>(pLang)->GetValue() )
{
m_pWesternLanguageLB->GrabFocus();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 5f12c5dbf4d8..6bd50151566e 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -62,7 +62,7 @@ private:
DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void );
DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void );
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 5ea938b21fd5..abfff4ba14bd 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -595,8 +595,8 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet)
, mpSecOptions(new SvtSecurityOptions)
- , mpSecOptDlg(NULL)
- , mpCertPathDlg(NULL)
+ , mpSecOptDlg(nullptr)
+ , mpCertPathDlg(nullptr)
{
get(m_pSecurityOptionsPB, "options");
get(m_pSavePasswordsCB, "savepassword");
@@ -645,7 +645,7 @@ SvxSecurityTabPage::~SvxSecurityTabPage()
void SvxSecurityTabPage::dispose()
{
delete mpSecOptions;
- mpSecOptions = NULL;
+ mpSecOptions = nullptr;
mpCertPathDlg.disposeAndClear();
mpSecOptDlg.clear();
m_pSecurityOptionsPB.clear();
@@ -995,7 +995,7 @@ SvxEMailTabPage::~SvxEMailTabPage()
void SvxEMailTabPage::dispose()
{
delete pImpl;
- pImpl = NULL;
+ pImpl = nullptr;
m_pMailContainer.clear();
m_pMailerURLFI.clear();
m_pMailerURLED.clear();
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 0e49670d4572..57236c0d7f26 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -172,7 +172,7 @@ private:
protected:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index c42b6a419ef7..bdb111023c0f 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -132,12 +132,12 @@ public:
SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", &rSet)
- , m_pParamDlg(NULL)
- , m_pPathDlg(NULL)
+ , m_pParamDlg(nullptr)
+ , m_pPathDlg(nullptr)
#if HAVE_FEATURE_JAVA
- , m_parJavaInfo(NULL)
- , m_parParameters(NULL)
- , m_pClassPath(NULL)
+ , m_parJavaInfo(nullptr)
+ , m_parParameters(nullptr)
+ , m_pClassPath(nullptr)
, m_nInfoSize(0)
, m_nParamSize(0)
#endif
@@ -456,7 +456,7 @@ void SvxJavaOptionsPage::ClearJavaInfo()
}
rtl_freeMemory( m_parJavaInfo );
- m_parJavaInfo = NULL;
+ m_parJavaInfo = nullptr;
m_nInfoSize = 0;
}
#else
@@ -502,7 +502,7 @@ void SvxJavaOptionsPage::LoadJREs()
AddJRE( pInfo );
}
- JavaInfo* pSelectedJava = NULL;
+ JavaInfo* pSelectedJava = nullptr;
eErr = jfw_getSelectedJRE( &pSelectedJava );
if ( JFW_E_NONE == eErr && pSelectedJava )
{
@@ -577,7 +577,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
{
#if HAVE_FEATURE_JAVA
bool bStartAgain = true;
- JavaInfo* pInfo = NULL;
+ JavaInfo* pInfo = nullptr;
javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo );
if ( JFW_E_NONE == eErr && pInfo )
{
@@ -708,17 +708,17 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
if ( m_pJavaList->GetCheckButtonState( m_pJavaList->GetEntry(i) ) == SV_BUTTON_CHECKED )
{
- JavaInfo* pInfo = NULL;
+ JavaInfo* pInfo = nullptr;
if ( i < static_cast< sal_uLong >( m_nInfoSize ) )
pInfo = m_parJavaInfo[i];
else
pInfo = m_aAddedInfos[ i - m_nInfoSize ];
- JavaInfo* pSelectedJava = NULL;
+ JavaInfo* pSelectedJava = nullptr;
eErr = jfw_getSelectedJRE( &pSelectedJava );
if ( JFW_E_NONE == eErr || JFW_E_INVALID_SETTINGS == eErr )
{
- if (pSelectedJava == NULL || !jfw_areEqualJavaInfo( pInfo, pSelectedJava ) )
+ if (pSelectedJava == nullptr || !jfw_areEqualJavaInfo( pInfo, pSelectedJava ) )
{
sal_Bool bRunning = sal_False;
eErr = jfw_isVMRunning( &bRunning );
@@ -962,7 +962,7 @@ void SvxJavaClassPathDlg::dispose()
sal_Int32 i, nCount = m_pPathList->GetEntryCount();
for ( i = 0; i < nCount; ++i )
delete static_cast< OUString* >( m_pPathList->GetEntryData(i) );
- m_pPathList = NULL;
+ m_pPathList = nullptr;
}
m_pPathList.clear();
m_pAddArchiveBtn.clear();
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index e6231826d6f5..55f0d2e3abd3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -336,7 +336,7 @@ public:
OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID)
: ModalDialog(pParent, "BreakNumberOption",
"cui/ui/breaknumberoption.ui")
- , m_pBreakNF(NULL)
+ , m_pBreakNF(nullptr)
{
get(m_pBeforeFrame, "beforeframe");
get(m_pAfterFrame, "afterframe");
@@ -565,7 +565,7 @@ static sal_Int32 lcl_SeqGetIndex( const Sequence< OUString > &rSeq, const OUStri
Sequence< OUString > SvxLinguData_Impl::GetSortedImplNames( sal_Int16 nLang, sal_uInt8 nType )
{
- LangImplNameTable *pTable = 0;
+ LangImplNameTable *pTable = nullptr;
switch (nType)
{
case TYPE_SPELL : pTable = &aCfgSpellTable; break;
@@ -627,7 +627,7 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp
return &rTmp;
}
}
- return 0;
+ return nullptr;
}
@@ -936,8 +936,8 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
{
DBG_ASSERT( !rDisplayName.isEmpty(), "empty DisplayName" );
- ServiceInfo_Impl *pInfo = 0;
- ServiceInfo_Impl *pTmp = 0;
+ ServiceInfo_Impl *pInfo = nullptr;
+ ServiceInfo_Impl *pTmp = nullptr;
for (sal_uLong i = 0; i < nDisplayServices; ++i)
{
pTmp = &aDisplayServiceArr[i];
@@ -953,7 +953,7 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
pInfo->bConfigured = bEnable;
Sequence< Locale > aLocales;
- const Locale *pLocale = 0;
+ const Locale *pLocale = nullptr;
sal_Int32 nLocales = 0;
sal_Int32 i;
@@ -1040,7 +1040,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
sHyphAuto (CUI_RES(RID_SVXSTR_HYPH_AUTO)),
sHyphSpecial (CUI_RES(RID_SVXSTR_HYPH_SPECIAL)),
- pLinguData(NULL)
+ pLinguData(nullptr)
{
get(m_pLinguModulesFT, "lingumodulesft");
get(m_pLinguModulesCLB, "lingumodules");
@@ -1058,7 +1058,7 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
m_pLinguDicsCLB->set_height_request(m_pLinguDicsCLB->GetTextHeight() * 5);
m_pLinguOptionsCLB->set_height_request(m_pLinguOptionsCLB->GetTextHeight() * 5);
- pCheckButtonData = NULL;
+ pCheckButtonData = nullptr;
m_pLinguModulesCLB->SetStyle( m_pLinguModulesCLB->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
m_pLinguModulesCLB->SetHighlightRange();
@@ -1133,7 +1133,7 @@ SvxLinguTabPage::~SvxLinguTabPage()
void SvxLinguTabPage::dispose()
{
delete pLinguData;
- pLinguData = NULL;
+ pLinguData = nullptr;
m_pLinguModulesFT.clear();
m_pLinguModulesCLB.clear();
m_pLinguModulesEditPB.clear();
@@ -1423,7 +1423,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
m_pLinguOptionsCLB->Clear();
SvTreeList *pModel = m_pLinguOptionsCLB->GetModel();
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
sal_Int16 nVal = 0;
bool bVal = false;
@@ -1473,7 +1473,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
pEntry->SetUserData( reinterpret_cast<void *>(nUserData) );
pModel->Insert( pEntry );
- const SfxHyphenRegionItem *pHyp = NULL;
+ const SfxHyphenRegionItem *pHyp = nullptr;
sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION );
if ( rSet->GetItemState( nWhich, false ) == SfxItemState::SET )
pHyp = &static_cast<const SfxHyphenRegionItem &>( rSet->Get( nWhich ) );
@@ -1521,7 +1521,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox,
//! on a module entry and exiting the "Edit Modules" dialog
//! after that.
Application::PostUserEvent( LINK(
- this, SvxLinguTabPage, PostDblClickHdl_Impl ), NULL, true);
+ this, SvxLinguTabPage, PostDblClickHdl_Impl ), nullptr, true);
}
else if (pBox == m_pLinguOptionsCLB)
{
@@ -1699,7 +1699,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
}
}
- aDics.getArray()[ nDicPos ] = 0;
+ aDics.getArray()[ nDicPos ] = nullptr;
// remove entry from checklistbox
sal_uLong nCnt = m_pLinguDicsCLB->GetEntryCount();
@@ -1851,7 +1851,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rD
get(m_pLanguageLB, "language");
m_pLanguageLB->SetStyle(m_pLanguageLB->GetStyle() | WB_SORT);
- pCheckButtonData = NULL;
+ pCheckButtonData = nullptr;
pDefaultLinguData = new SvxLinguData_Impl( rLinguData );
@@ -1912,7 +1912,7 @@ SvxEditModulesDlg::~SvxEditModulesDlg()
void SvxEditModulesDlg::dispose()
{
delete pDefaultLinguData;
- pDefaultLinguData = NULL;
+ pDefaultLinguData = nullptr;
m_pLanguageLB.clear();
m_pModulesCLB.clear();
m_pPrioUpPB.clear();
@@ -1978,7 +1978,7 @@ IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void )
IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void )
{
- BoxCheckButtonHdl_Impl(NULL);
+ BoxCheckButtonHdl_Impl(nullptr);
}
IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void )
{
@@ -2038,7 +2038,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox)
{
if(bChanged)
{
- LangImplNameTable *pTable = 0;
+ LangImplNameTable *pTable = nullptr;
sal_uInt8 nType = pData->GetType();
switch (nType - 1)
{
@@ -2273,7 +2273,7 @@ IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void )
sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos();
SvTreeListEntry* pEntry;
if (nCurPos != TREELIST_ENTRY_NOTFOUND &&
- 0 != (pEntry = m_pModulesCLB->GetEntry(nCurPos)))
+ nullptr != (pEntry = m_pModulesCLB->GetEntry(nCurPos)))
{
m_pModulesCLB->SetUpdateMode(false);
SvTreeList *pModel = m_pModulesCLB->GetModel();
@@ -2305,7 +2305,7 @@ IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, ClickHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void)
{
rLinguData = *pDefaultLinguData;
- LangSelectHdl_Impl(0);
+ LangSelectHdl_Impl(nullptr);
}
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index e7b80b29b484..92d53c47ddcd 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -51,7 +51,7 @@ private:
inline void SetNfGraphicObjectCacheMax( long nSizeInBytes );
inline void SetNfGraphicObjectCacheLast( long nSizeInBytes );
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index db508a2d40dd..71cd281480dc 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -183,7 +183,7 @@ void fillListBox(SvSimpleTable* pListBox, const OpenCLConfig::ImplMatcherSet& rS
for (auto i = rSet.cbegin(); i != rSet.cend(); ++i)
{
OpenCLConfig::ImplMatcher* pImpl = new OpenCLConfig::ImplMatcher(*i);
- pListBox->InsertEntry(format(*i), NULL, false, TREELIST_APPEND, pImpl);
+ pListBox->InsertEntry(format(*i), nullptr, false, TREELIST_APPEND, pImpl);
}
pListBox->SetUpdateMode(true);
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 598e35f2209f..8695c0c2003b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -118,7 +118,7 @@ static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] =
#if OSL_DEBUG_LEVEL > 1
{ SvtPathOptions::PATH_LINGUISTIC, "Linguistic" },
#endif
- { USHRT_MAX, NULL }
+ { USHRT_MAX, nullptr }
};
static OUString getCfgName_Impl( sal_uInt16 _nHandle )
@@ -249,7 +249,7 @@ void SvxPathTabPage::dispose()
pPathBox.disposeAndClear();
}
delete pImpl;
- pImpl = NULL;
+ pImpl = nullptr;
m_pPathCtrl.clear();
m_pStandardBtn.clear();
m_pPathBtn.clear();
@@ -364,7 +364,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
HeaderSelect_Impl( &rBar );
}
#endif
- PathSelect_Impl( NULL );
+ PathSelect_Impl( nullptr );
}
@@ -537,14 +537,14 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool)
{
- PathHdl_Impl(NULL);
+ PathHdl_Impl(nullptr);
return false;
}
IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void)
{
SvTreeListEntry* pEntry = pPathBox->GetCurEntry();
- sal_uInt16 nPos = ( pEntry != NULL ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0;
+ sal_uInt16 nPos = ( pEntry != nullptr ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0;
OUString sInternal, sUser, sWritable;
if ( pEntry )
{
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 4b36b145cd4b..d3448524014e 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -204,7 +204,7 @@ SvxSaveTabPage::~SvxSaveTabPage()
void SvxSaveTabPage::dispose()
{
delete pImpl;
- pImpl = NULL;
+ pImpl = nullptr;
aLoadUserSettingsCB.clear();
aLoadDocPrinterCB.clear();
aDocInfoCB.clear();
@@ -379,12 +379,12 @@ bool isODFFormat( const OUString& sFilter )
"impress8_draw",
"chart8",
"math8",
- NULL
+ nullptr
};
bool bRet = false;
int i = 0;
- while ( aODFFormats[i] != NULL )
+ while ( aODFFormats[i] != nullptr )
{
if ( sFilter.equalsAscii( aODFFormats[i++] ) )
{
@@ -630,7 +630,7 @@ IMPL_LINK_NOARG_TYPED(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
const sal_Int32 nCount = aSaveAsLB->GetEntryCount();
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- if ( aSaveAsLB->GetEntryData(i) != NULL )
+ if ( aSaveAsLB->GetEntryData(i) != nullptr )
{
bHasODFFormat = true;
break;
@@ -638,7 +638,7 @@ IMPL_LINK_NOARG_TYPED(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
}
bShown = !bHasODFFormat
- || ( aSaveAsLB->GetSelectEntryData() != NULL );
+ || ( aSaveAsLB->GetSelectEntryData() != nullptr );
}
aODFWarningFI->Show( bShown );
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 06a9fe3b255a..6ca3f1f63eec 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -135,7 +135,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType();
SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( ::comphelper::getProcessComponentContext(), eUILang );
- Color* pColor = NULL;
+ Color* pColor = nullptr;
Date* pNullDate = pNumberFormatter->GetNullDate();
sal_uInt32 nFormat = pNumberFormatter->GetStandardFormat( css::util::NumberFormat::DATE, eUILang );
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 905cf4e98a61..eb44d5fa4c6c 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -360,7 +360,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
if ( bModified )
{
// broadcast the change
- DataChangedEvent aDataChanged( DataChangedEventType::SETTINGS, NULL, AllSettingsFlags::STYLE );
+ DataChangedEvent aDataChanged( DataChangedEventType::SETTINGS, nullptr, AllSettingsFlags::STYLE );
Application::NotifyAllWindows( aDataChanged );
}
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 1f1a422d9c84..bf14d7732bff 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -52,7 +52,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt )
if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED )
{
SetCheckButtonState( pEntry, SV_BUTTON_CHECKED );
- GetCheckButtonHdl().Call( NULL );
+ GetCheckButtonHdl().Call( nullptr );
return ;
}
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 72e503145f9f..9bc61c682846 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -116,13 +116,13 @@ using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
-LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL;
+LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = nullptr;
// some stuff for easier changes for SvtViewOptions
static const sal_Char* pViewOptDataName = "page data";
#define VIEWOPT_DATANAME OUString::createFromAscii( pViewOptDataName )
-static XOutdevItemPool* mpStaticXOutdevItemPool = 0L;
+static XOutdevItemPool* mpStaticXOutdevItemPool = nullptr;
static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
{
@@ -145,7 +145,7 @@ struct ModuleToGroupNameMap_Impl
sal_uInt16 m_nNodeId;
};
-static OfaPageResource* pPageRes = NULL;
+static OfaPageResource* pPageRes = nullptr;
static ModuleToGroupNameMap_Impl ModuleMap[] =
{
@@ -162,7 +162,7 @@ static ModuleToGroupNameMap_Impl ModuleMap[] =
{ "Charts", OUString(), SID_SCH_EDITOPTIONS },
{ "Base", OUString(), SID_SB_STARBASEOPTIONS },
- { NULL, OUString(), 0xFFFF }
+ { nullptr, OUString(), 0xFFFF }
};
static void setGroupName( const OUString& rModule, const OUString& rGroupName )
@@ -291,7 +291,7 @@ void MailMergeCfg_Impl::Notify( const css::uno::Sequence< OUString >& )
//typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet );
VclPtr<SfxTabPage> CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
{
- CreateTabPage fnCreate = 0;
+ CreateTabPage fnCreate = nullptr;
switch(nId)
{
case RID_SFXPAGE_SAVE: fnCreate = &SvxSaveTabPage::Create; break;
@@ -344,7 +344,7 @@ struct OptionsMapping_Impl
static OptionsMapping_Impl const OptionsMap_Impl[] =
{
// GROUP PAGE PAGE-ID
- { "ProductName", NULL, SID_GENERAL_OPTIONS },
+ { "ProductName", nullptr, SID_GENERAL_OPTIONS },
{ "ProductName", "UserData", RID_SFXPAGE_GENERAL },
{ "ProductName", "General", OFA_TP_MISC },
{ "ProductName", "Memory", OFA_TP_MEMORY },
@@ -360,21 +360,21 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA },
{ "ProductName", "BasicIDEOptions", RID_SVXPAGE_BASICIDE_OPTIONS },
{ "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE },
- { "LanguageSettings", NULL, SID_LANGUAGE_OPTIONS },
+ { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS },
{ "LanguageSettings", "Languages", OFA_TP_LANGUAGES },
{ "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU },
{ "LanguageSettings", "SearchingInJapanese", RID_SVXPAGE_JSEARCH_OPTIONS },
{ "LanguageSettings", "AsianLayout", RID_SVXPAGE_ASIAN_LAYOUT },
{ "LanguageSettings", "ComplexTextLayout", RID_SVXPAGE_OPTIONS_CTL },
- { "Internet", NULL, SID_INET_DLG },
+ { "Internet", nullptr, SID_INET_DLG },
{ "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
{ "Internet", "Email", RID_SVXPAGE_INET_MAIL },
- { "LoadSave", NULL, SID_FILTER_DLG },
+ { "LoadSave", nullptr, SID_FILTER_DLG },
{ "LoadSave", "General", RID_SFXPAGE_SAVE },
{ "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE },
{ "LoadSave", "MicrosoftOffice", RID_OFAPAGE_MSFILTEROPT2 },
{ "LoadSave", "HTMLCompatibility", RID_OFAPAGE_HTMLOPT },
- { "Writer", NULL, SID_SW_EDITOPTIONS },
+ { "Writer", nullptr, SID_SW_EDITOPTIONS },
{ "Writer", "General", RID_SW_TP_OPTLOAD_PAGE },
{ "Writer", "View", RID_SW_TP_CONTENT_OPT },
{ "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR },
@@ -389,16 +389,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE },
{ "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE },
{ "Writer", "MailMerge", RID_SW_TP_MAILCONFIG },
- { "WriterWeb", NULL, SID_SW_ONLINEOPTIONS },
+ { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS },
{ "WriterWeb", "View", RID_SW_TP_HTML_CONTENT_OPT },
{ "WriterWeb", "FormattingAids", RID_SW_TP_HTML_OPTSHDWCRSR },
{ "WriterWeb", "Grid", RID_SW_TP_HTML_OPTGRID_PAGE },
{ "WriterWeb", "Print", RID_SW_TP_HTML_OPTPRINT_PAGE },
{ "WriterWeb", "Table", RID_SW_TP_HTML_OPTTABLE_PAGE },
{ "WriterWeb", "Background", RID_SW_TP_BACKGROUND },
- { "Math", NULL, SID_SM_EDITOPTIONS },
+ { "Math", nullptr, SID_SM_EDITOPTIONS },
{ "Math", "Settings", SID_SM_TP_PRINTOPTIONS },
- { "Calc", NULL, SID_SC_EDITOPTIONS },
+ { "Calc", nullptr, SID_SC_EDITOPTIONS },
{ "Calc", "General", SID_SC_TP_LAYOUT },
{ "Calc", "View", SID_SC_TP_CONTENT },
{ "Calc", "Calculate", SID_SC_TP_CALC },
@@ -408,22 +408,22 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "Calc", "Compatibility", SID_SC_TP_COMPATIBILITY },
{ "Calc", "Grid", SID_SC_TP_GRID },
{ "Calc", "Print", RID_SC_TP_PRINT },
- { "Impress", NULL, SID_SD_EDITOPTIONS },
+ { "Impress", nullptr, SID_SD_EDITOPTIONS },
{ "Impress", "General", SID_SI_TP_MISC },
{ "Impress", "View", SID_SI_TP_CONTENTS },
{ "Impress", "Grid", SID_SI_TP_SNAP },
{ "Impress", "Print", SID_SI_TP_PRINT },
- { "Draw", NULL, SID_SD_GRAPHIC_OPTIONS },
+ { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS },
{ "Draw", "General", SID_SD_TP_MISC },
{ "Draw", "View", SID_SD_TP_CONTENTS },
{ "Draw", "Grid", SID_SD_TP_SNAP },
{ "Draw", "Print", SID_SD_TP_PRINT },
- { "Charts", NULL, SID_SCH_EDITOPTIONS },
+ { "Charts", nullptr, SID_SCH_EDITOPTIONS },
{ "Charts", "DefaultColors", RID_OPTPAGE_CHART_DEFCOLORS },
- { "Base", NULL, SID_SB_STARBASEOPTIONS },
+ { "Base", nullptr, SID_SB_STARBASEOPTIONS },
{ "Base", "Connections", SID_SB_CONNECTIONPOOLING },
{ "Base", "Databases", SID_SB_DBREGISTEROPTIONS },
- { NULL, NULL, 0 }
+ { nullptr, nullptr, 0 }
};
static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName )
@@ -431,13 +431,13 @@ static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUS
bool bRet = false;
sal_uInt16 nIdx = 0;
- while ( OptionsMap_Impl[nIdx].m_pGroupName != NULL )
+ while ( OptionsMap_Impl[nIdx].m_pGroupName != nullptr )
{
if ( _nPageId == OptionsMap_Impl[nIdx].m_nPageId )
{
bRet = true;
_rGroupName = OUString::createFromAscii( OptionsMap_Impl[nIdx].m_pGroupName );
- if ( OptionsMap_Impl[nIdx].m_pPageName != NULL )
+ if ( OptionsMap_Impl[nIdx].m_pPageName != nullptr )
_rPageName = OUString::createFromAscii( OptionsMap_Impl[nIdx].m_pPageName );
break;
}
@@ -469,7 +469,7 @@ struct OptionsPageInfo
OUString m_sEventHdl;
VclPtr<ExtensionsTabPage> m_pExtPage;
- explicit OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {}
+ explicit OptionsPageInfo( sal_uInt16 nId ) : m_pPage( nullptr ), m_nPageId( nId ), m_pExtPage( nullptr ) {}
};
struct OptionsGroupInfo
@@ -484,18 +484,18 @@ struct OptionsGroupInfo
VclPtr<ExtensionsTabPage> m_pExtPage;
OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) :
- m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ),
+ m_pInItemSet( nullptr ), m_pOutItemSet( nullptr ), m_pShell( pSh ),
m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( false ),
- m_sPageURL( OUString() ), m_pExtPage( NULL ) {}
+ m_sPageURL( OUString() ), m_pExtPage( nullptr ) {}
~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; }
};
#define INI_LIST() \
- pCurrentPageEntry ( NULL ),\
+ pCurrentPageEntry ( nullptr ),\
sTitle ( GetText() ),\
sNotLoadedError ( CUI_RES( RID_SVXSTR_LOAD_ERROR ) ),\
- pColorPageItemSet ( NULL ),\
- mpColorPage ( NULL ),\
+ pColorPageItemSet ( nullptr ),\
+ mpColorPage ( nullptr ),\
bForgetSelection ( false ),\
bIsFromExtensionManager( false ), \
bIsForSetDocumentLanguage( false )
@@ -555,8 +555,8 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
void OfaTreeOptionsDialog::dispose()
{
- pCurrentPageEntry = NULL;
- SvTreeListEntry* pEntry = pTreeLB ? pTreeLB->First() : NULL;
+ pCurrentPageEntry = nullptr;
+ SvTreeListEntry* pEntry = pTreeLB ? pTreeLB->First() : nullptr;
// first children
while(pEntry)
{
@@ -594,7 +594,7 @@ void OfaTreeOptionsDialog::dispose()
}
// and parents
- pEntry = pTreeLB ? pTreeLB->First() : NULL;
+ pEntry = pTreeLB ? pTreeLB->First() : nullptr;
while(pEntry)
{
if(!pTreeLB->GetParent(pEntry))
@@ -607,7 +607,7 @@ void OfaTreeOptionsDialog::dispose()
pEntry = pTreeLB->Next(pEntry);
}
delete pColorPageItemSet;
- pColorPageItemSet = NULL;
+ pColorPageItemSet = nullptr;
deleteGroupNames();
pOkPB.clear();
pBackPB.clear();
@@ -621,7 +621,7 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup )
{
OptionsPageInfo* pPageInfo = new OptionsPageInfo( nId );
- SvTreeListEntry* pParent = pTreeLB->GetEntry( 0, nGroup );
+ SvTreeListEntry* pParent = pTreeLB->GetEntry( nullptr, nGroup );
DBG_ASSERT( pParent, "OfaTreeOptionsDialog::AddTabPage(): no group found" );
SvTreeListEntry* pEntry = pTreeLB->InsertEntry( rPageName, pParent );
pEntry->SetUserData( pPageInfo );
@@ -826,7 +826,7 @@ void OfaTreeOptionsDialog::ActivatePage( const OUString& rPageURL )
void OfaTreeOptionsDialog::ActivateLastSelection()
{
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
if ( pLastPageSaver )
{
OUString sLastURL = bIsFromExtensionManager ? pLastPageSaver->m_sLastPageURL_ExtMgr
@@ -890,7 +890,7 @@ bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
aKeyCode.GetCode() == KEY_PAGEDOWN)
{
SvTreeListEntry* pCurEntry = pTreeLB->FirstSelected();
- SvTreeListEntry* pTemp = 0;
+ SvTreeListEntry* pTemp = nullptr;
if(aKeyCode.GetCode() == KEY_PAGEDOWN)
{
pTemp = pTreeLB->Next( pCurEntry ) ;
@@ -943,10 +943,10 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
pBox->EndSelection();
- TabPage* pOldPage = NULL;
- TabPage* pNewPage = NULL;
+ TabPage* pOldPage = nullptr;
+ TabPage* pNewPage = nullptr;
OptionsPageInfo* pOptPageInfo = ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
- ? static_cast<OptionsPageInfo*>(pCurrentPageEntry->GetUserData()) : NULL;
+ ? static_cast<OptionsPageInfo*>(pCurrentPageEntry->GetUserData()) : nullptr;
if ( pOptPageInfo && pOptPageInfo->m_pPage && pOptPageInfo->m_pPage->IsVisible() )
{
@@ -1171,7 +1171,7 @@ OfaPageResource::OfaPageResource() :
SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
{
Reference< XLinguProperties > xProp( SvxGetLinguPropertySet() );
- SfxItemSet* pRet = 0;
+ SfxItemSet* pRet = nullptr;
switch(nId)
{
case SID_GENERAL_OPTIONS:
@@ -1193,7 +1193,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if ( pViewFrame )
{
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
// miscellaneous - Year2000
@@ -1243,7 +1243,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if ( pViewFrame )
{
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
pRet->Put(
@@ -1334,7 +1334,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
case SID_GENERAL_OPTIONS:
{
utl::MiscCfg aMisc;
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
SfxItemSet aOptSet(SfxGetpApp()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
aOptSet.Put(rSet);
if(aOptSet.Count())
@@ -1408,7 +1408,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
{
bool bSaveSpellCheck = false;
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
if ( SfxItemState::SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) )
{
@@ -1429,7 +1429,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
if ( pViewFrame )
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
- pItem = NULL;
+ pItem = nullptr;
if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SfxCallMode::ASYNCHRON, pItem, 0L);
@@ -1517,7 +1517,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray();
setGroupName( "ProductName", rGeneralArray.GetString(0) );
- nGroup = AddGroup( rGeneralArray.GetString(0), 0, 0, SID_GENERAL_OPTIONS );
+ nGroup = AddGroup( rGeneralArray.GetString(0), nullptr, nullptr, SID_GENERAL_OPTIONS );
sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() );
for ( i = 1; i < nEnd; ++i )
@@ -1550,7 +1550,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
ResStringArray& rFilterArray = aDlgResource.GetFilterArray();
setGroupName( "LoadSave", rFilterArray.GetString(0) );
- nGroup = AddGroup( rFilterArray.GetString(0), 0, 0, SID_FILTER_DLG );
+ nGroup = AddGroup( rFilterArray.GetString(0), nullptr, nullptr, SID_FILTER_DLG );
for ( i = 1; i < rFilterArray.Count(); ++i )
{
nPageId = (sal_uInt16)rFilterArray.GetValue(i);
@@ -1565,7 +1565,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
ResStringArray& rLangArray = aDlgResource.GetLangArray();
setGroupName( "LanguageSettings", rLangArray.GetString(0) );
- nGroup = AddGroup( rLangArray.GetString(0), 0, 0, SID_LANGUAGE_OPTIONS );
+ nGroup = AddGroup( rLangArray.GetString(0), nullptr, nullptr, SID_LANGUAGE_OPTIONS );
for ( i = 1; i < rLangArray.Count(); ++i )
{
nPageId = (sal_uInt16)rLangArray.GetValue(i);
@@ -1734,7 +1734,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray();
setGroupName( "Base", rDSArray.GetString(0) );
- nGroup = AddGroup( rDSArray.GetString(0), 0, NULL, SID_SB_STARBASEOPTIONS );
+ nGroup = AddGroup( rDSArray.GetString(0), nullptr, nullptr, SID_SB_STARBASEOPTIONS );
for ( i = 1; i < rDSArray.Count(); ++i )
{
nPageId = (sal_uInt16)rDSArray.GetValue(i);
@@ -1748,7 +1748,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
ResStringArray& rChartArray = aDlgResource.GetChartArray();
setGroupName( "Charts", rChartArray.GetString(0) );
- nGroup = AddGroup( rChartArray.GetString(0), 0, 0, SID_SCH_EDITOPTIONS );
+ nGroup = AddGroup( rChartArray.GetString(0), nullptr, nullptr, SID_SCH_EDITOPTIONS );
for ( i = 1; i < rChartArray.Count(); ++i )
{
nPageId = (sal_uInt16)rChartArray.GetValue(i);
@@ -1762,7 +1762,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
{
ResStringArray& rInetArray = aDlgResource.GetInetArray();
setGroupName( "Internet", rInetArray.GetString(0) );
- nGroup = AddGroup(rInetArray.GetString(0), 0, 0, SID_INET_DLG );
+ nGroup = AddGroup(rInetArray.GetString(0), nullptr, nullptr, SID_INET_DLG );
for ( i = 1; i < rInetArray.Count(); ++i )
{
@@ -1812,7 +1812,7 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule )
void OfaTreeOptionsDialog::LoadExtensionOptions( const OUString& rExtensionId )
{
- Module* pModule = NULL;
+ Module* pModule = nullptr;
// when called by Tools - Options then load nodes of active module
if ( rExtensionId.isEmpty() )
@@ -1860,7 +1860,7 @@ OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& r
Module* OfaTreeOptionsDialog::LoadModule(
const OUString& rModuleIdentifier )
{
- Module* pModule = NULL;
+ Module* pModule = nullptr;
Reference< XNameAccess > xSet(
officecfg::Office::OptionsDialog::Modules::get());
@@ -2092,10 +2092,10 @@ static void lcl_insertLeaf(
if ( USHRT_MAX == nGrpId )
{
sal_uInt16 nNodeGrpId = getGroupNodeId( pNode->m_sId );
- nGrpId = pDlg->AddGroup( pNode->m_sLabel, NULL, NULL, nNodeGrpId );
+ nGrpId = pDlg->AddGroup( pNode->m_sLabel, nullptr, nullptr, nNodeGrpId );
if ( !pNode->m_sPageURL.isEmpty() )
{
- SvTreeListEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId );
+ SvTreeListEntry* pGrpEntry = rTreeLB.GetEntry( nullptr, nGrpId );
DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" );
if ( pGrpEntry )
{
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 4649f3eac485..3feee93698e2 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -137,7 +137,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)
m_pRemoveBtn->Enable( false );
m_pChangeBtn->Enable( false );
- HeaderBarClickedHdl( NULL );
+ HeaderBarClickedHdl( nullptr );
}
WebConnectionInfoDialog::~WebConnectionInfoDialog()
@@ -156,7 +156,7 @@ void WebConnectionInfoDialog::dispose()
IMPL_LINK_TYPED( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable, void )
{
- m_pPasswordsLB->Resort( NULL == pTable );
+ m_pPasswordsLB->Resort( nullptr == pTable );
}
@@ -170,7 +170,7 @@ void WebConnectionInfoDialog::FillPasswordList()
if ( xMasterPasswd->isPersistentStoringAllowed() )
{
uno::Reference< task::XInteractionHandler > xInteractionHandler(
- task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0),
+ task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), nullptr),
uno::UNO_QUERY);
uno::Sequence< task::UrlRecord > aURLEntries = xMasterPasswd->getAllPersistent( xInteractionHandler );
@@ -272,7 +272,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void)
uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest );
uno::Reference< task::XInteractionHandler > xInteractionHandler(
- task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0),
+ task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), nullptr),
uno::UNO_QUERY );
xInteractionHandler->handle( rRequest );