diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-08 11:13:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:38 +0200 |
commit | 760b86a75746968f8cd77c6aaae871af09aec47c (patch) | |
tree | 08e7b080a9dc65a7a57becd36b892a3771a4d0bc /idl/source/objects | |
parent | 1795bb2fefe29ff0a46497918b5c571f9d541e5a (diff) |
Export attribute only applies to SvMetaSlot, so move it down
Change-Id: I686fd2148d4cf03acbef892223c3ed2b1966e73a
Diffstat (limited to 'idl/source/objects')
-rw-r--r-- | idl/source/objects/slot.cxx | 20 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 7ac6c72c3987..f94ad2c4877b 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -41,6 +41,7 @@ SvMetaSlot::SvMetaSlot() , nListPos(0) , pEnumValue(nullptr) , aReadOnlyDoc ( true, false ) + , aExport( true, false ) { } @@ -53,6 +54,7 @@ SvMetaSlot::SvMetaSlot( SvMetaType * pType ) , nListPos(0) , pEnumValue(nullptr) , aReadOnlyDoc ( true, false ) + , aExport( true, false ) { } @@ -62,6 +64,23 @@ bool SvMetaSlot::GetReadOnlyDoc() const return static_cast<SvMetaSlot *>(GetRef())->GetReadOnlyDoc(); } +bool SvMetaSlot::GetExport() const +{ + if( aExport.IsSet() || !GetRef() ) return aExport; + return static_cast<SvMetaSlot *>(GetRef())->GetExport(); +} + +bool SvMetaSlot::GetHidden() const +{ + // when export is set, but hidden is not the default is used + if ( aExport.IsSet() ) + return !aExport; + else if( !GetRef() ) + return false; + else + return static_cast<SvMetaSlot *>(GetRef())->GetHidden(); +} + bool SvMetaSlot::IsVariable() const { return SvMetaAttribute::IsVariable(); @@ -229,6 +248,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, bOk |= aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm ); bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm ); bOk |= aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm ); + bOk |= aExport.ReadSvIdl( SvHash_Export(), rInStm ); if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) ) SetToggle( aToggle ), bOk = true; diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 84f6e55cd715..42deae19d378 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -30,13 +30,11 @@ #include <database.hxx> SvMetaAttribute::SvMetaAttribute() - : aExport( true, false ) { } SvMetaAttribute::SvMetaAttribute( SvMetaType * pType ) : aType( pType ) - , aExport( true, false ) { } @@ -52,23 +50,6 @@ const SvIdentifier & SvMetaAttribute::GetSlotId() const return static_cast<SvMetaAttribute *>(GetRef())->GetSlotId(); } -bool SvMetaAttribute::GetExport() const -{ - if( aExport.IsSet() || !GetRef() ) return aExport; - return static_cast<SvMetaAttribute *>(GetRef())->GetExport(); -} - -bool SvMetaAttribute::GetHidden() const -{ - // when export is set, but hidden is not the default is used - if ( aExport.IsSet() ) - return !aExport; - else if( !GetRef() ) - return false; - else - return static_cast<SvMetaAttribute *>(GetRef())->GetHidden(); -} - bool SvMetaAttribute::IsMethod() const { SvMetaType * pType = GetType(); @@ -143,7 +124,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { SvMetaReference::ReadAttributesSvIdl( rBase, rInStm ); - aExport.ReadSvIdl( SvHash_Export(), rInStm ); } sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) |