diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:23:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:38 +0100 |
| commit | 28034eaf925aa50d379dd5cffccc20d7edc95aec (patch) | |
| tree | 5cde1f141bc0ffc5cb04a12980d0c4bce69de0f0 /include | |
| parent | d930b6c2e6e3dfb9e1ed19b84a3137cc0cfbfd8c (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I7213b49b09ddcb00841aa5f63343baeab0e65fa4
Diffstat (limited to 'include')
51 files changed, 145 insertions, 145 deletions
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx index a6950e45fa92..ca23ffb63e49 100644 --- a/include/sfx2/Metadatable.hxx +++ b/include/sfx2/Metadatable.hxx @@ -66,7 +66,7 @@ createXmlIdRegistry(const bool i_DocIsClipboard); class SFX2_DLLPUBLIC Metadatable { public: - Metadatable() : m_pReg(0) {} + Metadatable() : m_pReg(nullptr) {} // destructor calls RemoveMetadataReference virtual ~Metadatable(); diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx index 54fd77c973d7..d16735480adf 100644 --- a/include/sfx2/XmlIdRegistry.hxx +++ b/include/sfx2/XmlIdRegistry.hxx @@ -72,7 +72,7 @@ public: virtual ~IXmlIdRegistrySupplier() { } /** override this if you have a XmlIdRegistry. */ - virtual const IXmlIdRegistry* GetXmlIdRegistry() const { return 0; } + virtual const IXmlIdRegistry* GetXmlIdRegistry() const { return nullptr; } }; diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index af3edfc376c1..0b6c89806935 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -98,7 +98,7 @@ public: SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem*, void>& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } - virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const override + virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override { return new SfxLinkItem( *this ); } virtual bool operator==( const SfxPoolItem& rL) const override { return static_cast<const SfxLinkItem&>(rL).aLink == aLink; } @@ -157,7 +157,7 @@ public: /** * @param pArgs Takes ownership */ - sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 ); + sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = nullptr ); vcl::Window* GetTopWindow() const; // members @@ -172,7 +172,7 @@ public: static OUString ChooseScript(); static void MacroOrganizer( sal_Int16 nTabId ); static ErrCode CallBasic( const OUString&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); - static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL ) + static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = nullptr, SbxValue* i_ret = nullptr ) { return CallBasic( i_macroName, SfxApplication::GetBasicManager(), i_args, i_ret ); } static BasicManager* GetBasicManager(); css::script::XLibraryContainer * GetDialogContainer(); @@ -229,7 +229,7 @@ public: SAL_DLLPRIVATE void SetLastDir_Impl( const OUString & ); SAL_DLLPRIVATE void Registrations_Impl(); - SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const; + SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=nullptr) const; // TODO/CLEANUP: still needed? -- unclear whether this comment // refers to the GetDisabledSlotList_Impl() method which was diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 610c5e672f25..5d4a83bb97d3 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -179,14 +179,14 @@ public: const OUString& rID = OUString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); - SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = 0, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = nullptr, const OUString& rID = OUString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); virtual ~SfxSingleTabDialog(); virtual void dispose() override; - void SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0, sal_uInt32 nSettingsId = 0); + void SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = nullptr, sal_uInt32 nSettingsId = 0); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } OKButton* GetOKButton() const { return pOKBtn; } diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 5bcaf6e77e20..bbe5cc46cda9 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -166,21 +166,21 @@ public: SfxItemState QueryState( sal_uInt16 nSID, SfxPoolItem* &rpState ); const SfxPoolItem* ExecuteSynchron( sal_uInt16 nSlot, - const SfxPoolItem **pArgs = 0, + const SfxPoolItem **pArgs = nullptr, sal_uInt16 nModi = 0, - const SfxPoolItem **pInternalArgs = 0); + const SfxPoolItem **pInternalArgs = nullptr); bool Execute( sal_uInt16 nSlot, - const SfxPoolItem **pArgs = 0, + const SfxPoolItem **pArgs = nullptr, sal_uInt16 nModi = 0, SfxCallMode nCall = SfxCallMode::SLOT, - const SfxPoolItem **pInternalArgs = 0); + const SfxPoolItem **pInternalArgs = nullptr); SAL_DLLPRIVATE void SetDispatchProvider_Impl( const css::uno::Reference< css::frame::XDispatchProvider > & rFrame ); void SetActiveFrame( const css::uno::Reference< css::frame::XFrame > & rFrame ); const css::uno::Reference< css::frame::XFrame > GetActiveFrame() const; // Reconfig - sal_uInt16 EnterRegistrations(const char *pFile = 0, int nLine = 0); - void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = 0, int nLine = 0 ); + sal_uInt16 EnterRegistrations(const char *pFile = nullptr, int nLine = 0); + void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = nullptr, int nLine = 0 ); void Register( SfxControllerItem& rBinding ); void Release( SfxControllerItem& rBinding ); SfxDispatcher* GetDispatcher() const diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index e1fb523cdfe1..2baa43c95f6a 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -77,10 +77,10 @@ struct SAL_DLLPUBLIC_RTTI SfxChildWinInfo nFlags = SfxChildWindowFlags::NONE; } bool GetExtraData_Impl( SfxChildAlignment *pAlign, - SfxChildAlignment *pLastAlign = 0, - Size *pSize = 0, - sal_uInt16 *pLine = 0, - sal_uInt16 *pPos = 0 ) const; + SfxChildAlignment *pLastAlign = nullptr, + Size *pSize = nullptr, + sal_uInt16 *pLine = nullptr, + sal_uInt16 *pPos = nullptr ) const; }; // ChildWindow factory methods @@ -186,7 +186,7 @@ public: { return pContext ? pContext->GetContextId(): 0; } vcl::Window* GetContextWindow() const - { return pContext ? pContext->GetWindow(): 0; } + { return pContext ? pContext->GetWindow(): nullptr; } vcl::Window* GetContextWindow( SfxModule *pModule ) const; @@ -224,13 +224,13 @@ public: #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ - static void RegisterChildWindowContext(SfxModule *pMod=0); \ + static void RegisterChildWindowContext(SfxModule *pMod=nullptr); \ //! The Macro of the future ... #define SFX_DECL_CHILDWINDOWCONTEXT(Class) \ static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ - static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \ + static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=nullptr); \ //! soon obsolete ! #define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \ @@ -272,7 +272,7 @@ public: public : \ static SfxChildWindow* CreateImpl(vcl::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ - static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, SfxChildWindowFlags nFlags=SfxChildWindowFlags::NONE); \ + static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=nullptr, SfxChildWindowFlags nFlags=SfxChildWindowFlags::NONE); \ virtual SfxChildWinInfo GetInfo() const override #define SFX_DECL_CHILDWINDOW_WITHID(Class) \ diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 9913d208e60a..c333c94cf972 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -58,7 +58,7 @@ public: virtual ~SfxControllerItem(); virtual void dispose(); - void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // Register in SfxBindings + void Bind( sal_uInt16 nNewId, SfxBindings * = nullptr); // Register in SfxBindings void UnBind(); void ReBind(); bool IsBound() const; @@ -79,7 +79,7 @@ public: static SfxItemState GetItemState( const SfxPoolItem* pState ); SAL_DLLPRIVATE bool IsBindable_Impl() const - { return pBindings != NULL; } + { return pBindings != nullptr; } SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* ); }; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 2f81aa39f38f..1d3ef7a7677a 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -165,7 +165,7 @@ public: GetCmisProperties() const { return m_aCmisProperties;} void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -507,7 +507,7 @@ protected: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); @@ -627,7 +627,7 @@ private: protected: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 801d9f80ec53..17dec3243b5f 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -111,7 +111,7 @@ protected: public: SfxDispatcher( SfxDispatcher* pParent ); - SfxDispatcher( SfxViewFrame *pFrame = 0 ); + SfxDispatcher( SfxViewFrame *pFrame = nullptr ); SAL_DLLPRIVATE void Construct_Impl( SfxDispatcher* pParent ); @@ -119,9 +119,9 @@ public: const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall = SfxCallMode::SLOT, - const SfxPoolItem **pArgs = 0, + const SfxPoolItem **pArgs = nullptr, sal_uInt16 nModi = 0, - const SfxPoolItem **pInternalArgs = 0); + const SfxPoolItem **pInternalArgs = nullptr); const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, @@ -158,9 +158,9 @@ public: static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ); void ExecutePopup( const ResId &rId, - vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = nullptr, const Point *pPosPixel = nullptr ); static void ExecutePopup( sal_uInt16 nConfigId = 0, - vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = nullptr, const Point *pPosPixel = nullptr ); bool IsAppDispatcher() const; bool IsFlushed() const; @@ -168,7 +168,7 @@ public: void Lock( bool bLock ); bool IsLocked( sal_uInt16 nSID = 0 ) const; void SetSlotFilter( SfxSlotFilterState nEnable = SfxSlotFilterState::DISABLED, - sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 ); + sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = nullptr ); void HideUI( bool bHide = true ); sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const; diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index f1192b3e8c58..d60596d54bfe 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -74,30 +74,30 @@ public: */ SfxMedium( const OUString &rName, StreamMode nOpenMode, - const SfxFilter *pFilter = 0, - SfxItemSet *pSet = 0 ); + const SfxFilter *pFilter = nullptr, + SfxItemSet *pSet = nullptr ); /** * @param pSet Takes ownership */ SfxMedium( const OUString &rName, const OUString &rReferer, StreamMode nOpenMode, - const SfxFilter *pFilter = 0, - SfxItemSet *pSet = 0 ); + const SfxFilter *pFilter = nullptr, + SfxItemSet *pSet = nullptr ); /** * @param pSet does NOT take ownership */ SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& rBaseURL, - const SfxItemSet* pSet=0 ); + const SfxItemSet* pSet=nullptr ); /** * @param pSet does NOT take ownership */ SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& rBaseURL, const OUString& rTypeName, - const SfxItemSet* pSet=0 ); + const SfxItemSet* pSet=nullptr ); SfxMedium( const css::uno::Sequence< css::beans::PropertyValue >& aArgs ); virtual ~SfxMedium(); diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index 59e1ccbc14b1..fbb8ee00efdb 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -110,7 +110,7 @@ public: static OUString GetTypeFromStorage( const SotStorage& rStg ); static OUString GetTypeFromStorage( const css::uno::Reference<css::embed::XStorage>& xStorage, - bool bTemplate = false, OUString* pName = NULL ) + bool bTemplate = false, OUString* pName = nullptr ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx index 066b1e14a89e..0c1b66f1c38e 100644 --- a/include/sfx2/docinf.hxx +++ b/include/sfx2/docinf.hxx @@ -57,9 +57,9 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( bool SFX2_DLLPUBLIC SaveOlePropertySet( css::uno::Reference< css::document::XDocumentProperties> i_xDocProps, SotStorage* i_pStorage, - const css::uno::Sequence<sal_uInt8> * i_pThumb = 0, - const css::uno::Sequence<sal_uInt8> * i_pGuid = 0, - const css::uno::Sequence<sal_uInt8> * i_pHyperlinks = 0); + const css::uno::Sequence<sal_uInt8> * i_pThumb = nullptr, + const css::uno::Sequence<sal_uInt8> * i_pGuid = nullptr, + const css::uno::Sequence<sal_uInt8> * i_pHyperlinks = nullptr); css::uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile( diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 95bd3cdbc433..079a13aafc54 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint sal_uInt16 nEventId; public: - SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = 0 ) + SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = nullptr ) : pObjShell(pObj), aEventName(aName), nEventId(nId) @@ -101,7 +101,7 @@ public: {} SfxPrintingHint( sal_Int32 nEvent ) - : SfxViewEventHint( SFX_EVENT_PRINTDOC, rtl::OUString(), 0, css::uno::Reference< css::frame::XController >() ) + : SfxViewEventHint( SFX_EVENT_PRINTDOC, rtl::OUString(), nullptr, css::uno::Reference< css::frame::XController >() ) , mnPrintableState( nEvent ) {} diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index d7cf357a2ce6..88398a4ef7cc 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -62,7 +62,7 @@ public: size_t size() const { return aEventNamesList.size(); }; SfxEventName* at( size_t Index ) const - { return Index < aEventNamesList.size() ? aEventNamesList[ Index ] : NULL; } + { return Index < aEventNamesList.size() ? aEventNamesList[ Index ] : nullptr; } void push_back( SfxEventName* Item ) { aEventNamesList.push_back( Item ); } }; @@ -81,8 +81,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + const IntlWrapper * = nullptr ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 2f962ff5cb8d..c77470582492 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -46,7 +46,7 @@ class SfxRefItem : public SfxPoolItem public: SfxRefItem( sal_uInt16 nWhichId, const tools::SvRef<SvRefBase>& rValue ) : SfxPoolItem( nWhichId ) { maRef = rValue; } - virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const override + virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override { return new SfxRefItem( *this ); } virtual bool operator==( const SfxPoolItem& rL) const override { return static_cast<const SfxRefItem&>(rL).maRef == maRef; } diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 78c31fabbe82..741507af7d89 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -100,7 +100,7 @@ private: public: FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - vcl::Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = nullptr ); FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, @@ -123,7 +123,7 @@ public: const OUString& aExtName, const OUString& rStandardDir, const css::uno::Sequence< OUString >& rBlackList, - vcl::Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = nullptr ); virtual ~FileDialogHelper(); @@ -242,7 +242,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, std::vector<OUString>& rpURLList, OUString& rFilter, SfxItemSet *& rpSet, - const OUString* pPath = NULL, + const OUString* pPath = nullptr, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, const OUString& rStandardDir = OUString(), const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >()); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 15539aae8517..af408d2f19b3 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -218,11 +218,11 @@ public: TYPEINFO_OVERRIDE(); SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame *p ); - SfxFrameItem( SfxFrame *p=0 ); + SfxFrameItem( SfxFrame *p=nullptr ); SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -240,7 +240,7 @@ public: css::uno::Any GetValue() const { return aValue; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; @@ -258,7 +258,7 @@ public: GetFrame() const { return m_xFrame; } virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index a5f292194c77..7b56f1cf6491 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -178,7 +178,7 @@ public: bIsRootSet( false ), bIsInColSet( false ), bHasBorderInherited( true ), - pFrame( 0 ) {} + pFrame( nullptr ) {} ~SfxFrameProperties() { delete pFrame; } @@ -210,9 +210,9 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const override; + OUString &rText, const IntlWrapper * = nullptr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; #endif // INCLUDED_SFX2_FRMDESCR_HXX diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx index a501d84ace83..616d5a973ce1 100644 --- a/include/sfx2/frmhtml.hxx +++ b/include/sfx2/frmhtml.hxx @@ -32,7 +32,7 @@ class SfxMedium; class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser { protected: - SfxFrameHTMLParser( SvStream& rStream, bool bIsNewDoc=true, SfxMedium *pMediumPtr=0 ): + SfxFrameHTMLParser( SvStream& rStream, bool bIsNewDoc=true, SfxMedium *pMediumPtr=nullptr ): SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {}; public: diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx index 6e8161b1d9a1..da44dc92968a 100644 --- a/include/sfx2/frmhtmlw.hxx +++ b/include/sfx2/frmhtmlw.hxx @@ -45,24 +45,24 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter const sal_Char *pIndent, const OUString& rName, const OUString& rContent, bool bHTTPEquiv, rtl_TextEncoding eDestEnc, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm, const sal_Char *pIndent, const sal_Char *pName, const OUString& rContent, bool bHTTPEquiv, rtl_TextEncoding eDestEnc, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); public: static void Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, const css::uno::Reference< css::document::XDocumentProperties>&, const sal_Char *pIndent, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); static void Out_FrameDescriptor( SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); }; inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 36a7cabe1b8c..03a4bec6c143 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -49,7 +49,7 @@ protected: public: SfxHintPoster(const Link<SfxRequest*,void>& rLink); - void Post( SfxRequest* pHint = 0 ); + void Post( SfxRequest* pHint = nullptr ); void SetEventHdl(const Link<SfxRequest*,void>& rLink); }; diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 787a9526b748..c6cbcf000960 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC LinkManager SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell protected: bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, SfxLinkUpdateMode nUpdateType, - const OUString* pName = 0 ); + const OUString* pName = nullptr ); public: enum LinkState @@ -103,8 +103,8 @@ public: bool InsertFileLink( sfx2::SvBaseLink&, sal_uInt16 nFileType, const OUString& rFileNm, - const OUString* pFilterNm = NULL, - const OUString* pRange = NULL ); + const OUString* pFilterNm = nullptr, + const OUString* pRange = nullptr ); void ReconnectDdeLink(SfxObjectShell& rServer); @@ -120,16 +120,16 @@ public: // Obtain the string for the dialog static bool GetDisplayNames( const SvBaseLink *, OUString* pType, - OUString* pFile = NULL, - OUString* pLink = NULL, - OUString* pFilter = NULL ); + OUString* pFile = nullptr, + OUString* pLink = nullptr, + OUString* pFilter = nullptr ); static SvLinkSourceRef CreateObj( SvBaseLink* ); void UpdateAllLinks( bool bAskUpdate = true, bool bCallErrHdl = true, bool bUpdateGrfLinks = false, - vcl::Window* pParentWin = 0 ); + vcl::Window* pParentWin = nullptr ); // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } @@ -175,7 +175,7 @@ SFX2_DLLPUBLIC void MakeLnkName( OUString& rName, const OUString* pType, // Can also be null!! const OUString& rFile, const OUString& rLink, - const OUString* pFilter = 0 ); + const OUString* pFilter = nullptr ); } diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 30c065757c46..ea7a71c13ddb 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -61,7 +61,7 @@ public: SvLinkSource(); virtual ~SvLinkSource(); - bool HasDataLinks( const SvBaseLink* = 0 ) const; + bool HasDataLinks( const SvBaseLink* = nullptr ) const; void Closed(); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 27b87e127f89..504e7ee526e7 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -90,11 +90,11 @@ protected: static bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, sal_uInt16 nFamily, sal_uInt16 nMask = 0, - const sal_uInt16* pModifier = NULL ); + const sal_uInt16* pModifier = nullptr ); using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) override; using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage(SfxItemSet * = 0) override; + virtual sfxpg DeactivatePage(SfxItemSet * = nullptr) override; public: SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet ); diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index c0f509e4d407..e8ce8e9f9d00 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -35,7 +35,7 @@ class SFX2_DLLPUBLIC MSE40HTMLClipFormatObj OUString sBaseURL; public: - MSE40HTMLClipFormatObj() : pStrm(0) {} + MSE40HTMLClipFormatObj() : pStrm(nullptr) {} ~MSE40HTMLClipFormatObj(); SvStream* IsValid( SvStream& ); diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 71720ebb1fd0..f0b0541ddf4f 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -45,7 +45,7 @@ public: SfxMacroInfoItem( const SfxMacroInfoItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; OUString GetMethod() const { return aMethodName; } diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index b7ac4dd2946f..3d76b44e8635 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -49,7 +49,7 @@ public: SfxMenuControl( sal_uInt16, SfxBindings&); static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); - static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL ); + static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr ); virtual ~SfxMenuControl(); @@ -110,7 +110,7 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const #define SFX_DECL_MENU_CONTROL() \ static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \ - static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) #define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \ SfxMenuControl* Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \ diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index b76a64c0acb1..8254c6d25ea2 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -90,7 +90,7 @@ public: bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const; - static SfxModule* GetActiveModule( SfxViewFrame* pFrame=NULL ); + static SfxModule* GetActiveModule( SfxViewFrame* pFrame=nullptr ); static FieldUnit GetCurrentFieldUnit(); /** retrieves the field unit of the module belonging to the document displayed in the given frame diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index cd5e278d63cb..2b75d9503440 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -46,14 +46,14 @@ private: const SfxSlot* SeekSlot( sal_uInt16 nObject ); public: - SfxSlotPool(SfxSlotPool* pParent=0); + SfxSlotPool(SfxSlotPool* pParent=nullptr); ~SfxSlotPool(); void RegisterInterface( SfxInterface& rFace ); void ReleaseInterface( SfxInterface& rFace ); SfxInterface* FirstInterface(); - static SfxSlotPool& GetSlotPool( SfxViewFrame *pFrame=NULL ); + static SfxSlotPool& GetSlotPool( SfxViewFrame *pFrame=nullptr ); sal_uInt16 GetGroupCount(); OUString SeekGroup( sal_uInt16 nNo ); diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 1fe4a08e3aec..d7c1b764d04a 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -104,7 +104,7 @@ inline sal_uInt16 SfxInterface::Count() const inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const { - return nPos < nCount? pSlots+nPos: 0; + return nPos < nCount? pSlots+nPos: nullptr; } #endif diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 70ad39042b0b..d2ce6c080ebd 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -33,10 +33,10 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem public: TYPEINFO_OVERRIDE(); - SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 ); + SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; SfxShell* GetShell() const { return _pSh; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9ad250491954..70da01048542 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -323,7 +323,7 @@ public: * @return true if the initialization is successful, false otherwise. */ bool DoInitUnitTest(); - bool DoInitNew( SfxMedium* pMedium=0 ); + bool DoInitNew( SfxMedium* pMedium=nullptr ); bool DoLoad( SfxMedium* pMedium ); bool DoLoadExternal( SfxMedium* pMed ); bool DoSave(); @@ -331,7 +331,7 @@ public: bool DoSaveObjectAs( SfxMedium &rNewStor, bool bCommit ); // TODO/LATER: currently only overridden in Calc, should be made non-virtual - virtual bool DoSaveCompleted( SfxMedium* pNewStor=0 ); + virtual bool DoSaveCompleted( SfxMedium* pNewStor=nullptr ); bool LoadOwnFormat( SfxMedium& pMedium ); virtual bool SaveAsOwnFormat( SfxMedium& pMedium ); @@ -383,7 +383,7 @@ public: vcl::Window *pParent, const SfxItemSet& ); ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName, - SbxArray* pArgs = 0, SbxValue* pRet = 0 ); + SbxArray* pArgs = nullptr, SbxValue* pRet = nullptr ); ErrCode CallXScript( const OUString& rScriptURL, @@ -392,7 +392,7 @@ public: css::uno::Sequence< sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam, bool bRaiseError = true, - const css::uno::Any* aCaller = 0 ); + const css::uno::Any* aCaller = nullptr ); static ErrCode CallXScript( const css::uno::Reference< css::uno::XInterface >& _rxScriptContext, @@ -402,7 +402,7 @@ public: css::uno::Sequence< sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam, bool bRaiseError = true, - const css::uno::Any* aCaller = 0 + const css::uno::Any* aCaller = nullptr ); /** adjusts the internal macro mode, according to the current security settings @@ -539,11 +539,11 @@ public: virtual css::uno::Sequence< OUString > GetEventNames(); - vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=nullptr ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD ); static css::uno::Reference< css::lang::XComponent > - CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL ); + CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = nullptr ); static SfxObjectShell* GetShellFromComponent( const css::uno::Reference< css::lang::XComponent >& xComp ); static OUString GetServiceNameFromFactory( const OUString& rFact ); bool IsInPlaceActive(); @@ -689,8 +689,8 @@ public: SAL_DLLPRIVATE void UpdateFromTemplate_Impl(); SAL_DLLPRIVATE bool CanReload_Impl(); SAL_DLLPRIVATE void SetNamedVisibility_Impl(); - SAL_DLLPRIVATE bool DoSave_Impl( const SfxItemSet* pSet=0 ); - SAL_DLLPRIVATE bool Save_Impl( const SfxItemSet* pSet=0 ); + SAL_DLLPRIVATE bool DoSave_Impl( const SfxItemSet* pSet=nullptr ); + SAL_DLLPRIVATE bool Save_Impl( const SfxItemSet* pSet=nullptr ); SAL_DLLPRIVATE bool PreDoSaveAs_Impl(const OUString& rFileName, const OUString& rFiltName, SfxItemSet& rItemSet); SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet); SAL_DLLPRIVATE bool CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet); @@ -765,14 +765,14 @@ class SfxObjectShellLock protected: SfxObjectShell * pObj; public: - inline SfxObjectShellLock() { pObj = 0; } + inline SfxObjectShellLock() { pObj = nullptr; } inline SfxObjectShellLock( const SfxObjectShellLock & rObj ); inline SfxObjectShellLock( SfxObjectShell * pObjP ); inline void Clear(); inline ~SfxObjectShellLock(); inline SfxObjectShellLock & operator = ( const SfxObjectShellLock & rObj ); inline SfxObjectShellLock & operator = ( SfxObjectShell * pObj ); - inline bool Is() const { return pObj != NULL; } + inline bool Is() const { return pObj != nullptr; } inline SfxObjectShell * operator & () const { return pObj; } inline SfxObjectShell * operator -> () const { return pObj; } inline SfxObjectShell & operator * () const { return *pObj; } @@ -787,7 +787,7 @@ inline void SfxObjectShellLock::Clear() if( pObj ) { SfxObjectShell* const pRefObj = pObj; - pObj = 0; + pObj = nullptr; pRefObj->OwnerLock( false ); } } @@ -824,7 +824,7 @@ public: TYPEINFO_OVERRIDE(); SfxObjectShellItem() : SfxPoolItem( 0 ), - pObjSh( 0 ) + pObjSh( nullptr ) {} SfxObjectShellItem( SfxObjectShell *pObjShell ): SfxPoolItem( 0 ), @@ -837,7 +837,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 35e15d8b53a0..9b972c83d313 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -83,7 +83,7 @@ private: void SetPasswdText(); public: - SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText = NULL); + SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText = nullptr); virtual ~SfxPasswordDialog(); virtual void dispose() override; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index f3a48dbcfd4e..35b4040a7515 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -89,7 +89,7 @@ private: protected: using TabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override; public: diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx index b1c05e3bcc27..f613a3df5657 100644 --- a/include/sfx2/progress.hxx +++ b/include/sfx2/progress.hxx @@ -59,7 +59,7 @@ public: void Stop(); - static SfxProgress* GetActiveProgress( SfxObjectShell *pDocSh = 0 ); + static SfxProgress* GetActiveProgress( SfxObjectShell *pDocSh = nullptr ); static void EnterLock(); static void LeaveLock(); }; diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 4e46c7819469..13c52aa831e4 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -94,8 +94,8 @@ public: void SetReturnValue(const SfxPoolItem &); const SfxPoolItem* GetReturnValue() const; - static css::uno::Reference< css::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL ); - static bool HasMacroRecorder( SfxViewFrame* pFrame=NULL ); + static css::uno::Reference< css::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=nullptr ); + static bool HasMacroRecorder( SfxViewFrame* pFrame=nullptr ); SfxCallMode GetCallMode() const; void AllowRecording( bool ); bool AllowsRecording() const; diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 07b2668193dd..834443fecff2 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -172,7 +172,7 @@ public: // constructor/destructor - SfxBaseModel( SfxObjectShell *pObjectShell = NULL ) ; + SfxBaseModel( SfxObjectShell *pObjectShell = nullptr ) ; virtual ~SfxBaseModel() ; diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index d6342bf41959..dfb0e967c246 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -96,8 +96,8 @@ public: virtual void Insert( SotClipboardFormatId nFormat, const rtl::OUString & rFormatName ) = 0; virtual void SetObjName( const SvGlobalName & rClass, const rtl::OUString & rObjName ) = 0; virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper, - const DataFlavorExVector* pFormats=0, - const TransferableObjectDescriptor* pDesc=0 ) = 0; + const DataFlavorExVector* pFormats=nullptr, + const TransferableObjectDescriptor* pDesc=nullptr ) = 0; }; class SfxAbstractLinksDialog : virtual public VclAbstractDialog @@ -124,22 +124,22 @@ public: const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, - const rtl::OUString *pUserButtonText=0 ) = 0; + const rtl::OUString *pUserButtonText=nullptr ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, const css::uno::Reference< css::frame::XFrame >& xViewFrame, bool bEditFmt=false, - const rtl::OUString *pUserButtonText=0 ) = 0; + const rtl::OUString *pUserButtonText=nullptr ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const css::uno::Reference < css::embed::XStorage >& xStor, - const SvObjectServerList* pList = 0 )=0; + const SvObjectServerList* pList = nullptr )=0; virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr )=0; virtual VclAbstractDialog * CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 829121722825..93e25e04cc5f 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser protected: - SfxHTMLParser( SvStream& rStream, bool bNewDoc=true, SfxMedium *pMedium=0 ); + SfxHTMLParser( SvStream& rStream, bool bNewDoc=true, SfxMedium *pMedium=nullptr ); virtual ~SfxHTMLParser(); @@ -88,7 +88,7 @@ protected: // Returns TRUE if a file was downloaded and if FileDownloadFinished // has not yet been called - bool ShouldFinishFileDownload() const { return pDLMedium != 0; } + bool ShouldFinishFileDownload() const { return pDLMedium != nullptr; } SfxMedium *GetMedium() { return pMedium; } const SfxMedium *GetMedium() const { return pMedium; } diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index 6d2e4937d18b..69ce86e9be6f 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -49,12 +49,12 @@ class SfxSlot ; SFX2_DLLPUBLIC void TransformParameters( sal_uInt16 nSlotId , const css::uno::Sequence< css::beans::PropertyValue >& seqArgs , SfxAllItemSet& aSet , - const SfxSlot* pSlot = 0 ); + const SfxSlot* pSlot = nullptr ); SFX2_DLLPUBLIC void TransformItems( sal_uInt16 nSlotId , const SfxItemSet& aSet , css::uno::Sequence< css::beans::PropertyValue >& seqArgs , - const SfxSlot* pSlot = 0 ); + const SfxSlot* pSlot = nullptr ); bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 8d469aa307cd..8ec29fdfcd46 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -183,7 +183,7 @@ public: NULL-pointer is returned. */ virtual SfxInterface* GetInterface() const; - static SfxInterface* GetStaticInterface() { return 0; } + static SfxInterface* GetStaticInterface() { return nullptr; } /** Sets the name of the Shell object. With this name, the SfxShell instance @@ -246,7 +246,7 @@ public: <SfxShell::ExecuteSlot(SfxRequest&)> */ - const SfxPoolItem* GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 ); + const SfxPoolItem* GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = nullptr, SfxItemSet *pStateSet = nullptr ); /** This method allows you to forward a <SfxRequest> to the specified @@ -278,7 +278,7 @@ public: <SfxShell::GetSlotState(sal_uInt16,const SfxInterface*,SfxItemSet*)> */ - const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 ); + const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = nullptr ); /** Asynchronous ExecuteSlot for the RELOAD @@ -538,12 +538,12 @@ inline void SfxShell::SetPool static SfxInterface* pInterface; \ static SfxInterface* GetStaticInterface(); \ static SfxInterfaceId GetInterfaceId() {return SfxInterfaceId(nId);} \ - static void RegisterInterface(SfxModule* pMod=NULL); \ + static void RegisterInterface(SfxModule* pMod=nullptr); \ virtual SfxInterface* GetInterface() const override; #define SFX_TMPL_INTERFACE(Class,SuperClass,Abstract) \ \ - SfxInterface* Class::pInterface = 0; \ + SfxInterface* Class::pInterface = nullptr; \ SfxInterface* Class::GetStaticInterface() \ { \ if ( !pInterface ) \ diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 8753d90599ae..a4b890d2541b 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -123,7 +123,7 @@ public: #define SFX_DECL_STATUSBAR_CONTROL() \ static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ - static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) #define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \ SfxStatusBarControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \ diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 8dcd02a03017..c35ea6ccc1fd 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -72,7 +72,7 @@ public: { return aEntryList.size(); } const SfxStyleFamilyItem* at(size_t nIdx) const - { return aEntryList.empty() ? NULL : aEntryList[nIdx]; } + { return aEntryList.empty() ? nullptr : aEntryList[nIdx]; } /** updates the images of all single SfxStyleFamilyItems with new images from the given resource diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 8281c9399028..a02076495215 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -51,7 +51,7 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem public: TYPEINFO_OVERRIDE(); SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); - SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); + SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=nullptr); virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; }; @@ -124,10 +124,10 @@ protected: public: SfxTabDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, - const SfxItemSet * = 0, bool bEditFmt = false); + const SfxItemSet * = nullptr, bool bEditFmt = false); SfxTabDialog(SfxViewFrame *pViewFrame, vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, - const SfxItemSet * = 0, bool bEditFmt = false); + const SfxItemSet * = nullptr, bool bEditFmt = false); virtual ~SfxTabDialog(); virtual void dispose() override; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 5043c0bcd436..20dc0120af54 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -134,7 +134,7 @@ public: #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ - static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) /* For special ToolBox controls, such as a font selection box or toolbox tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl @@ -276,7 +276,7 @@ public: // We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this // RegisterControl() marked as SFX2_DLLPUBLIC static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); - static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL); + static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr); SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxRecentFilesToolBoxControl(); @@ -291,7 +291,7 @@ public: // We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this // RegisterControl() marked as SFX2_DLLPUBLIC static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); - static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL); + static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr); SfxSaveAsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxSaveAsToolBoxControl(); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 57cb6defaee2..796647f8fa90 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -48,7 +48,7 @@ class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModalDialog public: - SfxTemplateManagerDlg(vcl::Window *parent = NULL); + SfxTemplateManagerDlg(vcl::Window *parent = nullptr); virtual ~SfxTemplateManagerDlg(); virtual void dispose() override; diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx index af699ddd4095..afa39e49135b 100644 --- a/include/sfx2/templateinfodlg.hxx +++ b/include/sfx2/templateinfodlg.hxx @@ -25,7 +25,7 @@ class SfxTemplateInfoDlg : public ModalDialog { public: - SfxTemplateInfoDlg (vcl::Window *pParent = NULL); + SfxTemplateInfoDlg (vcl::Window *pParent = nullptr); virtual ~SfxTemplateInfoDlg(); virtual void dispose() override; diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 8d325d5fd179..490013493e9b 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -39,7 +39,7 @@ public: const OUString& GetStyleName() const { return aStyle; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual sal_uInt8 GetFlagCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index ce81492fc938..7626770bc7d3 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -73,7 +73,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener sal_uInt16 nAdjustPosPixelLock; private: - SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh=NULL ); + SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh=nullptr ); protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -84,7 +84,7 @@ protected: virtual ~SfxViewFrame(); public: - SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc = NULL ); + SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc = nullptr ); TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM) @@ -104,13 +104,13 @@ public: static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 ); static SfxViewFrame* Current(); - static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, bool bOnlyVisible = true ); - static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, bool bOnlyVisible = true ); + static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); + static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); - static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL ); + static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = nullptr ); - void DoActivate(bool bMDI, SfxViewFrame *pOld=NULL); - void DoDeactivate(bool bMDI, SfxViewFrame *pOld=NULL); + void DoActivate(bool bMDI, SfxViewFrame *pOld=nullptr); + void DoDeactivate(bool bMDI, SfxViewFrame *pOld=nullptr); SfxViewFrame* GetParentViewFrame() const; @@ -291,7 +291,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; SfxViewFrame* GetFrame() const { return pFrame; } @@ -310,7 +310,7 @@ public: SfxVerbListItem( sal_uInt16 nWhichId, const css::uno::Sequence < css::embed::VerbDescriptor >& ); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; }; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 61ac65d25041..669e9a5bbe38 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -220,11 +220,11 @@ public: SfxShell* GetSubShell() const { return pSubShell; } void AddSubShell( SfxShell& rShell ); - void RemoveSubShell( SfxShell *pShell=NULL ); + void RemoveSubShell( SfxShell *pShell=nullptr ); SfxShell* GetSubShell( sal_uInt16 ); - virtual SfxShell* GetFormShell() { return 0; }; - virtual const SfxShell* GetFormShell() const { return 0; }; + virtual SfxShell* GetFormShell() { return nullptr; }; + virtual const SfxShell* GetFormShell() const { return nullptr; }; // Focus, KeyInput, Cursor virtual void ShowCursor( bool bOn = true ); diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index b0e82c66b98d..9e9205950f7c 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -71,7 +71,7 @@ public: SvxZoomType GetType() const { return eType; } void SetType( SvxZoomType eNewType ) { eType = eNewType; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override; virtual bool operator==( const SfxPoolItem& ) const override; |