From 71f2f88c1938f3fa7a80881e45daf3b5a8321172 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 4 Feb 2016 12:57:22 +0200
Subject: remove unused int/char/map/ItemName/AllConfig from .SDI files

Change-Id: Iaf2633d7591b705bd0e84a376e06a01c2ec22b9b
---
 idl/inc/globals.hxx         | 8 --------
 idl/inc/slot.hxx            | 6 ------
 idl/source/objects/slot.cxx | 3 ---
 idl/source/prj/database.cxx | 2 --
 idl/source/prj/globals.cxx  | 5 -----
 5 files changed, 24 deletions(-)

(limited to 'idl')

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 47776cdee084..74016d6b6a85 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -44,18 +44,14 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_INT16;
     SvStringHashEntryRef MM_UINT32;
     SvStringHashEntryRef MM_INT32;
-    SvStringHashEntryRef MM_int;
     SvStringHashEntryRef MM_BOOL;
-    SvStringHashEntryRef MM_char;
     SvStringHashEntryRef MM_BYTE;
     SvStringHashEntryRef MM_float;
     SvStringHashEntryRef MM_double;
     SvStringHashEntryRef MM_item;
     SvStringHashEntryRef MM_PseudoSlots;
-    SvStringHashEntryRef MM_map;
     SvStringHashEntryRef MM_import;
     SvStringHashEntryRef MM_SlotIdFile;
-    SvStringHashEntryRef MM_ItemName;
     SvStringHashEntryRef MM_include;
     SvStringHashEntryRef MM_ExecMethod;
     SvStringHashEntryRef MM_StateMethod;
@@ -66,7 +62,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_MenuConfig;
     SvStringHashEntryRef MM_ToolBoxConfig;
     SvStringHashEntryRef MM_AccelConfig;
-    SvStringHashEntryRef MM_AllConfig;
     SvStringHashEntryRef MM_FastCall;
     SvStringHashEntryRef MM_SbxObject;
     SvStringHashEntryRef MM_Container;
@@ -122,9 +117,7 @@ HASH_INLINE(UINT16)
 HASH_INLINE(INT16)
 HASH_INLINE(UINT32)
 HASH_INLINE(INT32)
-HASH_INLINE(int)
 HASH_INLINE(BOOL)
-HASH_INLINE(char)
 HASH_INLINE(BYTE)
 HASH_INLINE(item)
 HASH_INLINE(PseudoSlots)
@@ -142,7 +135,6 @@ HASH_INLINE(define)
 HASH_INLINE(MenuConfig)
 HASH_INLINE(ToolBoxConfig)
 HASH_INLINE(AccelConfig)
-HASH_INLINE(AllConfig)
 HASH_INLINE(FastCall)
 HASH_INLINE(SbxObject)
 HASH_INLINE(Container)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index ab38cbd508eb..ff487a917de3 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -101,12 +101,6 @@ protected:
             }
     void    SetRecordAbsolute( bool bSet )
             { aRecordAbsolute = bSet; }
-    void    SetAllConfig( bool bSet )
-            {
-                aMenuConfig     = bSet;
-                aToolBoxConfig  = bSet;
-                aAccelConfig    = bSet;
-            }
 
 public:
             SvMetaObject *  MakeClone() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index c940902efb8a..69b70df60db7 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -254,9 +254,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     bOk |= aToolBoxConfig.ReadSvIdl( SvHash_ToolBoxConfig(), rInStm );
     bOk |= aAccelConfig.ReadSvIdl( SvHash_AccelConfig(), rInStm );
 
-    SvBOOL aAllConfig;
-    if( aAllConfig.ReadSvIdl( SvHash_AllConfig(), rInStm ) )
-        SetAllConfig( aAllConfig ), bOk = true;
     bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
     bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
     bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 0cb6e1e7bf84..4a08b70b922a 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -61,9 +61,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
         ADD_TYPE( INT16,     'h', "short", "Integer", "%" );
         ADD_TYPE( UINT32,    'l', "unsigned long", "Long", "&" );
         ADD_TYPE( INT32,     'l', "long", "Long", "&" );
-        ADD_TYPE( int,       'i', "int", "Integer", "%" );
         ADD_TYPE( BOOL,      'b', "unsigned char", "Boolean", "" );
-        ADD_TYPE( char,      'c', "char", "Integer", "%" );
         ADD_TYPE( BYTE,      'c', "unsigned char", "Integer", "%" );
         ADD_TYPE( float,     'f', "float", "Single", "!" );
         ADD_TYPE( double,    'F', "double", "Double", "#" );
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index bdc1b4c649f0..cb4f9672e939 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -72,18 +72,14 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(INT16)
     A_ENTRY(UINT32)
     A_ENTRY(INT32)
-    A_ENTRY(int)
     A_ENTRY(BOOL)
-    A_ENTRY(char)
     A_ENTRY(BYTE)
     A_ENTRY(float)
     A_ENTRY(double)
     A_ENTRY(item)
     A_ENTRY(PseudoSlots)
-    A_ENTRY(map)
     A_ENTRY(import)
     A_ENTRY(SlotIdFile)
-    A_ENTRY(ItemName)
     A_ENTRY(include)
     A_ENTRY(ExecMethod)
     A_ENTRY(StateMethod)
@@ -94,7 +90,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(MenuConfig)
     A_ENTRY(ToolBoxConfig)
     A_ENTRY(AccelConfig)
-    A_ENTRY(AllConfig)
     A_ENTRY(FastCall)
     A_ENTRY(SbxObject)
     A_ENTRY(Container)
-- 
cgit