diff options
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/globals.hxx | 2 | ||||
| -rw-r--r-- | idl/inc/slot.hxx | 10 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 17 | ||||
| -rw-r--r-- | idl/source/prj/command.cxx | 2 | ||||
| -rw-r--r-- | idl/source/prj/globals.cxx | 1 |
5 files changed, 3 insertions, 29 deletions
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index f3f30cc18d7a..8a82aee5c969 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -46,7 +46,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_Volatile; SvStringHashEntryRef MM_Toggle; SvStringHashEntryRef MM_AutoUpdate; - SvStringHashEntryRef MM_Synchron; SvStringHashEntryRef MM_Asynchron; SvStringHashEntryRef MM_RecordPerSet; SvStringHashEntryRef MM_RecordPerItem; @@ -149,7 +148,6 @@ HASH_INLINE(SlotId) HASH_INLINE(Volatile) HASH_INLINE(Toggle) HASH_INLINE(AutoUpdate) -HASH_INLINE(Synchron) HASH_INLINE(Asynchron) HASH_INLINE(RecordPerItem) HASH_INLINE(RecordPerSet) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index c9c09a27c091..6f12fcf68c19 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -40,7 +40,6 @@ class SvMetaSlot : public SvMetaAttribute SvBOOL aToggle; SvBOOL aAutoUpdate; - SvBOOL aSynchron; // exclusive SvBOOL aAsynchron; SvBOOL aRecordPerItem;// exclusive @@ -88,17 +87,9 @@ protected: aAutoUpdate = bSet; } - void SetSynchron( bool bSet ) - { - aSynchron = bSet; - if( bSet ) - aAsynchron = false; - } void SetAsynchron( bool bSet ) { aAsynchron = bSet; - if( bSet ) - aSynchron = false; } void SetRecordPerItem( bool bSet ) @@ -159,7 +150,6 @@ public: bool GetToggle() const; bool GetAutoUpdate() const; - bool GetSynchron() const; bool GetAsynchron() const; bool GetRecordPerItem() const; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 4d5782fdf333..fbb560fa6ba8 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -34,8 +34,7 @@ SvMetaObject *SvMetaSlot::MakeClone() const } SvMetaSlot::SvMetaSlot() - : aSynchron( true, false ) - , aRecordPerSet( true, false ) + : aRecordPerSet( true, false ) , aRecordAbsolute( false, false ) , pLinkedSlot(nullptr) , pNextSlot(nullptr) @@ -46,7 +45,6 @@ SvMetaSlot::SvMetaSlot() SvMetaSlot::SvMetaSlot( SvMetaType * pType ) : SvMetaAttribute( pType ) - , aSynchron( true, false ) , aRecordPerSet( true, false ) , aRecordAbsolute( false, false ) , pLinkedSlot(nullptr) @@ -148,17 +146,10 @@ bool SvMetaSlot::GetAutoUpdate() const if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate; return static_cast<SvMetaSlot *>(GetRef())->GetAutoUpdate(); } -bool SvMetaSlot::GetSynchron() const -{ - // Synchron and Asynchron are exclusive - if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() ) - return aSynchron; - return static_cast<SvMetaSlot *>(GetRef())->GetSynchron(); -} bool SvMetaSlot::GetAsynchron() const { // Synchron and Asynchron are exclusive - if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() ) + if( !GetRef() || aAsynchron.IsSet() ) return aAsynchron; return static_cast<SvMetaSlot *>(GetRef())->GetAsynchron(); } @@ -293,8 +284,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) ) SetAutoUpdate( aAutoUpdate ), bOk = true; - if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) ) - SetSynchron( aSynchron ), bOk = true; if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) ) SetAsynchron( aAsynchron ), bOk = true; @@ -821,8 +810,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, rOutStm.WriteCharPtr( MakeSlotName( SvHash_Toggle() ).getStr() ).WriteChar( '|' ); if( GetAutoUpdate() ) rOutStm.WriteCharPtr( MakeSlotName( SvHash_AutoUpdate() ).getStr() ).WriteChar( '|' ); - if( GetSynchron() ) - rOutStm.WriteCharPtr( MakeSlotName( SvHash_Synchron() ).getStr() ).WriteChar( '|' ); if( GetAsynchron() ) rOutStm.WriteCharPtr( MakeSlotName( SvHash_Asynchron() ).getStr() ).WriteChar( '|' ); if( GetRecordPerItem() ) diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index b1c87083f697..6e6afd3c8711 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -95,7 +95,7 @@ char const * SyntaxStrings[] = { "\t\tRecordPerSet*, RecordPerItem, RecordManual, NoRecord", "\t\tRecordAbsolute", "\t\tStateMethod = Identifier", -"\t\tSynchron*, Asynchron", +"\t\tAsynchron", "\t\tToggle", "\t']'\n", diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index c5d1c7658efd..b8357d8c5c0c 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -73,7 +73,6 @@ SvGlobalHashNames::SvGlobalHashNames() , MM_SlotId( INS( "SlotId" ) ) , MM_Toggle( INS( "Toggle" ) ) , MM_AutoUpdate( INS( "AutoUpdate" ) ) - , MM_Synchron( INS( "Synchron" ) ) , MM_Asynchron( INS( "Asynchron" ) ) A_ENTRY(RecordPerSet) A_ENTRY(RecordPerItem) |