summaryrefslogtreecommitdiff
path: root/svx/source/inc
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 /svx/source/inc
parent28f4bee7bd7378141d8569186162e1a3166eb012 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx4
-rw-r--r--svx/source/inc/delayedevent.hxx2
-rw-r--r--svx/source/inc/filtnav.hxx10
-rw-r--r--svx/source/inc/fmexpl.hxx8
-rw-r--r--svx/source/inc/fmitems.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx4
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/inc/formcontrolling.hxx2
-rw-r--r--svx/source/inc/gridcell.hxx30
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx4
10 files changed, 34 insertions, 34 deletions
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index cb59c82d18b8..f711998f975c 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -88,8 +88,8 @@ public:
SvxGraphCtrlAccessibleContext(
const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
GraphCtrl& rRepresentation,
- const OUString* pName = NULL,
- const OUString* pDescription = NULL );
+ const OUString* pName = nullptr,
+ const OUString* pDescription = nullptr );
void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ) override;
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index d5a33dd6ecfc..4ebaff8eb0e6 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -40,7 +40,7 @@ namespace svxform
public:
DelayedEvent( const Link<void*,void>& _rHandler )
:m_aHandler( _rHandler )
- ,m_nEventId( 0 )
+ ,m_nEventId( nullptr )
{
}
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index d00a9676587e..891d904928a0 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -63,7 +63,7 @@ class FmFilterData
public:
TYPEINFO();
- FmFilterData(FmParentData* pParent = NULL, const OUString& rText = OUString())
+ FmFilterData(FmParentData* pParent = nullptr, const OUString& rText = OUString())
:m_pParent( pParent )
,m_aText( rText )
{}
@@ -125,7 +125,7 @@ class FmFilterItems : public FmParentData
{
public:
TYPEINFO_OVERRIDE();
- FmFilterItems() : FmParentData(NULL, OUString()) {}
+ FmFilterItems() : FmParentData(nullptr, OUString()) {}
FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {}
FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const;
@@ -176,7 +176,7 @@ public:
void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem);
void SetTextForItem(FmFilterItem* pItem, const OUString& rText);
- FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? static_cast<FmFormItem*>(m_pCurrentItems->GetParent()) : NULL;}
+ FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? static_cast<FmFormItem*>(m_pCurrentItems->GetParent()) : nullptr;}
FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;}
void SetCurrentItems(FmFilterItems* pCurrent);
@@ -301,8 +301,8 @@ private:
* If <TRUE/> the items will not be removed from the model, otherwise they will.
*/
void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems, bool _bCopy = false);
- SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = NULL);
- SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = NULL);
+ SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = nullptr);
+ SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = nullptr);
using SvTreeListBox::Select;
using SvTreeListBox::ExecuteDrop;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 79c53143fe79..f7a7d1abc922 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -202,7 +202,7 @@ public:
virtual ~FmEntryDataList();
FmEntryData* at( size_t Index )
- { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : NULL; }
+ { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : nullptr; }
size_t size() const { return maEntryDataList.size(); }
FmEntryData* remove( FmEntryData* pItem );
@@ -245,7 +245,7 @@ public:
FmFormData(
const css::uno::Reference< css::form::XForm >& _rxForm,
const ImageList& _rNormalImages,
- FmFormData* _pParent = NULL
+ FmFormData* _pParent = nullptr
);
FmFormData( const FmFormData& rFormData );
@@ -324,7 +324,7 @@ namespace svxform
void UnLock() { m_nLocks--; }
bool IsLocked() const { return m_nLocks != 0; }
bool CanUndo() const { return m_bCanUndo; }
- void ReleaseModel() { m_pNavModel = NULL; }
+ void ReleaseModel() { m_pNavModel = nullptr; }
protected:
void Insert(const css::uno::Reference< css::uno::XInterface >& xIface, sal_Int32 nIndex);
void Remove( const css::uno::Reference< css::uno::XInterface >& _rxElement );
@@ -529,7 +529,7 @@ namespace svxform
sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
// check if a cut, copy, or drag operation can be started in the current situation
- bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = NULL );
+ bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = nullptr );
// check if a paste with the current clipboard content can be accepted
bool implAcceptPaste( );
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 530697b3feeb..a9f0d3e40527 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -41,7 +41,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) 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;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 1002a12bb8a8..ccacff49ea5a 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -113,7 +113,7 @@ struct FmLoadAction
ImplSVEvent * nEventId;
sal_uInt16 nFlags;
- FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { }
+ FmLoadAction( ) : pPage( nullptr ), nEventId( nullptr ), nFlags( 0 ) { }
FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ImplSVEvent * _nEventId )
:pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags )
{
@@ -527,7 +527,7 @@ public:
/** determines whether the current form slot is currently enabled
*/
- SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState = NULL );
+ SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState = nullptr );
protected:
DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void );
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index c1ad869cc57b..77d60fa08479 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -277,7 +277,7 @@ private:
const OUString& _rFieldPostfix,
SdrUnoObj*& _rpLabel,
SdrUnoObj*& _rpControl,
- const css::uno::Reference< css::sdbc::XDataSource >& _rxDataSource = NULL,
+ const css::uno::Reference< css::sdbc::XDataSource >& _rxDataSource = nullptr,
const OUString& _rDataSourceName = OUString(),
const OUString& _rCommand = OUString(),
const sal_Int32 _nCommandType = -1
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f6b9b519e845..ffbed7f7c01c 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -104,7 +104,7 @@ namespace svx
~ControllerFeatures();
/// checks whether the instance is properly assigned to a form and/or controller
- inline bool isAssigned( ) const { return m_pImpl != NULL; }
+ inline bool isAssigned( ) const { return m_pImpl != nullptr; }
/** assign to a controller
*/
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 2cc5c0fe92ab..44ca4d57e391 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -97,7 +97,7 @@ private:
// used by locked columns
public:
DbGridColumn(sal_uInt16 _nId, DbGridControl& rParent)
- :m_pCell(NULL)
+ :m_pCell(nullptr)
,m_rParent(rParent)
,m_nLastVisibleWidth(-1)
,m_nFormatKey(0)
@@ -287,7 +287,7 @@ public:
bool Commit();
// Formatting the field data to output text
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) = 0;
virtual void Update(){}
// Refresh the control by the field data
@@ -399,7 +399,7 @@ public:
bool IsSimpleEdit() const { return m_bIsSimpleEdit; }
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
virtual void PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect,
@@ -429,7 +429,7 @@ public:
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -455,7 +455,7 @@ public:
virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
const css::uno::Reference< css::sdb::XColumn >& _rxField,
const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
protected:
// DbCellControl
@@ -472,7 +472,7 @@ public:
DbComboBox(DbGridColumn& _rColumn);
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -500,7 +500,7 @@ public:
DbListBox(DbGridColumn& _rColumn);
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -524,7 +524,7 @@ public:
TYPEINFO_OVERRIDE();
DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext );
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
@@ -574,7 +574,7 @@ class DbDateField : public DbSpinField
public:
TYPEINFO_OVERRIDE();
DbDateField(DbGridColumn& _rColumn);
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
protected:
@@ -599,7 +599,7 @@ class DbTimeField : public DbSpinField
public:
TYPEINFO_OVERRIDE();
DbTimeField(DbGridColumn& _rColumn);
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
protected:
@@ -626,7 +626,7 @@ class DbCurrencyField : public DbSpinField
public:
TYPEINFO_OVERRIDE();
DbCurrencyField(DbGridColumn& _rColumn);
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
double GetCurrency(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const;
@@ -653,7 +653,7 @@ class DbNumericField : public DbSpinField
public:
TYPEINFO_OVERRIDE();
DbNumericField(DbGridColumn& _rColumn);
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
protected:
@@ -694,7 +694,7 @@ public:
virtual ::svt::CellControllerRef CreateController() const override;
virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect) override;
virtual void Update() override;
- virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override;
+ virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
const OUString& GetText() const {return m_aText;}
@@ -873,7 +873,7 @@ public:
OUString GetText(const css::uno::Reference< css::sdb::XColumn >& _rxField,
const css::uno::Reference< css::util::XNumberFormatter >& xFormatter,
- Color** ppColor = NULL)
+ Color** ppColor = nullptr)
{return m_pCellControl->GetFormatText(_rxField, xFormatter, ppColor);}
};
@@ -1090,7 +1090,7 @@ protected:
virtual ~FmXFilterCell();
public:
TYPEINFO_OVERRIDE();
- FmXFilterCell(DbGridColumn* pColumn = NULL, DbCellControl* pControl = NULL);
+ FmXFilterCell(DbGridColumn* pColumn = nullptr, DbCellControl* pControl = nullptr);
DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell)
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index e7a6ef1e7ed5..c0082a6be418 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -75,8 +75,8 @@ public:
SvxRectCtlAccessibleContext(
const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
SvxRectCtl& rRepresentation,
- const OUString* pName = NULL,
- const OUString* pDescription = NULL );
+ const OUString* pName = nullptr,
+ const OUString* pDescription = nullptr );
protected:
virtual ~SvxRectCtlAccessibleContext();
public: