diff options
author | Jacek Fraczek <fraczek.jacek@gmail.com> | 2016-10-05 22:00:51 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-10 08:48:30 +0000 |
commit | f004aa99514d385f3ee254bba735f5eaeb7d9ad8 (patch) | |
tree | aacd5792f553b8e9cbf029cc7e0797ed0dd423fe /basic/source/sbx/sbxvar.cxx | |
parent | 728c7327bd97602a38723553ed044ea4c01d13b2 (diff) |
tdf#89307: Removed SvRef::operator T*()
Conditional statements are using SvRef::Is() method.
Changed static_cast<T*>(svRef<T>) occurances to svRef.get().
Added operator == and != to SvRef.
SbxObject::Execute is using SbxVariableRef internally.
SbxObject::FindQualified is using SbxVariableRef internally.
Change-Id: I45b553e35d8fca9bf71163e6eefc60802a066395
Reviewed-on: https://gerrit.libreoffice.org/29621
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'basic/source/sbx/sbxvar.cxx')
-rw-r--r-- | basic/source/sbx/sbxvar.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index ff8c7e07fccc..27766dfc7fd4 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -148,7 +148,7 @@ SfxBroadcaster& SbxVariable::GetBroadcaster() SbxArray* SbxVariable::GetParameters() const { - return mpPar; + return mpPar.get(); } @@ -199,7 +199,7 @@ void SbxVariable::Broadcast( sal_uInt32 nHintId ) SbxInfo* SbxVariable::GetInfo() { - if( !pInfo ) + if( !pInfo.Is() ) { Broadcast( SBX_HINT_INFOWANTED ); if( pInfo.Is() ) @@ -207,7 +207,7 @@ SbxInfo* SbxVariable::GetInfo() SetModified( true ); } } - return pInfo; + return pInfo.get(); } void SbxVariable::SetInfo( SbxInfo* p ) @@ -239,7 +239,7 @@ const OUString& SbxVariable::GetName( SbxNameType t ) const // Request parameter-information (not for objects) const_cast<SbxVariable*>(this)->GetInfo(); // Append nothing, if it is a simple property (no empty brackets) - if (!pInfo || (pInfo->m_Params.empty() && GetClass() == SbxClassType::Property)) + if (!pInfo.Is() || (pInfo->m_Params.empty() && GetClass() == SbxClassType::Property)) { return maName; } |