diff options
| author | Noel Grandin <noel@peralex.com> | 2016-10-11 08:15:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-11 08:43:33 +0000 |
| commit | d0304a8f57b3fe0065193a2a3f7089f414b1ffd9 (patch) | |
| tree | 6ac18f078dc91b56ae7db204028c15089113339c /rsc/inc | |
| parent | 52dfb06b194bf890510352a98540c64bc3d44b70 (diff) | |
remove some conversion operator methods
which, in these cases, only serve to make the code harder to read
Change-Id: Ic9bcf42545b4fcfd60a535fb63956092d392f469
Reviewed-on: https://gerrit.libreoffice.org/29685
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'rsc/inc')
| -rw-r--r-- | rsc/inc/rscclobj.hxx | 2 | ||||
| -rw-r--r-- | rsc/inc/rscdef.hxx | 1 | ||||
| -rw-r--r-- | rsc/inc/rscerror.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx index eeb694f25cb7..7bbc5f1c1f46 100644 --- a/rsc/inc/rscclobj.hxx +++ b/rsc/inc/rscclobj.hxx @@ -42,7 +42,7 @@ public: sal_uLong GetFileKey() const { return lFileKey; }; ObjNode* Search( const RscId &rName ) const //< search the index in the b-tree { - return static_cast<ObjNode *>(IdNode::Search( rName )); + return static_cast<ObjNode *>(IdNode::Search( rName.GetNumber() )); } bool Insert( ObjNode* pTN ) //< insert a new node in the b-tree diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index 279be92cbcf1..c9a2f9e6af45 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -103,7 +103,6 @@ public: RscId& operator = ( const RscId& rRscId ); static void SetNames( bool bSet = true ); - operator sal_Int32() const; // returns the number OString GetName() const; // returns the define bool operator < ( const RscId& rRscId ) const; bool operator > ( const RscId& rRscId ) const; diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 758cf967a171..f0f984589d44 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -93,11 +93,11 @@ public: ERRTYPE( sal_uInt32 nErr ) { nError = nErr; } ERRTYPE( const ERRTYPE & ) = default; ERRTYPE& operator = ( const ERRTYPE & rError ); - operator sal_uInt32() const { return nError; } + sal_uInt32 GetError() const { return nError; } bool IsError() const { return nError <= ERR_ERROREND; } bool IsOk() const { return !IsError(); } bool IsWarning() const { return nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND;} - void Clear(){ nError = ERR_OK; } + void Clear() { nError = ERR_OK; } }; // Rsc Error |