[Libreoffice-commits] core.git: include/svx svx/source

Stephan Bergmann sbergman at redhat.com
Wed Nov 11 07:09:39 PST 2015


 include/svx/sdasitm.hxx           |    2 +-
 include/svx/sdtaiitm.hxx          |    4 ++--
 include/svx/sxcecitm.hxx          |    4 ++--
 include/svx/sxcllitm.hxx          |    4 ++--
 include/svx/sxmbritm.hxx          |    2 +-
 include/svx/sxmtfitm.hxx          |    6 +++---
 include/svx/sxmtritm.hxx          |    4 ++--
 svx/source/dialog/rulritem.cxx    |    2 +-
 svx/source/items/SmartTagItem.cxx |    2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 8bae6345bff0508f5f01e0061d7b576f36e6961d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 11 16:07:35 2015 +0100

    loplugin:nullptr
    
    Change-Id: Id0cab3b90ea9f3de7dc63f58ef247ba512af79f4

diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 6712a3a..a927467 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SdrCustomShapeReplacementURLItem : public SfxStringItem
     public:
             SdrCustomShapeReplacementURLItem();
             virtual ~SdrCustomShapeReplacementURLItem();
-            virtual SfxPoolItem*        Clone( SfxItemPool* pPool = NULL ) const override;
+            virtual SfxPoolItem*        Clone( SfxItemPool* pPool = nullptr ) const override;
 };
 
 inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) {
diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index 03db38d..23eaf19 100644
--- a/include/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
@@ -27,7 +27,7 @@ public:
     SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
     SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {}
     virtual ~SdrTextAniStartInsideItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 class SVX_DLLPUBLIC SdrTextAniStopInsideItem: public SdrYesNoItem {
@@ -35,7 +35,7 @@ public:
     SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
     SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {}
     virtual ~SdrTextAniStopInsideItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index e2a5e9a..94e3751 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -54,7 +54,7 @@ public:
     SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
     SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn)  {}
     virtual ~SdrCaptionEscIsRelItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 
@@ -69,7 +69,7 @@ public:
     SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {}
     SdrCaptionEscRelItem(SvStream& rIn)    : SfxInt32Item(SDRATTR_CAPTIONESCREL,rIn)     {}
     virtual ~SdrCaptionEscRelItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 
diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx
index b343a10..224b181 100644
--- a/include/svx/sxcllitm.hxx
+++ b/include/svx/sxcllitm.hxx
@@ -34,7 +34,7 @@ public:
     SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {}
     SdrCaptionLineLenItem(SvStream& rIn)  : SdrMetricItem(SDRATTR_CAPTIONLINELEN,rIn)      {}
     virtual ~SdrCaptionLineLenItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 
@@ -48,7 +48,7 @@ public:
     SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
     SdrCaptionFitLineLenItem(SvStream& rIn)     : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn)      {}
     virtual ~SdrCaptionFitLineLenItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx
index aff84cd..a24c893 100644
--- a/include/svx/sxmbritm.hxx
+++ b/include/svx/sxmbritm.hxx
@@ -34,7 +34,7 @@ public:
     SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {}
     SdrMeasureBelowRefEdgeItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,rIn) {}
     virtual ~SdrMeasureBelowRefEdgeItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index 2d156a5..d0b452c 100644
--- a/include/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
@@ -32,7 +32,7 @@ public:
     SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {}
     SdrMeasureTextIsFixedAngleItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,rIn) {}
     virtual ~SdrMeasureTextIsFixedAngleItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 //Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.)
@@ -41,7 +41,7 @@ public:
     SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal)  {}
     SdrMeasureTextFixedAngleItem(SvStream& rIn): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,rIn) {}
     virtual ~SdrMeasureTextFixedAngleItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 // The decimal places used for the measure value
@@ -50,7 +50,7 @@ public:
     SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal)  {}
     SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {}
     virtual ~SdrMeasureDecimalPlacesItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx
index 226dbb7..82c58c1 100644
--- a/include/svx/sxmtritm.hxx
+++ b/include/svx/sxmtritm.hxx
@@ -28,7 +28,7 @@ public:
     SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {}
     SdrMeasureTextRota90Item(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,rIn) {}
     virtual ~SdrMeasureTextRota90Item();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 // Turn the calculated TextRect through 180 deg
@@ -38,7 +38,7 @@ public:
     SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {}
     SdrMeasureTextUpsideDownItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,rIn) {}
     virtual ~SdrMeasureTextUpsideDownItem();
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override;
+    virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
 };
 
 #endif
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 502eeb9..9fbdcf4 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -29,7 +29,7 @@ SfxPoolItem* SvxPagePosSizeItem::CreateDefault() { return new SvxPagePosSizeItem
 SfxPoolItem* SvxLongLRSpaceItem::CreateDefault() { return new SvxLongLRSpaceItem; }
 SfxPoolItem* SvxLongULSpaceItem::CreateDefault() { return new SvxLongULSpaceItem; }
 SfxPoolItem* SvxColumnItem::CreateDefault() { return new SvxColumnItem; }
-SfxPoolItem* SvxObjectItem::CreateDefault() { DBG_ASSERT(false, "No SvxObjectItem factory available"); return 0; }
+SfxPoolItem* SvxObjectItem::CreateDefault() { DBG_ASSERT(false, "No SvxObjectItem factory available"); return nullptr; }
 
 /* SvxLongLRSpaceItem */
 
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index fd64d96..565174e 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -26,7 +26,7 @@
 using namespace ::com::sun::star;
 
 
-SfxPoolItem* SvxSmartTagItem::CreateDefault() { DBG_ASSERT(false, "No SvxSmartTagItem factory available"); return 0; }
+SfxPoolItem* SvxSmartTagItem::CreateDefault() { DBG_ASSERT(false, "No SvxSmartTagItem factory available"); return nullptr; }
 
 SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
                                   const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence,


More information about the Libreoffice-commits mailing list