diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:36 +0100 |
commit | de29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch) | |
tree | 139f75d657cb825622e812254b8b7df4e509140b /sc/source/ui/attrdlg | |
parent | 60c40af090e420a8619b5236bde1ff4ef79100c6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/ui/attrdlg')
-rw-r--r-- | sc/source/ui/attrdlg/attrdlg.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scabstdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scuiexp.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/tabpages.cxx | 4 |
6 files changed, 28 insertions, 28 deletions
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 6bf0f365ce10..0002c815ecd7 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -42,26 +42,26 @@ ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, vcl::Window* pParent, const SfxItemS OSL_ENSURE(pFact, "Dialog creation failed!"); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!"); - m_nNumberPageId = AddTabPage( "numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 ); + m_nNumberPageId = AddTabPage( "numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); - m_nFontPageId = AddTabPage( "font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); + m_nFontPageId = AddTabPage( "font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); + AddTabPage( "fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); + AddTabPage( "alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); if ( aCJKOptions.IsAsianTypographyEnabled() ) { OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); - AddTabPage( "asiantypography", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), 0 ); + AddTabPage( "asiantypography", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), nullptr ); } else RemoveTabPage( "asiantypography" ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); + AddTabPage( "borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); - AddTabPage( "cellprotection" , ScTabPageProtection::Create, 0 ); + AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); + AddTabPage( "cellprotection" , ScTabPageProtection::Create, nullptr ); } ScAttrDlg::~ScAttrDlg() @@ -90,7 +90,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) IMPL_LINK_NOARG_TYPED(ScAttrDlg, OkHandler, SfxPoolItem*, void) { - GetOKButton().GetClickHdl().Call( NULL ); + GetOKButton().GetClickHdl().Call( nullptr ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index cd8d1b7ce54f..a11e45a9034e 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -38,7 +38,7 @@ extern "C" ScAbstractDialogFactory* ScCreateDialogFactory(); ScAbstractDialogFactory* ScAbstractDialogFactory::Create() { - ScFuncPtrCreateDialogFactory fp = 0; + ScFuncPtrCreateDialogFactory fp = nullptr; #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; @@ -56,7 +56,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() #endif if ( fp ) return fp(); - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index b4881436ded6..3f7e5a0eb8e6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -646,7 +646,7 @@ AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormat if(pDlg) return new AbstractScCondFormatManagerDlg_Impl( pDlg ); - return NULL; + return nullptr; } AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(vcl::Window* pParent) @@ -678,7 +678,7 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe if ( pDlg ) return new AbstractScDataPilotServiceDlg_Impl( pDlg ); - return 0; + return nullptr; } AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(vcl::Window* pParent, @@ -740,7 +740,7 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( v if ( pDlg ) return new AbstractScInsertCellDlg_Impl( pDlg ); - return 0; + return nullptr; } AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window* pParent, @@ -838,7 +838,7 @@ AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( { if( nId == RID_SCDLG_DPNUMGROUP ) return new AbstractScDPNumGroupDlg_Impl( VclPtr<ScDPNumGroupDlg>::Create( pParent, rInfo ) ); - return 0; + return nullptr; } AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( @@ -847,7 +847,7 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( { if( nId == RID_SCDLG_DPDATEGROUP ) return new AbstractScDPDateGroupDlg_Impl( VclPtr<ScDPDateGroupDlg>::Create( pParent, rInfo, nDatePart, rNullDate ) ); - return 0; + return nullptr; } AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg ( @@ -855,7 +855,7 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl { if( nId == RID_SCDLG_DPSHOWDETAIL ) return new AbstractScDPShowDetailDlg_Impl( VclPtr<ScDPShowDetailDlg>::Create( pParent, rDPObj, nOrient ) ); - return 0; + return nullptr; } AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, @@ -956,7 +956,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF break; } - return pDlg ? new ScAbstractTabDialog_Impl( pDlg ) : NULL; + return pDlg ? new ScAbstractTabDialog_Impl( pDlg ) : nullptr; } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Window* pParent, @@ -977,7 +977,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Wind if ( pDlg ) return new ScAbstractTabDialog_Impl( pDlg ); - return 0; + return nullptr; } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) @@ -1042,7 +1042,7 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI break; } - return 0; + return nullptr; } GetTabPageRanges ScAbstractDialogFactory_Impl::GetTabPageRangesFunc() diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index c4ab71e757e9..5971f6c8ec7f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -225,11 +225,11 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg) virtual bool GetTablesFromFile() override; virtual bool GetTablesAsLink() override; - virtual const OUString* GetFirstTable( sal_uInt16* pN = NULL ) override; + virtual const OUString* GetFirstTable( sal_uInt16* pN = nullptr ) override; virtual ScDocShell* GetDocShellTables() override; virtual bool IsTableBefore() override; virtual sal_uInt16 GetTableCount() override; - virtual const OUString* GetNextTable( sal_uInt16* pN = NULL ) override; + virtual const OUString* GetNextTable( sal_uInt16* pN = nullptr ) override; }; @@ -447,7 +447,7 @@ public: virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = InsertDeleteFlags::NONE, - const OUString* pStrTitle = NULL ) override; + const OUString* pStrTitle = nullptr ) override; virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) override; @@ -523,8 +523,8 @@ public: virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii = true, - const ScImportOptions* pOptions = NULL, - const OUString* pStrTitle = NULL, + const ScImportOptions* pOptions = nullptr, + const OUString* pStrTitle = nullptr, bool bMultiByte = false, bool bOnlyDbtoolsEncodings = false, bool bImport = true ) override; diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index 374e8ad74d15..b1e49d5a8cf8 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -54,7 +54,7 @@ namespace scui { - static ScAbstractDialogFactory_Impl* pFactory=NULL; + static ScAbstractDialogFactory_Impl* pFactory=nullptr; ScAbstractDialogFactory_Impl* GetFactory() { if ( !pFactory ) diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index ba339e42ab85..cd27c35386fe 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -83,7 +83,7 @@ void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs ) // Initialize variables sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); - const ScProtectionAttr* pProtAttr = NULL; + const ScProtectionAttr* pProtAttr = nullptr; SfxItemState eItemState = rCoreAttrs->GetItemState( nWhich, false, reinterpret_cast<const SfxPoolItem**>(&pProtAttr) ); @@ -92,7 +92,7 @@ void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs ) pProtAttr = static_cast<const ScProtectionAttr*>(&(rCoreAttrs->Get(nWhich))); // At SfxItemState::DONTCARE let to 0 - bTriEnabled = ( pProtAttr == NULL ); // TriState, when DontCare + bTriEnabled = ( pProtAttr == nullptr ); // TriState, when DontCare bDontCare = bTriEnabled; if (bTriEnabled) { |