diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-08 10:58:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:38 +0200 |
commit | 1795bb2fefe29ff0a46497918b5c571f9d541e5a (patch) | |
tree | 6160e6954dccac492437dae4be90befebbcf41f8 /idl | |
parent | b2c7ea1a22eb2158d3e40351c066ac174f61eb55 (diff) |
ReadonlyDoc only applies to Slot's
so move it down from SvMetaAttribute to SvMetaSlot
Change-Id: I3a433d9a1cee0a5a9f52b57c6cd16b16198dade1
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/slot.hxx | 2 | ||||
-rw-r--r-- | idl/inc/types.hxx | 2 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 9 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 9 |
4 files changed, 11 insertions, 11 deletions
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index b3c096882cc8..94fef1c99696 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -55,6 +55,7 @@ class SvMetaSlot : public SvMetaAttribute SvMetaSlot* pNextSlot; sal_uLong nListPos; SvMetaEnumValue* pEnumValue; + SvBOOL aReadOnlyDoc; void WriteSlot( const OString& rShellName, sal_uInt16 nCount, const OString& rSlotId, @@ -136,6 +137,7 @@ public: bool GetContainer() const; bool GetImageRotation() const; bool GetImageReflection() const; + bool GetReadOnlyDoc() const; sal_uLong GetListPos() const { return nListPos; } diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 894707361df4..1f30f90f4791 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -36,7 +36,6 @@ class SvMetaAttribute : public SvMetaReference tools::SvRef<SvMetaType> aType; SvIdentifier aSlotId; SvBOOL aExport; - SvBOOL aReadOnlyDoc; protected: virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, @@ -50,7 +49,6 @@ public: const SvIdentifier & GetSlotId() const; bool GetExport() const; bool GetHidden() const; - bool GetReadOnlyDoc() const; SvMetaType * GetType() const; virtual bool IsMethod() const; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 1a3f65caf393..7ac6c72c3987 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -40,6 +40,7 @@ SvMetaSlot::SvMetaSlot() , pNextSlot(nullptr) , nListPos(0) , pEnumValue(nullptr) + , aReadOnlyDoc ( true, false ) { } @@ -51,9 +52,16 @@ SvMetaSlot::SvMetaSlot( SvMetaType * pType ) , pNextSlot(nullptr) , nListPos(0) , pEnumValue(nullptr) + , aReadOnlyDoc ( true, false ) { } +bool SvMetaSlot::GetReadOnlyDoc() const +{ + if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc; + return static_cast<SvMetaSlot *>(GetRef())->GetReadOnlyDoc(); +} + bool SvMetaSlot::IsVariable() const { return SvMetaAttribute::IsVariable(); @@ -220,6 +228,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm ); bOk |= aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm ); bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm ); + bOk |= aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), 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 baaf5e34b140..84f6e55cd715 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -31,14 +31,12 @@ SvMetaAttribute::SvMetaAttribute() : aExport( true, false ) - , aReadOnlyDoc ( true, false ) { } SvMetaAttribute::SvMetaAttribute( SvMetaType * pType ) : aType( pType ) , aExport( true, false ) - , aReadOnlyDoc ( true, false) { } @@ -71,12 +69,6 @@ bool SvMetaAttribute::GetHidden() const return static_cast<SvMetaAttribute *>(GetRef())->GetHidden(); } -bool SvMetaAttribute::GetReadOnlyDoc() const -{ - if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc; - return static_cast<SvMetaSlot *>(GetRef())->GetReadOnlyDoc(); -} - bool SvMetaAttribute::IsMethod() const { SvMetaType * pType = GetType(); @@ -152,7 +144,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase, { SvMetaReference::ReadAttributesSvIdl( rBase, rInStm ); aExport.ReadSvIdl( SvHash_Export(), rInStm ); - aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm ); } sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) |