summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-04 12:47:08 +0200
committerNoel Grandin <noel@peralex.com>2016-02-05 09:35:28 +0200
commit8cb1c1ec2bd5a48e17fa6474336a3e1f7b092739 (patch)
tree7ad6cfa538b7756834e6ffa4dd1cc06daf415be5 /idl
parent353b9b43da8dadf35012d658465bc957ceb242ce (diff)
remove unused SlotId/Volatile from .SDI files
Change-Id: I29f039c2fec8433fa062c603b64afffa60e7b0d0
Diffstat (limited to 'idl')
-rw-r--r--idl/inc/globals.hxx4
-rw-r--r--idl/inc/slot.hxx5
-rw-r--r--idl/source/objects/slot.cxx11
-rw-r--r--idl/source/objects/types.cxx1
-rw-r--r--idl/source/prj/globals.cxx1
5 files changed, 0 insertions, 22 deletions
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index f91b7c1ed487..47776cdee084 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -32,8 +32,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_HelpText;
SvStringHashEntryRef MM_void;
SvStringHashEntryRef MM_shell;
- SvStringHashEntryRef MM_SlotId;
- SvStringHashEntryRef MM_Volatile;
SvStringHashEntryRef MM_Toggle;
SvStringHashEntryRef MM_AutoUpdate;
SvStringHashEntryRef MM_Asynchron;
@@ -112,8 +110,6 @@ HASH_INLINE(module)
HASH_INLINE(interface)
HASH_INLINE(HelpText)
HASH_INLINE(shell)
-HASH_INLINE(SlotId)
-HASH_INLINE(Volatile)
HASH_INLINE(Toggle)
HASH_INLINE(AutoUpdate)
HASH_INLINE(Asynchron)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 7be120563d6a..ab38cbd508eb 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -33,7 +33,6 @@ class SvMetaSlot : public SvMetaAttribute
SvIdentifier aStateMethod;
SvBOOL aPseudoSlots;
- SvBOOL aVolatile;
SvBOOL aToggle;
SvBOOL aAutoUpdate;
@@ -68,10 +67,6 @@ class SvMetaSlot : public SvMetaAttribute
void SetEnumValue(SvMetaEnumValue *p)
{ pEnumValue = p; }
protected:
- void SetVolatile( bool bSet )
- {
- aVolatile = bSet;
- }
void SetToggle( bool bSet )
{
aToggle = bSet;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 26ceba001413..c940902efb8a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -124,13 +124,6 @@ bool SvMetaSlot::GetPseudoSlots() const
if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
return static_cast<SvMetaSlot *>(GetRef())->GetPseudoSlots();
}
-bool SvMetaSlot::GetVolatile() const
-{
- // Cachable and Volatile are exclusive
- if( !GetRef() || aVolatile.IsSet() )
- return aVolatile;
- return static_cast<SvMetaSlot *>(GetRef())->GetVolatile();
-}
bool SvMetaSlot::GetToggle() const
{
if( aToggle.IsSet() || !GetRef() ) return aToggle;
@@ -239,8 +232,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
bOk |= aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm );
bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm );
- if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
- SetVolatile( aVolatile ), bOk = true;
if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
SetToggle( aToggle ), bOk = true;
if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
@@ -762,8 +753,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
WriteTab( rOutStm, 4 );
// write flags
- if( GetVolatile() )
- rOutStm.WriteCharPtr( MakeSlotName( SvHash_Volatile() ).getStr() ).WriteChar( '|' );
if( GetToggle() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_Toggle() ).getStr() ).WriteChar( '|' );
if( GetAutoUpdate() )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index fb229a956c2e..704bbb41061c 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -155,7 +155,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
- aSlotId.ReadSvIdl( rBase, SvHash_SlotId(), rInStm );
aExport.ReadSvIdl( SvHash_Export(), rInStm );
aHidden.ReadSvIdl( SvHash_Hidden(), rInStm );
aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 3ecc2f42f77e..bdc1b4c649f0 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -60,7 +60,6 @@ SvGlobalHashNames::SvGlobalHashNames()
, MM_HelpText( INS( "HelpText" ) )
, MM_void( INS( "void" ) )
, MM_shell( INS( "shell" ) )
- , MM_SlotId( INS( "SlotId" ) )
, MM_Toggle( INS( "Toggle" ) )
, MM_AutoUpdate( INS( "AutoUpdate" ) )
, MM_Asynchron( INS( "Asynchron" ) )