remove unused Cachable keyword from SDI files

Change-Id: I60c423b799f34f79f58bc39cf7ea616ec4f5d16a
Reviewed-on: https://gerrit.libreoffice.org/22096
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 2 insertions, 28 deletions

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ab12cb72b904..f3f30cc18d7a 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -43,7 +43,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_Get;
     SvStringHashEntryRef MM_Set;
     SvStringHashEntryRef MM_SlotId;
-    SvStringHashEntryRef MM_Cachable;
     SvStringHashEntryRef MM_Volatile;
     SvStringHashEntryRef MM_Toggle;
     SvStringHashEntryRef MM_AutoUpdate;
@@ -147,7 +146,6 @@ HASH_INLINE(shell)
 HASH_INLINE(Get)
 HASH_INLINE(Set)
 HASH_INLINE(SlotId)
-HASH_INLINE(Cachable)
 HASH_INLINE(Volatile)
 HASH_INLINE(Toggle)
 HASH_INLINE(AutoUpdate)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 165388bbfc7f..c9c09a27c091 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -36,7 +36,6 @@ class SvMetaSlot : public SvMetaAttribute
     SvBOOL          aGet;
     SvBOOL          aSet;
 
-    SvBOOL          aCachable;  // exclusive
     SvBOOL          aVolatile;
     SvBOOL          aToggle;
     SvBOOL          aAutoUpdate;
@@ -76,17 +75,9 @@ class SvMetaSlot : public SvMetaAttribute
     void            SetEnumValue(SvMetaEnumValue *p)
                     { pEnumValue = p; }
 protected:
-    void    SetCachable( bool bSet )
-            {
-                aCachable = bSet;
-                if( bSet )
-                    aVolatile = false;
-            }
     void    SetVolatile( bool bSet )
             {
                 aVolatile = bSet;
-                if( bSet )
-                    aCachable = false;
             }
     void    SetToggle( bool bSet )
             {
@@ -164,7 +155,6 @@ public:
     const OString&     GetDefault() const;
     const OString&     GetDisableFlags() const;
     bool                GetPseudoSlots() const;
-    bool                GetCachable() const;
     bool                GetVolatile() const;
     bool                GetToggle() const;
     bool                GetAutoUpdate() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 9f0e03677de6..4d5782fdf333 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -34,8 +34,7 @@ SvMetaObject *SvMetaSlot::MakeClone() const
 }
 
 SvMetaSlot::SvMetaSlot()
-    : aCachable( true, false )
-    , aSynchron( true, false )
+    : aSynchron( true, false )
     , aRecordPerSet( true, false )
     , aRecordAbsolute( false, false )
     , pLinkedSlot(nullptr)
@@ -47,7 +46,6 @@ SvMetaSlot::SvMetaSlot()
 
 SvMetaSlot::SvMetaSlot( SvMetaType * pType )
     : SvMetaAttribute( pType )
-    , aCachable( true, false )
     , aSynchron( true, false )
     , aRecordPerSet( true, false )
     , aRecordAbsolute( false, false )
@@ -133,17 +131,10 @@ bool SvMetaSlot::GetPseudoSlots() const
     if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
     return static_cast<SvMetaSlot *>(GetRef())->GetPseudoSlots();
 }
-bool SvMetaSlot::GetCachable() const
-{
-    // Cachable and Volatile are exclusive
-    if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() )
-         return aCachable;
-    return static_cast<SvMetaSlot *>(GetRef())->GetCachable();
-}
 bool SvMetaSlot::GetVolatile() const
 {
     // Cachable and Volatile are exclusive
-    if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() )
+    if( !GetRef() || aVolatile.IsSet() )
         return aVolatile;
     return static_cast<SvMetaSlot *>(GetRef())->GetVolatile();
 }
@@ -295,8 +286,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                     rInStm.GetToken().GetColumn() );
     }
 
-    if( aCachable.ReadSvIdl( SvHash_Cachable(), rInStm ) )
-        SetCachable( aCachable ), bOk = true;
     if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
         SetVolatile( aVolatile ), bOk = true;
     if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
@@ -826,8 +815,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
     WriteTab( rOutStm, 4 );
 
     // write flags
-    if( GetCachable() )
-        rOutStm.WriteCharPtr( MakeSlotName( SvHash_Cachable() ).getStr() ).WriteChar( '|' );
     if( GetVolatile() )
         rOutStm.WriteCharPtr( MakeSlotName( SvHash_Volatile() ).getStr() ).WriteChar( '|' );
     if( GetToggle() )
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 6665fcc3c0e7..c5d1c7658efd 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -71,7 +71,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     , MM_Get( INS( "Get" ) )
     , MM_Set( INS( "Set" ) )
     , MM_SlotId( INS( "SlotId" ) )
-    , MM_Cachable( INS( "Cachable" ) )
     , MM_Toggle( INS( "Toggle" ) )
     , MM_AutoUpdate( INS( "AutoUpdate" ) )
     , MM_Synchron( INS( "Synchron" ) )