diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:28 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:50 +0100 |
commit | 6cd7bf2043146a630925a2e49336f02c802f707a (patch) | |
tree | 786cecd8ab993e25cda497d45b68007050c30d61 /svx/inc | |
parent | 28f4bee7bd7378141d8569186162e1a3166eb012 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/inc')
-rw-r--r-- | svx/inc/dragmt3d.hxx | 2 | ||||
-rw-r--r-- | svx/inc/galbrws2.hxx | 6 | ||||
-rw-r--r-- | svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sdr/properties/attributeproperties.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sdr/properties/customshapeproperties.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sdr/properties/e3dsceneproperties.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sdr/properties/emptyproperties.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sdr/properties/groupproperties.hxx | 6 | ||||
-rw-r--r-- | svx/inc/sdr/properties/pageproperties.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sdr/properties/textproperties.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svdibrow.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sxcikitm.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sxmkitm.hxx | 4 |
13 files changed, 23 insertions, 23 deletions
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index ce75e7fde5a6..f41257020d12 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -40,7 +40,7 @@ public: sal_Int32 mnLastAngle; E3dDragMethodUnit() - : mp3DObj(0), + : mp3DObj(nullptr), maWireframePoly(), maDisplayTransform(), maInvDisplayTransform(), diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 3eea5096555b..e1a9fca071da 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -170,9 +170,9 @@ public: sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt ); - void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = NULL ); - void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = NULL ); - void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL ); + void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = nullptr ); + void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = nullptr ); + void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = nullptr ); bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow ); static css::uno::Reference< css::frame::XFrame > GetFrame(); diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 43b39c80f0d3..4a16c80fb890 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -60,7 +60,7 @@ namespace sdr void ImpPrepareBufferDevice(); void ImpRestoreBackground() const ; void ImpRestoreBackground(const vcl::Region& rRegionPixel) const; - void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L); + void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr); OverlayManagerBuffered( OutputDevice& rOutputDevice, @@ -74,7 +74,7 @@ namespace sdr bool bRefreshWithPreRendering = false); // complete redraw - virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const override; + virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const override; // flush. Do buffered updates. virtual void flush() override; diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx index 1eee80bcb6d5..8f2431717c39 100644 --- a/svx/inc/sdr/properties/attributeproperties.hxx +++ b/svx/inc/sdr/properties/attributeproperties.hxx @@ -46,7 +46,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // react on ItemSet changes virtual void ItemSetChanged(const SfxItemSet& rSet) override; @@ -71,7 +71,7 @@ namespace sdr virtual SfxStyleSheet* GetStyleSheet() const override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr) override; // Set new model. virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) override; diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 141db8a5cb6c..62821a5d6e1e 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -38,7 +38,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const override; // react on ItemSet changes virtual void ItemSetChanged(const SfxItemSet& rSet) override; diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 3aaf29ca6a05..732259522dca 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -73,7 +73,7 @@ namespace sdr virtual SfxStyleSheet* GetStyleSheet() const override; // Move properties to a new ItemPool. Default implementation does nothing. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr) override; // Special for scene: void SetSceneItemsFromCamera(); diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index ae9e31e227ee..dc5126216b3b 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -38,10 +38,10 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // Called after ItemChange() is done for all items. virtual void PostItemChange(const sal_uInt16 nWhich) override; diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index 73ff23ec2b1f..22c1b2c86356 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -35,10 +35,10 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const override; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // Called after ItemChange() is done for all items. virtual void PostItemChange(const sal_uInt16 nWhich) override; @@ -105,7 +105,7 @@ namespace sdr virtual void ForceDefaultAttributes() override; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) override; + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr) override; // force all attributes which come from styles to hard attributes // to be able to live without the style. diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index 67cd908f1d7d..c503d3bf8f84 100644 --- a/svx/inc/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx @@ -35,7 +35,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // Called after ItemChange() is done for all items. virtual void PostItemChange(const sal_uInt16 nWhich) override; diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx index bda1268ddeeb..4bbcf5e81e41 100644 --- a/svx/inc/sdr/properties/textproperties.hxx +++ b/svx/inc/sdr/properties/textproperties.hxx @@ -40,7 +40,7 @@ namespace sdr virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) override; + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; // react on ItemSet changes virtual void ItemSetChanged(const SfxItemSet& rSet) override; diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index bc1a0fb3753d..e6a5fc249a6c 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -73,7 +73,7 @@ public: virtual ~_SdrItemBrowserControl(); virtual void dispose() override; void Clear(); - void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); + void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr); sal_uInt16 GetCurrentWhich() const; bool EndChangeEntry(); void BreakChangeEntry(); @@ -105,7 +105,7 @@ public: virtual void dispose() override; virtual void Resize() override; virtual void GetFocus() override; - void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse->SetAttributes(pAttr,p2ndSet); } + void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr) { aBrowse->SetAttributes(pAttr,p2ndSet); } _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); } }; diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index 4b0102619ae8..2bbac7428575 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } @@ -41,7 +41,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index e8a893cba950..b892e0cb8ee5 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } @@ -41,7 +41,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; }; #endif |