diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:13:27 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:22 +0100 |
commit | b58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (patch) | |
tree | bc7dcc71437367b193cb18dc5011c98ceb8c2c8b /cui/source/factory | |
parent | 5185569e502240a064ef78d06d9de7fbbd93f3b6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I7257532b90e3e393d56d5349531c9ad397523bca
Diffstat (limited to 'cui/source/factory')
-rw-r--r-- | cui/source/factory/cuiexp.cxx | 2 | ||||
-rw-r--r-- | cui/source/factory/cuiresmgr.cxx | 2 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 38 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 18 |
4 files changed, 30 insertions, 30 deletions
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; |