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 /idl/source/objects/slot.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 'idl/source/objects/slot.cxx')
| -rw-r--r-- | idl/source/objects/slot.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index a4df0c89dbb1..d72e996eba68 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -110,12 +110,12 @@ OString SvMetaSlot::GetMangleName() const /** reference disbandment **/ SvMetaType * SvMetaSlot::GetSlotType() const { - if( aSlotType.Is() || !GetRef() ) return aSlotType; + if( aSlotType.Is() || !GetRef() ) return aSlotType.get(); return static_cast<SvMetaSlot *>(GetRef())->GetSlotType(); } SvMetaAttribute * SvMetaSlot::GetMethod() const { - if( aMethod.Is() || !GetRef() ) return aMethod; + if( aMethod.Is() || !GetRef() ) return aMethod.get(); return static_cast<SvMetaSlot *>(GetRef())->GetMethod(); } const OString& SvMetaSlot::GetGroupId() const @@ -510,7 +510,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, xEnumSlot->SetEnumValue(enumValue); if ( !pFirstEnumSlot || xEnumSlot->GetSlotId().GetValue() < pFirstEnumSlot->GetSlotId().GetValue() ) - pFirstEnumSlot = xEnumSlot; + pFirstEnumSlot = xEnumSlot.get(); // insert the created slave as well xEnumSlot->Insert( rList, rPrefix, rBase); |