summaryrefslogtreecommitdiff
path: root/sw/source/ui/envelp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:53 +0100
commit01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch)
treeb8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/ui/envelp
parent6cd7bf2043146a630925a2e49336f02c802f707a (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/ui/envelp')
-rw-r--r--sw/source/ui/envelp/envfmt.cxx2
-rw-r--r--sw/source/ui/envelp/envfmt.hxx2
-rw-r--r--sw/source/ui/envelp/envlop1.cxx12
-rw-r--r--sw/source/ui/envelp/envprt.cxx2
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx28
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx4
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/envelp/labprt.hxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx8
13 files changed, 35 insertions, 35 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 61220e376e12..7d3bbb9b0dfd 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -326,7 +326,7 @@ IMPL_LINK_TYPED( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void )
if ( pDlg->Execute() == RET_OK )
{
// maybe relocate defaults
- const SfxPoolItem* pItem = 0;
+ const SfxPoolItem* pItem = nullptr;
SfxItemSet* pOutputSet = const_cast<SfxItemSet*>(pDlg->GetOutputItemSet());
sal_uInt16 nNewDist;
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 2abd1c2576fb..51a98ae6c716 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -65,7 +65,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
void FillItem(SwEnvItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 89d7f9d749da..4aeb134907c4 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -133,8 +133,8 @@ SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet,
, aEnvItem(static_cast<const SwEnvItem&>( rSet.Get(FN_ENVELOP)))
, pSh(pWrtSh)
, pPrinter(pPrt)
- , pAddresseeSet(0)
- , pSenderSet(0)
+ , pAddresseeSet(nullptr)
+ , pSenderSet(nullptr)
, m_nEnvPrintId(0)
{
if (!bInsert)
@@ -142,9 +142,9 @@ SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet,
GetUserButton()->SetText(get<PushButton>("modify")->GetText());
}
- AddTabPage("envelope", SwEnvPage ::Create, 0);
- AddTabPage("format", SwEnvFormatPage::Create, 0);
- m_nEnvPrintId = AddTabPage("printer", SwEnvPrtPage::Create, 0);
+ AddTabPage("envelope", SwEnvPage ::Create, nullptr);
+ AddTabPage("format", SwEnvFormatPage::Create, nullptr);
+ m_nEnvPrintId = AddTabPage("printer", SwEnvPrtPage::Create, nullptr);
}
SwEnvDlg::~SwEnvDlg()
@@ -269,7 +269,7 @@ IMPL_LINK_NOARG_TYPED(SwEnvPage, FieldHdl, Button*, void)
{
OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." +
m_pTableLB->GetSelectEntry() + "." +
- OUString(m_pTableLB->GetSelectEntryData() == 0 ? '0' : '1') + "." +
+ OUString(m_pTableLB->GetSelectEntryData() == nullptr ? '0' : '1') + "." +
m_pDBFieldLB->GetSelectEntry() + ">");
m_pAddrEdit->ReplaceSelected(aStr);
Selection aSel = m_pAddrEdit->GetSelection();
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 9a3d59448c7f..2b8516d0c425 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -31,7 +31,7 @@
SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "EnvPrinterPage",
"modules/swriter/ui/envprinterpage.ui", &rSet)
- , pPrt(NULL)
+ , pPrt(nullptr)
{
get(m_pAlignBox, "alignbox");
get(m_pTopButton, "top");
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index cd964ba758a0..d68991d311e8 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -64,7 +64,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
void FillItem(SwEnvItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 0b5711bf367d..63e03d19da67 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -94,7 +94,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
: SfxTabDialog(pParent, "LabelDialog",
"modules/swriter/ui/labeldialog.ui", &rSet)
, pDBManager(pDBManager_)
- , pPrtPage(0)
+ , pPrtPage(nullptr)
, aTypeIds(50, 10)
, m_pRecs(new SwLabRecs)
, m_bLabel(bLabel)
@@ -107,9 +107,9 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
{
WaitObject aWait( pParent );
- m_nFormatId = AddTabPage("format", SwLabFormatPage::Create, 0);
- m_nOptionsId = AddTabPage("options", SwLabPrtPage::Create, 0);
- m_nCardsId = AddTabPage("cards", SwVisitingCardPage::Create, 0);
+ m_nFormatId = AddTabPage("format", SwLabFormatPage::Create, nullptr);
+ m_nOptionsId = AddTabPage("options", SwLabPrtPage::Create, nullptr);
+ m_nCardsId = AddTabPage("cards", SwVisitingCardPage::Create, nullptr);
m_sBusinessCardDlg = GetPageText(m_nCardsId);
if (m_bLabel)
@@ -118,15 +118,15 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
RemoveTabPage("private");
RemoveTabPage("cards");
RemoveTabPage("medium");
- m_nLabelId = AddTabPage("labels", SwLabPage::Create, 0);
+ m_nLabelId = AddTabPage("labels", SwLabPage::Create, nullptr);
}
else
{
RemoveTabPage("labels");
RemoveTabPage("cards");
- m_nLabelId = AddTabPage("medium", SwLabPage::Create, 0);
- m_nBusinessId = AddTabPage("business", SwBusinessDataPage::Create, 0 );
- m_nPrivateId = AddTabPage("private", SwPrivateDataPage::Create, 0);
+ m_nLabelId = AddTabPage("medium", SwLabPage::Create, nullptr);
+ m_nBusinessId = AddTabPage("business", SwBusinessDataPage::Create, nullptr );
+ m_nPrivateId = AddTabPage("private", SwPrivateDataPage::Create, nullptr);
SetText(m_sBusinessCardDlg);
}
// Read user label from writer.cfg
@@ -201,7 +201,7 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem)
SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont)
{
- SwLabRec* pRec = NULL;
+ SwLabRec* pRec = nullptr;
bool bFound = false;
const OUString sCustom(SW_RES(STR_CUSTOM));
@@ -227,13 +227,13 @@ Printer *SwLabDlg::GetPrt()
if (pPrtPage)
return pPrtPage->GetPrt();
else
- return NULL;
+ return nullptr;
}
SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "CardMediumPage",
"modules/swriter/ui/cardmediumpage.ui", &rSet)
- , pDBManager(NULL)
+ , pDBManager(nullptr)
, aItem(static_cast<const SwLabItem&>(rSet.Get(FN_LABEL)))
, m_bLabel(false)
{
@@ -352,7 +352,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, FieldHdl, Button*, void)
{
OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." +
m_pTableLB->GetSelectEntry() + "." +
- (m_pTableLB->GetSelectEntryData() == 0 ? OUString("0") : OUString("1")) + "." +
+ (m_pTableLB->GetSelectEntryData() == nullptr ? OUString("0") : OUString("1")) + "." +
m_pDBFieldLB->GetSelectEntry() + ">");
m_pWritingEdit->ReplaceSelected(aStr);
Selection aSel = m_pWritingEdit->GetSelection();
@@ -584,7 +584,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "CardFormatPage",
"modules/swriter/ui/cardformatpage.ui", &rSet)
- , pExampleFrame(0)
+ , pExampleFrame(nullptr)
{
get(m_pAutoTextLB, "treeview");
m_pAutoTextLB->set_height_request(m_pAutoTextLB->GetTextHeight() * 16);
@@ -613,7 +613,7 @@ void SwVisitingCardPage::dispose()
{
for(sal_Int32 i = 0; i < m_pAutoTextGroupLB->GetEntryCount(); ++i)
delete static_cast<OUString*>(m_pAutoTextGroupLB->GetEntryData( i ));
- m_xAutoText = 0;
+ m_xAutoText = nullptr;
ClearUserData();
delete pExampleFrame;
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 2834e504ac85..f027de2d9dca 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -211,7 +211,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
{ "BC_COMP_FAX" , &SwLabItem::m_aCompFax },
{ "BC_COMP_WWW" , &SwLabItem::m_aCompWWW },
{ "BC_COMP_MAIL" , &SwLabItem::m_aCompMail },
- { 0, 0 }
+ { nullptr, nullptr }
};
try
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index dab095f3b155..d8d8ef4545fe 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -401,7 +401,7 @@ IMPL_LINK_NOARG_TYPED(SwLabFormatPage, PreviewHdl, Idle *, void)
IMPL_LINK_TYPED( SwLabFormatPage, LoseFocusHdl, Control&, rControl, void )
{
if (static_cast<Edit*>( &rControl)->IsModified())
- PreviewHdl(0);
+ PreviewHdl(nullptr);
}
void SwLabFormatPage::ChangeMinMax()
@@ -560,7 +560,7 @@ void SwLabFormatPage::Reset(const SfxItemSet* )
m_pRowsField->SetValue(aItem.m_nRows);
m_pMakeFI->SetText(aItem.m_aMake);
m_pTypeFI->SetText(aItem.m_aType);
- PreviewHdl(0);
+ PreviewHdl(nullptr);
}
IMPL_LINK_NOARG_TYPED(SwLabFormatPage, SaveHdl, Button*, void)
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 1e4675cb13d4..da680899cb7e 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -105,7 +105,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
void FillItem(SwLabItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 922e32592ac2..d5a95de387ca 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -30,7 +30,7 @@
SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "LabelOptionsPage",
"modules/swriter/ui/labeloptionspage.ui", &rSet)
- , pPrinter(0)
+ , pPrinter(nullptr)
{
get(m_pPageButton, "entirepage");
get(m_pSingleButton, "singlelabel");
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 97a09666b857..d7dbc5b78b93 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -59,7 +59,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
void FillItem(SwLabItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index fe75d2fd1820..5f55838598bf 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -372,7 +372,7 @@ SwMailMergeDlg::~SwMailMergeDlg()
void SwMailMergeDlg::dispose()
{
if(m_xFrame.is()) {
- m_xFrame->setComponent(NULL, NULL);
+ m_xFrame->setComponent(nullptr, nullptr);
m_xFrame->dispose();
}
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index aa83f306507e..c7aff3e5dd66 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -69,7 +69,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
void FillItem(SwLabItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -123,7 +123,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
};
@@ -162,7 +162,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
};
@@ -199,7 +199,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
};