diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/lnkbase.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/editbrowsebox.hxx | 4 | ||||
| -rw-r--r-- | include/svx/gridctrl.hxx | 2 | ||||
| -rw-r--r-- | include/tools/ref.hxx | 15 |
4 files changed, 12 insertions, 11 deletions
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 5ad572947d1b..ceca0fd2aeab 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -103,7 +103,7 @@ protected: SvLinkSource* GetRealObject() { - if( !xObj.Is() ) + if( !xObj.is() ) GetRealObject_(); return xObj.get(); } diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index c3d54e600b98..d11dcafb07f5 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -555,7 +555,7 @@ namespace svt // return sal_False prevents leaving the cell virtual bool SaveRow(); // commit the current row - virtual bool IsModified() const {return aController.Is() && aController->IsModified();} + virtual bool IsModified() const {return aController.is() && aController->IsModified();} virtual CellController* GetController(long nRow, sal_uInt16 nCol); virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); @@ -588,7 +588,7 @@ namespace svt virtual ~EditBrowseBox() override; virtual void dispose() override; - bool IsEditing() const {return aController.Is();} + bool IsEditing() const {return aController.is();} void InvalidateStatusCell(long nRow) {RowModified(nRow, 0);} void InvalidateHandleColumn(); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 51c35259be89..9a06bddb6d59 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -564,7 +564,7 @@ protected: OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const; virtual void DeleteSelectedRows(); - static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.Is() && _xRow->IsValid(); } + static bool IsValid(const DbGridRowRef& _xRow) { return _xRow.is() && _xRow->IsValid(); } // row which is currently being appended bool IsCurrentAppending() const; diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index 97a5b362254e..2ec345c40b56 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -56,7 +56,7 @@ public: if (pObj != nullptr) pObj->ReleaseRef(); } - void Clear() + void clear() { if (pObj != nullptr) { T * pRefObj = pObj; @@ -88,9 +88,9 @@ public: return *this; } - bool Is() const { return pObj != nullptr; } + bool is() const { return pObj != nullptr; } - explicit operator bool() const { return Is(); } + explicit operator bool() const { return is(); } T * get() const { return pObj; } @@ -219,12 +219,13 @@ public: { if( pObj ) _xHdl = pObj->GetHdl(); } inline SvCompatWeakRef& operator = ( T * pObj ) { _xHdl = pObj ? pObj->GetHdl() : nullptr; return *this; } - inline bool Is() const - { return _xHdl.Is() && _xHdl->GetObj(); } + inline bool is() const + { return _xHdl.is() && _xHdl->GetObj(); } + explicit operator bool() const { return is(); } inline T* operator -> () const - { return _xHdl.Is() ? _xHdl->GetObj() : nullptr; } + { return _xHdl.is() ? _xHdl->GetObj() : nullptr; } inline operator T* () const - { return _xHdl.Is() ? _xHdl->GetObj() : nullptr; } + { return _xHdl.is() ? _xHdl->GetObj() : nullptr; } }; #endif |