summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/acccfg.cxx46
-rw-r--r--cui/source/customize/cfg.cxx130
-rw-r--r--cui/source/customize/cfgutil.cxx16
-rw-r--r--cui/source/customize/macropg.cxx22
-rw-r--r--cui/source/customize/selector.cxx28
-rw-r--r--cui/source/dialogs/SpellAttrib.hxx8
-rw-r--r--cui/source/dialogs/SpellDialog.cxx56
-rw-r--r--cui/source/dialogs/colorpicker.cxx16
-rw-r--r--cui/source/dialogs/cuicharmap.cxx10
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx14
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx22
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx2
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx2
-rw-r--r--cui/source/dialogs/dlgname.cxx4
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx60
-rw-r--r--cui/source/dialogs/hldocntp.cxx4
-rw-r--r--cui/source/dialogs/hlinettp.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/hltpbase.cxx16
-rw-r--r--cui/source/dialogs/hyphen.cxx8
-rw-r--r--cui/source/dialogs/iconcdlg.cxx24
-rw-r--r--cui/source/dialogs/insdlg.cxx10
-rw-r--r--cui/source/dialogs/linkdlg.cxx30
-rw-r--r--cui/source/dialogs/multipat.cxx10
-rw-r--r--cui/source/dialogs/pastedlg.cxx2
-rw-r--r--cui/source/dialogs/postdlg.cxx4
-rw-r--r--cui/source/dialogs/scriptdlg.cxx16
-rw-r--r--cui/source/dialogs/srchxtra.cxx28
-rw-r--r--cui/source/dialogs/thesdlg.cxx14
-rw-r--r--cui/source/dialogs/zoom.cxx6
-rw-r--r--cui/source/factory/cuiexp.cxx2
-rw-r--r--cui/source/factory/cuiresmgr.cxx2
-rw-r--r--cui/source/factory/dlgfact.cxx38
-rw-r--r--cui/source/factory/dlgfact.hxx18
-rw-r--r--cui/source/inc/acccfg.hxx2
-rw-r--r--cui/source/inc/autocdlg.hxx6
-rw-r--r--cui/source/inc/backgrnd.hxx2
-rw-r--r--cui/source/inc/border.hxx2
-rw-r--r--cui/source/inc/cfg.hxx16
-rw-r--r--cui/source/inc/cfgutil.hxx2
-rw-r--r--cui/source/inc/chardlg.hxx8
-rw-r--r--cui/source/inc/cuicharmap.hxx2
-rw-r--r--cui/source/inc/cuitabline.hxx2
-rw-r--r--cui/source/inc/dbregister.hxx2
-rw-r--r--cui/source/inc/dlgname.hxx2
-rw-r--r--cui/source/inc/hlmarkwn.hxx2
-rw-r--r--cui/source/inc/hltpbase.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx8
-rw-r--r--cui/source/inc/insdlg.hxx2
-rw-r--r--cui/source/inc/macropg.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx4
-rw-r--r--cui/source/inc/page.hxx2
-rw-r--r--cui/source/inc/paragrph.hxx6
-rw-r--r--cui/source/inc/pastedlg.hxx4
-rw-r--r--cui/source/inc/selector.hxx4
-rw-r--r--cui/source/inc/swpossizetabpage.hxx2
-rw-r--r--cui/source/inc/tabstpge.hxx2
-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
-rw-r--r--cui/source/tabpages/align.cxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx50
-rw-r--r--cui/source/tabpages/backgrnd.cxx54
-rw-r--r--cui/source/tabpages/bbdlg.cxx8
-rw-r--r--cui/source/tabpages/border.cxx12
-rw-r--r--cui/source/tabpages/chardlg.cxx70
-rw-r--r--cui/source/tabpages/connect.cxx2
-rw-r--r--cui/source/tabpages/dstribut.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx22
-rw-r--r--cui/source/tabpages/labdlg.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx16
-rw-r--r--cui/source/tabpages/measure.cxx14
-rw-r--r--cui/source/tabpages/numfmt.cxx48
-rw-r--r--cui/source/tabpages/numpages.cxx72
-rw-r--r--cui/source/tabpages/page.cxx14
-rw-r--r--cui/source/tabpages/paragrph.cxx14
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx14
-rw-r--r--cui/source/tabpages/tabarea.cxx14
-rw-r--r--cui/source/tabpages/tabline.cxx8
-rw-r--r--cui/source/tabpages/tabstpge.cxx16
-rw-r--r--cui/source/tabpages/textanim.cxx12
-rw-r--r--cui/source/tabpages/textattr.cxx6
-rw-r--r--cui/source/tabpages/tparea.cxx46
-rw-r--r--cui/source/tabpages/tpbitmap.cxx22
-rw-r--r--cui/source/tabpages/tpcolor.cxx20
-rw-r--r--cui/source/tabpages/tpgradnt.cxx16
-rw-r--r--cui/source/tabpages/tphatch.cxx16
-rw-r--r--cui/source/tabpages/tpline.cxx34
-rw-r--r--cui/source/tabpages/tplnedef.cxx18
-rw-r--r--cui/source/tabpages/tplneend.cxx24
-rw-r--r--cui/source/tabpages/tpshadow.cxx8
-rw-r--r--cui/source/tabpages/transfrm.cxx16
-rw-r--r--cui/source/uno/services.cxx4
119 files changed, 895 insertions, 895 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 642f2ca18865..2d42b3c392fb 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -730,7 +730,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const
, m_pMacroInfoItem()
, m_pStringItem()
, m_pFontItem()
- , m_pFileDlg(NULL)
+ , m_pFileDlg(nullptr)
, aLoadAccelConfigStr(CUI_RES(RID_SVXSTR_LOADACCELCONFIG))
, aSaveAccelConfigStr(CUI_RES(RID_SVXSTR_SAVEACCELCONFIG))
, aFilterCfgStr(CUI_RES(RID_SVXSTR_FILTERNAME_CFG))
@@ -835,7 +835,7 @@ void SfxAcceleratorConfigPage::dispose()
m_pKeyBox->Clear();
delete m_pFileDlg;
- m_pFileDlg = NULL;
+ m_pFileDlg = nullptr;
m_pEntriesBox.clear();
m_pOfficeButton.clear();
@@ -954,7 +954,7 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
if (sKey.isEmpty())
continue;
TAccInfo* pEntry = new TAccInfo(i1, nListPos, aKey);
- SvTreeListEntry* pLBEntry = m_pEntriesBox->InsertEntryToColumn(sKey, 0L, TREELIST_APPEND, 0xFFFF);
+ SvTreeListEntry* pLBEntry = m_pEntriesBox->InsertEntryToColumn(sKey, nullptr, TREELIST_APPEND, 0xFFFF);
pLBEntry->SetUserData(pEntry);
}
@@ -977,7 +977,7 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
m_pEntriesBox->SetEntryText(sLabel, nPos, nCol);
- SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos);
+ SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(nullptr, nPos);
TAccInfo* pEntry = static_cast<TAccInfo*>(pLBEntry->GetUserData());
pEntry->m_bIsConfigurable = true;
@@ -997,7 +997,7 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
continue;
// Hardcoded function mapped so no ID possible and mark entry as not changeable
- SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos);
+ SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(nullptr, nPos);
TAccInfo* pEntry = static_cast<TAccInfo*>(pLBEntry->GetUserData());
pEntry->m_bIsConfigurable = false;
@@ -1072,13 +1072,13 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void)
Init(m_xAct);
m_pEntriesBox->SetUpdateMode(true);
m_pEntriesBox->Invalidate();
- m_pEntriesBox->Select(m_pEntriesBox->GetEntry(0, 0));
+ m_pEntriesBox->Select(m_pEntriesBox->GetEntry(nullptr, 0));
}
IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void)
{
sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
- TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
+ TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(nullptr, nPos)->GetUserData());
OUString sNewCommand = m_pFunctionBox->GetCurCommand();
OUString sLabel = m_pFunctionBox->GetCurLabel();
if (sLabel.isEmpty())
@@ -1095,7 +1095,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void)
{
// get selected entry
sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
- TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
+ TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(nullptr, nPos)->GetUserData());
// remove function name from selected entry
sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
@@ -1112,7 +1112,7 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox,
if (pListBox == m_pEntriesBox)
{
sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
- TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
+ TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(nullptr, nPos)->GetUserData());
OUString sPossibleNewCommand = m_pFunctionBox->GetCurCommand();
m_pRemoveButton->Enable( false );
@@ -1138,10 +1138,10 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox,
// #i36994 First selected can return zero!
SvTreeListEntry* pLBEntry = m_pEntriesBox->FirstSelected();
- if ( pLBEntry != 0 )
+ if ( pLBEntry != nullptr )
{
sal_uLong nPos = SvTreeList::GetRelPos( pLBEntry );
- TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
+ TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(nullptr, nPos)->GetUserData());
OUString sPossibleNewCommand = m_pFunctionBox->GetCurCommand();
if (pEntry->m_bIsConfigurable)
@@ -1160,7 +1160,7 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox,
if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand )
{
TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey);
- SvTreeListEntry* pE1 = m_pKeyBox->InsertEntry( pUserData->m_aKey.GetName(), 0L, true );
+ SvTreeListEntry* pE1 = m_pKeyBox->InsertEntry( pUserData->m_aKey.GetName(), nullptr, true );
pE1->SetUserData(pU1);
pE1->EnableChildrenOnDemand( false );
}
@@ -1171,10 +1171,10 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox,
else
{
// goto selected "key" entry of the key box
- SvTreeListEntry* pE2 = 0;
- TAccInfo* pU2 = 0;
+ SvTreeListEntry* pE2 = nullptr;
+ TAccInfo* pU2 = nullptr;
sal_uLong nP2 = TREELIST_ENTRY_NOTFOUND;
- SvTreeListEntry* pE3 = 0;
+ SvTreeListEntry* pE3 = nullptr;
pE2 = m_pKeyBox->FirstSelected();
if (pE2)
@@ -1182,7 +1182,7 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox,
if (pU2)
nP2 = MapKeyCodeToPos(pU2->m_aKey);
if (nP2 != TREELIST_ENTRY_NOTFOUND)
- pE3 = m_pEntriesBox->GetEntry( 0, nP2 );
+ pE3 = m_pEntriesBox->GetEntry( nullptr, nP2 );
if (pE3)
{
m_pEntriesBox->Select( pE3 );
@@ -1213,10 +1213,10 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void)
m_pGroupLBox->Init(m_xContext, m_xFrame, m_sModuleLongName, true);
// pb: #133213# do not select NULL entries
- SvTreeListEntry* pEntry = m_pEntriesBox->GetEntry( 0, 0 );
+ SvTreeListEntry* pEntry = m_pEntriesBox->GetEntry( nullptr, 0 );
if ( pEntry )
m_pEntriesBox->Select( pEntry );
- pEntry = m_pGroupLBox->GetEntry( 0, 0 );
+ pEntry = m_pGroupLBox->GetEntry( nullptr, 0 );
if ( pEntry )
m_pGroupLBox->Select( pEntry );
@@ -1280,7 +1280,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*
Init(xTempAccMgr);
m_pEntriesBox->SetUpdateMode(true);
m_pEntriesBox->Invalidate();
- m_pEntriesBox->Select(m_pEntriesBox->GetEntry(0, 0));
+ m_pEntriesBox->Select(m_pEntriesBox->GetEntry(nullptr, 0));
}
@@ -1468,9 +1468,9 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet )
m_pOfficeButton->Check();
}
- RadioHdl(0);
+ RadioHdl(nullptr);
- const SfxPoolItem* pMacroItem=0;
+ const SfxPoolItem* pMacroItem=nullptr;
if( SfxItemState::SET == rSet->GetItemState( SID_MACROINFO, true, &pMacroItem ) )
{
m_pMacroInfoItem = &dynamic_cast<const SfxMacroInfoItem&>(*pMacroItem);
@@ -1478,11 +1478,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet )
}
else
{
- const SfxPoolItem* pStringItem=0;
+ const SfxPoolItem* pStringItem=nullptr;
if( SfxItemState::SET == rSet->GetItemState( SID_CHARMAP, true, &pStringItem ) )
m_pStringItem = dynamic_cast<const SfxStringItem*>( pStringItem );
- const SfxPoolItem* pFontItem=0;
+ const SfxPoolItem* pFontItem=nullptr;
if( SfxItemState::SET == rSet->GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) )
m_pFontItem = dynamic_cast<const SfxStringItem*>( pFontItem );
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index f338b22c0433..6a823400dcfd 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -789,10 +789,10 @@ SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet
{
InitImageType();
- m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage, NULL);
- m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage, NULL);
- m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage, NULL);
- m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage, NULL);
+ m_nMenusPageId = AddTabPage("menus", CreateSvxMenuConfigPage, nullptr);
+ m_nKeyboardPageId = AddTabPage("keyboard", CreateKeyboardConfigPage, nullptr);
+ m_nToolbarsPageId = AddTabPage("toolbars", CreateSvxToolbarConfigPage, nullptr);
+ m_nEventsPageId = AddTabPage("events", CreateSvxEventConfigPage, nullptr);
const SfxPoolItem* pItem =
pInSet->GetItem( pInSet->GetPool()->GetWhich( SID_CONFIG ) );
@@ -837,7 +837,7 @@ void SvxConfigDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
******************************************************************************/
// Initialize static variable which holds default XImageManager
-uno::Reference< css::ui::XImageManager>* SaveInData::xDefaultImgMgr = NULL;
+uno::Reference< css::ui::XImageManager>* SaveInData::xDefaultImgMgr = nullptr;
SaveInData::SaveInData(
const uno::Reference< css::ui::XUIConfigurationManager >& xCfgMgr,
@@ -938,7 +938,7 @@ Image SaveInData::GetImage( const OUString& rCommandURL )
{
aImage = Image( xGraphic );
}
- else if ( xDefaultImgMgr != NULL && (*xDefaultImgMgr).is() )
+ else if ( xDefaultImgMgr != nullptr && (*xDefaultImgMgr).is() )
{
xGraphic = GetGraphic( (*xDefaultImgMgr), rCommandURL );
@@ -985,7 +985,7 @@ bool SaveInData::PersistChanges(
******************************************************************************/
// Initialize static variable which holds default Menu data
-MenuSaveInData* MenuSaveInData::pDefaultData = NULL;
+MenuSaveInData* MenuSaveInData::pDefaultData = nullptr;
MenuSaveInData::MenuSaveInData(
const uno::Reference< css::ui::XUIConfigurationManager >& cfgmgr,
@@ -998,7 +998,7 @@ MenuSaveInData::MenuSaveInData(
ITEM_MENUBAR_URL ),
m_aDescriptorContainer(
ITEM_DESCRIPTOR_CONTAINER ),
- pRootEntry( 0 )
+ pRootEntry( nullptr )
{
try
{
@@ -1022,7 +1022,7 @@ MenuSaveInData::MenuSaveInData(
MenuSaveInData::~MenuSaveInData()
{
- if ( pRootEntry != NULL )
+ if ( pRootEntry != nullptr )
{
delete pRootEntry;
}
@@ -1031,7 +1031,7 @@ MenuSaveInData::~MenuSaveInData()
SvxEntries*
MenuSaveInData::GetEntries()
{
- if ( pRootEntry == NULL )
+ if ( pRootEntry == nullptr )
{
pRootEntry = new SvxConfigEntry(
OUString("MainMenus"),
@@ -1041,7 +1041,7 @@ MenuSaveInData::GetEntries()
{
LoadSubMenus( m_xMenuSettings, OUString(), pRootEntry );
}
- else if ( GetDefaultData() != NULL )
+ else if ( GetDefaultData() != nullptr )
{
// If the doc has no config settings use module config settings
LoadSubMenus( GetDefaultData()->m_xMenuSettings, OUString(), pRootEntry );
@@ -1301,7 +1301,7 @@ MenuSaveInData::Reset()
GetConfigManager()->reset();
delete pRootEntry;
- pRootEntry = NULL;
+ pRootEntry = nullptr;
try
{
@@ -1476,7 +1476,7 @@ TriState SvxMenuEntriesListBox::NotifyCopying(
if ( !m_bIsInternalDrag )
{
// if the target is NULL then add function to the start of the list
- pPage->AddFunction( pTarget, pTarget == NULL );
+ pPage->AddFunction( pTarget, pTarget == nullptr );
// AddFunction already adds the listbox entry so return TRISTATE_FALSE
// to stop another listbox entry being added
@@ -1522,9 +1522,9 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "MenuAssignPage", "cui/ui/menuassignpage.ui", &rSet)
, bInitialised(false)
- , pCurrentSaveInData(0)
- , m_pContentsListBox(0)
- , m_pSelectorDlg(0)
+ , pCurrentSaveInData(nullptr)
+ , m_pContentsListBox(nullptr)
+ , m_pSelectorDlg(nullptr)
{
get(m_pTopLevel, "toplevel");
get(m_pTopLevelLabel, "toplevelft");
@@ -1616,7 +1616,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
xModuleCfgSupplier( css::ui::theModuleUIConfigurationManagerSupplier::get(xContext) );
// Set up data for module specific menus
- SaveInData* pModuleData = NULL;
+ SaveInData* pModuleData = nullptr;
try
{
@@ -1632,7 +1632,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
{
}
- if ( pModuleData != NULL )
+ if ( pModuleData != nullptr )
{
nPos = m_pSaveInListBox->InsertEntry(
utl::ConfigManager::getProductName() + " " + aModuleName );
@@ -1659,7 +1659,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
}
}
- SaveInData* pDocData = NULL;
+ SaveInData* pDocData = nullptr;
if ( xDocCfgMgr.is() )
{
pDocData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, true );
@@ -1694,7 +1694,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
{
// if the document has menu configuration settings select it
// it the SaveIn listbox, otherwise select the module data
- if ( pDocData != NULL && pDocData->HasSettings() )
+ if ( pDocData != nullptr && pDocData->HasSettings() )
{
m_pSaveInListBox->SelectEntryPos( nPos );
pCurrentSaveInData = pDocData;
@@ -1956,13 +1956,13 @@ SvxEntries* SvxConfigPage::FindParentForChild(
SvxEntries* result =
FindParentForChild( pEntryData->GetEntries(), pChildData );
- if ( result != NULL )
+ if ( result != nullptr )
{
return result;
}
}
}
- return NULL;
+ return nullptr;
}
SvTreeListEntry* SvxConfigPage::AddFunction(
@@ -1973,7 +1973,7 @@ SvTreeListEntry* SvxConfigPage::AddFunction(
if ( aURL.isEmpty() )
{
- return NULL;
+ return nullptr;
}
SvxConfigEntry* pNewEntryData =
@@ -1994,9 +1994,9 @@ SvTreeListEntry* SvxConfigPage::AddFunction(
{
// asynchronous error message, because of MsgBoxes
PostUserEvent(
- LINK( this, SvxConfigPage, AsyncInfoMsg ), NULL, true );
+ LINK( this, SvxConfigPage, AsyncInfoMsg ), nullptr, true );
delete pNewEntryData;
- return NULL;
+ return nullptr;
}
}
}
@@ -2012,16 +2012,16 @@ SvTreeListEntry* SvxConfigPage::InsertEntry(
// Grab the entries list for the currently selected menu
SvxEntries* pEntries = GetTopLevelSelection()->GetEntries();
- SvTreeListEntry* pNewEntry = NULL;
+ SvTreeListEntry* pNewEntry = nullptr;
SvTreeListEntry* pCurEntry =
- pTarget != NULL ? pTarget : m_pContentsListBox->GetCurEntry();
+ pTarget != nullptr ? pTarget : m_pContentsListBox->GetCurEntry();
if ( bFront )
{
pEntries->insert( pEntries->begin(), pNewEntryData );
pNewEntry = InsertEntryIntoUI( pNewEntryData, 0 );
}
- else if ( pCurEntry == NULL || pCurEntry == m_pContentsListBox->Last() )
+ else if ( pCurEntry == nullptr || pCurEntry == m_pContentsListBox->Last() )
{
pEntries->push_back( pNewEntryData );
pNewEntry = InsertEntryIntoUI( pNewEntryData );
@@ -2053,7 +2053,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntry(
}
}
- if ( pNewEntry != NULL )
+ if ( pNewEntry != nullptr )
{
m_pContentsListBox->Select( pNewEntry );
m_pContentsListBox->MakeVisible( pNewEntry );
@@ -2067,13 +2067,13 @@ SvTreeListEntry* SvxConfigPage::InsertEntry(
SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
SvxConfigEntry* pNewEntryData, sal_uLong nPos )
{
- SvTreeListEntry* pNewEntry = NULL;
+ SvTreeListEntry* pNewEntry = nullptr;
if (pNewEntryData->IsSeparator())
{
pNewEntry = m_pContentsListBox->InsertEntry(
OUString(aSeparatorStr),
- 0, false, nPos, pNewEntryData);
+ nullptr, false, nPos, pNewEntryData);
}
else
{
@@ -2085,12 +2085,12 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
if ( !!aImage )
{
pNewEntry = m_pContentsListBox->InsertEntry(
- aName, aImage, aImage, 0, false, nPos, pNewEntryData );
+ aName, aImage, aImage, nullptr, false, nPos, pNewEntryData );
}
else
{
pNewEntry = m_pContentsListBox->InsertEntry(
- aName, 0, false, nPos, pNewEntryData );
+ aName, nullptr, false, nPos, pNewEntryData );
}
if ( pNewEntryData->IsPopup() ||
@@ -2122,8 +2122,8 @@ IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void )
void SvxConfigPage::MoveEntry( bool bMoveUp )
{
SvTreeListEntry *pSourceEntry = m_pContentsListBox->FirstSelected();
- SvTreeListEntry *pTargetEntry = NULL;
- SvTreeListEntry *pToSelect = NULL;
+ SvTreeListEntry *pTargetEntry = nullptr;
+ SvTreeListEntry *pToSelect = nullptr;
if ( !pSourceEntry )
{
@@ -2157,7 +2157,7 @@ bool SvxConfigPage::MoveEntryData(
SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry )
{
//#i53677#
- if (NULL == pSourceEntry || NULL == pTargetEntry)
+ if (nullptr == pSourceEntry || nullptr == pTargetEntry)
{
return false;
}
@@ -2171,7 +2171,7 @@ bool SvxConfigPage::MoveEntryData(
SvxConfigEntry* pTargetData =
static_cast<SvxConfigEntry*>(pTargetEntry->GetUserData());
- if ( pSourceData != NULL && pTargetData != NULL )
+ if ( pSourceData != nullptr && pTargetData != nullptr )
{
// remove the source entry from our list
RemoveEntry( pEntries, pSourceData );
@@ -2277,7 +2277,7 @@ void SvxMenuConfigPage::UpdateButtonStates()
// Disable Up and Down buttons depending on current selection
SvTreeListEntry* selection = m_pContentsListBox->GetCurEntry();
- if ( m_pContentsListBox->GetEntryCount() == 0 || selection == NULL )
+ if ( m_pContentsListBox->GetEntryCount() == 0 || selection == nullptr )
{
m_pMoveUpButton->Enable( false );
m_pMoveDownButton->Enable( false );
@@ -2337,7 +2337,7 @@ bool SvxMenuConfigPage::DeleteSelectedContent()
{
SvTreeListEntry *pActEntry = m_pContentsListBox->FirstSelected();
- if ( pActEntry != NULL )
+ if ( pActEntry != nullptr )
{
// get currently selected menu entry
SvxConfigEntry* pMenuEntry =
@@ -2578,7 +2578,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
vcl::Window* pParent, SvxEntries* entries,
SvxConfigEntry* selection, bool bCreateMenu )
: ModalDialog(pParent, "MoveMenuDialog", "cui/ui/movemenu.ui")
- , mpEntries(0)
+ , mpEntries(nullptr)
, bModified(false)
{
get(m_pMenuBox, "namebox");
@@ -2589,7 +2589,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
m_pMenuListBox->set_height_request(m_pMenuListBox->GetTextHeight() * 12);
// Copy the entries list passed in
- if ( entries != NULL )
+ if ( entries != nullptr )
{
mpEntries = new SvxEntries();
SvxEntries::const_iterator iter = entries->begin();
@@ -2638,7 +2638,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
}
else
{
- pNewMenuEntry = NULL;
+ pNewMenuEntry = nullptr;
// hide name label and textfield
m_pMenuBox->Hide();
@@ -2705,7 +2705,7 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates()
IMPL_LINK_TYPED( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void )
{
SvTreeListEntry *pSourceEntry = m_pMenuListBox->FirstSelected();
- SvTreeListEntry *pTargetEntry = NULL;
+ SvTreeListEntry *pTargetEntry = nullptr;
if ( !pSourceEntry )
{
@@ -2723,7 +2723,7 @@ IMPL_LINK_TYPED( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void )
pSourceEntry = SvTreeListBox::PrevSibling( pTargetEntry );
}
- if ( pSourceEntry != NULL && pTargetEntry != NULL )
+ if ( pSourceEntry != nullptr && pTargetEntry != nullptr )
{
SvxConfigEntry* pSourceData =
static_cast<SvxConfigEntry*>(pSourceEntry->GetUserData());
@@ -2768,7 +2768,7 @@ SvxConfigEntry::GetHelpText()
{
if ( !aCommand.isEmpty() )
{
- aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL );
+ aHelpText = Application::GetHelp()->GetHelpText( aCommand, nullptr );
}
}
@@ -2787,7 +2787,7 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
, bIsParentData( bParentData )
, bIsVisible( true )
, nStyle( 0 )
- , mpEntries( 0 )
+ , mpEntries( nullptr )
{
if (bPopUp)
{
@@ -2797,7 +2797,7 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
SvxConfigEntry::~SvxConfigEntry()
{
- if ( mpEntries != NULL )
+ if ( mpEntries != nullptr )
{
SvxEntries::const_iterator iter = mpEntries->begin();
@@ -2970,7 +2970,7 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
{
SvTreeListEntry *pActEntry = m_pContentsListBox->FirstSelected();
- if ( pActEntry != NULL )
+ if ( pActEntry != nullptr )
{
// get currently selected entry
SvxConfigEntry* pEntry =
@@ -3163,7 +3163,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
// find position of entry within the list
for ( sal_uLong i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
{
- if ( m_pContentsListBox->GetEntry( 0, i ) == pActEntry )
+ if ( m_pContentsListBox->GetEntry( nullptr, i ) == pActEntry )
{
nSelectionPos = i;
break;
@@ -3261,7 +3261,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
// find position of entry within the list
for ( sal_uLong i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
{
- if ( m_pContentsListBox->GetEntry( 0, i ) == pActEntry )
+ if ( m_pContentsListBox->GetEntry( nullptr, i ) == pActEntry )
{
nSelectionPos = i;
break;
@@ -3339,7 +3339,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
// find position of entry within the list
for ( sal_uLong i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
{
- if ( m_pContentsListBox->GetEntry( 0, i ) == pActEntry )
+ if ( m_pContentsListBox->GetEntry( nullptr, i ) == pActEntry )
{
nSelectionPos = i;
break;
@@ -3445,7 +3445,7 @@ ToolbarSaveInData::ToolbarSaveInData(
bool docConfig ) :
SaveInData ( xCfgMgr, xParentCfgMgr, aModuleId, docConfig ),
- pRootEntry ( NULL ),
+ pRootEntry ( nullptr ),
m_aDescriptorContainer ( ITEM_DESCRIPTOR_CONTAINER )
{
@@ -3473,7 +3473,7 @@ void ToolbarSaveInData::SetSystemStyle(
// this code is a temporary hack as the UI is not updating after
// changing the toolbar style via the API
uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- vcl::Window *window = NULL;
+ vcl::Window *window = nullptr;
uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY );
if ( xPropSet.is() )
@@ -3497,7 +3497,7 @@ void ToolbarSaveInData::SetSystemStyle(
window = VCLUnoHelper::GetWindow( xWindow );
}
- if ( window != NULL && window->GetType() == WINDOW_TOOLBOX )
+ if ( window != nullptr && window->GetType() == WINDOW_TOOLBOX )
{
ToolBox* toolbox = static_cast<ToolBox*>(window);
@@ -3661,7 +3661,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
ToolbarInfo aToolbarInfo;
- if ( pRootEntry == NULL )
+ if ( pRootEntry == nullptr )
{
pRootEntry = new SvxConfigEntry(
@@ -3901,7 +3901,7 @@ void ToolbarSaveInData::Reset()
// now delete the root SvxConfigEntry the next call to GetEntries()
// causes it to be reinitialised
delete pRootEntry;
- pRootEntry = NULL;
+ pRootEntry = nullptr;
// reset all icons to default
try
@@ -4262,7 +4262,7 @@ void SvxToolbarConfigPage::UpdateButtonStates()
m_pDescriptionField->SetText("");
SvTreeListEntry* selection = m_pContentsListBox->GetCurEntry();
- if ( m_pContentsListBox->GetEntryCount() == 0 || selection == NULL )
+ if ( m_pContentsListBox->GetEntryCount() == 0 || selection == nullptr )
{
return;
}
@@ -4309,7 +4309,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void )
m_pContentsListBox->Clear();
SvxConfigEntry* pToolbar = GetTopLevelSelection();
- if ( pToolbar == NULL )
+ if ( pToolbar == nullptr )
{
m_pModifyTopLevelButton->Enable( false );
m_pModifyCommandButton->Enable( false );
@@ -4480,7 +4480,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction(
// get currently selected toolbar and apply change
SvxConfigEntry* pToolbar = GetTopLevelSelection();
- if ( pToolbar != NULL )
+ if ( pToolbar != nullptr )
{
static_cast<ToolbarSaveInData*>( GetSaveInData() )->ApplyToolbar( pToolbar );
}
@@ -4505,7 +4505,7 @@ SvxToolbarEntriesListBox::~SvxToolbarEntriesListBox()
void SvxToolbarEntriesListBox::dispose()
{
delete m_pButtonData;
- m_pButtonData = NULL;
+ m_pButtonData = nullptr;
pPage.clear();
SvxMenuEntriesListBox::dispose();
@@ -4583,7 +4583,7 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt )
void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry )
{
- if ( pEntry != NULL )
+ if ( pEntry != nullptr )
{
SvxConfigEntry* pEntryData =
static_cast<SvxConfigEntry*>(pEntry->GetUserData());
@@ -4635,7 +4635,7 @@ TriState SvxToolbarEntriesListBox::NotifyMoving(
{
// Instant Apply changes to UI
SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection();
- if ( pToolbar != NULL )
+ if ( pToolbar != nullptr )
{
ToolbarSaveInData* pSaveInData =
static_cast<ToolbarSaveInData*>( pPage->GetSaveInData() );
@@ -4659,11 +4659,11 @@ TriState SvxToolbarEntriesListBox::NotifyCopying(
if ( !m_bIsInternalDrag )
{
// if the target is NULL then add function to the start of the list
- static_cast<SvxToolbarConfigPage*>(pPage.get())->AddFunction( pTarget, pTarget == NULL );
+ static_cast<SvxToolbarConfigPage*>(pPage.get())->AddFunction( pTarget, pTarget == nullptr );
// Instant Apply changes to UI
SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection();
- if ( pToolbar != NULL )
+ if ( pToolbar != nullptr )
{
ToolbarSaveInData* pSaveInData =
static_cast<ToolbarSaveInData*>( pPage->GetSaveInData() );
@@ -4909,7 +4909,7 @@ void SvxIconSelectorDialog::dispose()
uno::XInterface* xi = static_cast< uno::XInterface* >(
pTbSymbol->GetItemData( nId ) );
- if ( xi != NULL )
+ if ( xi != nullptr )
xi->release();
}
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 30af1e3aaeed..1102c4c1933f 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -251,7 +251,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox( pParent, nStyle )
- , pStylesInfo( 0 )
+ , pStylesInfo( nullptr )
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
GetModel()->SetSortMode( SortAscending );
@@ -303,7 +303,7 @@ void SfxConfigFunctionListBox::ClearAll()
if ( pData->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER )
{
XInterface* xi = static_cast<XInterface *>(pData->pObject);
- if (xi != NULL)
+ if (xi != nullptr)
{
xi->release();
}
@@ -393,7 +393,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
- , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), pStylesInfo(0)
+ , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(nullptr), pStylesInfo(nullptr)
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
@@ -431,7 +431,7 @@ void SfxConfigGroupListBox::ClearAll()
if (pData->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER)
{
XInterface* xi = static_cast<XInterface *>(pData->pObject);
- if (xi != NULL)
+ if (xi != nullptr)
{
xi->release();
}
@@ -696,13 +696,13 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
{
OUString sStyle( pImp->m_aStrGroupStyles );
SvTreeListEntry *pEntry = InsertEntry( sStyle );
- SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SfxCfgKind::GROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data
+ SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SfxCfgKind::GROUP_STYLES, 0, nullptr ); // TODO last parameter should contain user data
aArr.push_back( pInfo );
pEntry->SetUserData( pInfo );
pEntry->EnableChildrenOnDemand();
}
- MakeVisible( GetEntry( 0,0 ) );
+ MakeVisible( GetEntry( nullptr,0 ) );
SetUpdateMode( true );
}
@@ -952,7 +952,7 @@ void SfxConfigGroupListBox::GroupSelected()
}
if ( pFunctionListBox->GetEntryCount() )
- pFunctionListBox->Select( pFunctionListBox->GetEntry( 0, 0 ) );
+ pFunctionListBox->Select( pFunctionListBox->GetEntry( nullptr, 0 ) );
pFunctionListBox->SetUpdateMode(true);
}
@@ -1136,7 +1136,7 @@ void SfxConfigGroupListBox::SelectMacro( const OUString& rBasic,
aModule = rMacro.getToken( nCount-2, '.' );
}
- SvTreeListEntry *pEntry = FirstChild(0);
+ SvTreeListEntry *pEntry = FirstChild(nullptr);
while ( pEntry )
{
OUString aEntryBas = GetEntryText( pEntry );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 61f687bcf2c8..0944bb125c5b 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -52,10 +52,10 @@ static const char aVndSunStarUNO[] = "vnd.sun.star.UNO:";
static const char aVndSunStarScript[] = "vnd.sun.star.script:";
_SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet )
- : pAssignPB(NULL)
- , pAssignComponentPB(NULL)
- , pDeletePB(NULL)
- , pEventLB(NULL)
+ : pAssignPB(nullptr)
+ , pAssignComponentPB(nullptr)
+ , pDeletePB(nullptr)
+ , pEventLB(nullptr)
, bReadOnly(false)
, bIDEDialogMode(false)
{
@@ -225,8 +225,8 @@ void _SvxMacroTabPage::EnableButtons()
_SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet)
: SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ),
- m_xAppEvents(0),
- m_xDocEvents(0),
+ m_xAppEvents(nullptr),
+ m_xDocEvents(nullptr),
bReadOnly(false),
bDocModified(false),
bAppEvents(false),
@@ -594,7 +594,7 @@ IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void )
IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool)
{
- return GenericHandler_Impl( this, NULL );
+ return GenericHandler_Impl( this, nullptr );
}
// handler for double click on the listbox, and for the assign/delete buttons
@@ -636,7 +636,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
}
}
- bool bDoubleClick = (pBtn == NULL);
+ bool bDoubleClick = (pBtn == nullptr);
bool bUNOAssigned = sEventURL.startsWith( aVndSunStarUNO );
if( pBtn == pImpl->pDeletePB )
{
@@ -646,7 +646,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
if(!pThis->bAppEvents)
pThis->bDocModified = true;
}
- else if ( ( ( pBtn != NULL )
+ else if ( ( ( pBtn != nullptr )
&& ( pBtn == pImpl->pAssignComponentPB )
)
|| ( bDoubleClick
@@ -839,7 +839,7 @@ SvxMacroTabPage::SvxMacroTabPage(vcl::Window* pParent,
InitResources();
- InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0));
+ InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(nullptr), Reference< util::XModifiable >(nullptr));
DisplayAppEvents(true);
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.GetEntry( (sal_uLong)nSelectedIndex );
@@ -898,7 +898,7 @@ void AssignComponentDialog::dispose()
IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void )
{
- GetTabPage()->FillItemSet( 0 );
+ GetTabPage()->FillItemSet( nullptr );
EndDialog( RET_OK );
}
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 115dcab17793..a713d0d1f15a 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -77,8 +77,8 @@ using namespace ::com::sun::star::container;
*/
SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP)
- , pCurEntry(0)
- , m_pDraggingEntry(0)
+ , pCurEntry(nullptr)
+ , m_pDraggingEntry(nullptr)
{
GetModel()->SetSortMode( SortAscending );
@@ -112,7 +112,7 @@ void SvxConfigFunctionListBox::dispose()
SvTreeListEntry* SvxConfigFunctionListBox::GetLastSelectedEntry()
{
- if ( m_pDraggingEntry != NULL )
+ if ( m_pDraggingEntry != nullptr )
{
return m_pDraggingEntry;
}
@@ -155,7 +155,7 @@ void SvxConfigFunctionListBox::ClearAll()
OUString SvxConfigFunctionListBox::GetHelpText( SvTreeListEntry *pEntry )
{
SvxGroupInfo_Impl *pInfo =
- pEntry ? static_cast<SvxGroupInfo_Impl*>(pEntry->GetUserData()): 0;
+ pEntry ? static_cast<SvxGroupInfo_Impl*>(pEntry->GetUserData()): nullptr;
if ( pInfo )
{
@@ -191,7 +191,7 @@ DragDropMode SvxConfigFunctionListBox::NotifyStartDrag(
void SvxConfigFunctionListBox::DragFinished( sal_Int8 /*nDropAction*/ )
{
- m_pDraggingEntry = NULL;
+ m_pDraggingEntry = nullptr;
}
sal_Int8
@@ -204,8 +204,8 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl
: SvTreeListBox(pParent, nStyle |
WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP)
, m_bShowSlots(false)
- , pFunctionListBox(NULL)
- , m_pImageProvider(NULL)
+ , pFunctionListBox(nullptr)
+ , m_pImageProvider(nullptr)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
, m_libImage(CUI_RES(RID_CUIIMG_LIB))
, m_macImage(CUI_RES(RID_CUIIMG_MACRO))
@@ -536,10 +536,10 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
}
else
{
- fillScriptList( rootNode, NULL, false );
+ fillScriptList( rootNode, nullptr, false );
}
}
- MakeVisible( GetEntry( 0,0 ) );
+ MakeVisible( GetEntry( nullptr,0 ) );
SetUpdateMode( true );
}
@@ -650,7 +650,7 @@ void SvxConfigGroupListBox::GroupSelected()
case SVX_CFGGROUP_FUNCTION :
{
SvTreeListEntry *_pEntry = FirstSelected();
- if ( _pEntry != NULL )
+ if ( _pEntry != nullptr )
{
SvxGroupInfo_Impl *_pInfo =
static_cast<SvxGroupInfo_Impl*>(_pEntry->GetUserData());
@@ -711,7 +711,7 @@ void SvxConfigGroupListBox::GroupSelected()
aLabel = commands[i].Command;
}
- SvTreeListEntry* pFuncEntry = NULL;
+ SvTreeListEntry* pFuncEntry = nullptr;
if ( !!aImage )
{
pFuncEntry = pFunctionListBox->InsertEntry(
@@ -803,7 +803,7 @@ void SvxConfigGroupListBox::GroupSelected()
}
if ( pFunctionListBox->GetEntryCount() )
- pFunctionListBox->Select( pFunctionListBox->GetEntry( 0, 0 ) );
+ pFunctionListBox->Select( pFunctionListBox->GetEntry( nullptr, 0 ) );
pFunctionListBox->SetUpdateMode(true);
}
@@ -959,7 +959,7 @@ void
SvxScriptSelectorDialog::UpdateUI()
{
OUString url = GetScriptURL();
- if ( url != NULL && !url.isEmpty() )
+ if ( url != nullptr && !url.isEmpty() )
{
OUString sMessage =
m_pCommands->GetHelpText(m_pCommands->FirstSelected());
@@ -1005,7 +1005,7 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void )
SvTreeListEntry* current = m_pCommands->FirstSelected();
SvTreeListEntry* next = SvTreeListBox::NextSibling( current );
- if ( next != NULL )
+ if ( next != nullptr )
{
m_pCommands->Select( next );
}
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 015b8641194d..a3e7983dbeea 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -54,10 +54,10 @@ struct SpellErrorDescription
const css::uno::Sequence< OUString >& rSuggestions,
css::uno::Reference< css::linguistic2::XProofreader > rxGrammarChecker,
const OUString& rServiceName,
- const OUString* pDialogTitle = 0,
- const OUString* pExplanation = 0,
- const OUString* pRuleId = 0,
- const OUString* pExplanationURL = 0 ) :
+ const OUString* pDialogTitle = nullptr,
+ const OUString* pExplanation = nullptr,
+ const OUString* pRuleId = nullptr,
+ const OUString* pExplanationURL = nullptr ) :
bIsGrammarError( bGrammar ),
sErrorText( rText ),
sDialogTitle( ),
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index b327639249e3..fbb23b8b0c85 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -239,7 +239,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
//can't be called during the ctor, so init
//it on next event cycle post-ctor
Application::PostUserEvent(
- LINK( this, SpellDialog, InitHdl ), NULL, true );
+ LINK( this, SpellDialog, InitHdl ), nullptr, true );
}
@@ -259,7 +259,7 @@ void SpellDialog::dispose()
SaveDictionaries( xDicList );
delete pImpl;
- pImpl = NULL;
+ pImpl = nullptr;
}
m_pLanguageFT.clear();
m_pLanguageLB.clear();
@@ -419,7 +419,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
m_pNotInDictFT,
m_pSentenceED,
m_pLanguageFT,
- 0
+ nullptr
};
sal_Int32 nIdx = 0;
do
@@ -571,7 +571,7 @@ OUString SpellDialog::getReplacementString() const
IMPL_LINK_NOARG_TYPED(SpellDialog, DoubleClickChangeHdl, ListBox&, void)
{
- ChangeHdl(NULL);
+ ChangeHdl(nullptr);
}
IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void)
@@ -823,7 +823,7 @@ int SpellDialog::InitUserDicts()
{
const LanguageType nLang = m_pLanguageLB->GetSelectLanguage();
- const Reference< XDictionary > *pDic = 0;
+ const Reference< XDictionary > *pDic = nullptr;
// get list of dictionaries
Reference< XSearchableDictionaryList > xDicList( SvxGetDictionaryList() );
@@ -1036,7 +1036,7 @@ void SpellDialog::InvalidateDialog()
m_pChangeAllPB,
m_pAutoCorrPB,
m_pUndoPB,
- 0
+ nullptr
};
sal_Int16 i = 0;
while(aDisableArr[i])
@@ -1105,7 +1105,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
if( xNamed.is() )
sServiceName = xNamed->getName();
SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(),
- aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), 0, sServiceName);
+ aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), nullptr, sServiceName);
m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
}
else if(aStart->bIsGrammarError )
@@ -1176,7 +1176,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe
if(xEntry.is())
{
aStart->sText = getDotReplacementString(rString, xEntry->getReplacementText());
- aStart->xAlternatives = 0;
+ aStart->xAlternatives = nullptr;
bHasReplaced = true;
}
else
@@ -1302,11 +1302,11 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
TextPaM aCursor(rCurrentSelection.GetStart());
const TextCharAttrib* pBackAttr = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_BACKGROUND );
const TextCharAttrib* pErrorAttr = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR );
- const TextCharAttrib* pBackAttrLeft = 0;
- const TextCharAttrib* pErrorAttrLeft = 0;
+ const TextCharAttrib* pBackAttrLeft = nullptr;
+ const TextCharAttrib* pErrorAttrLeft = nullptr;
- bool bHasField = pBackAttr != 0 && (bHasRange || pBackAttr->GetEnd() > aCursor.GetIndex());
- bool bHasError = pErrorAttr != 0 && (bHasRange || pErrorAttr->GetEnd() > aCursor.GetIndex());
+ bool bHasField = pBackAttr != nullptr && (bHasRange || pBackAttr->GetEnd() > aCursor.GetIndex());
+ bool bHasError = pErrorAttr != nullptr && (bHasRange || pErrorAttr->GetEnd() > aCursor.GetIndex());
if(bHasRange)
{
if(pBackAttr &&
@@ -1335,7 +1335,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
//the field has to be selected
if(pIntBackAttr && !pBackAttr)
pBackAttr = pIntBackAttr;
- bHasField |= pIntBackAttr != 0;
+ bHasField |= pIntBackAttr != nullptr;
}
}
}
@@ -1355,13 +1355,13 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
if(bHasFieldLeft)
{
pBackAttrLeft = pBackAttr;
- pBackAttr = 0;
+ pBackAttr = nullptr;
}
bHasErrorLeft = pErrorAttr && pErrorAttr->GetEnd() == aCursor.GetIndex();
if(bHasErrorLeft)
{
pErrorAttrLeft = pErrorAttr;
- pErrorAttr = 0;
+ pErrorAttr = nullptr;
}
//check previous position if this exists
@@ -1372,8 +1372,8 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
--aCursor.GetIndex();
pBackAttrLeft = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_BACKGROUND );
pErrorAttrLeft = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR );
- bHasFieldLeft = pBackAttrLeft !=0;
- bHasErrorLeft = pErrorAttrLeft != 0;
+ bHasFieldLeft = pBackAttrLeft !=nullptr;
+ bHasErrorLeft = pErrorAttrLeft != nullptr;
++aCursor.GetIndex();
}
}
@@ -1399,7 +1399,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
{
nAction = bHasFieldLeft ? ACTION_SELECTFIELD : ACTION_UNDOEDIT;
//to force the use of pBackAttrLeft
- pBackAttr = 0;
+ pBackAttr = nullptr;
}
else if(bDelete)
nAction = bHasField ? ACTION_SELECTFIELD : ACTION_CONTINUE;
@@ -1560,14 +1560,14 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, css::uno:
TextPaM aCursor(0, m_nErrorEnd ? m_nErrorEnd + 1 : 0);
//search for SpellErrorAttrib
- const TextCharAttrib* pNextError = 0;
+ const TextCharAttrib* pNextError = nullptr;
//iterate over the text and search for the next error that maybe has
//to be replace by a ChangeAllList replacement
bool bGrammarError = false;
while(aCursor.GetIndex() < nTextLen)
{
while(aCursor.GetIndex() < nTextLen &&
- 0 == (pNextError = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR)))
+ nullptr == (pNextError = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR)))
{
++aCursor.GetIndex();
}
@@ -1576,7 +1576,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, css::uno:
Reference<XDictionary> xChangeAll( SvxGetChangeAllList(), UNO_QUERY );
Reference<XDictionaryEntry> xEntry;
- const SpellErrorDescription* pSpellErrorDescription = 0;
+ const SpellErrorDescription* pSpellErrorDescription = nullptr;
if(pNextError)
{
pSpellErrorDescription = &static_cast<const SpellErrorAttrib&>(pNextError->GetAttr()).GetErrorDescription();
@@ -1655,7 +1655,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Languag
pTextEngine->UndoActionStart();
const TextCharAttrib* pErrorAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_ERROR );
DBG_ASSERT(pErrorAttrib, "no error attribute found");
- const SpellErrorDescription* pSpellErrorDescription = 0;
+ const SpellErrorDescription* pSpellErrorDescription = nullptr;
if(pErrorAttrib)
{
pTextEngine->RemoveAttrib(0, *pErrorAttrib);
@@ -1718,7 +1718,7 @@ const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives()
TextPaM aCursor(0, m_nErrorStart);
const SpellErrorAttrib* pAttrib = static_cast<const SpellErrorAttrib*>(
GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR));
- return pAttrib ? &pAttrib->GetErrorDescription() : 0;
+ return pAttrib ? &pAttrib->GetErrorDescription() : nullptr;
}
@@ -1755,7 +1755,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
if (xNamed.is())
sServiceName = xNamed->getName();
}
- SpellErrorDescription aDesc( false, aWord, aLocale, aAlts, 0, sServiceName);
+ SpellErrorDescription aDesc( false, aWord, aLocale, aAlts, nullptr, sServiceName);
GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd );
}
@@ -1822,10 +1822,10 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
{
TextPaM aCursor(0, 0);
LanguagePositions_Impl aBreakPositions;
- const TextCharAttrib* pLastLang = 0;
- const TextCharAttrib* pLastError = 0;
+ const TextCharAttrib* pLastLang = nullptr;
+ const TextCharAttrib* pLastError = nullptr;
LanguageType eLang = LANGUAGE_DONTKNOW;
- const TextCharAttrib* pError = 0;
+ const TextCharAttrib* pError = nullptr;
while(aCursor.GetIndex() < nTextLen)
{
const TextCharAttrib* pLang = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_LANGUAGE);
@@ -1995,7 +1995,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
pSpellDialog->m_pAddToDictMB,
pSpellDialog->m_pAddToDictPB,
pSpellDialog->m_pAutoCorrPB,
- 0
+ nullptr
};
sal_Int32 nIdx = 0;
do
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 420d12972f83..424204d80bba 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -351,7 +351,7 @@ ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyl
, meMode( DefaultMode )
, mdX( -1.0 )
, mdY( -1.0 )
-, mpBitmap( 0 )
+, mpBitmap( nullptr )
{
SetControlBackground();
}
@@ -364,7 +364,7 @@ ColorFieldControl::~ColorFieldControl()
void ColorFieldControl::dispose()
{
delete mpBitmap;
- mpBitmap = NULL;
+ mpBitmap = nullptr;
Control::dispose();
}
@@ -389,7 +389,7 @@ void ColorFieldControl::UpdateBitmap()
const Size aSize(GetOutputSizePixel());
if (mpBitmap && mpBitmap->GetSizePixel() != aSize)
- delete mpBitmap, mpBitmap = NULL;
+ delete mpBitmap, mpBitmap = nullptr;
const sal_Int32 nWidth = aSize.Width();
const sal_Int32 nHeight = aSize.Height();
@@ -565,12 +565,12 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate )
mdY = double(aSize.Height() - 1.0 - nY) / double(aSize.Height() - 1.0);
BitmapReadAccess* pReadAccess = mpBitmap->AcquireReadAccess();
- if (pReadAccess != NULL)
+ if (pReadAccess != nullptr)
{
// mpBitmap always has a bit count of 24 => use of GetPixel(...) is safe
maColor = pReadAccess->GetPixel(nY, nX);
Bitmap::ReleaseAccess(pReadAccess);
- pReadAccess = NULL;
+ pReadAccess = nullptr;
}
}
}
@@ -748,7 +748,7 @@ private:
ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle )
: Control( pParent, nStyle )
, meMode( DefaultMode )
- , mpBitmap( 0 )
+ , mpBitmap( nullptr )
, mnLevel( 0 )
, mdValue( -1.0 )
{
@@ -763,7 +763,7 @@ ColorSliderControl::~ColorSliderControl()
void ColorSliderControl::dispose()
{
delete mpBitmap;
- mpBitmap = NULL;
+ mpBitmap = nullptr;
Control::dispose();
}
@@ -783,7 +783,7 @@ void ColorSliderControl::UpdateBitmap()
Size aSize(1, GetOutputSizePixel().Height());
if (mpBitmap && mpBitmap->GetSizePixel() != aSize)
- delete mpBitmap, mpBitmap = NULL;
+ delete mpBitmap, mpBitmap = nullptr;
if (!mpBitmap)
mpBitmap = new Bitmap(aSize, 24);
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6d835dd8a103..bbf06a90fcd7 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -47,7 +47,7 @@
SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxItemSet* pSet )
: SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui")
, bOne( bOne_ )
- , pSubsetMap( NULL )
+ , pSubsetMap( nullptr )
{
get(m_pShowSet, "showcharset");
get(m_pShowChar, "showchar");
@@ -412,7 +412,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void)
void SvxCharacterMap::fillAllSubsets(ListBox &rListBox)
{
- SubsetMap aAll(NULL);
+ SubsetMap aAll(nullptr);
rListBox.Clear();
bool bFirst = true;
while (const Subset *s = aAll.GetNextSubset(bFirst))
@@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void)
// hide unicode subset listbar for symbol fonts
// TODO: get info from the Font once it provides it
delete pSubsetMap;
- pSubsetMap = NULL;
+ pSubsetMap = nullptr;
m_pSubsetLB->Clear();
bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
@@ -458,7 +458,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void)
// TODO: is it worth to improve the stupid linear search?
bool bFirst = true;
const Subset* s;
- while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) )
+ while( nullptr != (s = pSubsetMap->GetNextSubset( bFirst )) )
{
const sal_Int32 nPos_ = m_pSubsetLB->InsertEntry( s->GetName() );
m_pSubsetLB->SetEntryData( nPos_, const_cast<Subset *>(s) );
@@ -547,7 +547,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void)
// using the new UCS4 constructor
aText = OUString( &cChar, 1 );
- const Subset* pSubset = NULL;
+ const Subset* pSubset = nullptr;
if( pSubsetMap )
pSubset = pSubsetMap->GetSubsetByUnicode( cChar );
if( pSubset )
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index cbca73e7d872..1a888ac4ef63 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -77,9 +77,9 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier)
:ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui")
,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) )
- ,m_pPreSearchFocus( NULL )
+ ,m_pPreSearchFocus( nullptr )
,m_lnkContextSupplier(lnkContextSupplier)
- ,m_pConfig( NULL )
+ ,m_pConfig( nullptr )
{
get(m_prbSearchForText,"rbSearchForText");
get(m_prbSearchForNull,"rbSearchForNull");
@@ -170,10 +170,10 @@ void FmSearchDialog::dispose()
SaveParams();
delete m_pConfig;
- m_pConfig = NULL;
+ m_pConfig = nullptr;
delete m_pSearchEngine;
- m_pSearchEngine = NULL;
+ m_pSearchEngine = nullptr;
m_prbSearchForText.clear();
m_prbSearchForNull.clear();
@@ -578,7 +578,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable)
if ( pFocusWindow && IsChild( pFocusWindow ) )
m_pPreSearchFocus = pFocusWindow;
else
- m_pPreSearchFocus = NULL;
+ m_pPreSearchFocus = nullptr;
}
// the search button has two functions -> adjust its text accordingly
@@ -623,7 +623,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable)
pEdit->SetSelection( Selection( 0, pEdit->GetText().getLength() ) );
}
}
- m_pPreSearchFocus = NULL;
+ m_pPreSearchFocus = nullptr;
}
}
@@ -809,7 +809,7 @@ void FmSearchDialog::LoadParams()
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(*m_pcbRegular);
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(*m_pcbApprox);
- CheckBox* pToCheck = NULL;
+ CheckBox* pToCheck = nullptr;
if (aParams.bWildcard)
pToCheck = m_pcbWildCard;
if (aParams.bRegular)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a42c00eceb64..d1c50a11566a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -110,7 +110,7 @@ void SearchThread::execute()
ImplSearch( maStartURL, aFormats, mpBrowser->bSearchRecursive );
}
- Application::PostUserEvent( LINK( mpProgress, SearchProgress, CleanUpHdl ), NULL, true );
+ Application::PostUserEvent( LINK( mpProgress, SearchProgress, CleanUpHdl ), nullptr, true );
}
@@ -337,7 +337,7 @@ void TakeThread::execute()
delete pStatusProgress;
}
- Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), NULL, true );
+ Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), nullptr, true );
}
// - TakeProgress -
@@ -453,7 +453,7 @@ void TakeProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)
: ModalDialog(pWindow, "GalleryUpdateProgress",
"cui/ui/galleryupdateprogress.ui")
- , pIdle(NULL)
+ , pIdle(nullptr)
, pTheme(pThm)
{
get(m_pFtActualizeFile, "file");
@@ -506,7 +506,7 @@ IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
}
pTheme->Actualize( LINK( this, ActualizeProgress, ActualizeHdl ), &aStatusProgress );
- ClickCancelBtn( NULL );
+ ClickCancelBtn( nullptr );
}
@@ -616,8 +616,8 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
, m_nGeneralPageId(0)
, m_nFilesPageId(0)
{
- m_nGeneralPageId = AddTabPage("general", TPGalleryThemeGeneral::Create, 0);
- m_nFilesPageId = AddTabPage("files", TPGalleryThemeProperties::Create, 0);
+ m_nGeneralPageId = AddTabPage("general", TPGalleryThemeGeneral::Create, nullptr);
+ m_nFilesPageId = AddTabPage("files", TPGalleryThemeProperties::Create, nullptr);
if( pData->pTheme->IsReadOnly() )
RemoveTabPage(m_nFilesPageId);
@@ -644,7 +644,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "GalleryGeneralPage",
"cui/ui/gallerygeneralpage.ui", &rSet)
- , pData(NULL)
+ , pData(nullptr)
{
get(m_pFiMSImage, "image");
get(m_pEdtMSName, "name");
@@ -744,7 +744,7 @@ VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const Sf
// - TPGalleryThemeProperties -
TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet )
: SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet)
- , pData(NULL)
+ , pData(nullptr)
, nCurFilterPos(0)
, nFirstExtFilterPos(0)
, bEntriesFound(false)
@@ -871,7 +871,7 @@ void TPGalleryThemeProperties::FillFilterList()
aExt = rFilter.GetImportFormatShortName( i );
aName = rFilter.GetImportFormatName( i );
size_t entryIndex = 0;
- FilterEntry* pTestEntry = aFilterEntryList.empty() ? NULL : aFilterEntryList[ entryIndex ];
+ FilterEntry* pTestEntry = aFilterEntryList.empty() ? nullptr : aFilterEntryList[ entryIndex ];
bool bInList = false;
OUString aExtensions;
@@ -899,7 +899,7 @@ void TPGalleryThemeProperties::FillFilterList()
break;
}
pTestEntry = ( ++entryIndex < aFilterEntryList.size() )
- ? aFilterEntryList[ entryIndex ] : NULL;
+ ? aFilterEntryList[ entryIndex ] : nullptr;
}
if ( !bInList )
{
@@ -1206,7 +1206,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
aPreviewTimer.Stop();
if (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound)
- ClickTakeHdl(NULL);
+ ClickTakeHdl(nullptr);
}
}
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 52eb96d295c8..66d9d1f920c6 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -31,7 +31,7 @@
GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
const WinBits nStyle)
: Control(pParent, nStyle)
- , mpOrigGraphic(NULL)
+ , mpOrigGraphic(nullptr)
, mfScaleX(0.0)
, mfScaleY(0.0)
{
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b360c6f0ab6d..6e06fd9c5815 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -173,7 +173,7 @@ void SvxHpLinkDlg::dispose()
aViewOpt.Delete();
delete mpItemSet;
- mpItemSet = NULL;
+ mpItemSet = nullptr;
maCtrl.dispose();
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 0ab18c3f19d5..3ff72b728f6a 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -149,7 +149,7 @@ void SvxObjectTitleDescDialog::dispose()
SvxMessDialog::SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg )
: ModalDialog(pWindow, "MessBox", "cui/ui/messbox.ui")
- , pImage(NULL)
+ , pImage(nullptr)
{
get(pBtn1, "mess_box_btn1");
get(pBtn2, "mess_box_btn2");
@@ -178,7 +178,7 @@ SvxMessDialog::~SvxMessDialog()
void SvxMessDialog::dispose()
{
delete pImage;
- pImage = NULL;
+ pImage = nullptr;
pFtDescription.clear();
pBtn1.clear();
pBtn2.clear();
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 91a97fd33262..5665b0d58843 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -100,8 +100,8 @@ namespace svx
public:
void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
- Rectangle* _pPrimaryLocation = NULL, Rectangle* _pSecondaryLocation = NULL,
- vcl::ControlLayoutData* _pLayoutData = NULL );
+ Rectangle* _pPrimaryLocation = nullptr, Rectangle* _pSecondaryLocation = nullptr,
+ vcl::ControlLayoutData* _pLayoutData = nullptr );
};
PseudoRubyText::PseudoRubyText()
@@ -121,9 +121,9 @@ namespace svx
Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation,
vcl::ControlLayoutData* _pLayoutData )
{
- bool bLayoutOnly = (NULL != _pLayoutData);
- MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : NULL;
- OUString* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText : NULL;
+ bool bLayoutOnly = (nullptr != _pLayoutData);
+ MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : nullptr;
+ OUString* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText : nullptr;
Size aPlaygroundSize(_rRect.GetSize());
@@ -551,7 +551,7 @@ namespace svx
HangulHanjaConversionDialog::HangulHanjaConversionDialog( vcl::Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
:ModalDialog( _pParent, "HangulHanjaConversionDialog", "cui/ui/hangulhanjaconversiondialog.ui" )
- ,m_pIgnoreNonPrimary( NULL )
+ ,m_pIgnoreNonPrimary( nullptr )
,m_bDocumentMode( true )
{
get( m_pFind, "find" );
@@ -743,7 +743,7 @@ namespace svx
IMPL_LINK_TYPED( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void )
{
- CheckBox *pOtherBox = 0;
+ CheckBox *pOtherBox = nullptr;
if ( pBox == m_pHangulOnly )
pOtherBox = m_pHanjaOnly;
else if ( pBox == m_pHanjaOnly )
@@ -802,8 +802,8 @@ namespace svx
// switch the def button depending if we're working for document text
if ( bOldDocumentMode != m_bDocumentMode )
{
- vcl::Window* pOldDefButton = NULL;
- vcl::Window* pNewDefButton = NULL;
+ vcl::Window* pOldDefButton = nullptr;
+ vcl::Window* pNewDefButton = nullptr;
if ( m_bDocumentMode )
{
pOldDefButton = m_pFind;
@@ -1021,7 +1021,7 @@ namespace svx
IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void)
{
- bool bSel = m_pDictsLB->FirstSelected() != NULL;
+ bool bSel = m_pDictsLB->FirstSelected() != nullptr;
m_pEditPB->Enable(bSel);
m_pDeletePB->Enable(bSel);
@@ -1102,8 +1102,8 @@ namespace svx
HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent)
: ModalDialog( _pParent, "HangulHanjaOptDialog",
"cui/ui/hangulhanjaoptdialog.ui" )
- , m_pCheckButtonData(NULL)
- , m_xConversionDictionaryList(NULL)
+ , m_pCheckButtonData(nullptr)
+ , m_xConversionDictionaryList(nullptr)
{
get(m_pDictsLB, "dicts");
get(m_pIgnorepostCB, "ignorepost");
@@ -1158,13 +1158,13 @@ namespace svx
while( pEntry )
{
delete static_cast<OUString const *>(pEntry->GetUserData());
- pEntry->SetUserData( NULL );
+ pEntry->SetUserData( nullptr );
pEntry = m_pDictsLB->Next( pEntry );
}
}
delete m_pCheckButtonData;
- m_pCheckButtonData = NULL;
+ m_pCheckButtonData = nullptr;
m_pDictsLB.clear();
m_pIgnorepostCB.clear();
@@ -1259,7 +1259,7 @@ namespace svx
};
SuggestionList::SuggestionList() :
- m_vElements(MAXNUM_SUGGESTIONS, static_cast<OUString*>(NULL))
+ m_vElements(MAXNUM_SUGGESTIONS, static_cast<OUString*>(nullptr))
{
m_nAct = m_nNumOfEntries = 0;
}
@@ -1274,7 +1274,7 @@ namespace svx
bool bRet = _nNumOfElement < m_vElements.size();
if( bRet )
{
- if( m_vElements[_nNumOfElement] != NULL )
+ if( m_vElements[_nNumOfElement] != nullptr )
*(m_vElements[_nNumOfElement]) = _rElement;
else
{
@@ -1291,10 +1291,10 @@ namespace svx
bool bRet = _nNumOfElement < m_vElements.size();
if( bRet )
{
- if( m_vElements[_nNumOfElement] != NULL )
+ if( m_vElements[_nNumOfElement] != nullptr )
{
delete m_vElements[_nNumOfElement];
- m_vElements[_nNumOfElement] = NULL;
+ m_vElements[_nNumOfElement] = nullptr;
--m_nNumOfEntries;
}
}
@@ -1306,7 +1306,7 @@ namespace svx
{
if( _nNumOfElement < m_vElements.size())
return m_vElements[_nNumOfElement];
- return NULL;
+ return nullptr;
}
void SuggestionList::Clear()
@@ -1314,10 +1314,10 @@ namespace svx
if( m_nNumOfEntries )
{
for( std::vector<OUString*>::iterator it = m_vElements.begin(); it != m_vElements.end(); ++it )
- if( *it != NULL )
+ if( *it != nullptr )
{
delete *it;
- *it = NULL;
+ *it = nullptr;
}
m_nNumOfEntries = m_nAct = 0;
@@ -1326,7 +1326,7 @@ namespace svx
const OUString* SuggestionList::_Next()
{
- const OUString* pRet = NULL;
+ const OUString* pRet = nullptr;
while( m_nAct < m_vElements.size() && !pRet )
{
pRet = m_vElements[ m_nAct ];
@@ -1353,7 +1353,7 @@ namespace svx
pRet = _Next();
}
else
- pRet = NULL;
+ pRet = nullptr;
return pRet;
}
@@ -1388,9 +1388,9 @@ namespace svx
SuggestionEdit::SuggestionEdit( vcl::Window* pParent, WinBits nBits )
: Edit(pParent, nBits)
- , m_pPrev(NULL)
- , m_pNext(NULL)
- , m_pScrollBar(NULL)
+ , m_pPrev(nullptr)
+ , m_pNext(nullptr)
+ , m_pScrollBar(nullptr)
{
}
@@ -1739,7 +1739,7 @@ namespace svx
,m_aEditHintText ( CUI_RESSTR(RID_SVXSTR_EDITHINT) )
,m_rDictList ( _rDictList )
,m_nCurrentDict ( 0xFFFFFFFF )
- ,m_pSuggestions ( NULL )
+ ,m_pSuggestions ( nullptr )
,m_nTopPos ( 0 )
,m_bModifiedSuggestions ( false )
,m_bModifiedOriginal ( false )
@@ -1754,10 +1754,10 @@ namespace svx
get( m_aEdit3, "edit3" );
get( m_aEdit4, "edit4" );
- m_aEdit1->init( m_aScrollSB, NULL, m_aEdit2 );
+ m_aEdit1->init( m_aScrollSB, nullptr, m_aEdit2 );
m_aEdit2->init( m_aScrollSB, m_aEdit1, m_aEdit3 );
m_aEdit3->init( m_aScrollSB, m_aEdit2, m_aEdit4 );
- m_aEdit4->init( m_aScrollSB, m_aEdit3, NULL );
+ m_aEdit4->init( m_aScrollSB, m_aEdit3, nullptr );
m_aOriginalLB->SetModifyHdl( LINK( this, HangulHanjaEditDictDialog, OriginalModifyHdl ) );
@@ -1807,7 +1807,7 @@ namespace svx
void HangulHanjaEditDictDialog::dispose()
{
delete m_pSuggestions;
- m_pSuggestions = NULL;
+ m_pSuggestions = nullptr;
m_aBookLB.clear();
m_aOriginalLB.clear();
m_aEdit1.clear();
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index e35ed0bc1c6c..e38b02ed0b43 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -138,7 +138,7 @@ void SvxHyperlinkNewDocTp::dispose()
{
for ( sal_Int32 n=0; n<m_pLbDocTypes->GetEntryCount(); n++ )
delete static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData ( n ));
- m_pLbDocTypes = NULL;
+ m_pLbDocTypes = nullptr;
}
m_pRbtEditNow.clear();
m_pRbtEditLater.clear();
@@ -304,7 +304,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
// create Document
aStrNewName = aURL.GetURLPath( INetURLObject::NO_DECODE );
- SfxViewFrame *pViewFrame = NULL;
+ SfxViewFrame *pViewFrame = nullptr;
try
{
bool bCreate = true;
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 31579db9748a..99330d974c60 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -258,7 +258,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void
if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) )
{
m_pCbAnonymous->Check();
- ClickAnonymousHdl_Impl(NULL);
+ ClickAnonymousHdl_Impl(nullptr);
}
}
@@ -403,7 +403,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, Button*, void
SfxBoolItem aBrowse( SID_BROWSE, true );
- const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL };
+ const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, nullptr };
static_cast<SvxHpLinkDlg*>(mpDialog.get())->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 06a8ba26836b..a822f075c39f 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -68,7 +68,7 @@ struct TargetData
//# #
SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
- , mpParentWnd(NULL)
+ , mpParentWnd(nullptr)
{
SetNodeDefaultImages();
}
@@ -563,7 +563,7 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark)
IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool)
{
- ClickApplyHdl_Impl(NULL);
+ ClickApplyHdl_Impl(nullptr);
return false;
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 69c94924a15d..c972d24deb21 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -122,11 +122,11 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent,
const OUString& rUIXMLDescription,
const SfxItemSet& rItemSet )
: IconChoicePage ( pParent, rID, rUIXMLDescription, rItemSet ),
- mpCbbFrame ( NULL ),
- mpLbForm ( NULL ),
- mpEdIndication ( NULL ),
- mpEdText ( NULL ),
- mpBtScript ( NULL ),
+ mpCbbFrame ( nullptr ),
+ mpLbForm ( nullptr ),
+ mpEdIndication ( nullptr ),
+ mpEdText ( nullptr ),
+ mpBtScript ( nullptr ),
mbIsCloseDisabled ( false ),
mpDialog ( pDlg ),
mbStdControlsInit ( false )
@@ -178,8 +178,8 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
get(mpCbbFrame, "frame");
SfxDispatcher* pDispatch = GetDispatcher();
- SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
- SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0;
+ SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : nullptr;
+ SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : nullptr;
if ( pFrame )
{
std::unique_ptr<TargetList> pList(new TargetList);
@@ -225,7 +225,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
static_cast<vcl::Window*>(mpMarkWnd)->Show();
// Size of dialog-window in screen pixels
- Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) );
+ Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( nullptr ) );
Point aDlgPos ( aDlgRect.TopLeft() );
Size aDlgSize ( mpDialog->GetSizePixel () );
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 5d00a0803242..0bfd45e5811c 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -201,7 +201,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
void SvxHyphenWordDialog::InitControls_Impl()
{
- m_xPossHyph = NULL;
+ m_xPossHyph = nullptr;
if (m_xHyphenator.is())
{
lang::Locale aLocale( LanguageTag::convertToLocale(m_nActLanguage) );
@@ -443,8 +443,8 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
SvxSpellWrapper* pWrapper)
: SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui")
, m_pHyphWrapper(pWrapper)
- , m_xHyphenator(NULL)
- , m_xPossHyph(NULL)
+ , m_xHyphenator(nullptr)
+ , m_xPossHyph(nullptr)
, m_aActWord(rWord)
, m_nActLanguage(nLang)
, m_nMaxHyphenationPos(0)
@@ -466,7 +466,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
m_xHyphenator = xHyphen;
uno::Reference< linguistic2::XHyphenatedWord > xHyphWord( m_pHyphWrapper ?
- m_pHyphWrapper->GetLast() : NULL, uno::UNO_QUERY );
+ m_pHyphWrapper->GetLast() : nullptr, uno::UNO_QUERY );
DBG_ASSERT( xHyphWord.is(), "hyphenation result missing" );
if (xHyphWord.is())
{
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 46fd8b4d59eb..c265576032e6 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -47,7 +47,7 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID,
: TabPage ( pParent, rID, rUIXMLDescription ),
pSet ( &rAttrSet ),
bHasExchangeSupport ( false ),
- pDialog ( NULL )
+ pDialog ( nullptr )
{
SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE );
}
@@ -166,9 +166,9 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
mnCurrentPageId ( USHRT_MAX ),
pSet ( pItemSet ),
- pOutSet ( NULL ),
- pExampleSet ( NULL ),
- pRanges ( NULL ),
+ pOutSet ( nullptr ),
+ pExampleSet ( nullptr ),
+ pRanges ( nullptr ),
bHideResetBtn ( false ),
bModal ( false ),
@@ -258,9 +258,9 @@ void IconChoiceDialog::dispose()
}
delete pRanges;
- pRanges = NULL;
+ pRanges = nullptr;
delete pOutSet;
- pOutSet = NULL;
+ pOutSet = nullptr;
m_pIconCtrl.clear();
m_pOKBtn.clear();
@@ -449,7 +449,7 @@ void IconChoiceDialog::ActivatePageImpl ()
{
if ( !pData->pPage )
{
- const SfxItemSet* pTmpSet = 0;
+ const SfxItemSet* pTmpSet = nullptr;
if ( pSet )
{
@@ -534,7 +534,7 @@ bool IconChoiceDialog::DeActivatePageImpl ()
nRet = pPage->DeactivatePage( pExampleSet );
}
else
- nRet = pPage->DeactivatePage( NULL );
+ nRet = pPage->DeactivatePage( nullptr );
}
if ( nRet & IconChoicePage::REFRESH_SET )
@@ -633,7 +633,7 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
{
- bool bSet = ( pSet != NULL );
+ bool bSet = ( pSet != nullptr );
pSet = pInSet;
@@ -657,7 +657,7 @@ SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 )
{
SAL_INFO( "cui.dialogs", "CreateInputItemSet not implemented" );
- return 0;
+ return nullptr;
}
/**********************************************************************
@@ -727,7 +727,7 @@ void IconChoiceDialog::RefreshInputSet()
IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId )
{
- IconChoicePageData *pRet = NULL;
+ IconChoicePageData *pRet = nullptr;
for ( size_t i=0; i < maPageList.size(); i++ )
{
IconChoicePageData* pData = maPageList[ i ];
@@ -769,7 +769,7 @@ bool IconChoiceDialog::OK_Impl()
}
}
else
- nRet = pPage->DeactivatePage( NULL );
+ nRet = pPage->DeactivatePage( nullptr );
bEnd = nRet;
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index bade98ceff5c..f47208bef1c3 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -180,7 +180,7 @@ SvInsertOleDlg::SvInsertOleDlg
m_pRbNewObject->SetClickHdl( aLink );
m_pRbObjectFromfile->SetClickHdl( aLink );
m_pRbNewObject->Check();
- RadioHdl( NULL );
+ RadioHdl( nullptr );
}
SvInsertOleDlg::~SvInsertOleDlg()
@@ -319,7 +319,7 @@ short SvInsertOleDlg::Execute()
uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
uno::Reference< task::XInteractionHandler2 > xInteraction(
- task::InteractionHandler::createWithParent(xContext, 0) );
+ task::InteractionHandler::createWithParent(xContext, nullptr) );
aMedium[1].Name = "InteractionHandler";
aMedium[1].Value <<= xInteraction;
@@ -342,7 +342,7 @@ short SvInsertOleDlg::Execute()
}
}
- m_pServers = 0;
+ m_pServers = nullptr;
return nRet;
}
@@ -393,7 +393,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertPlugInDialog, BrowseHdl, Button*, void)
SvInsertPlugInDialog::SvInsertPlugInDialog(vcl::Window* pParent,
const uno::Reference < embed::XStorage >& xStorage)
: InsertObjectDialog_Impl(pParent, "InsertPluginDialog", "cui/ui/insertplugin.ui", xStorage)
- , m_pURL(0)
+ , m_pURL(nullptr)
{
get(m_pEdFileurl, "urled");
get(m_pBtnFileurl, "urlbtn");
@@ -409,7 +409,7 @@ SvInsertPlugInDialog::~SvInsertPlugInDialog()
void SvInsertPlugInDialog::dispose()
{
delete m_pURL;
- m_pURL = NULL;
+ m_pURL = nullptr;
m_pEdFileurl.clear();
m_pBtnFileurl.clear();
m_pEdPluginsOptions.clear();
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 402e20c81b7a..3a4981c35c86 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -94,7 +94,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b
aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ),
aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ),
aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ),
- pLinkMgr( NULL ),
+ pLinkMgr( nullptr ),
bHtmlMode(bHtml)
{
get(m_pTbLinks, "TB_LINKS");
@@ -171,8 +171,8 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox,
if(nSelectionCount > 1)
{
// possibly deselect old entries in case of multi-selection
- SvTreeListEntry* pEntry = 0;
- SvBaseLink* pLink = 0;
+ SvTreeListEntry* pEntry = nullptr;
+ SvBaseLink* pLink = nullptr;
pEntry = pSvTabListBox->GetHdlEntry();
pLink = static_cast<SvBaseLink*>(pEntry->GetUserData());
sal_uInt16 nObjectType = pLink->GetObjType();
@@ -217,7 +217,7 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox,
m_pPbUpdateNow->Enable();
OUString sType, sLink;
- OUString *pLinkNm = &sLink, *pFilter = 0;
+ OUString *pLinkNm = &sLink, *pFilter = nullptr;
if( FILEOBJECT & pLink->GetObjType() )
{
@@ -225,7 +225,7 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox,
m_pRbManual->Check();
m_pRbManual->Disable();
if( OBJECT_CLIENT_GRF == pLink->GetObjType() )
- pLinkNm = 0, pFilter = &sLink;
+ pLinkNm = nullptr, pFilter = &sLink;
}
else
{
@@ -249,7 +249,7 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox,
IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool )
{
- ChangeSourceClickHdl( 0 );
+ ChangeSourceClickHdl( nullptr );
return false;
}
@@ -312,11 +312,11 @@ IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void)
// if somebody is of the opinion to swap his links (SD)
LinkManager* pNewMgr = pLinkMgr;
- pLinkMgr = 0;
+ pLinkMgr = nullptr;
SetManager( pNewMgr );
- if( 0 == (pE = rListBox.GetEntry( aPosArr[ 0 ] )) ||
+ if( nullptr == (pE = rListBox.GetEntry( aPosArr[ 0 ] )) ||
pE->GetUserData() != aLnkArr[ 0 ] )
{
// search the link
@@ -388,7 +388,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void )
INetURLObject aUrl2(aPath, INetProtocol::File);
aUrl2.insertName( aUrl_.getName() );
OUString sNewLinkName;
- MakeLnkName( sNewLinkName, 0 ,
+ MakeLnkName( sNewLinkName, nullptr ,
aUrl2.GetMainURL(INetURLObject::DECODE_TO_IURI), sLinkName, &sFilter);
pLink->SetLinkSourceName( sNewLinkName );
pLink->Update();
@@ -396,7 +396,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void )
if( pLinkMgr->GetPersist() )
pLinkMgr->GetPersist()->SetModified();
LinkManager* pNewMgr = pLinkMgr;
- pLinkMgr = 0;
+ pLinkMgr = nullptr;
SetManager( pNewMgr );
}
}
@@ -443,7 +443,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
if( bNewLnkMgr )
{
LinkManager* pNewMgr = pLinkMgr;
- pLinkMgr = 0;
+ pLinkMgr = nullptr;
SetManager( pNewMgr );
SvTreeListEntry* pEntry = m_pTbLinks->GetEntry( nPos ? --nPos : 0 );
@@ -551,7 +551,7 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink&, _rLink, void )
else
{
LinkManager* pNewMgr = pLinkMgr;
- pLinkMgr = 0;
+ pLinkMgr = nullptr;
SetManager( pNewMgr );
}
if (pLinkMgr && pLinkMgr->GetPersist())
@@ -610,7 +610,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
SvTreeListEntry* pEntry = m_pTbLinks->GetEntry( 0 );
m_pTbLinks->SetCurEntry( pEntry );
m_pTbLinks->Select( pEntry );
- LinksSelectHdl( 0 );
+ LinksSelectHdl( nullptr );
}
m_pTbLinks->SetUpdateMode( true );
m_pTbLinks->Invalidate();
@@ -669,7 +669,7 @@ SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uLong* pPos )
*pPos = nPos;
return static_cast<SvBaseLink*>(pE->GetUserData());
}
- return 0;
+ return nullptr;
}
void SvBaseLinksDlg::SetType( SvBaseLink& rLink,
@@ -700,7 +700,7 @@ void SvBaseLinksDlg::SetActLink( SvBaseLink * pLink )
if( pLink == rLinkRef.get() )
{
m_pTbLinks->Select( m_pTbLinks->GetEntry( nSelect ) );
- LinksSelectHdl( 0 );
+ LinksSelectHdl( nullptr );
return ;
}
nSelect++;
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index dc7300f12d36..ce065a3cc25e 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno;
IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void)
{
sal_uLong nCount = m_pRadioLB->GetEntryCount();
- bool bIsSelected = m_pRadioLB->FirstSelected() != NULL;
+ bool bIsSelected = m_pRadioLB->FirstSelected() != nullptr;
bool bEnable = nCount > 1;
m_pDelBtn->Enable(bEnable && bIsSelected);
}
@@ -95,7 +95,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
ScopedVclPtr<InfoBox>::Create( this, sMsg )->Execute();
}
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( nullptr );
}
}
@@ -151,7 +151,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void)
m_pRadioLB->Select( pEntry );
}
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( nullptr );
}
IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void)
@@ -196,7 +196,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent)
m_pAddBtn->SetClickHdl( LINK( this, SvxMultiPathDialog, AddHdl_Impl ) );
m_pDelBtn->SetClickHdl( LINK( this, SvxMultiPathDialog, DelHdl_Impl ) );
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( nullptr );
m_pRadioLB->ShowTable();
}
@@ -330,7 +330,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
}
}
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( nullptr );
}
void SvxPathSelectDialog::SetPath(const OUString& rPath)
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index b6f3013f1046..ed8c705e2029 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -128,7 +128,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
// from an accompanied "Object Descriptor" format on the clipboard
// Remember: these formats mostly appear together on the clipboard
OUString aName;
- const OUString* pName = NULL;
+ const OUString* pName = nullptr;
if ( itName == aSupplementMap.end() )
{
SvPasteObjectHelper::GetEmbeddedName(rHelper,aName,aSourceName,nFormat);
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 7af081aa2d98..1b69f936e410 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -42,7 +42,7 @@ SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSe
bool bPrevNext)
: SfxModalDialog(pParent, "CommentDialog", "cui/ui/comment.ui")
, rSet(rCoreSet)
- , pOutSet(0)
+ , pOutSet(nullptr)
{
get(m_pLastEditFT, "lastedit");
get(m_pInsertAuthor, "insertauthor");
@@ -130,7 +130,7 @@ SvxPostItDialog::~SvxPostItDialog()
void SvxPostItDialog::dispose()
{
delete pOutSet;
- pOutSet = 0;
+ pOutSet = nullptr;
m_pLastEditFT.clear();
m_pEditED.clear();
m_pInsertAuthor.clear();
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 1ac98183d69f..0e8598629351 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -71,7 +71,7 @@ using namespace css::document;
void ShowErrorDialog( const Any& aException )
{
- std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( NULL, aException ));
+ std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( nullptr, aException ));
pDlg->Execute();
}
@@ -119,7 +119,7 @@ void SFTreeListBox::delUserData( SvTreeListEntry* pEntry )
// so need to be able to detect that this node is not to be
// processed in order to do this, setting userData to NULL ( must
// be a better way to do this )
- pUserData = 0;
+ pUserData = nullptr;
pEntry->SetUserData( pUserData );
}
}
@@ -243,7 +243,7 @@ void SFTreeListBox::Init( const OUString& language )
getLangNodeFromRootNode( children[ n ], lang );
insertEntry( uiName, app ? RID_CUIIMG_HARDDISK : RID_CUIIMG_DOC,
- 0, true, std::unique_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
+ nullptr, true, std::unique_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
}
SetUpdateMode( true );
@@ -390,7 +390,7 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
void SFTreeListBox::RequestingChildren( SvTreeListEntry* pEntry )
{
- SFEntry* userData = 0;
+ SFEntry* userData = nullptr;
if ( !pEntry )
{
return;
@@ -632,7 +632,7 @@ IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, voi
SvTreeListEntry* pEntry = pBox->GetHdlEntry();
- SFEntry* userData = 0;
+ SFEntry* userData = nullptr;
if ( !pEntry )
{
return;
@@ -664,7 +664,7 @@ IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void )
if ( m_pScriptsBox->IsSelected( m_pScriptsBox->GetHdlEntry() ) )
{
SvTreeListEntry* pEntry = m_pScriptsBox->GetHdlEntry();
- SFEntry* userData = 0;
+ SFEntry* userData = nullptr;
if ( !pEntry )
{
return;
@@ -960,7 +960,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
if ( aChildNode.is() )
{
OUString aChildName = aChildNode->getName();
- SvTreeListEntry* pNewEntry = NULL;
+ SvTreeListEntry* pNewEntry = nullptr;
Reference<XModel> xDocumentModel = getModel( pEntry );
@@ -1194,7 +1194,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
OUString aStoredEntry = m_lastSelection[ m_sLanguage ];
if( aStoredEntry.isEmpty() )
return;
- SvTreeListEntry* pEntry = 0;
+ SvTreeListEntry* pEntry = nullptr;
sal_Int32 nIndex = 0;
while ( nIndex != -1 )
{
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index b07fa2ab3611..b8ae3ffbde23 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -38,21 +38,21 @@
SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet)
- , m_pFontList(NULL)
+ , m_pFontList(nullptr)
, m_nNamePageId(0)
, m_nParaStdPageId(0)
, m_nParaAlignPageId(0)
, m_nBackPageId(0)
{
- m_nNamePageId = AddTabPage("font", SvxCharNamePage::Create, 0);
- AddTabPage("fonteffects", SvxCharEffectsPage::Create, 0);
- AddTabPage("position", SvxCharPositionPage::Create, 0);
- AddTabPage("asianlayout", SvxCharTwoLinesPage::Create, 0);
- m_nParaStdPageId = AddTabPage("labelTP_PARA_STD", SvxStdParagraphTabPage::Create, 0);
- m_nParaAlignPageId = AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, 0);
- AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, 0);
- AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, 0 );
- m_nBackPageId = AddTabPage("background", SvxBackgroundTabPage::Create, 0);
+ m_nNamePageId = AddTabPage("font", SvxCharNamePage::Create, nullptr);
+ AddTabPage("fonteffects", SvxCharEffectsPage::Create, nullptr);
+ AddTabPage("position", SvxCharPositionPage::Create, nullptr);
+ AddTabPage("asianlayout", SvxCharTwoLinesPage::Create, nullptr);
+ m_nParaStdPageId = AddTabPage("labelTP_PARA_STD", SvxStdParagraphTabPage::Create, nullptr);
+ m_nParaAlignPageId = AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr);
+ AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr);
+ AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr );
+ m_nBackPageId = AddTabPage("background", SvxBackgroundTabPage::Create, nullptr);
// remove asian tabpages if necessary
SvtCJKOptions aCJKOptions;
@@ -70,7 +70,7 @@ SvxSearchFormatDialog::~SvxSearchFormatDialog()
void SvxSearchFormatDialog::dispose()
{
delete m_pFontList;
- m_pFontList = NULL;
+ m_pFontList = nullptr;
SfxTabDialog::dispose();
}
@@ -78,7 +78,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
{
if (nId == m_nNamePageId)
{
- const FontList* pApm_pFontList = 0;
+ const FontList* pApm_pFontList = nullptr;
SfxObjectShell* pSh = SfxObjectShell::Current();
if ( pSh )
@@ -161,7 +161,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
// item resources are in svx
sal_uInt32 nId = aAttrNames.FindIndex( nSlot );
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
if ( RESARRAY_INDEX_NOTFOUND != nId )
pEntry = m_pAttrLB->SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
else
@@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchAttributeDialog, OKHdl, Button*, void)
rItem.pItem = reinterpret_cast<SfxPoolItem*>(-1);
}
else if( IsInvalidItem( rItem.pItem ) )
- rItem.pItem = 0;
+ rItem.pItem = nullptr;
j = 1;
break;
}
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index b06ec7d05e0b..80f9ae290581 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star;
LookUpComboBox::LookUpComboBox(vcl::Window *pParent)
: ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP)
- , m_pDialog(NULL)
+ , m_pDialog(nullptr)
{
EnableAutoSize(true);
@@ -100,7 +100,7 @@ IMPL_LINK_NOARG_TYPED( LookUpComboBox, ModifyTimer_Hdl, Idle *, void )
ReplaceEdit::ReplaceEdit(vcl::Window *pParent)
: Edit(pParent, WB_BORDER | WB_TABSTOP)
- , m_pBtn(NULL)
+ , m_pBtn(nullptr)
{
}
@@ -167,7 +167,7 @@ void AlternativesString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::
ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(vcl::Window* pParent)
: SvxCheckListBox(pParent)
- , m_pDialog(NULL)
+ , m_pDialog(nullptr)
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
SetHighlightRange();
@@ -215,7 +215,7 @@ void ThesaurusAlternativesCtrl::SetExtraData(
AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData(
const SvTreeListEntry *pEntry )
{
- AlternativesExtraData *pRes = NULL;
+ AlternativesExtraData *pRes = nullptr;
UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
if (aIt != m_aUserData.end())
pRes = &aIt->second;
@@ -395,7 +395,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void )
IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void )
{
- SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
+ SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr;
if (pEntry)
{
AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
@@ -411,7 +411,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *
IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool )
{
- SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
+ SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr;
if (pEntry)
{
AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
@@ -449,7 +449,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
LanguageType nLanguage)
: SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui")
, m_aErrStr(CUI_RESSTR(RID_SVXSTR_ERR_TEXTNOTFOUND))
- , xThesaurus(NULL)
+ , xThesaurus(nullptr)
, aLookUpText()
, nLookUpLanguage(LANGUAGE_NONE)
, m_bWordFound(false)
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 8adf79265833..66b3e11b9411 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -178,7 +178,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
sal_uInt16 nMax = 1000;
// maybe get the old value first
- const SfxUInt16Item* pOldUserItem = 0;
+ const SfxUInt16Item* pOldUserItem = nullptr;
SfxObjectShell* pShell = SfxObjectShell::Current();
if (pShell)
@@ -203,7 +203,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
const SfxPoolItem& rItem = mrSet.Get(mrSet.GetPool()->GetWhich(SID_ATTR_ZOOM));
- if (0 != dynamic_cast<const SvxZoomItem*>( &rItem))
+ if (nullptr != dynamic_cast<const SvxZoomItem*>( &rItem))
{
const SvxZoomItem& rZoomItem = static_cast<const SvxZoomItem&>(rItem);
const sal_uInt16 nZoom = rZoomItem.GetValue();
@@ -245,7 +245,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
SetFactor(nZoom);
}
- const SfxPoolItem* pPoolViewLayoutItem = NULL;
+ const SfxPoolItem* pPoolViewLayoutItem = nullptr;
if (SfxItemState::SET == mrSet.GetItemState(SID_ATTR_VIEWLAYOUT, false, &pPoolViewLayoutItem))
{
const SvxViewLayoutItem* pViewLayoutItem = static_cast<const SvxViewLayoutItem*>(pPoolViewLayoutItem);
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index 754d8b47a092..9ac7c9a61b30 100644
--- a/cui/source/factory/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -51,7 +51,7 @@
namespace cui
{
- static AbstractDialogFactory_Impl* pFactory=NULL;
+ static AbstractDialogFactory_Impl* pFactory=nullptr;
AbstractDialogFactory_Impl* GetFactory()
{
if ( !pFactory )
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index 5409156db54f..e872f9dd9836 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -25,7 +25,7 @@
// struct DialogsResMgr --------------------------------------------------
ResMgr* CuiResMgr::GetResMgr()
{
- static ResMgr* pResMgr=0;
+ static ResMgr* pResMgr=nullptr;
if ( !pResMgr )
{
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index df51d084b28d..a27a8f189047 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -850,7 +850,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pPa
if ( pDlg )
return new CuiVclAbstractDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
@@ -873,7 +873,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
if ( pDlg )
return new CuiVclAbstractDialog_Impl( pDlg );
else
- return NULL;
+ return nullptr;
}
// TabDialog outside the drawing layer
@@ -884,7 +884,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
bool /*bEditFmt*/,
const OUString * )
{
- SfxTabDialog* pDlg=NULL;
+ SfxTabDialog* pDlg=nullptr;
switch ( nResId )
{
case RID_OFA_AUTOCORR_DLG :
@@ -899,7 +899,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
if ( pDlg )
return new CuiAbstractTabDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId,
@@ -928,7 +928,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
if ( pDlg )
return new CuiAbstractTabDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
// TabDialog that use functionality of the drawing layer
@@ -1157,7 +1157,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( v
if ( pDlg )
return new CuiAbstractTabDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
@@ -1186,7 +1186,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo
::Reference< css::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId )
{
- Dialog* pDlg=NULL;
+ Dialog* pDlg=nullptr;
switch ( nResId )
{
case RID_SFXDLG_EDITDICT :
@@ -1198,7 +1198,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo
if ( pDlg )
return new CuiVclAbstractDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Window* pParent,
@@ -1234,7 +1234,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl::Wind
SfxBindings* pBindings,
sal_uInt32 nResId)
{
- SvxHpLinkDlg* pDlg=NULL;
+ SvxHpLinkDlg* pDlg=nullptr;
switch ( nResId )
{
case SID_HYPERLINK_DIALOG :
@@ -1246,7 +1246,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl::Wind
if ( pDlg )
return new AbstractSvxHpLinkDlg_Impl( pDlg );
- return 0;
+ return nullptr;
}
AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::Window* pParent,
@@ -1330,7 +1330,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pPa
sal_uInt32 nResId
)
{
- SfxModalDialog* pDlg=NULL;
+ SfxModalDialog* pDlg=nullptr;
switch ( nResId )
{
case SID_EVENTCONFIG :
@@ -1345,7 +1345,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pPa
if ( pDlg )
return new CuiAbstractSfxDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent,
@@ -1355,7 +1355,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pPa
)
{
- SfxSingleTabDialog* pDlg=NULL;
+ SfxSingleTabDialog* pDlg=nullptr;
switch ( nResId )
{
case RID_SVXPAGE_MEASURE :
@@ -1374,7 +1374,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pPa
if ( pDlg )
return new CuiAbstractSfxDialog_Impl( pDlg );
- return 0;
+ return nullptr;
}
AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( vcl::Window* pParent,
@@ -1492,7 +1492,7 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
break;
}
- return 0;
+ return nullptr;
}
DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc()
@@ -1555,14 +1555,14 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
break;
}
- return 0;
+ return nullptr;
}
SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand,
const Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList )
{
- InsertObjectDialog_Impl* pDlg=0;
+ InsertObjectDialog_Impl* pDlg=nullptr;
if ( rCommand == ".uno:InsertObject" )
pDlg = VclPtr<SvInsertOleDlg>::Create( pParent, xStor, pList );
else if ( rCommand == ".uno:InsertPlugin" )
@@ -1575,7 +1575,7 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new AbstractInsertObjectDialog_Impl( pDlg );
}
- return 0;
+ return nullptr;
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand,
@@ -1587,7 +1587,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Wind
pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new CuiVclAbstractDialog_Impl( pDlg );
}
- return 0;
+ return nullptr;
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 39b645d1d58f..21d8e29f1d5d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -433,8 +433,8 @@ public:
virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) override;
virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) override;
virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper,
- const DataFlavorExVector* pFormats=0,
- const TransferableObjectDescriptor* pDesc=0 ) override;
+ const DataFlavorExVector* pFormats=nullptr,
+ const TransferableObjectDescriptor* pDesc=nullptr ) override;
};
class AbstractLinksDialog_Impl : public SfxAbstractLinksDialog
@@ -498,17 +498,17 @@ public:
const SfxItemSet* pAttrSet,
SfxViewFrame* pViewFrame,
bool bEditFmt=false,
- const OUString *pUserButtonText=0 ) override;
+ const OUString *pUserButtonText=nullptr ) override;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const SfxItemSet* pAttrSet,
const css::uno::Reference< css::frame::XFrame >& xViewFrame,
bool bEditFmt=false,
- const OUString *pUserButtonText=0 ) override;
+ const OUString *pUserButtonText=nullptr ) override;
virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttrSet,
SdrView* pView,
- SdrModel* pModel=0 ) override;
+ SdrModel* pModel=nullptr ) override;
virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent,
const SfxItemSet& rSet) override;
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent,
@@ -520,11 +520,11 @@ public:
SvxDistributeVertical eVer = SvxDistributeVerticalNone) override;
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
const css::uno::Reference < css::embed::XStorage >& xStor,
- const SvObjectServerList* pList = 0 ) override;
+ const SvObjectServerList* pList = nullptr ) override;
virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) override;
virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) override;
- virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) override;
+ virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=nullptr ) override;
virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) override;
@@ -628,7 +628,7 @@ public:
bool bShadow ) override;
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel,
- const SdrObject* pObj = NULL,
+ const SdrObject* pObj = nullptr,
bool bHasObj = true ) override;
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet,
@@ -659,7 +659,7 @@ public:
const sal_uInt16 _nInitiallySelectedEvent
) override;
- virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) override;
+ virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr ) override;
virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) override;
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index dbcd06c39057..9ada6ee1d792 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -64,7 +64,7 @@ protected:
public:
SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
- , m_pAccelConfigPage(NULL)
+ , m_pAccelConfigPage(nullptr)
{
}
virtual ~SfxAccCfgTabListBox_Impl();
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index a874f6ad431d..8ea2d9a5ce74 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -290,7 +290,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
void SetLanguage(LanguageType eSet);
void DeleteEntry(const OUString& sShort, const OUString& sLong);
@@ -350,7 +350,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
void SetLanguage(LanguageType eSet);
};
@@ -432,7 +432,7 @@ public:
public:
AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits)
: MultiListBox(pParent, nBits)
- , m_pPage(NULL)
+ , m_pPage(nullptr)
{
}
virtual ~AutoCompleteMultiListBox();
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 05d6806038b9..d961504f5738 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -64,7 +64,7 @@ public:
virtual void PageCreated(const SfxAllItemSet& aSet) override;
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
private:
SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 3fd76592ffb9..81fee6486a53 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -60,7 +60,7 @@ public:
virtual void PageCreated(const SfxAllItemSet& aSet) override;
void SetTableMode();
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
private:
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index a85d6252da00..f4bb1df273bd 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -167,12 +167,12 @@ private:
SvxConfigEntry* pRootEntry,
css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar,
css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
- SvTreeListEntry *pParent = NULL );
+ SvTreeListEntry *pParent = nullptr );
void ApplyMenu(
css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar,
css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
- SvxConfigEntry *pMenuData = NULL );
+ SvxConfigEntry *pMenuData = nullptr );
bool LoadSubMenus(
const css::uno::Reference< css::container::XIndexAccess >& xMenuBarSettings,
@@ -239,7 +239,7 @@ public:
bIsParentData( false ),
bIsVisible( true ),
nStyle( 0 ),
- mpEntries( 0 )
+ mpEntries( nullptr )
{}
~SvxConfigEntry();
@@ -378,7 +378,7 @@ protected:
virtual short QueryReset() = 0;
SvTreeListEntry* InsertEntry( SvxConfigEntry* pNewEntryData,
- SvTreeListEntry* pTarget = NULL,
+ SvTreeListEntry* pTarget = nullptr,
bool bFront = false );
void AddSubMenusToUI( const OUString& rBaseTitle,
@@ -390,7 +390,7 @@ protected:
SvxEntries* FindParentForChild( SvxEntries* pParentEntries,
SvxConfigEntry* pChildData );
- void ReloadTopLevelListBox( SvxConfigEntry* pSelection = NULL );
+ void ReloadTopLevelListBox( SvxConfigEntry* pSelection = nullptr );
public:
@@ -401,7 +401,7 @@ public:
SaveInData* GetSaveInData() { return pCurrentSaveInData; }
- SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL,
+ SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = nullptr,
bool bFront = false,
bool bAllowDuplicates = false );
@@ -552,7 +552,7 @@ public:
virtual ~SvxToolbarConfigPage();
virtual void dispose() override;
- SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL,
+ SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = nullptr,
bool bFront = false,
bool bAllowDuplicates = true );
@@ -584,7 +584,7 @@ private:
void ApplyToolbar(
css::uno::Reference< css::container::XIndexContainer >& rNewToolbarBar,
css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
- SvxConfigEntry *pToolbar = NULL );
+ SvxConfigEntry *pToolbar = nullptr );
public:
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index fbfa54660544..314f16522751 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -92,7 +92,7 @@ struct SfxGroupInfo_Impl
OUString sCommand;
OUString sLabel;
- SfxGroupInfo_Impl( SfxCfgKind n, sal_uInt16 nr, void* pObj = 0 ) :
+ SfxGroupInfo_Impl( SfxCfgKind n, sal_uInt16 nr, void* pObj = nullptr ) :
nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {}
};
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 180950612bb6..ed2fc5933021 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -143,7 +143,7 @@ public:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
virtual ~SvxCharNamePage();
@@ -230,7 +230,7 @@ public:
virtual void dispose() override;
using SfxTabPage::DeactivatePage;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
@@ -313,7 +313,7 @@ public:
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
public:
@@ -362,7 +362,7 @@ public:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pTwoLinesRanges; }
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 1fa77d2dbbcb..869df9f25488 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -92,7 +92,7 @@ private:
static void fillAllSubsets(ListBox &rListBox);
public:
- SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 );
+ SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=nullptr );
virtual ~SvxCharacterMap();
virtual void dispose() override;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index e25562eef712..2eb5df821aa6 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -63,7 +63,7 @@ protected:
public:
SvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
- SdrModel* pModel, const SdrObject* pObj = NULL,
+ SdrModel* pModel, const SdrObject* pObj = nullptr,
bool bHasObj = true );
void SetNewDashList( XDashListRef pInLst)
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 37ef956b6b29..22c8c5989fbb 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -80,7 +80,7 @@ namespace svx
@param _pEntry
The entry to remove if the entry will be changed
*/
- void openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry = NULL);
+ void openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry = nullptr);
#endif
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 736154c9c776..76c979e55601 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -143,7 +143,7 @@ private:
DECL_LINK_TYPED(Button2Hdl, Button*, void);
public:
- SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL );
+ SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = nullptr );
virtual ~SvxMessDialog();
virtual void dispose() override;
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 184b2add43cc..d9984e213b43 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -82,7 +82,7 @@ protected:
SvTreeListEntry* FindEntry(const OUString& aStrName);
void ClearTree();
- int FillTree( css::uno::Reference< css::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL );
+ int FillTree( css::uno::Reference< css::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =nullptr );
virtual void Move () override;
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index c11d8afde363..043ab0130bda 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -130,7 +130,7 @@ public:
virtual void Reset( const SfxItemSet& ) override;
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void ActivatePage( const SfxItemSet& rItemSet ) override;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual int DeactivatePage( SfxItemSet* pSet = nullptr ) override;
bool IsMarkWndVisible () { return static_cast<vcl::Window*>(mpMarkWnd)->IsVisible(); }
Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); }
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index b63e121a5442..a852d92828a0 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -58,7 +58,7 @@ struct IconChoicePageData
: nId ( Id ),
fnCreatePage ( fnPage ),
fnGetRanges ( fnRanges ),
- pPage ( NULL ),
+ pPage ( nullptr ),
bOnDemand ( bDemand ),
bRefresh ( false )
{}
@@ -160,7 +160,7 @@ protected:
virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
static SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
inline IconChoicePage* GetTabPage( sal_uInt16 nPageId )
- { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : NULL); }
+ { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : nullptr); }
static void RefreshInputSet();
void ActivatePageImpl ();
@@ -173,14 +173,14 @@ public:
// the IconChoiceCtrl's could also be set in the Ctor
IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
- const SfxItemSet * pItemSet = 0 );
+ const SfxItemSet * pItemSet = nullptr );
virtual ~IconChoiceDialog ();
virtual void dispose() override;
// interface
SvxIconChoiceCtrlEntry* AddTabPage(
sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon,
- CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
+ CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = nullptr /* NULL allowed*/,
bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND );
void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 4c2c943a3337..f9b3d43da6ff 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -85,7 +85,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
public:
SvInsertOleDlg( vcl::Window* pParent,
const css::uno::Reference < css::embed::XStorage >& xStorage,
- const SvObjectServerList* pServers = NULL );
+ const SvObjectServerList* pServers = nullptr );
virtual ~SvInsertOleDlg();
virtual void dispose() override;
virtual short Execute() override;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index e1ed2ce4bcc3..74eb46e54a67 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -42,7 +42,7 @@ struct EventDisplayName
{
const sal_Char* pAsciiEventName;
sal_uInt16 nEventResourceID;
- EventDisplayName() : pAsciiEventName( NULL ), nEventResourceID(0) { }
+ EventDisplayName() : pAsciiEventName( nullptr ), nEventResourceID(0) { }
EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
: pAsciiEventName( _pAsciiName )
, nEventResourceID( _nResId )
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index f936e1f71f9b..5ada9262ba37 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -58,7 +58,7 @@ protected:
public:
SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER);
- void NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL );
+ void NotifyChange( const OUString& rPrevStr, const Color* pColor = nullptr );
};
@@ -80,7 +80,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
- virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) override;
+ virtual sfxpg DeactivatePage ( SfxItemSet* pSet = nullptr ) override;
void SetInfoItem( const SvxNumberInfoItem& rItem );
void SetNumberFormatList( const SvxNumberInfoItem& rItem )
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index be03c3abbc08..81a76b666dfb 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -186,7 +186,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* rSet );
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index df2f87b1ec2c..6397f82083a3 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -95,7 +95,7 @@ private:
DECL_LINK_TYPED( AutoHdl_Impl, Button*, void );
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
@@ -162,7 +162,7 @@ class SvxParaAlignTabPage : public SfxTabPage
SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
public:
virtual ~SvxParaAlignTabPage();
@@ -214,7 +214,7 @@ public:
void DisablePageBreak();
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
private:
SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index e6c2a1eccb42..7f4831b0bfba 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -61,8 +61,8 @@ public:
void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName );
void SetObjName( const SvGlobalName & rClass, const OUString & rObjName );
SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper,
- const DataFlavorExVector* pFormats=0,
- const TransferableObjectDescriptor* pDesc=0 );
+ const DataFlavorExVector* pFormats=nullptr,
+ const TransferableObjectDescriptor* pDesc=nullptr );
};
#endif // INCLUDED_CUI_SOURCE_INC_PASTEDLG_HXX
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index f78523cef916..4d65c0484190 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -193,9 +193,9 @@ class SvxScriptSelectorDialog : public ModelessDialog
public:
SvxScriptSelectorDialog (
- vcl::Window* pParent = NULL,
+ vcl::Window* pParent = nullptr,
bool bShowSlots = false,
- const css::uno::Reference< css::frame::XFrame >& xFrame = 0
+ const css::uno::Reference< css::frame::XFrame >& xFrame = nullptr
);
virtual ~SvxScriptSelectorDialog();
virtual void dispose() override;
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 602dd555ae3f..69605d713eb6 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -115,7 +115,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
sal_uInt16 GetMapPos(FrmMap *pMap, ListBox &rAlignLB);
static short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
static short GetRelation(FrmMap *pMap, ListBox &rRelationLB);
- short GetAnchorType(bool* pbHasChanged = 0);
+ short GetAnchorType(bool* pbHasChanged = nullptr);
sal_uLong FillRelLB(FrmMap *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, ListBox &rLB, FixedText &rFT);
sal_uInt16 FillPosLB(FrmMap *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, ListBox &rLB);
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 82dbb831a9f0..a91a0801a54a 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -61,7 +61,7 @@ public:
void DisableControls( const sal_uInt16 nFlag );
protected:
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
private:
SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
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 );
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index c297ce3b5cc4..ac55f13a2337 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -256,7 +256,7 @@ AlignmentTabPage::~AlignmentTabPage()
void AlignmentTabPage::dispose()
{
delete m_pOrientHlp;
- m_pOrientHlp = NULL;
+ m_pOrientHlp = nullptr;
m_pLbHorAlign.clear();
m_pFtIndent.clear();
m_pEdIndent.clear();
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index e43868e20fc8..cf7af4a9cc8e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -81,10 +81,10 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
bOpenSmartTagOptions = true;
}
- AddTabPage("options", OfaAutocorrOptionsPage::Create, 0);
- AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, 0);
- AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, 0);
- AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, 0);
+ AddTabPage("options", OfaAutocorrOptionsPage::Create, nullptr);
+ AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, nullptr);
+ AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, nullptr);
+ AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, nullptr);
if (!bShowSWOptions)
{
@@ -103,9 +103,9 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
RemoveTabPage("options");
}
- m_nReplacePageId = AddTabPage("replace", OfaAutocorrReplacePage::Create, 0);
- m_nExceptionsPageId = AddTabPage("exceptions", OfaAutocorrExceptPage::Create, 0);
- AddTabPage("localized", OfaQuoteTabPage::Create, 0);
+ m_nReplacePageId = AddTabPage("replace", OfaAutocorrReplacePage::Create, nullptr);
+ m_nExceptionsPageId = AddTabPage("exceptions", OfaAutocorrExceptPage::Create, nullptr);
+ AddTabPage("localized", OfaQuoteTabPage::Create, nullptr);
// initialize languages
//! LANGUAGE_NONE is displayed as '[All]' and the LanguageType
@@ -430,7 +430,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
, sDelSpaceAtSttEnd(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_AT_STT_END))
, sDelSpaceBetweenLines(CUI_RESSTR(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
, nPercent(50)
- , pCheckButtonData(NULL)
+ , pCheckButtonData(nullptr)
{
get(m_pEditPB, "edit");
@@ -502,7 +502,7 @@ void OfaSwAutoFmtOptionsPage::dispose()
delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( APPLY_NUMBERING ));
delete static_cast<ImpUserData*>(m_pCheckLB->GetUserData( MERGE_SINGLE_LINE_PARA ));
delete pCheckButtonData;
- pCheckButtonData = NULL;
+ pCheckButtonData = nullptr;
}
m_pCheckLB.disposeAndClear();
m_pEditPB.clear();
@@ -697,7 +697,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
nPercent = pOpt->nRightMargin;
sMargin = " " +
unicode::formatPercent(nPercent, Application::GetSettings().GetUILanguageTag());
- pUserData = new ImpUserData(&sMargin, 0);
+ pUserData = new ImpUserData(&sMargin, nullptr);
m_pCheckLB->SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
m_pCheckLB->CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule );
@@ -717,12 +717,12 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void)
{
- m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData());
+ m_pEditPB->Enable(nullptr != pBox->FirstSelected()->GetUserData());
}
IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool)
{
- EditHdl(NULL);
+ EditHdl(nullptr);
return false;
}
@@ -922,9 +922,9 @@ void OfaAutocorrReplacePage::dispose()
aChangesTable.clear();
delete pCompareClass;
- pCompareClass = NULL;
+ pCompareClass = nullptr;
delete pCharClass;
- pCharClass = NULL;
+ pCharClass = nullptr;
m_pTextOnlyCB.clear();
m_pShortED.clear();
@@ -1039,7 +1039,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset,
for( size_t i = 0; i < rArray.size(); i++ )
{
DoubleString& rDouble = rArray[i];
- bool bTextOnly = 0 == rDouble.pUserData;
+ bool bTextOnly = nullptr == rDouble.pUserData;
// formatted text is only in Writer
if(bSWriter || bTextOnly)
{
@@ -1149,7 +1149,7 @@ IMPL_LINK_TYPED(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void)
}
m_pReplaceED->SetText( SvTabListBox::GetEntryText(pEntry, 1) );
// with UserData there is a Formatinfo
- m_pTextOnlyCB->Check( pEntry->GetUserData() == 0);
+ m_pTextOnlyCB->Check( pEntry->GetUserData() == nullptr);
}
else
{
@@ -1272,7 +1272,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn)
nPos = j;
}
SvTreeListEntry* pInsEntry = m_pReplaceTLB->InsertEntry(
- sEntry, static_cast< SvTreeListEntry * >(NULL), false,
+ sEntry, static_cast< SvTreeListEntry * >(nullptr), false,
nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos);
if (bKeepSourceFormatting)
{
@@ -1342,7 +1342,7 @@ IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void)
if( !bFound )
{
m_pReplaceTLB->SelectAll( false );
- pFirstSel = 0;
+ pFirstSel = nullptr;
m_pNewReplacePB->SetText( sNew );
if( bReplaceEditChanged )
m_pTextOnlyCB->Enable(false);
@@ -1825,7 +1825,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet)
, sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE))
, sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL))
- , pCheckButtonData(NULL)
+ , pCheckButtonData(nullptr)
, cSglStartQuote(0)
, cSglEndQuote(0)
, cStartQuote(0)
@@ -1905,7 +1905,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage()
void OfaQuoteTabPage::dispose()
{
delete pCheckButtonData;
- pCheckButtonData = NULL;
+ pCheckButtonData = nullptr;
m_pSwCheckLB.disposeAndClear();
m_pCheckLB.disposeAndClear();
m_pSingleTypoCB.clear();
@@ -2187,7 +2187,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "WordCompletionPage",
"cui/ui/wordcompletionpage.ui", &rSet)
- , m_pAutoCompleteList(0)
+ , m_pAutoCompleteList(nullptr)
, m_nAutoCmpltListCnt(0)
{
get(m_pCBActiv, "enablewordcomplete");
@@ -2348,7 +2348,7 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet* )
{
m_pAutoCompleteList = const_cast<editeng::SortedAutoCompleteStrings*>(
pOpt->m_pAutoCompleteList);
- pOpt->m_pAutoCompleteList = 0;
+ pOpt->m_pAutoCompleteList = nullptr;
m_nAutoCmpltListCnt = m_pAutoCompleteList->size();
for (size_t n = 0; n < m_nAutoCmpltListCnt; ++n)
{
@@ -2453,7 +2453,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
switch( rKeyCode.GetModifier() | rKeyCode.GetCode() )
{
case KEY_DELETE:
- m_pPage->DeleteHdl( 0 );
+ m_pPage->DeleteHdl( nullptr );
bHandled = true;
break;
@@ -2679,8 +2679,8 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
if ( bModifiedSmartTagTypes || bModifiedRecognize )
{
bool bLabelTextWithSmartTags = m_pMainCB->IsChecked();
- pSmartTagMgr->WriteConfiguration( bModifiedRecognize ? &bLabelTextWithSmartTags : 0,
- bModifiedSmartTagTypes ? &aDisabledSmartTagTypes : 0 );
+ pSmartTagMgr->WriteConfiguration( bModifiedRecognize ? &bLabelTextWithSmartTags : nullptr,
+ bModifiedSmartTagTypes ? &aDisabledSmartTagTypes : nullptr );
}
return true;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 613a3d94b04a..d85a6a8f97d9 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -78,9 +78,9 @@ struct SvxBackgroundTable_Impl
sal_Int32 nActPos;
SvxBackgroundTable_Impl()
- : pCellBrush(NULL)
- , pRowBrush(NULL)
- , pTableBrush(NULL)
+ : pCellBrush(nullptr)
+ , pRowBrush(nullptr)
+ , pTableBrush(nullptr)
, nCellWhich(0)
, nRowWhich(0)
, nTableWhich(0)
@@ -94,7 +94,7 @@ struct SvxBackgroundPage_Impl
bool bIsImportDlgInExecute;
SvxBackgroundPage_Impl()
- : pLoadIdle(NULL)
+ : pLoadIdle(nullptr)
, bIsImportDlgInExecute(false)
{}
};
@@ -176,7 +176,7 @@ private:
BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent)
: Window(pParent, WB_BORDER)
, bIsBmp(false)
- , pBitmap(NULL)
+ , pBitmap(nullptr)
, aDrawRect(Point(0,0), GetOutputSizePixel())
, nTransparency(0)
{
@@ -204,7 +204,7 @@ BackgroundPreviewImpl::~BackgroundPreviewImpl()
void BackgroundPreviewImpl::dispose()
{
delete pBitmap;
- pBitmap = NULL;
+ pBitmap = nullptr;
vcl::Window::dispose();
}
@@ -331,8 +331,8 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe
, bLinkOnly(false)
, bHighlighting(false)
, pPageImpl(new SvxBackgroundPage_Impl)
- , pImportDlg(NULL)
- , pTableBck_Impl(NULL)
+ , pImportDlg(nullptr)
+ , pTableBck_Impl(nullptr)
, pHighlighting(nullptr)
{
get(m_pAsGrid, "asgrid");
@@ -371,8 +371,8 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe
SfxObjectShell* pShell;
if ( SfxItemState::SET == rCoreSet.GetItemState( SID_HTML_MODE, false, &pItem )
- || ( 0 != ( pShell = SfxObjectShell::Current()) &&
- 0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
+ || ( nullptr != ( pShell = SfxObjectShell::Current()) &&
+ nullptr != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
}
@@ -395,11 +395,11 @@ void SvxBackgroundTabPage::dispose()
{
delete pPageImpl->pLoadIdle;
delete pPageImpl;
- pPageImpl = NULL;
+ pPageImpl = nullptr;
}
delete pImportDlg;
- pImportDlg = NULL;
+ pImportDlg = nullptr;
if( pTableBck_Impl)
{
@@ -407,7 +407,7 @@ void SvxBackgroundTabPage::dispose()
delete pTableBck_Impl->pRowBrush;
delete pTableBck_Impl->pTableBrush;
delete pTableBck_Impl;
- pTableBck_Impl = NULL;
+ pTableBck_Impl = nullptr;
}
m_pAsGrid.clear();
@@ -456,7 +456,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
// get and evaluate Input-BrushItem
- const SvxBrushItem* pBgdAttr = NULL;
+ const SvxBrushItem* pBgdAttr = nullptr;
sal_uInt16 nSlot = SID_ATTR_BRUSH;
const SfxPoolItem* pItem;
sal_uInt16 nDestValue = USHRT_MAX;
@@ -575,7 +575,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
m_pBtnPreview->Check( !aUserData.isEmpty() && '1' == aUserData[0] );
// get and evaluate Input-BrushItem
- const SvxBrushItem* pBgdAttr = NULL;
+ const SvxBrushItem* pBgdAttr = nullptr;
sal_uInt16 nSlot = SID_VIEW_FLD_PIC;
sal_uInt16 nWhich = GetWhich( nSlot );
std::unique_ptr<SvxBrushItem> pTemp;
@@ -696,7 +696,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
SvxGraphicPosition eNewPos = GetGraphicPosition_Impl();
const bool bIsLink = m_pBtnLink->IsChecked();
- const bool bWasLink = (NULL != rOldItem.GetGraphicLink() );
+ const bool bWasLink = (nullptr != rOldItem.GetGraphicLink() );
if ( !bIsLink && !bIsGraphicValid )
@@ -989,9 +989,9 @@ bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
void SvxBackgroundTabPage::FillColorValueSets_Impl()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
- const SfxPoolItem* pItem = NULL;
- XColorListRef pColorTable = NULL;
- if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
+ const SfxPoolItem* pItem = nullptr;
+ XColorListRef pColorTable = nullptr;
+ if ( pDocSh && ( nullptr != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
{
pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
}
@@ -1189,11 +1189,11 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void )
{
if ( !aBgdGraphicPath.isEmpty() ) // only for linked bitmap
RaiseLoadError_Impl();
- m_pPreviewWin2->NotifyChange( NULL );
+ m_pPreviewWin2->NotifyChange( nullptr );
}
}
else
- m_pPreviewWin2->NotifyChange( NULL );
+ m_pPreviewWin2->NotifyChange( nullptr );
}
}
@@ -1294,7 +1294,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void )
m_pPreviewWin2->NotifyChange( &aBmp );
}
else
- m_pPreviewWin2->NotifyChange( NULL );
+ m_pPreviewWin2->NotifyChange( nullptr );
}
FileClickHdl_Impl(m_pBtnLink);
@@ -1318,7 +1318,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, v
if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos)
{
std::unique_ptr<SvxBrushItem> xItemHolder;
- SvxBrushItem* pActItem = NULL;
+ SvxBrushItem* pActItem = nullptr;
sal_uInt16 nWhich = 0;
switch(pTableBck_Impl->nActPos)
{
@@ -1335,7 +1335,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, v
nWhich = pTableBck_Impl->nTableWhich;
break;
default:
- pActItem = NULL;
+ pActItem = nullptr;
break;
}
pTableBck_Impl->nActPos = nSelPos;
@@ -1386,7 +1386,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, v
// The item will be new'ed again below, but that will be the
// default item then, not an existing modified one.
xItemHolder.reset();
- pActItem = NULL;
+ pActItem = nullptr;
break;
}
OUString aUserData = GetUserData();
@@ -1435,7 +1435,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
m_pBtnPreview->Check( false );
m_pBtnLink->Check( false );
m_pBtnLink->Disable();
- m_pPreviewWin2->NotifyChange( NULL );
+ m_pPreviewWin2->NotifyChange( nullptr );
SetGraphicPosition_Impl( GPOS_TILED ); // tiles as default
}
}
@@ -1501,7 +1501,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
m_pPreviewWin2->NotifyChange( &aBmp );
}
else
- m_pPreviewWin2->NotifyChange( NULL );
+ m_pPreviewWin2->NotifyChange( nullptr );
SetGraphicPosition_Impl( ePos );
}
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index e3e89f40e980..8f3336db60fb 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -42,16 +42,16 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent,
, m_nAreaPageId(0)
, m_nTransparencePageId(0)
{
- AddTabPage("borders", SvxBorderTabPage::Create, 0 );
+ AddTabPage("borders", SvxBorderTabPage::Create, nullptr );
if (mbEnableDrawingLayerFillStyles)
{
//UUUU Here we want full DrawingLayer FillStyle access, so add Area and Transparency TabPages
- m_nAreaPageId = AddTabPage("area", SvxAreaTabPage::Create, 0);
- m_nTransparencePageId = AddTabPage("transparence", SvxTransparenceTabPage::Create, 0);
+ m_nAreaPageId = AddTabPage("area", SvxAreaTabPage::Create, nullptr);
+ m_nTransparencePageId = AddTabPage("transparence", SvxTransparenceTabPage::Create, nullptr);
}
else
{
- m_nBackgroundPageId = AddTabPage("background", SvxBackgroundTabPage::Create, 0 );
+ m_nBackgroundPageId = AddTabPage("background", SvxBackgroundTabPage::Create, nullptr );
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 3b432e17fe90..1c3f2a5ea1fe 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -158,7 +158,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
is needed across various functions... */
mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN)) != SfxItemState::UNKNOWN;
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
if (rCoreAttrs.HasItem(SID_ATTR_BORDER_STYLES, &pItem))
{
const SfxIntegerListItem* p = static_cast<const SfxIntegerListItem*>(pItem);
@@ -289,7 +289,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
if ( pDocSh )
{
pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- if ( pItem != NULL )
+ if ( pItem != nullptr )
pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
}
@@ -571,8 +571,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
if(SfxItemState::SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) ||
- ( 0 != (pShell = SfxObjectShell::Current()) &&
- 0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
+ ( nullptr != (pShell = SfxObjectShell::Current()) &&
+ nullptr != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
sal_uInt16 nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
if(nHtmlMode & HTMLMODE_ON)
@@ -591,7 +591,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
}
}
- LinesChanged_Impl( 0 );
+ LinesChanged_Impl( nullptr );
if(m_pLeftMF->GetValue() == m_pRightMF->GetValue() && m_pTopMF->GetValue() == m_pBottomMF->GetValue() && m_pTopMF->GetValue() == m_pLeftMF->GetValue())
mbSync = true;
else
@@ -843,7 +843,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void)
// Presets ValueSet does not show a selection (used as push buttons).
m_pWndPresets->SetNoSelection();
- LinesChanged_Impl( 0 );
+ LinesChanged_Impl( nullptr );
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ce791822704c..9e47e2469dd1 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -177,7 +177,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset)
: SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset )
- , m_pPreviewWin(NULL)
+ , m_pPreviewWin(nullptr)
, m_bPreviewBackgroundToCharacter( false )
{
}
@@ -248,7 +248,7 @@ struct SvxCharNamePage_Impl
SvxCharNamePage_Impl() :
- m_pFontList ( NULL ),
+ m_pFontList ( nullptr ),
m_nExtraEntryPos( COMBOBOX_ENTRY_NOTFOUND ),
m_bMustDelete ( false ),
m_bInSearchMode ( false )
@@ -384,7 +384,7 @@ SvxCharNamePage::~SvxCharNamePage()
void SvxCharNamePage::dispose()
{
delete m_pImpl;
- m_pImpl = NULL;
+ m_pImpl = nullptr;
m_pWestFrame.clear();
m_pWestFontNameFT.clear();
m_pWestFontNameLB.clear();
@@ -452,9 +452,9 @@ const FontList* SvxCharNamePage::GetFontList() const
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
- if ( pItem != NULL )
+ if ( pItem != nullptr )
{
- DBG_ASSERT(NULL != static_cast<const SvxFontListItem*>(pItem)->GetFontList(),
+ DBG_ASSERT(nullptr != static_cast<const SvxFontListItem*>(pItem)->GetFontList(),
"Where is the font list?");
m_pImpl->m_pFontList = static_cast<const SvxFontListItem*>(pItem )->GetFontList()->Clone();
m_pImpl->m_bMustDelete = true;
@@ -587,7 +587,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
const FontList* pFontList = GetFontList();
DBG_ASSERT( pFontList, "no fontlist" );
- FontStyleBox* pStyleBox = NULL;
+ FontStyleBox* pStyleBox = nullptr;
if ( m_pWestFontNameLB == pNameBox )
pStyleBox = m_pWestFontStyleLB;
@@ -624,8 +624,8 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
const FontList* pFontList = GetFontList();
DBG_ASSERT( pFontList, "no fontlist" );
- FontStyleBox* pStyleBox = NULL;
- FontSizeBox* pSizeBox = NULL;
+ FontStyleBox* pStyleBox = nullptr;
+ FontSizeBox* pSizeBox = nullptr;
if ( m_pWestFontNameLB == pNameBox )
{
@@ -656,13 +656,13 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp )
{
- FontNameBox* pNameBox = NULL;
- FixedText* pStyleLabel = NULL;
- FontStyleBox* pStyleBox = NULL;
- FixedText* pSizeLabel = NULL;
- FontSizeBox* pSizeBox = NULL;
- FixedText* pLangFT = NULL;
- SvxLanguageBoxBase* pLangBox = NULL;
+ FontNameBox* pNameBox = nullptr;
+ FixedText* pStyleLabel = nullptr;
+ FontStyleBox* pStyleBox = nullptr;
+ FixedText* pSizeLabel = nullptr;
+ FontSizeBox* pSizeBox = nullptr;
+ FixedText* pLangFT = nullptr;
+ SvxLanguageBoxBase* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
switch ( eLangGrp )
@@ -704,7 +704,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
const FontList* pFontList = GetFontList();
pNameBox->Fill( pFontList );
- const SvxFontItem* pFontItem = NULL;
+ const SvxFontItem* pFontItem = nullptr;
SfxItemState eState = rSet.GetItemState( nWhich );
if ( eState >= SfxItemState::DEFAULT )
@@ -882,10 +882,10 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
{
bool bModified = false;
- FontNameBox* pNameBox = NULL;
- FontStyleBox* pStyleBox = NULL;
- FontSizeBox* pSizeBox = NULL;
- SvxLanguageBoxBase* pLangBox = NULL;
+ FontNameBox* pNameBox = nullptr;
+ FontStyleBox* pStyleBox = nullptr;
+ FontSizeBox* pSizeBox = nullptr;
+ SvxLanguageBoxBase* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
sal_uInt16 nSlot = 0;
@@ -917,11 +917,11 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
}
nWhich = GetWhich( nSlot );
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
const SfxItemSet& rOldSet = GetItemSet();
- const SfxPoolItem* pOld = NULL;
+ const SfxPoolItem* pOld = nullptr;
- const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
+ const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr;
bool bChanged = true;
const OUString& rFontName = pNameBox->GetText();
@@ -1438,8 +1438,8 @@ void SvxCharEffectsPage::Initialize()
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
if ( SfxItemState::SET == GetItemSet().GetItemState( SID_HTML_MODE, false, &pItem ) ||
- ( NULL != ( pShell = SfxObjectShell::Current() ) &&
- NULL != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
+ ( nullptr != ( pShell = SfxObjectShell::Current() ) &&
+ nullptr != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
m_nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
if ( ( m_nHtmlMode & HTMLMODE_ON ) == HTMLMODE_ON )
@@ -1456,7 +1456,7 @@ void SvxCharEffectsPage::Initialize()
if ( pDocSh )
{
pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- if ( pItem != NULL )
+ if ( pItem != nullptr )
pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
}
@@ -1468,7 +1468,7 @@ void SvxCharEffectsPage::Initialize()
m_pFontColorLB->SetUpdateMode( false );
{
- SfxPoolItem* pDummy = NULL;
+ SfxPoolItem* pDummy = nullptr;
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocSh );
if ( !pFrame ||
SfxItemState::DEFAULT > pFrame->GetBindings().QueryState( SID_ATTR_AUTO_COLOR_INVALID, pDummy ) )
@@ -1511,7 +1511,7 @@ void SvxCharEffectsPage::Initialize()
m_pStrikeoutLB->SelectEntryPos( 0 );
m_pEmphasisLB->SelectEntryPos( 0 );
m_pPositionLB->SelectEntryPos( 0 );
- SelectHdl_Impl( NULL );
+ SelectHdl_Impl( nullptr );
SelectHdl_Impl( m_pEmphasisLB );
m_pEffectsLB->SelectEntryPos( 0 );
@@ -1675,9 +1675,9 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
{
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR );
const SvxColorItem* pOld = static_cast<const SvxColorItem*>(GetOldItem( rSet, SID_ATTR_CHAR_COLOR ));
- const SvxColorItem* pItem = NULL;
+ const SvxColorItem* pItem = nullptr;
bool bChanged = true;
- const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
+ const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr;
const SfxItemSet& rOldSet = GetItemSet();
Color aSelectedColor;
@@ -2263,7 +2263,7 @@ void SvxCharEffectsPage::ChangesApplied()
bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
{
- const SfxPoolItem* pOld = 0;
+ const SfxPoolItem* pOld = nullptr;
const SfxItemSet& rOldSet = GetItemSet();
bool bModified = false;
bool bChanged = true;
@@ -2474,7 +2474,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
}
// Outline
- const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
+ const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr;
nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CONTOUR );
TriState eState = m_pOutlineBtn->GetState();
@@ -3083,7 +3083,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
{
m_pNormalPosBtn->Check();
m_pHighLowRB->Check();
- PositionHdl_Impl( NULL );
+ PositionHdl_Impl( nullptr );
}
//the height has to be set after the handler is called to keep the value also if the escapement is zero
m_pFontSizeMF->SetValue( m_pFontSizeMF->Normalize( nEscProp ) );
@@ -3432,7 +3432,7 @@ void SvxCharTwoLinesPage::dispose()
void SvxCharTwoLinesPage::Initialize()
{
m_pTwoLinesBtn->Check( false );
- TwoLinesHdl_Impl( NULL );
+ TwoLinesHdl_Impl( nullptr );
m_pTwoLinesBtn->SetClickHdl( LINK( this, SvxCharTwoLinesPage, TwoLinesHdl_Impl ) );
@@ -3573,7 +3573,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
SetBracket( rItem.GetEndBracket(), false );
}
}
- TwoLinesHdl_Impl( NULL );
+ TwoLinesHdl_Impl( nullptr );
SetPrevFontWidthScale( *rSet );
}
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f717e0fbe29c..80ca0fa25e33 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -74,7 +74,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI
,&rInAttrs)
, rOutAttrs(rInAttrs)
, aAttrSet(*rInAttrs.GetPool())
- , pView(NULL)
+ , pView(nullptr)
{
get(m_pLbType,"LB_TYPE");
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index e3ae1cad9a63..280ac7ba17e2 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -35,7 +35,7 @@ SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent,
SvxDistributeVertical eVer)
: SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog",
"cui/ui/distributiondialog.ui")
- , mpPage(NULL)
+ , mpPage(nullptr)
{
mpPage = VclPtr<SvxDistributePage>::Create(get_content_area(), rInAttrs, eHor, eVer);
SetTabPage(mpPage);
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index b833b5095500..1ffd0b4ef5f2 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -50,7 +50,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
: SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet)
- , pLastCropField(0)
+ , pLastCropField(nullptr)
, nOldWidth(0)
, nOldHeight(0)
, bReset(false)
@@ -227,7 +227,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
OUString referer;
SfxStringItem const * it = static_cast<SfxStringItem const *>(
rSet->GetItem(SID_REFERER));
- if (it != 0) {
+ if (it != nullptr) {
referer = it->GetValue();
}
const Graphic* pGrf = static_cast<const SvxBrushItem*>(pItem)->GetGraphic(referer);
@@ -272,8 +272,8 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
SvxSizeItem aSz( nW );
// size could already have been set from another page
- const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
- const SfxPoolItem* pItem = 0;
+ const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr;
+ const SfxPoolItem* pItem = nullptr;
if( pExSet && SfxItemState::SET ==
pExSet->GetItemState( nW, false, &pItem ) )
aSz = *static_cast<const SvxSizeItem*>(pItem);
@@ -289,11 +289,11 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
m_pWidthMF->SaveValue();
m_pHeightMF->SaveValue();
- bModified |= 0 != rSet->Put( aSz );
+ bModified |= nullptr != rSet->Put( aSz );
if( bSetOrigSize )
{
- bModified |= 0 != rSet->Put( SvxSizeItem( rPool.GetWhich(
+ bModified |= nullptr != rSet->Put( SvxSizeItem( rPool.GetWhich(
SID_ATTR_GRAF_FRMSIZE_PERCENT ), Size( 0, 0 )) );
}
}
@@ -308,12 +308,12 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) );
pNew->SetTop( lcl_GetValue( *m_pTopMF, eUnit ) );
pNew->SetBottom( lcl_GetValue( *m_pBottomMF, eUnit ) );
- bModified |= 0 != rSet->Put( *pNew );
+ bModified |= nullptr != rSet->Put( *pNew );
}
if( m_pZoomConstRB->IsValueChangedFromSaved() )
{
- bModified |= 0 != rSet->Put( SfxBoolItem( rPool.GetWhich(
+ bModified |= nullptr != rSet->Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) );
}
@@ -380,7 +380,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
OUString referer;
SfxStringItem const * it = static_cast<SfxStringItem const *>(
rSet.GetItem(SID_REFERER));
- if (it != 0) {
+ if (it != nullptr) {
referer = it->GetValue();
}
const Graphic* pGrf = rBrush.GetGraphic(referer);
@@ -730,7 +730,7 @@ IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void)
{
DBG_ASSERT(pLastCropField,"Timeout ohne Feld?");
CropHdl(*pLastCropField);
- pLastCropField = 0;
+ pLastCropField = nullptr;
}
@@ -739,7 +739,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void )
MetricField* pField = static_cast<MetricField*>(&rControl);
aTimer.Stop();
CropHdl(*pField);
- pLastCropField = 0;
+ pLastCropField = nullptr;
}
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 60f575fd9696..55cb3b301cf9 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -83,7 +83,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rIn
, nAnsatzRelPos(0)
, nAnsatzTypePos(0)
, rOutAttrs(rInAttrs)
- , pView(NULL)
+ , pView(nullptr)
{
get(m_pCT_CAPTTYPE, "valueset");
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 339d6418c5ef..5e599ae4788f 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -62,13 +62,13 @@ public:
};
_SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl()
- : pAssignPB(NULL)
- , pDeletePB(NULL)
- , pEventLB(NULL)
- , pGroupFrame(NULL)
- , pGroupLB(NULL)
- , pMacroFrame(NULL)
- , pMacroLB(NULL)
+ : pAssignPB(nullptr)
+ , pDeletePB(nullptr)
+ , pEventLB(nullptr)
+ , pGroupFrame(nullptr)
+ , pGroupLB(nullptr)
+ , pMacroFrame(nullptr)
+ , pMacroLB(nullptr)
, bReadOnly(false)
, bGotEvents(false)
, m_bDummyActivated(false)
@@ -124,7 +124,7 @@ void _SfxMacroTabPage::EnableButtons()
{
// get bound macro
const SvxMacro* pM = aTbl.Get( (sal_uInt16)reinterpret_cast<sal_uLong>(pE->GetUserData()) );
- mpImpl->pDeletePB->Enable( 0 != pM && !mpImpl->bReadOnly );
+ mpImpl->pDeletePB->Enable( nullptr != pM && !mpImpl->bReadOnly );
OUString sEventMacro = static_cast<const SvLBoxString&>(pE->GetItem( LB_MACROS_ITEMPOS )).GetText();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 6afab7062b32..dfd5abca4620 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -86,7 +86,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
,rInAttrs ),
rOutAttrs ( rInAttrs ),
aAttrSet ( *rInAttrs.GetPool() ),
- pView( 0 ),
+ pView( nullptr ),
eUnit( SFX_MAPUNIT_100TH_MM ),
bPositionModified ( false )
{
@@ -188,7 +188,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_MEASURELINEDIST );
// SdrMeasureLineDistItem
- if( pItem == NULL )
+ if( pItem == nullptr )
pItem = &pPool->GetDefaultItem( SDRATTR_MEASURELINEDIST );
if( pItem )
{
@@ -203,7 +203,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
// SdrMeasureHelplineOverhangItem
pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEOVERHANG );
- if( pItem == NULL )
+ if( pItem == nullptr )
pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEOVERHANG );
if( pItem )
{
@@ -218,7 +218,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
// SdrMeasureHelplineDistItem
pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEDIST );
- if( pItem == NULL )
+ if( pItem == nullptr )
pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEDIST );
if( pItem )
{
@@ -233,7 +233,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
// SdrMeasureHelpline1LenItem
pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE1LEN );
- if( pItem == NULL )
+ if( pItem == nullptr )
pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE1LEN );
if( pItem )
{
@@ -248,7 +248,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
// SdrMeasureHelpline2LenItem
pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE2LEN );
- if( pItem == NULL )
+ if( pItem == nullptr )
pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE2LEN );
if( pItem )
{
@@ -276,7 +276,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
// SdrMeasureDecimalPlacesItem
pItem = GetItem( *rAttrs, SDRATTR_MEASUREDECIMALPLACES );
- if( pItem == NULL )
+ if( pItem == nullptr )
pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREDECIMALPLACES );
if( pItem )
{
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9f22d4c43aed..72d79a7cb287 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -236,13 +236,13 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent,
const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "NumberingFormatPage",
"cui/ui/numberingformatpage.ui", &rCoreAttrs)
- , pNumItem(NULL)
- , pNumFmtShell(NULL)
+ , pNumItem(nullptr)
+ , pNumFmtShell(nullptr)
, nInitFormat(ULONG_MAX)
, sAutomaticEntry(CUI_RES(RID_SVXSTR_AUTO_ENTRY))
, sThousandSeparator(CUI_RES(RID_SVXSTR_THOUSAND_SEP))
, sEngineeringNotation(CUI_RES(RID_SVXSTR_ENGINEERING))
- , pLastActivWindow(NULL)
+ , pLastActivWindow(nullptr)
{
get(m_pFtCategory, "categoryft");
get(m_pLbCategory, "categorylb");
@@ -288,9 +288,9 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
void SvxNumberFormatTabPage::dispose()
{
delete pNumFmtShell;
- pNumFmtShell = NULL;
+ pNumFmtShell = nullptr;
delete pNumItem;
- pNumItem = NULL;
+ pNumItem = nullptr;
m_pFtCategory.clear();
m_pLbCategory.clear();
m_pFtFormat.clear();
@@ -398,9 +398,9 @@ VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( vcl::Window* pParent,
void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
{
- const SfxUInt32Item* pValFmtAttr = NULL;
- const SfxPoolItem* pItem = NULL;
- const SfxBoolItem* pAutoEntryAttr = NULL;
+ const SfxUInt32Item* pValFmtAttr = nullptr;
+ const SfxPoolItem* pItem = nullptr;
+ const SfxBoolItem* pAutoEntryAttr = nullptr;
sal_uInt16 nCatLbSelPos = 0;
sal_uInt16 nFmtLbSelPos = 0;
@@ -417,7 +417,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
const SfxBoolItem* pBoolLangItem = static_cast<const SfxBoolItem*>(
GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE));
- if(pBoolLangItem!=NULL && pBoolLangItem->GetValue())
+ if(pBoolLangItem!=nullptr && pBoolLangItem->GetValue())
{
HideLanguage();
}
@@ -432,7 +432,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
if(eState==SfxItemState::SET)
{
- if(pNumItem==NULL)
+ if(pNumItem==nullptr)
{
bNumItemFlag=true;
pNumItem= static_cast<SvxNumberInfoItem *>(pItem->Clone());
@@ -455,7 +455,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
const SfxBoolItem* pBoolItem = static_cast<const SfxBoolItem*>(
GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA));
- if(pBoolItem!=NULL)
+ if(pBoolItem!=nullptr)
{
bOneAreaFlag= pBoolItem->GetValue();
}
@@ -544,7 +544,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
FillCurrencyBox();
OUString aPrevString;
- Color* pDummy = NULL;
+ Color* pDummy = nullptr;
pNumFmtShell->GetInitSettings( nCatLbSelPos, eLangType, nFmtLbSelPos,
aFmtEntryList, aPrevString, pDummy );
@@ -821,7 +821,7 @@ SfxTabPage::sfxpg SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem )
{
- if(pNumItem==NULL)
+ if(pNumItem==nullptr)
{
pNumItem = static_cast<SvxNumberInfoItem*>(rItem.Clone());
}
@@ -866,7 +866,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
default: break;
}
- if(pNumFmtShell!=NULL)
+ if(pNumFmtShell!=nullptr)
{
for ( ; i < rEntries.size(); ++i )
{
@@ -874,7 +874,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
short aPrivCat = pNumFmtShell->GetCategory4Entry( static_cast<short>(i) );
if(aPrivCat!=CAT_TEXT)
{
- Color* pPreviewColor = NULL;
+ Color* pPreviewColor = nullptr;
OUString aPreviewString( GetExpColorString( pPreviewColor, aEntry, aPrivCat ) );
vcl::Font aEntryFont( m_pLbFormat->GetFont() );
m_pLbFormat->InsertFontEntry( aPreviewString, aEntryFont, pPreviewColor );
@@ -1162,12 +1162,12 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pL
if ( fnOkHdl.IsSet() )
{ // temporary solution, should be offered by SfxTabPage
- fnOkHdl.Call( NULL );
+ fnOkHdl.Call( nullptr );
}
else
{
SfxSingleTabDialog* pParent = dynamic_cast< SfxSingleTabDialog* >( GetParentDialog() );
- OKButton* pOKButton = pParent ? pParent->GetOKButton() : NULL;
+ OKButton* pOKButton = pParent ? pParent->GetOKButton() : nullptr;
if ( pOKButton )
pOKButton->Click();
}
@@ -1290,7 +1290,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb )
if (pLb == m_pLbCategory || pLb == m_pLbCurrency)
{
UpdateFormatListBox_Impl( true, true );
- EditHdl_Impl( NULL );
+ EditHdl_Impl( nullptr );
UpdateOptions_Impl( false );
return;
@@ -1342,7 +1342,7 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB)
short nFmtLbSelPos = SELPOS_NONE;
sal_Int32 nErrPos=0;
- pNumFmtShell->SetCurCurrencyEntry(NULL);
+ pNumFmtShell->SetCurCurrencyEntry(nullptr);
bool bAdded = pNumFmtShell->AddFormat( aFormat, nErrPos,
nCatLbSelPos, nFmtLbSelPos,
aEntryList);
@@ -1619,7 +1619,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl )
}
else
{
- EditHdl_Impl( NULL );
+ EditHdl_Impl( nullptr );
m_pLbFormat->SetNoSelection();
}
}
@@ -1627,7 +1627,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl )
IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void)
{
- pLastActivWindow=NULL;
+ pLastActivWindow=nullptr;
}
@@ -1706,7 +1706,7 @@ OUString SvxNumberFormatTabPage::GetExpColorString(
void SvxNumberFormatTabPage::MakePreviewText( const OUString& rFormat )
{
OUString aPreviewString;
- Color* pPreviewColor = NULL;
+ Color* pPreviewColor = nullptr;
pNumFmtShell->MakePreviewString( rFormat, aPreviewString, pPreviewColor );
m_pWndPreview->NotifyChange( aPreviewString, pPreviewColor );
}
@@ -1714,7 +1714,7 @@ void SvxNumberFormatTabPage::MakePreviewText( const OUString& rFormat )
void SvxNumberFormatTabPage::ChangePreviewText( sal_uInt16 nPos )
{
OUString aPreviewString;
- Color* pPreviewColor = NULL;
+ Color* pPreviewColor = nullptr;
pNumFmtShell->FormatChanged( nPos, aPreviewString, pPreviewColor );
m_pWndPreview->NotifyChange( aPreviewString, pPreviewColor );
}
@@ -1725,7 +1725,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
{
if ( rNEvt.GetWindow() == dynamic_cast<const vcl::Window* >( m_pEdComment.get() ) && !m_pEdComment->IsVisible() )
{
- pLastActivWindow = NULL;
+ pLastActivWindow = nullptr;
}
else
{
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d04334effe60..4456e89799bd 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -157,7 +157,7 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
for( sal_uInt16 i = 0; i < SVX_MAX_NUM && !bRet; i++ )
{
if(nLevelMask & nMask)
- bRet |= 0 != pNum->Get( i );
+ bRet |= nullptr != pNum->Get( i );
nMask <<= 1 ;
}
return bRet;
@@ -183,8 +183,8 @@ static vcl::Font& lcl_GetDefaultBulletFont()
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet)
- , pActNum(0)
- , pSaveNum(0)
+ , pActNum(nullptr)
+ , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
@@ -232,9 +232,9 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
void SvxSingleNumPickTabPage::dispose()
{
delete pActNum;
- pActNum = NULL;
+ pActNum = nullptr;
delete pSaveNum;
- pSaveNum = NULL;
+ pSaveNum = nullptr;
m_pExamplesVS.clear();
SfxTabPage::dispose();
}
@@ -376,8 +376,8 @@ IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, v
SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet)
- , pActNum(0)
- , pSaveNum(0)
+ , pActNum(nullptr)
+ , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
@@ -398,9 +398,9 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage()
void SvxBulletPickTabPage::dispose()
{
delete pActNum;
- pActNum = NULL;
+ pActNum = nullptr;
delete pSaveNum;
- pSaveNum = NULL;
+ pSaveNum = nullptr;
m_pExamplesVS.clear();
SfxTabPage::dispose();
}
@@ -544,8 +544,8 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet)
- , pActNum(0)
- , pSaveNum(0)
+ , pActNum(nullptr)
+ , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -600,9 +600,9 @@ SvxNumPickTabPage::~SvxNumPickTabPage()
void SvxNumPickTabPage::dispose()
{
delete pActNum;
- pActNum = NULL;
+ pActNum = nullptr;
delete pSaveNum;
- pSaveNum = NULL;
+ pSaveNum = nullptr;
m_pExamplesVS.clear();
SfxTabPage::dispose();
}
@@ -701,12 +701,12 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
bPreset = false;
bModified = true;
- const FontList* pList = 0;
+ const FontList* pList = nullptr;
SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_pExamplesVS->GetSelectItemId() - 1];
vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
- SvxNumSettings_Impl* pLevelSettings = 0;
+ SvxNumSettings_Impl* pLevelSettings = nullptr;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
if(rItemArr.size() > i)
@@ -732,7 +732,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
const SvxFontListItem* pFontListItem =
static_cast<const SvxFontListItem*>( pCurDocShell
->GetItem( SID_ATTR_CHAR_FONTLIST ));
- pList = pFontListItem ? pFontListItem->GetFontList() : 0;
+ pList = pFontListItem ? pFontListItem->GetFontList() : nullptr;
}
if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
{
@@ -797,8 +797,8 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet)
- , pActNum(0)
- , pSaveNum(0)
+ , pActNum(nullptr)
+ , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -850,9 +850,9 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
void SvxBitmapPickTabPage::dispose()
{
delete pActNum;
- pActNum = NULL;
+ pActNum = nullptr;
delete pSaveNum;
- pSaveNum = NULL;
+ pSaveNum = nullptr;
m_pBtBrowseFile.clear();
m_pErrorText.clear();
m_pExamplesVS.clear();
@@ -1150,8 +1150,8 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR
SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet)
- , pActNum(0)
- , pSaveNum(0)
+ , pActNum(nullptr)
+ , pSaveNum(nullptr)
, bLastWidthModified(false)
, bModified(false)
, bPreset(false)
@@ -1261,9 +1261,9 @@ void SvxNumOptionsTabPage::dispose()
delete m_pBitmapMB->GetPopupMenu()->GetPopupMenu(m_nGalleryId);
}
delete pActNum;
- pActNum = NULL;
+ pActNum = nullptr;
delete pSaveNum;
- pSaveNum = NULL;
+ pSaveNum = nullptr;
m_pLevelLB.clear();
m_pFmtLB.clear();
m_pSeparatorFT.clear();
@@ -1474,8 +1474,8 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet )
SfxObjectShell* pShell;
if ( SfxItemState::SET == rSet->GetItemState( SID_HTML_MODE, false, &pItem )
- || ( 0 != ( pShell = SfxObjectShell::Current()) &&
- 0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
+ || ( nullptr != ( pShell = SfxObjectShell::Current()) &&
+ nullptr != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
sal_uInt16 nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
bHTMLMode = 0 != (nHtmlMode&HTMLMODE_ON);
@@ -1612,7 +1612,7 @@ void SvxNumOptionsTabPage::InitControls()
nHighestLevel = i;
}
else
- aNumFmtArr[i] = 0;
+ aNumFmtArr[i] = nullptr;
nMask <<= 1 ;
}
@@ -1883,7 +1883,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox,
sal_uInt16 nNumberingType = aNumFmt.GetNumberingType();
if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN)))
{
- bBmp |= 0 != aNumFmt.GetBrush();
+ bBmp |= nullptr != aNumFmt.GetBrush();
aNumFmt.SetIncludeUpperLevels( sal_False );
aNumFmt.SetSuffix( "" );
aNumFmt.SetPrefix( "" );
@@ -2176,7 +2176,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void)
VclPtrInstance< SvxCharacterMap > pMap( this, true );
sal_uInt16 nMask = 1;
- const vcl::Font* pFmtFont = 0;
+ const vcl::Font* pFmtFont = nullptr;
bool bSameBullet = true;
sal_Unicode cBullet = 0;
bool bFirst = true;
@@ -2434,9 +2434,9 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits)
: Window(pParent, nWinBits)
- , pActNum(0)
+ , pActNum(nullptr)
, nPageWidth(0)
- , pOutlineNames(0)
+ , pOutlineNames(nullptr)
, bPosition(false)
, nActLevel(SAL_MAX_UINT16)
{
@@ -2737,8 +2737,8 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan
SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet)
- , pActNum(0)
- , pSaveNum(0)
+ , pActNum(nullptr)
+ , pSaveNum(nullptr)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -2836,9 +2836,9 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage()
void SvxNumPositionTabPage::dispose()
{
delete pActNum;
- pActNum = NULL;
+ pActNum = nullptr;
delete pSaveNum;
- pSaveNum = NULL;
+ pSaveNum = nullptr;
m_pLevelLB.clear();
m_pDistBorderFT.clear();
m_pDistBorderMF.clear();
@@ -3231,7 +3231,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet* rSet )
void SvxNumPositionTabPage::InitPosAndSpaceMode()
{
- if ( pActNum == 0 )
+ if ( pActNum == nullptr )
{
DBG_ASSERT( false,
"<SvxNumPositionTabPage::InitPosAndSpaceMode()> - misusage of method -> <pAktNum> has to be already set!" );
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index ef7110af8b86..28959c48b8a4 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -182,7 +182,7 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
//UUUU
m_nPos( 0 ),
- mpDefPrinter( 0 ),
+ mpDefPrinter( nullptr ),
mbDelPrinter( false ),
//UUUU
@@ -242,8 +242,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
SfxObjectShell* pShell;
if(SfxItemState::SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) ||
- ( 0 != (pShell = SfxObjectShell::Current()) &&
- 0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
+ ( nullptr != (pShell = SfxObjectShell::Current()) &&
+ nullptr != (pItem = pShell->GetItem(SID_HTML_MODE))))
bWeb = 0 != (static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON);
// fill text flow listbox with valid entries
@@ -711,7 +711,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
DBG_ASSERT( pPool, "Wo ist der Pool" );
sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE );
SfxMapUnit eUnit = pPool->GetMetric( nWhich );
- const SfxPoolItem* pOld = 0;
+ const SfxPoolItem* pOld = nullptr;
// copy old left and right margins
SvxLRSpaceItem aMargin( static_cast<const SvxLRSpaceItem&>(rOldSet.Get( nWhich )) );
@@ -1297,7 +1297,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet)
}
drawinglayer::attribute::SdrAllFillAttributesHelperPtr aPageFillAttributes;
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
if(mbEnableDrawingLayerFillStyles)
{
@@ -1336,7 +1336,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
if ( pItem )
m_pBspWin->SetSize( static_cast<const SvxSizeItem*>(pItem)->GetSize() );
- const SvxSetItem* pSetItem = 0;
+ const SvxSetItem* pSetItem = nullptr;
// evaluate header attributes
@@ -1487,7 +1487,7 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( ScopedVclPtr<QueryBox>::Create( this, WB_YES_NO | WB_DEF_NO, m_pPrintRangeQueryText->GetText() )->Execute() == RET_NO )
{
- MetricField* pField = NULL;
+ MetricField* pField = nullptr;
if ( IsPrinterRangeOverflow( *m_pLeftMarginEdit, nFirstLeftMargin, nLastLeftMargin, MARGIN_LEFT ) )
pField = m_pLeftMarginEdit;
if ( IsPrinterRangeOverflow( *m_pRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT )
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ecbc0ca42c9b..775e80b61dd8 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -143,11 +143,11 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace,
sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet)
{
sal_uInt16 nHtmlMode = 0;
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
SfxObjectShell* pShell;
if(SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) ||
- ( 0 != (pShell = SfxObjectShell::Current()) &&
- 0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
+ ( nullptr != (pShell = SfxObjectShell::Current()) &&
+ nullptr != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
}
@@ -200,7 +200,7 @@ VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const S
bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
SfxItemState eState = SfxItemState::UNKNOWN;
- const SfxPoolItem* pOld = 0;
+ const SfxPoolItem* pOld = nullptr;
SfxItemPool* pPool = rOutSet->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
@@ -1824,9 +1824,9 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
m_pKeepTogetherBox->Enable(false);
// so that everything is enabled correctly
- KeepTogetherHdl_Impl( 0 );
- WidowHdl_Impl( 0 );
- OrphanHdl_Impl( 0 );
+ KeepTogetherHdl_Impl( nullptr );
+ WidowHdl_Impl( nullptr );
+ OrphanHdl_Impl( nullptr );
ChangesApplied();
}
void SvxExtParagraphTabPage::ChangesApplied()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 5056604dc285..2679637a785a 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -503,9 +503,9 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs)
- , m_pVMap(0)
- , m_pHMap(0)
- , m_pSdrView(0)
+ , m_pVMap(nullptr)
+ , m_pHMap(nullptr)
+ , m_pSdrView(nullptr)
, m_nOldH(HoriOrientation::CENTER)
, m_nOldHRel(RelOrientation::FRAME)
, m_nOldV(VertOrientation::TOP)
@@ -848,7 +848,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
}
}
if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsValueChangedFromSaved())
- bModified |= 0 != rSet->Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked()));
+ bModified |= nullptr != rSet->Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked()));
if ( m_pVMap )
{
@@ -892,7 +892,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
{
std::unique_ptr<SfxBoolItem> pFollow(static_cast<SfxBoolItem*>(pItem->Clone()));
pFollow->SetValue(m_pFollowCB->IsChecked());
- bModified |= 0 != rSet->Put(*pFollow);
+ bModified |= nullptr != rSet->Put(*pFollow);
}
}
}
@@ -1097,7 +1097,7 @@ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable)
short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged)
{
short nRet = -1;
- RadioButton* pCheckedButton = 0;
+ RadioButton* pCheckedButton = nullptr;
if(m_pToParaRB->IsEnabled())
{
if(m_pToPageRB->IsChecked())
@@ -1559,7 +1559,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
else if ( nAnchor == TextContentAnchorType_AS_CHARACTER )
{
m_pVMap = m_bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap;
- m_pHMap = 0;
+ m_pHMap = nullptr;
bEnable = false;
}
m_pHoriLB->Enable( bEnable );
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 62169efe59ff..73961af035ea 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -73,22 +73,22 @@ SvxAreaTabDialog::SvxAreaTabDialog
mnPos( 0 ),
mbAreaTP( false )
{
- m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, 0 );
+ m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, nullptr );
if(bShadow)
{
- m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, 0 );
+ m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, nullptr );
}
else
{
RemoveTabPage( "RID_SVXPAGE_SHADOW" );
}
- m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, 0);
- m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", SvxColorTabPage::Create, 0 );
- m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", SvxGradientTabPage::Create, 0 );
- m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", SvxHatchTabPage::Create, 0 );
- m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", SvxBitmapTabPage::Create, 0);
+ m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, nullptr);
+ m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", SvxColorTabPage::Create, nullptr );
+ m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", SvxGradientTabPage::Create, nullptr );
+ m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", SvxHatchTabPage::Create, nullptr );
+ m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", SvxBitmapTabPage::Create, nullptr);
SetCurPageId( "RID_SVXPAGE_AREA" );
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 56245180390f..20b3da921466 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -87,14 +87,14 @@ SvxLineTabDialog::SvxLineTabDialog
}
- m_nLineTabPage = AddTabPage( "RID_SVXPAGE_LINE", SvxLineTabPage::Create, 0);
+ m_nLineTabPage = AddTabPage( "RID_SVXPAGE_LINE", SvxLineTabPage::Create, nullptr);
if( bLineOnly )
- m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, 0 );
+ m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, nullptr );
else
RemoveTabPage( "RID_SVXPAGE_SHADOW" );
- m_nStyleTabPage = AddTabPage( "RID_SVXPAGE_LINE_DEF", SvxLineDefTabPage::Create, 0);
- m_nEndTabPage = AddTabPage( "RID_SVXPAGE_LINEEND_DEF", SvxLineEndDefTabPage::Create, 0);
+ m_nStyleTabPage = AddTabPage( "RID_SVXPAGE_LINE_DEF", SvxLineDefTabPage::Create, nullptr);
+ m_nEndTabPage = AddTabPage( "RID_SVXPAGE_LINEEND_DEF", SvxLineEndDefTabPage::Create, nullptr);
SetCurPageId( "RID_SVXPAGE_LINE" );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 25ede825288f..aa697b33dbb6 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -47,7 +47,7 @@ public:
TabWin_Impl(vcl::Window* pParent, WinBits nBits)
: Window(pParent, nBits)
- , mpPage(0)
+ , mpPage(nullptr)
, nTabStyle(0)
{
}
@@ -213,7 +213,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
// Put the controls' values in here
if (m_pNewBtn->IsEnabled())
- NewHdl_Impl( 0 );
+ NewHdl_Impl( nullptr );
// Call the LoseFocus-Handler first
GetDezCharHdl_Impl(*m_pDezChar);
@@ -368,7 +368,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
m_pTabBox->Clear();
long nOffset = 0;
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
if (GetItemSet().GetItemState(SID_ATTR_TABSTOP_OFFSET, true, &pItem) == SfxItemState::SET)
{
nOffset = static_cast<const SfxInt32Item*>(pItem)->GetValue();
@@ -418,8 +418,8 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
void SvxTabulatorTabPage::SetFillAndTabType_Impl()
{
- RadioButton* pTypeBtn = 0;
- RadioButton* pFillBtn = 0;
+ RadioButton* pTypeBtn = nullptr;
+ RadioButton* pFillBtn = nullptr;
m_pDezChar->Disable();
m_pDezCharLabel->Disable();
@@ -468,11 +468,11 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void )
long nVal = static_cast<long>(m_pTabBox->Denormalize( m_pTabBox->GetValue( eDefUnit ) ));
// If the pBtn == 0 && the value == 0 then do not create a tab, because we create via OK
- if ( nVal == 0 && pBtn == 0 )
+ if ( nVal == 0 && pBtn == nullptr )
return;
long nOffset = 0;
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
if ( GetItemSet().GetItemState( SID_ATTR_TABSTOP_OFFSET, true, &pItem ) ==
SfxItemState::SET )
@@ -525,7 +525,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void)
if ( m_pTabBox->GetEntryCount() == 1 )
{
- DelAllHdl_Impl( 0 );
+ DelAllHdl_Impl( nullptr );
return;
}
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 4ffacbe99e71..64bf0e17da0c 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -50,8 +50,8 @@ SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent,
, pAttr ),
pView ( pSdrView )
{
- m_nTextId = AddTabPage( "RID_SVXPAGE_TEXTATTR", SvxTextAttrPage::Create, 0);
- m_nTextAnimId = AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, 0);
+ m_nTextId = AddTabPage( "RID_SVXPAGE_TEXTATTR", SvxTextAttrPage::Create, nullptr);
+ m_nTextAnimId = AddTabPage( "RID_SVXPAGE_TEXTANIMATION", SvxTextAnimationPage::Create, nullptr);
}
/*************************************************************************
@@ -336,8 +336,8 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs )
SelectEffectHdl_Impl( *m_pLbEffect );
- ClickEndlessHdl_Impl( NULL );
- ClickAutoHdl_Impl( NULL );
+ ClickEndlessHdl_Impl( nullptr );
+ ClickAutoHdl_Impl( nullptr );
//ClickPixelHdl_Impl( NULL );
}
@@ -501,11 +501,11 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void
m_pTsbStartInside->Enable();
m_pTsbStopInside->Enable();
m_pTsbEndless->Enable();
- ClickEndlessHdl_Impl( NULL );
+ ClickEndlessHdl_Impl( nullptr );
}
m_pTsbAuto->Enable();
- ClickAutoHdl_Impl( NULL );
+ ClickAutoHdl_Impl( nullptr );
if( eAniKind == SDRTEXTANI_BLINK )
{
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 62ebd52393df..50cbcb5671f0 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -56,7 +56,7 @@ const sal_uInt16 SvxTextAttrPage::pRanges[] =
SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
: SvxTabPage(pWindow,"TextAttributesPage","cui/ui/textattrtabpage.ui", rInAttrs)
, rOutAttrs(rInAttrs)
- , pView(NULL)
+ , pView(nullptr)
, bAutoGrowSizeEnabled(false)
, bContourEnabled(false)
, bAutoGrowWidthEnabled(false)
@@ -287,7 +287,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
if((bLeftToRight && (SDRTEXTHORZADJUST_BLOCK == eTHA)) || (!bLeftToRight && (SDRTEXTVERTADJUST_BLOCK == eTVA)))
{
// Move anchor to valid position.
- ClickFullWidthHdl_Impl(NULL);
+ ClickFullWidthHdl_Impl(nullptr);
m_pTsbFullWidth->SetState(TRISTATE_TRUE);
}
@@ -327,7 +327,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
m_pTsbContour->SetState( TRISTATE_INDET );
m_pTsbContour->SaveValue();
- ClickHdl_Impl( NULL );
+ ClickHdl_Impl( nullptr );
}
/*************************************************************************
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index d1d4f6c62cd3..baa7ee275758 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -108,7 +108,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button
// preview
rXFSet.ClearItem (XATTR_FILLTRANSPARENCE);
- ModifiedTrgrHdl_Impl (NULL);
+ ModifiedTrgrHdl_Impl (nullptr);
}
SvxTransparenceTabPage::~SvxTransparenceTabPage()
@@ -311,8 +311,8 @@ VclPtr<SfxTabPage> SvxTransparenceTabPage::Create(vcl::Window* pWindow, const Sf
bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
{
- const SfxPoolItem* pGradientItem = NULL;
- const SfxPoolItem* pLinearItem = NULL;
+ const SfxPoolItem* pGradientItem = nullptr;
+ const SfxPoolItem* pLinearItem = nullptr;
SfxItemState eStateGradient(rOutAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem));
SfxItemState eStateLinear(rOutAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem));
bool bGradActive = (eStateGradient == SfxItemState::SET && static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->IsEnabled());
@@ -413,13 +413,13 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs)
{
- const SfxPoolItem* pGradientItem = NULL;
+ const SfxPoolItem* pGradientItem = nullptr;
SfxItemState eStateGradient(rAttrs->GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem));
if(!pGradientItem)
pGradientItem = &rAttrs->Get(XATTR_FILLFLOATTRANSPARENCE);
bool bGradActive = (eStateGradient == SfxItemState::SET && static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->IsEnabled());
- const SfxPoolItem* pLinearItem = NULL;
+ const SfxPoolItem* pLinearItem = nullptr;
SfxItemState eStateLinear(rAttrs->GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem));
if(!pLinearItem)
pLinearItem = &rAttrs->Get(XATTR_FILLTRANSPARENCE);
@@ -446,20 +446,20 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs)
{
// transparence gradient, set controls appropriate to item
m_pRbtTransGradient->Check();
- ClickTransGradientHdl_Impl(NULL);
+ ClickTransGradientHdl_Impl(nullptr);
}
else if(bLinearActive)
{
// linear transparence
m_pRbtTransLinear->Check();
- ClickTransLinearHdl_Impl(NULL);
+ ClickTransLinearHdl_Impl(nullptr);
}
else
{
// no transparence
m_pRbtTransOff->Check();
- ClickTransOffHdl_Impl(NULL);
- ModifiedTrgrHdl_Impl(NULL);
+ ClickTransOffHdl_Impl(nullptr);
+ ModifiedTrgrHdl_Impl(nullptr);
}
// save values
@@ -512,13 +512,13 @@ bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet )
// set transparencetyp for preview
if ( m_pRbtTransOff->IsChecked() )
{
- ClickTransOffHdl_Impl(NULL);
+ ClickTransOffHdl_Impl(nullptr);
} else if ( m_pRbtTransLinear->IsChecked() )
{
- ClickTransLinearHdl_Impl(NULL);
+ ClickTransLinearHdl_Impl(nullptr);
} else if ( m_pRbtTransGradient->IsChecked() )
{
- ClickTransGradientHdl_Impl(NULL);
+ ClickTransGradientHdl_Impl(nullptr);
}
// Get fillstyle for preview
@@ -601,10 +601,10 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
m_rOutAttrs (rInAttrs ),
m_eRP( RP_LT ),
- m_pColorList( NULL ),
- m_pGradientList( NULL ),
- m_pHatchingList( NULL ),
- m_pBitmapList( NULL ),
+ m_pColorList( nullptr ),
+ m_pGradientList( nullptr ),
+ m_pHatchingList( nullptr ),
+ m_pBitmapList( nullptr ),
// local fixed not o be changed values for local pointers
maFixed_ChangeType(ChangeType::NONE),
@@ -1056,7 +1056,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
if( m_nDlgType != 0 || *m_pbAreaTP )
{
- const SfxPoolItem* pOld = NULL;
+ const SfxPoolItem* pOld = nullptr;
drawing::FillStyle eStyle = (drawing::FillStyle) m_pTypeLB->GetSelectEntryPos();
drawing::FillStyle eSavedStyle = (drawing::FillStyle) m_pTypeLB->GetSavedValue();
switch( eStyle )
@@ -1673,7 +1673,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
else
m_pTsbScale->SetState( TRISTATE_TRUE );
- ClickScaleHdl_Impl( NULL );
+ ClickScaleHdl_Impl( nullptr );
}
else
m_pTsbScale->SetState( TRISTATE_INDET );
@@ -1915,7 +1915,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl()
IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void)
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
sal_Int32 _nPos = m_pLbColor->GetSelectEntryPos();
m_pLbHatchBckgrdColor->SelectEntryPos( _nPos );
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1969,7 +1969,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl()
IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void)
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
sal_Int32 _nPos = m_pLbGradient->GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -2023,7 +2023,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl()
IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void)
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
sal_Int32 _nPos = m_pLbHatching->GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -2049,7 +2049,7 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void)
IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, ListBox&, void)
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
sal_Int32 _nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos();
m_pLbColor->SelectEntryPos( _nPos );
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -2147,7 +2147,7 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void)
maDirectGraphic.Clear();
maDirectName.clear();
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
sal_Int32 _nPos = m_pLbBitmap->GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 000936a56ad3..88409708d340 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -57,12 +57,12 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rIn
rInAttrs ),
m_rOutAttrs ( rInAttrs ),
- m_pnBitmapListState ( 0 ),
- m_pnColorListState ( 0 ),
- m_pPageType ( 0 ),
+ m_pnBitmapListState ( nullptr ),
+ m_pnColorListState ( nullptr ),
+ m_pPageType ( nullptr ),
m_nDlgType ( 0 ),
- m_pPos ( 0 ),
- m_pbAreaTP ( 0 ),
+ m_pPos ( nullptr ),
+ m_pbAreaTP ( nullptr ),
m_bBmpChanged ( false ),
@@ -126,7 +126,7 @@ SvxBitmapTabPage::~SvxBitmapTabPage()
void SvxBitmapTabPage::dispose()
{
delete m_pBitmapCtl;
- m_pBitmapCtl = NULL;
+ m_pBitmapCtl = nullptr;
m_pBxPixelEditor.clear();
m_pCtlPixel.clear();
m_pLbColor.clear();
@@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBitmapHdl_Impl, ListBox&, void)
}
else
{
- const SfxPoolItem* pPoolItem = 0;
+ const SfxPoolItem* pPoolItem = nullptr;
if(SfxItemState::SET == m_rOutAttrs.GetItemState(GetWhich(XATTR_FILLSTYLE), true, &pPoolItem))
{
@@ -456,13 +456,13 @@ long SvxBitmapTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( NULL );
+ ClickModifyHdl_Impl( nullptr );
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( NULL );
+ ClickAddHdl_Impl( nullptr );
}
break;
@@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void)
if( !nError )
{
- XBitmapEntry* pEntry = 0;
+ XBitmapEntry* pEntry = nullptr;
if( m_pCtlPixel->IsEnabled() )
{
const BitmapEx aBitmapEx(m_pBitmapCtl->GetBitmapEx());
@@ -549,7 +549,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void)
}
else // it must be a not existing imported bitmap
{
- const SfxPoolItem* pPoolItem = 0;
+ const SfxPoolItem* pPoolItem = nullptr;
if(SfxItemState::SET == m_rOutAttrs.GetItemState(XATTR_FILLBITMAP, true, &pPoolItem))
{
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 4096920da5f2..9c7ee227cd0f 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -313,11 +313,11 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
, pShadow ( new SvxColorTabPageShadow() )
, rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
- , pnColorListState( 0 )
- , pPageType( NULL )
+ , pnColorListState( nullptr )
+ , pPageType( nullptr )
, nDlgType( 0 )
- , pPos( NULL )
- , pbAreaTP( NULL )
+ , pPos( nullptr )
+ , pbAreaTP( nullptr )
, aXFStyleItem( drawing::FillStyle_SOLID )
, aXFillColorItem( OUString(), Color( COL_BLACK ) )
, aXFillAttr( static_cast<XOutdevItemPool*>( rInAttrs.GetPool() ))
@@ -409,7 +409,7 @@ SvxColorTabPage::~SvxColorTabPage()
void SvxColorTabPage::dispose()
{
delete pShadow;
- pShadow = NULL;
+ pShadow = nullptr;
mpTopDlg.clear();
m_pBoxEmbed.clear();
m_pBtnLoad.clear();
@@ -475,7 +475,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
}
else if( *pPageType == PT_COLOR && *pPos == LISTBOX_ENTRY_NOTFOUND )
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
if( SfxItemState::SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
{
m_pLbColorModel->SelectEntryPos( CM_RGB );
@@ -556,14 +556,14 @@ long SvxColorTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( NULL );
+ ClickModifyHdl_Impl( nullptr );
aColor = pColorList->GetColor( nPos )->GetColor();
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( NULL );
+ ClickAddHdl_Impl( nullptr );
nPos = m_pLbColor->GetSelectEntryPos();
aColor = pColorList->GetColor( nPos )->GetColor();
}
@@ -1152,8 +1152,8 @@ void SvxColorTabPage::FillUserData()
void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame )
{
- const OfaRefItem<XColorList> *pPtr = NULL;
- if ( pViewFrame != NULL && pViewFrame->GetDispatcher() )
+ const OfaRefItem<XColorList> *pPtr = nullptr;
+ if ( pViewFrame != nullptr && pViewFrame->GetDispatcher() )
pPtr = static_cast<const OfaRefItem<XColorList> *>(pViewFrame->
GetDispatcher()->Execute( SID_GET_COLORLIST,
SfxCallMode::SYNCHRON ));
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 60d9a60a1fd9..c074fca231b0 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -52,12 +52,12 @@ SvxGradientTabPage::SvxGradientTabPage
m_rOutAttrs ( rInAttrs ),
- m_pnGradientListState ( 0 ),
- m_pnColorListState ( 0 ),
- m_pPageType ( 0 ),
+ m_pnGradientListState ( nullptr ),
+ m_pnColorListState ( nullptr ),
+ m_pPageType ( nullptr ),
m_nDlgType ( 0 ),
- m_pPos ( 0 ),
- m_pbAreaTP ( 0 ),
+ m_pPos ( nullptr ),
+ m_pbAreaTP ( nullptr ),
m_aXFStyleItem ( drawing::FillStyle_GRADIENT ),
m_aXGradientItem ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
@@ -306,14 +306,14 @@ long SvxGradientTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( NULL );
+ ClickModifyHdl_Impl( nullptr );
aGradient = m_pGradientList->GetGradient( nPos )->GetGradient();
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( NULL );
+ ClickAddHdl_Impl( nullptr );
nPos = m_pLbGradients->GetSelectEntryPos();
aGradient = m_pGradientList->GetGradient( nPos )->GetGradient();
}
@@ -819,7 +819,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl_Impl, ListBox&, void
pGradient.reset(new XGradient( m_pGradientList->GetGradient( nPos )->GetGradient() ));
else
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
if( SfxItemState::SET == m_rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
{
if( ( drawing::FillStyle_GRADIENT == (drawing::FillStyle) static_cast<const XFillStyleItem*>( pPoolItem )->GetValue() ) &&
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 46be349633f7..d6d4f850342b 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -55,12 +55,12 @@ SvxHatchTabPage::SvxHatchTabPage
m_rOutAttrs ( rInAttrs ),
- m_pnHatchingListState ( 0 ),
- m_pnColorListState ( 0 ),
- m_pPageType ( 0 ),
+ m_pnHatchingListState ( nullptr ),
+ m_pnColorListState ( nullptr ),
+ m_pPageType ( nullptr ),
m_nDlgType ( 0 ),
- m_pPos ( 0 ),
- m_pbAreaTP ( 0 ),
+ m_pPos ( nullptr ),
+ m_pbAreaTP ( nullptr ),
m_aXFStyleItem ( drawing::FillStyle_HATCH ),
m_aXHatchItem ( OUString(), XHatch() ),
@@ -276,13 +276,13 @@ long SvxHatchTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( NULL );
+ ClickModifyHdl_Impl( nullptr );
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( NULL );
+ ClickAddHdl_Impl( nullptr );
}
break;
@@ -415,7 +415,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl_Impl, ListBox&, void)
pHatch.reset(new XHatch( m_pHatchingList->GetHatch( nPos )->GetHatch() ));
else
{
- const SfxPoolItem* pPoolItem = NULL;
+ const SfxPoolItem* pPoolItem = nullptr;
if( SfxItemState::SET == m_rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
{
if( ( drawing::FillStyle_HATCH == (drawing::FillStyle) static_cast<const XFillStyleItem*>( pPoolItem )->GetValue() ) &&
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 03f095d70a25..65992f56815a 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -84,11 +84,11 @@ SvxLineTabPage::SvxLineTabPage
,"cui/ui/linetabpage.ui"
, rInAttrs ),
- m_pSymbolList(NULL),
+ m_pSymbolList(nullptr),
m_bNewSize(false),
m_nNumMenuGalleryItems(0),
m_nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), // unknown respectively unchanged
- m_pSymbolAttr(NULL),
+ m_pSymbolAttr(nullptr),
m_bLastWidthModified(false),
m_aSymbolLastSize(Size(0,0)),
@@ -104,14 +104,14 @@ SvxLineTabPage::SvxLineTabPage
m_aXColor ( OUString(), COL_LIGHTRED ),
m_aXLineAttr ( rInAttrs.GetPool() ),
m_rXLSet ( m_aXLineAttr.GetItemSet() ),
- m_pnLineEndListState( 0 ),
- m_pnDashListState( 0 ),
- m_pnColorListState( 0 ),
+ m_pnLineEndListState( nullptr ),
+ m_pnDashListState( nullptr ),
+ m_pnColorListState( nullptr ),
m_nPageType ( 0 ),
m_nDlgType(0),
- m_pPosDashLb(NULL),
- m_pPosLineEndLb(NULL)
+ m_pPosDashLb(nullptr),
+ m_pPosLineEndLb(nullptr)
{
get(m_pLbLineStyle,"LB_LINE_STYLE");
get(m_pBoxColor,"boxCOLOR");
@@ -237,7 +237,7 @@ void SvxLineTabPage::dispose()
if(m_pSymbolList)
delete m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS );
- m_pSymbolMB = NULL;
+ m_pSymbolMB = nullptr;
}
for ( size_t i = 0, n = m_aGrfBrushItems.size(); i < n; ++i )
@@ -381,7 +381,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
for(size_t i=0;; ++i)
{
SdrObject *pObj=m_pSymbolList->GetObj(i);
- if(pObj==NULL)
+ if(pObj==nullptr)
break;
pObj=pObj->Clone();
m_aGrfNames.push_back("");
@@ -439,7 +439,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
{
sal_uInt16 nItemId = pButton->GetCurItemId();
- const Graphic* pGraphic = 0;
+ const Graphic* pGraphic = nullptr;
Graphic aGraphic;
bool bResetSize = false;
bool bEnable = true;
@@ -472,7 +472,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
case MN_SYMBOLS_NONE:
{
m_nSymbolType=SVX_SYMBOLTYPE_NONE;
- pGraphic=NULL;
+ pGraphic=nullptr;
bEnable = false;
}
break;
@@ -520,7 +520,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
else
{
m_aSymbolGraphic=Graphic();
- m_pCtlPreview->SetSymbol(NULL,m_aSymbolSize);
+ m_pCtlPreview->SetSymbol(nullptr,m_aSymbolSize);
bEnable = false;
}
m_aSymbolLastSize=m_aSymbolSize;
@@ -707,7 +707,7 @@ SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
{
- const SfxPoolItem* pOld = NULL;
+ const SfxPoolItem* pOld = nullptr;
sal_Int32 nPos;
bool bModified = false;
@@ -962,7 +962,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
SfxInt32Item aTItem(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),m_nSymbolType);
const SfxPoolItem* pTOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE) );
- bool bNewType = pTOld == NULL || *static_cast<const SfxInt32Item*>(pTOld) != aTItem;
+ bool bNewType = pTOld == nullptr || *static_cast<const SfxInt32Item*>(pTOld) != aTItem;
if(bNewType && m_nSymbolType==SVX_SYMBOLTYPE_UNKNOWN)
bNewType=false; // a small fix, type wasn't set -> don't create a type item after all!
if(bNewType)
@@ -976,7 +976,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
SvxBrushItem aBItem(m_aSymbolGraphic,GPOS_MM,rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH));
const SfxPoolItem* pBOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH) );
bool bNewBrush =
- pBOld == NULL || *static_cast<const SvxBrushItem*>(pBOld) != aBItem;
+ pBOld == nullptr || *static_cast<const SvxBrushItem*>(pBOld) != aBItem;
if(bNewBrush)
{
rAttrs->Put(aBItem);
@@ -1155,7 +1155,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
std::unique_ptr<SdrView> pView(new SdrView( pModel.get(), pVDev ));
pView->hideMarkHandles();
pView->ShowSdrPage(pPage);
- SdrObject *pObj=NULL;
+ SdrObject *pObj=nullptr;
size_t nSymTmp = static_cast<size_t>(nSymType);
if(m_pSymbolList)
{
@@ -1510,7 +1510,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
ClickInvisibleHdl_Impl( *m_pLbLineStyle );
- ChangePreviewHdl_Impl( NULL );
+ ChangePreviewHdl_Impl( nullptr );
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 89d4a8209ace..3ec2f9247eea 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -67,10 +67,10 @@ SvxLineDefTabPage::SvxLineDefTabPage
aXColor ( OUString(), COL_BLACK ),
aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
- pnDashListState(0),
- pPageType(0),
+ pnDashListState(nullptr),
+ pPageType(nullptr),
nDlgType(0),
- pPosDashLb(0)
+ pPosDashLb(nullptr)
{
get(m_pLbLineStyles ,"LB_LINESTYLES");
@@ -149,7 +149,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
m_pMtrLength2->SetModifyHdl( aLink2 );
m_pMtrDistance->SetModifyHdl( aLink2 );
- pDashList = NULL;
+ pDashList = nullptr;
}
SvxLineDefTabPage::~SvxLineDefTabPage()
@@ -258,13 +258,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
{
case RET_BTN_1:
{
- ClickModifyHdl_Impl( NULL );
+ ClickModifyHdl_Impl( nullptr );
}
break;
case RET_BTN_2:
{
- ClickAddHdl_Impl( NULL );
+ ClickAddHdl_Impl( nullptr );
}
break;
@@ -329,7 +329,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
break;
}
}
- SelectLinestyleHdl_Impl( NULL );
+ SelectLinestyleHdl_Impl( nullptr );
// determine button state
if( pDashList->Count() )
@@ -499,7 +499,7 @@ IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void )
SetMetricValue( *m_pMtrDistance, nTmp3, ePoolUnit );
}
- SelectTypeHdl_Impl( NULL );
+ SelectTypeHdl_Impl( nullptr );
}
@@ -912,7 +912,7 @@ void SvxLineDefTabPage::FillDialog_Impl()
m_pLbType2->SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 );
SetMetricValue( *m_pMtrDistance, aDash.GetDistance(), ePoolUnit );
- ChangeMetricHdl_Impl( NULL );
+ ChangeMetricHdl_Impl( nullptr );
// save values for changes recognition (-> method)
m_pNumFldNumber1->SaveValue();
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index e0157ccc0bb9..254fa299c28f 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -58,7 +58,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
, "cui/ui/lineendstabpage.ui"
, &rInAttrs ),
rOutAttrs ( rInAttrs ),
- pPolyObj ( NULL ),
+ pPolyObj ( nullptr ),
bObjSelected ( false ),
aXLStyle ( css::drawing::LineStyle_SOLID ),
@@ -66,11 +66,11 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
aXColor ( OUString(), COL_BLACK ),
aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
- pLineEndList ( NULL ),
- pnLineEndListState ( NULL ),
- pPageType ( NULL ),
+ pLineEndList ( nullptr ),
+ pnLineEndListState ( nullptr ),
+ pPageType ( nullptr ),
nDlgType ( 0 ),
- pPosLineEndLb ( NULL )
+ pPosLineEndLb ( nullptr )
{
get(m_pEdtName,"EDT_NAME");
get(m_pLbLineEnds,"LB_LINEENDS");
@@ -140,15 +140,15 @@ void SvxLineEndDefTabPage::Construct()
{
bCreateArrowPossible = false;
}
- else if( 0 == dynamic_cast<const SdrPathObj*>( pPolyObj) )
+ else if( nullptr == dynamic_cast<const SdrPathObj*>( pPolyObj) )
{
SdrObjTransformInfoRec aInfoRec;
pPolyObj->TakeObjInfo( aInfoRec );
- SdrObject* pNewObj = 0;
+ SdrObject* pNewObj = nullptr;
if( aInfoRec.bCanConvToPath )
pNewObj = pPolyObj->ConvertToPolyObj( true, false );
- bCreateArrowPossible = pNewObj && 0 != dynamic_cast<const SdrPathObj*>( pNewObj);
+ bCreateArrowPossible = pNewObj && nullptr != dynamic_cast<const SdrPathObj*>( pNewObj);
SdrObject::Free( pNewObj );
}
@@ -208,7 +208,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
,"AskChangeLineEndDialog"
,"cui/ui/querychangelineenddialog.ui" );
if ( aQueryBox->Execute() == RET_YES )
- ClickModifyHdl_Impl( NULL );
+ ClickModifyHdl_Impl( nullptr );
}
}
nPos = m_pLbLineEnds->GetSelectEntryPos();
@@ -404,9 +404,9 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
if( pPolyObj )
{
const SdrObject* pNewObj;
- SdrObject* pConvPolyObj = NULL;
+ SdrObject* pConvPolyObj = nullptr;
- if( 0 != dynamic_cast<const SdrPathObj*>( pPolyObj) )
+ if( nullptr != dynamic_cast<const SdrPathObj*>( pPolyObj) )
{
pNewObj = pPolyObj;
}
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
{
pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false );
- if( !pNewObj || 0 == dynamic_cast<const SdrPathObj*>( pNewObj) )
+ if( !pNewObj || nullptr == dynamic_cast<const SdrPathObj*>( pNewObj) )
return; // cancel, additional safety, which
// has no use for group objects though.
}
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index ec3cf5f73a5b..37a64510b280 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -55,10 +55,10 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA
rInAttrs ),
m_rOutAttrs ( rInAttrs ),
m_eRP ( RP_LT ),
- m_pnColorListState ( 0 ),
+ m_pnColorListState ( nullptr ),
m_nPageType ( 0 ),
m_nDlgType ( 0 ),
- m_pbAreaTP ( 0 ),
+ m_pbAreaTP ( nullptr ),
m_bDisable ( false ),
m_aXFillAttr ( rInAttrs.GetPool() ),
m_rXFSet ( m_aXFillAttr.GetItemSet() )
@@ -273,7 +273,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
if( !m_bDisable )
{
- const SfxPoolItem* pOld = NULL;
+ const SfxPoolItem* pOld = nullptr;
if( m_pTsbShowShadow->IsValueChangedFromSaved() )
{
@@ -477,7 +477,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
// It IS the error.
m_pMtrTransparent->SaveValue();
- ClickShadowHdl_Impl( NULL );
+ ClickShadowHdl_Impl( nullptr );
ModifyShadowHdl_Impl( *m_pMtrTransparent );
}
}
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 0db63dbff63f..feca458c8c24 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -179,7 +179,7 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidat
SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SvxTabPage( pParent,"Rotation","cui/ui/rotationtabpage.ui", rInAttrs)
, rOutAttrs(rInAttrs)
- , pView(NULL)
+ , pView(nullptr)
, eDlgUnit(FUNIT_NONE)
{
get(m_pFlPosition, "FL_POSITION");
@@ -424,7 +424,7 @@ SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
: SvxTabPage( pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui",
rInAttrs)
, rOutAttrs(rInAttrs)
- , pView(NULL)
+ , pView(nullptr)
, eDlgUnit(FUNIT_NONE)
{
get(m_pFlRadius, "FL_RADIUS");
@@ -701,7 +701,7 @@ VclPtr<SfxTabPage> SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemS
void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
{
- SfxRectangleItem const * pRectItem = NULL;
+ SfxRectangleItem const * pRectItem = nullptr;
if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) )
{
@@ -736,7 +736,7 @@ void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT )
SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui", rInAttrs)
, mrOutAttrs(rInAttrs)
- , mpView(NULL)
+ , mpView(nullptr)
, meDlgUnit(FUNIT_NONE)
, mnProtectSizeState(TRISTATE_FALSE)
, mbPageDisabled(false)
@@ -1079,7 +1079,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
m_pCtlPos->Reset();
// #i2379# Disable controls for protected objects
- ChangePosProtectHdl( NULL );
+ ChangePosProtectHdl( nullptr );
}
{ // #i75273# set width
@@ -1141,10 +1141,10 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
m_pTsbSizeProtect->SaveValue();
m_pTsbAutoGrowWidth->SaveValue();
m_pTsbAutoGrowHeight->SaveValue();
- ClickSizeProtectHdl( NULL );
+ ClickSizeProtectHdl( nullptr );
// #i2379# Disable controls for protected objects
- ChangeSizeProtectHdl( NULL );
+ ChangeSizeProtectHdl( nullptr );
}
@@ -1158,7 +1158,7 @@ VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const S
void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
{
- SfxRectangleItem const * pRectItem = NULL;
+ SfxRectangleItem const * pRectItem = nullptr;
if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) )
{
diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index 893388e9aeba..20951e159242 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -29,8 +29,8 @@ using namespace com::sun::star;
namespace
{
cppu::ImplementationEntry entries[] = {
- { &::cui::ColorPicker_createInstance, &::cui::ColorPicker_getImplementationName, &::cui::ColorPicker_getSupportedServiceNames, &cppu::createSingleComponentFactory, 0, 0 },
- { 0, 0, 0, 0, 0, 0 }
+ { &::cui::ColorPicker_createInstance, &::cui::ColorPicker_getImplementationName, &::cui::ColorPicker_getSupportedServiceNames, &cppu::createSingleComponentFactory, nullptr, 0 },
+ { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
};
}