summaryrefslogtreecommitdiff
path: root/sc/source/ui/pagedlg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:22:39 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:36 +0100
commitde29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch)
tree139f75d657cb825622e812254b8b7df4e509140b /sc/source/ui/pagedlg
parent60c40af090e420a8619b5236bde1ff4ef79100c6 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/ui/pagedlg')
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx14
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.cxx48
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx8
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx14
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx16
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx4
6 files changed, 52 insertions, 52 deletions
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index ec32d3fd4c33..07e270c9b72f 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -93,8 +93,8 @@ static void printAddressFlags(sal_uInt16 nFlag)
ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent )
: ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui")
, bDlgLostFocus(false)
- , pDoc(NULL)
- , pViewData(NULL)
+ , pDoc(nullptr)
+ , pViewData(nullptr)
, nCurTab(0)
{
get(pLbPrintArea,"lbprintarea");
@@ -367,11 +367,11 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings()
bool bRepeatRowOk = aStrRepeatRow.isEmpty();
if ( !bRepeatRowOk )
- bRepeatRowOk = lcl_CheckRepeatString(aStrRepeatRow, pDoc, true, NULL);
+ bRepeatRowOk = lcl_CheckRepeatString(aStrRepeatRow, pDoc, true, nullptr);
bool bRepeatColOk = aStrRepeatCol.isEmpty();
if ( !bRepeatColOk )
- bRepeatColOk = lcl_CheckRepeatString(aStrRepeatCol, pDoc, false, NULL);
+ bRepeatColOk = lcl_CheckRepeatString(aStrRepeatCol, pDoc, false, nullptr);
// Fehlermeldungen
@@ -379,7 +379,7 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings()
if ( !bOk )
{
- Edit* pEd = NULL;
+ Edit* pEd = nullptr;
if ( !bPrintAreaOk ) pEd = pEdPrintArea;
else if ( !bRepeatRowOk ) pEd = pEdRepeatRow;
@@ -543,7 +543,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void )
{
ListBox* pLb = &rLb;
const sal_Int32 nSelPos = pLb->GetSelectEntryPos();
- Edit* pEd = NULL;
+ Edit* pEd = nullptr;
// list box positions of specific entries, default to "repeat row/column" list boxes
sal_Int32 nAllSheetPos = SC_AREASDLG_RR_NONE;
@@ -576,7 +576,7 @@ IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void )
IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_ModifyHdl, Edit&, rEd, void )
{
- ListBox* pLb = NULL;
+ ListBox* pLb = nullptr;
// list box positions of specific entries, default to "repeat row/column" list boxes
sal_Int32 nUserDefPos = SC_AREASDLG_RR_USER;
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index b2383f2b7943..14ddddbf1df4 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -64,8 +64,8 @@ ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"HeaderDialog", "modules/scalc/ui/headerdialog.ui" )
{
- AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
- AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
}
ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP,
@@ -75,8 +75,8 @@ ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"FooterDialog", "modules/scalc/ui/footerdialog.ui" )
{
- AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
- AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP,
@@ -86,7 +86,7 @@ ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"LeftHeaderDialog", "modules/scalc/ui/leftheaderdialog.ui" )
{
- AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
}
ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP,
@@ -96,7 +96,7 @@ ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"RightHeaderDialog", "modules/scalc/ui/rightheaderdialog.ui" )
{
- AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
}
ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP,
@@ -106,7 +106,7 @@ ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"LeftFooterDialog", "modules/scalc/ui/leftfooterdialog.ui" )
{
- AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP,
@@ -116,7 +116,7 @@ ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"RightFooterDialog", "modules/scalc/ui/rightfooterdialog.ui" )
{
- AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
}
ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP,
@@ -126,9 +126,9 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"SharedHeaderDialog", "modules/scalc/ui/sharedheaderdialog.ui" )
{
- AddTabPage( "header", ScRightHeaderEditPage::Create, NULL );
- AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
- AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP,
@@ -138,9 +138,9 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"SharedFooterDialog", "modules/scalc/ui/sharedfooterdialog.ui" )
{
- AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
- AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
- AddTabPage( "footer", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
+ AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
}
ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP,
@@ -150,10 +150,10 @@ ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP,
: ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle,
"AllHeaderFooterDialog", "modules/scalc/ui/allheaderfooterdialog.ui" )
{
- AddTabPage( "headerright", ScRightHeaderEditPage::Create, NULL );
- AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, NULL );
- AddTabPage( "footerright", ScRightFooterEditPage::Create, NULL );
- AddTabPage( "footerleft", ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "headerright", ScRightHeaderEditPage::Create, nullptr );
+ AddTabPage( "headerleft", ScLeftHeaderEditPage::Create, nullptr );
+ AddTabPage( "footerright", ScRightFooterEditPage::Create, nullptr );
+ AddTabPage( "footerleft", ScLeftFooterEditPage::Create, nullptr );
}
ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
@@ -172,8 +172,8 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
if ( bRightPage )
{
- AddTabPage( "header", ScRightHeaderEditPage::Create, NULL );
- AddTabPage( "footer", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
+ AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
}
else
{
@@ -181,15 +181,15 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP,
bool bShareHeader = IS_SHARE_HEADER(rCoreSet);
if ( bShareHeader )
- AddTabPage( "header", ScRightHeaderEditPage::Create, NULL );
+ AddTabPage( "header", ScRightHeaderEditPage::Create, nullptr );
else
- AddTabPage( "header", ScLeftHeaderEditPage::Create, NULL );
+ AddTabPage( "header", ScLeftHeaderEditPage::Create, nullptr );
bool bShareFooter = IS_SHARE_FOOTER(rCoreSet);
if ( bShareFooter )
- AddTabPage( "footer", ScRightFooterEditPage::Create, NULL );
+ AddTabPage( "footer", ScRightFooterEditPage::Create, nullptr );
else
- AddTabPage( "footer", ScLeftFooterEditPage::Create, NULL );
+ AddTabPage( "footer", ScLeftFooterEditPage::Create, nullptr );
}
}
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index d33cea554748..2b2192f71af8 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -51,7 +51,7 @@
// STATIC DATA -----------------------------------------------------------
-static VclPtr<ScEditWindow> pActiveEdWnd = NULL;
+static VclPtr<ScEditWindow> pActiveEdWnd = nullptr;
// class ScHFEditPage
@@ -193,7 +193,7 @@ void ScHFEditPage::SetNumType(SvxNumType eNumType)
void ScHFEditPage::Reset( const SfxItemSet* rCoreSet )
{
- const SfxPoolItem* pItem = NULL;
+ const SfxPoolItem* pItem = nullptr;
if ( rCoreSet->HasItem(nWhich, &pItem) )
{
const ScPageHFItem& rItem = static_cast<const ScPageHFItem&>(*pItem);
@@ -253,8 +253,8 @@ void ScHFEditPage::InitPreDefinedList()
{
SvtUserOptions aUserOpt;
- Color* pTxtColour = NULL;
- Color* pFldColour = NULL;
+ Color* pTxtColour = nullptr;
+ Color* pFldColour = nullptr;
// Get the all field values at the outset.
OUString aPageFieldValue(m_pWndLeft->GetEditEngine()->CalcFieldValue(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), 0,0, pTxtColour, pFldColour));
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 716e5238debd..614da79e5395 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -47,7 +47,7 @@ ScHFPage::ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSe
ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT,
ATTR_PAGE, ATTR_PAGE, 0 ),
nPageUsage ( (sal_uInt16)SVX_PAGE_ALL ),
- pStyleDlg ( NULL )
+ pStyleDlg ( nullptr )
{
get(m_pBtnEdit, "buttonEdit");
@@ -91,7 +91,7 @@ void ScHFPage::dispose()
void ScHFPage::Reset( const SfxItemSet* rSet )
{
SvxHFPage::Reset( rSet );
- TurnOnHdl( 0 );
+ TurnOnHdl( nullptr );
}
bool ScHFPage::FillItemSet( SfxItemSet* rOutSet )
@@ -163,7 +163,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void)
// the GrabFocus from the Edit-Dialog under OS/2 doesn't work.(Bug #41805#).
// With the new StarView, this workaround should be again considered!
- Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ), NULL, true );
+ Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ), nullptr, true );
}
IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void)
@@ -207,17 +207,17 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void)
{
aText = ScGlobal::GetRscString( STR_PAGEHEADER );
if ( bRightPage )
- pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId );
else
- pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId );
}
else
{
aText = ScGlobal::GetRscString( STR_PAGEFOOTER );
if ( bRightPage )
- pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId );
else
- pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId );
}
SvxNumType eNumType = static_cast<const SvxPageItem&>(aDataSet.Get(ATTR_PAGE)).GetNumType();
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 24932223c6f1..b5f8bf87e401 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -48,7 +48,7 @@
#include <memory>
// STATIC DATA -----------------------------------------------------------
-static VclPtr<ScEditWindow> pActiveEdWnd = NULL;
+static VclPtr<ScEditWindow> pActiveEdWnd = nullptr;
ScEditWindow* GetScEditWindow ()
{
@@ -72,7 +72,7 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData )
ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits nBits, ScEditWindowLocation eLoc )
: Control( pParent, nBits ),
eLocation(eLoc),
- pAcc(NULL)
+ pAcc(nullptr)
{
EnableRTL(false);
@@ -198,7 +198,7 @@ void ScEditWindow::SetCharAttributes()
if ( pDocSh && pViewSh )
{
- if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(true);
+ if(pTabViewSh!=nullptr) pTabViewSh->SetInFormatDialog(true);
SfxItemSet aSet( pEdView->GetAttribs() );
@@ -216,7 +216,7 @@ void ScEditWindow::SetCharAttributes()
pEdView->SetAttribs( aSet );
}
- if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(false);
+ if(pTabViewSh!=nullptr) pTabViewSh->SetInFormatDialog(false);
}
}
@@ -291,7 +291,7 @@ void ScEditWindow::GetFocus()
pAcc->GotFocus();
}
else
- pAcc = NULL;
+ pAcc = nullptr;
Control::GetFocus();
}
@@ -304,7 +304,7 @@ void ScEditWindow::LoseFocus()
pAcc->LostFocus();
}
else
- pAcc = NULL;
+ pAcc = nullptr;
Control::LoseFocus();
}
@@ -338,7 +338,7 @@ css::uno::Reference< css::accessibility::XAccessible > ScEditWindow::CreateAcces
}
ScExtIButton::ScExtIButton(vcl::Window* pParent, WinBits nBits )
- : ImageButton(pParent,nBits), pPopupMenu(NULL)
+ : ImageButton(pParent,nBits), pPopupMenu(nullptr)
{
nSelected=0;
aIdle.SetPriority(SchedulerPriority::LOWEST);
@@ -382,7 +382,7 @@ void ScExtIButton::StartPopup()
nSelected=0;
aSelectedIdent.clear();
- if(pPopupMenu!=NULL)
+ if(pPopupMenu!=nullptr)
{
SetPressed( true );
EndSelection();
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 7f308af58276..f7eddeb31822 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -176,7 +176,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,*rCoreSet);
m_pBtnPageNo->Check( nPage != 0 );
m_pEdPageNo->SetValue( (nPage != 0) ? nPage : 1 );
- PageNoHdl( NULL );
+ PageNoHdl( nullptr );
// object representation:
m_pBtnCharts->Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, *rCoreSet ) );
@@ -226,7 +226,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
m_pEdScaleAll->SetValue( 100 );
}
- PageDirHdl( NULL );
+ PageDirHdl( nullptr );
ScaleHdl( *m_pLbScaleMode.get() );
// remember for FillItemSet