summaryrefslogtreecommitdiff
path: root/include/svx/sdr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:50 +0100
commit6cd7bf2043146a630925a2e49336f02c802f707a (patch)
tree786cecd8ab993e25cda497d45b68007050c30d61 /include/svx/sdr
parent28f4bee7bd7378141d8569186162e1a3166eb012 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'include/svx/sdr')
-rw-r--r--include/svx/sdr/contact/viewobjectcontact.hxx2
-rw-r--r--include/svx/sdr/overlay/overlaymanager.hxx2
-rw-r--r--include/svx/sdr/primitive2d/sdrattributecreator.hxx16
-rw-r--r--include/svx/sdr/properties/defaultproperties.hxx4
-rw-r--r--include/svx/sdr/properties/properties.hxx6
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx4
6 files changed, 17 insertions, 17 deletions
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 0a48efffa9e8..9e8b4e972ffd 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -102,7 +102,7 @@ public:
// Check if this primitive is animated in any OC (View) which means it has
// generated a PrimitiveAnimation
- bool isAnimated() const { return (0 != mpPrimitiveAnimation); }
+ bool isAnimated() const { return (nullptr != mpPrimitiveAnimation); }
// Take some action when new objects are inserted
void ActionChildInserted(ViewContact& rChild);
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index d25613a1fa80..09c8505ef819 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -99,7 +99,7 @@ namespace sdr
const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const;
// complete redraw
- virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0) const;
+ virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const;
// flush. Do buffered updates.
virtual void flush();
diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
index f69a8578a71d..2bf74f5cdbe4 100644
--- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
@@ -73,10 +73,10 @@ namespace drawinglayer
attribute::SdrTextAttribute createNewSdrTextAttribute(
const SfxItemSet& rSet,
const SdrText& rText,
- const sal_Int32* pLeft = 0,
- const sal_Int32* pUpper = 0,
- const sal_Int32* pRight = 0,
- const sal_Int32* pLower = 0);
+ const sal_Int32* pLeft = nullptr,
+ const sal_Int32* pUpper = nullptr,
+ const sal_Int32* pRight = nullptr,
+ const sal_Int32* pLower = nullptr);
attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute(
const SfxItemSet& rSet);
@@ -112,10 +112,10 @@ namespace drawinglayer
attribute::SdrFillTextAttribute createNewSdrFillTextAttribute(
const SfxItemSet& rSet,
const SdrText* pSdrText,
- const sal_Int32* pLeft = 0,
- const sal_Int32* pUpper = 0,
- const sal_Int32* pRight = 0,
- const sal_Int32* pLower = 0);
+ const sal_Int32* pLeft = nullptr,
+ const sal_Int32* pUpper = nullptr,
+ const sal_Int32* pRight = nullptr,
+ const sal_Int32* pLower = nullptr);
// helpers
void calculateRelativeCornerRadius(
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index 9026130c3ad7..ccc3b84d5e25 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -39,10 +39,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/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index efdcbdcb06e0..80ae6abd2f2d 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -62,11 +62,11 @@ namespace sdr
// Test changeability for a single item. If a implementation wants to prevent
// changing an item it should override this method.
- virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const = 0;
+ virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const = 0;
// Do the internal ItemChange. If only nWhich is given, the item needs to be cleared.
// Also needs to handle if nWhich and pNewItem is 0, which means to clear all items.
- virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) = 0;
+ virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) = 0;
// Called after ItemChange() is done for all items. Allows local reactions on
// specific item changes
@@ -146,7 +146,7 @@ namespace sdr
// Move local items to a new ItemPool.
// Override this to do it for hierarchical objects like e.g. groups.
- virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
+ virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = nullptr);
// Set new model.
virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel);
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 23fa8c13e070..d1a87a24dc74 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -66,7 +66,7 @@ public:
SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) override;
// slots
- SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = 0 );
+ SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr );
SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId );
SVX_DLLPRIVATE void onSelect( sal_uInt16 nSId );
SVX_DLLPRIVATE void onFormatTable( SfxRequest& rReq );
@@ -134,7 +134,7 @@ private:
SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow );
- SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 );
+ SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent = nullptr, sal_uInt16 nAction = 0 );
SVX_DLLPRIVATE bool StopTextEdit();
SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow );