idl/inc/basobj.hxx | 10 ----------
idl/inc/bastype.hxx | 4 ----
idl/inc/globals.hxx | 34 ----------------------------------
idl/inc/slot.hxx | 15 +--------------
idl/inc/types.hxx | 11 +----------
idl/source/objects/basobj.cxx | 9 ---------
idl/source/objects/module.cxx | 3 +--
idl/source/objects/slot.cxx | 21 ---------------------
idl/source/objects/types.cxx | 35 ++++-------------------------------
idl/source/prj/command.cxx | 2 +-
idl/source/prj/database.cxx | 25 -------------------------
idl/source/prj/globals.cxx | 20 +-------------------
include/sfx2/msg.hxx | 3 +--
sfx2/source/control/bindings.cxx | 23 ++---------------------
14 files changed, 12 insertions(+), 203 deletions(-)
New commits:
commit d932eb95f4009a34af85b063df11aac83368950a
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 13:18:36 2016 +0200
remove unused Hidden/Description/UnoName from .SDI files
Change-Id: I9660690b29da411dcdf148007242ffa944957f78
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index b89c62f..9639b87 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -89,7 +89,6 @@ class SvMetaObject : public SvRttiBase
protected:
SvString aName;
SvHelpText aHelpText;
- SvString aDescription;
bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
@@ -107,7 +106,6 @@ public:
virtual bool SetName( const OString& rName, SvIdlDataBase *
= nullptr );
virtual const SvString & GetName() const { return aName; }
virtual const SvString & GetHelpText() const { return aHelpText; }
- virtual const SvString& GetDescription() const{ return aDescription; }
virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -160,13 +158,6 @@ public:
: aRef->GetHelpText();
}
- const SvString & GetDescription() const override
- {
- return ( !aRef.Is()
- ||
!SvMetaObject::GetDescription().getString().isEmpty() )
- ? SvMetaObject::GetDescription()
- : aRef->GetDescription();
- }
SvMetaReference * GetRef() const { return aRef; }
void SetRef( SvMetaReference * pRef )
{ aRef = pRef; }
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 692f826..1bb5198 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -72,9 +72,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_SlotType;
SvStringHashEntryRef MM_ModulePrefix;
SvStringHashEntryRef MM_DisableFlags;
- SvStringHashEntryRef MM_Hidden;
- SvStringHashEntryRef MM_Description;
- SvStringHashEntryRef MM_UnoName;
SvGlobalHashNames();
};
@@ -143,9 +140,6 @@ HASH_INLINE(struct)
HASH_INLINE(SlotType)
HASH_INLINE(ModulePrefix)
HASH_INLINE(DisableFlags)
-HASH_INLINE(Hidden)
-HASH_INLINE(Description)
-HASH_INLINE(UnoName)
#endif // INCLUDED_IDL_INC_GLOBALS_HXX
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index ff487a9..cdcc14f 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -54,9 +54,8 @@ class SvMetaSlot : public SvMetaAttribute
SvString aDisableFlags;
SvMetaSlot* pLinkedSlot;
SvMetaSlot* pNextSlot;
- sal_uLong nListPos;
+ sal_uLong nListPos;
SvMetaEnumValue* pEnumValue;
- SvString aUnoName;
void WriteSlot( const OString& rShellName,
sal_uInt16 nCount, const OString& rSlotId,
@@ -133,7 +132,6 @@ public:
bool GetRecordAbsolute() const;
const OString& GetPseudoPrefix() const;
- const OString& GetUnoName() const;
bool GetMenuConfig() const;
bool GetToolBoxConfig() const;
bool GetAccelConfig() const;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 0cc7e3c..849db75 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -38,7 +38,6 @@ class SvMetaAttribute : public SvMetaReference
SvIdentifier aSlotId;
SvBOOL aExport;
SvBOOL aReadOnlyDoc;
- SvBOOL aHidden;
bool bNewAttr;
protected:
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 6942a71..9d52d93 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -91,7 +91,6 @@ void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
aHelpText.ReadSvIdl( rBase, rInStm );
- aDescription.ReadSvIdl( SvHash_Description(), rInStm );
}
void SvMetaObject::DoReadContextSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 69b70df..805a37d 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -214,12 +214,6 @@ bool SvMetaSlot::GetImageReflection() const
return static_cast<SvMetaSlot *>(GetRef())->GetImageReflection();
}
-const OString& SvMetaSlot::GetUnoName() const
-{
- if( aUnoName.IsSet() || !GetRef() ) return aUnoName.getString();
- return static_cast<SvMetaSlot *>(GetRef())->GetUnoName();
-}
-
void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
@@ -258,7 +252,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
bOk |= aImageReflection.ReadSvIdl( SvHash_ImageReflection(), rInStm );
- bOk |= aUnoName.ReadSvIdl( SvHash_UnoName(), rInStm );
if( !bOk )
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 56ce729..b5d1c15 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -32,7 +32,6 @@
SvMetaAttribute::SvMetaAttribute()
: aExport( true, false )
, aReadOnlyDoc ( true, false )
- , aHidden( false, false )
, bNewAttr( false )
{
}
@@ -41,7 +40,6 @@ SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
: aType( pType )
, aExport( true, false )
, aReadOnlyDoc ( true, false)
- , aHidden( false, false )
, bNewAttr( false )
{
}
@@ -67,10 +65,10 @@ bool SvMetaAttribute::GetExport() const
bool SvMetaAttribute::GetHidden() const
{
// when export is set, but hidden is not the default is used
- if ( aExport.IsSet() && !aHidden.IsSet() )
+ if ( aExport.IsSet() )
return !aExport;
- else if( aHidden.IsSet() || !GetRef() )
- return aHidden;
+ else if( !GetRef() )
+ return false;
else
return static_cast<SvMetaAttribute *>(GetRef())->GetHidden();
}
@@ -156,7 +154,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase &
rBase,
{
SvMetaReference::ReadAttributesSvIdl( rBase, 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 932c08f..439e7d47 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -100,9 +100,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(SlotType)
A_ENTRY(ModulePrefix)
A_ENTRY(DisableFlags)
- A_ENTRY(Hidden)
- A_ENTRY(Description)
- A_ENTRY(UnoName)
{}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6b0279c095406095200e48efe746fe9b23e4cf4e
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 13:09:10 2016 +0200
remove unused typedef in .SDI files
Change-Id: Ib5459768c68d5eb5536116ba20d54f5a4ae06007
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 773cb18..692f826 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -69,7 +69,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_ImageReflection;
SvStringHashEntryRef MM_ReadOnlyDoc;
SvStringHashEntryRef MM_struct;
- SvStringHashEntryRef MM_typedef;
SvStringHashEntryRef MM_SlotType;
SvStringHashEntryRef MM_ModulePrefix;
SvStringHashEntryRef MM_DisableFlags;
@@ -141,7 +140,6 @@ HASH_INLINE(ImageRotation)
HASH_INLINE(ImageReflection)
HASH_INLINE(ReadOnlyDoc)
HASH_INLINE(struct)
-HASH_INLINE(typedef)
HASH_INLINE(SlotType)
HASH_INLINE(ModulePrefix)
HASH_INLINE(DisableFlags)
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 132a5f2..5766040 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -92,8 +92,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
}
else if( rInStm.GetToken().Is( SvHash_item() )
- || rInStm.GetToken().Is( SvHash_struct() )
- || rInStm.GetToken().Is( SvHash_typedef() ) )
+ || rInStm.GetToken().Is( SvHash_struct() ) )
{
SvMetaTypeRef xItem = new SvMetaType();
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index d3ec6a7..56ce729 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -355,8 +355,7 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
SetType( TYPE_ENUM );
bOk = ReadNameSvIdl( rBase, rInStm );
}
- else if( pTok->Is( SvHash_typedef() )
- || pTok->Is( SvHash_item() ) )
+ else if( pTok->Is( SvHash_item() ) )
{
if( pTok->Is( SvHash_item() ) )
bIsItem = true;
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 0b35521..932c08f 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -97,7 +97,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(ImageReflection)
A_ENTRY(ReadOnlyDoc)
A_ENTRY(struct)
- A_ENTRY(typedef)
A_ENTRY(SlotType)
A_ENTRY(ModulePrefix)
A_ENTRY(DisableFlags)
commit ffacdae90177aa466a43321f6642bad176728113
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 13:00:01 2016 +0200
remove unused union from .SDI files
Change-Id: I673e5a020279e323cccf50d0ff3d74166ef61329
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 74016d6..773cb18 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -68,7 +68,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_ImageRotation;
SvStringHashEntryRef MM_ImageReflection;
SvStringHashEntryRef MM_ReadOnlyDoc;
- SvStringHashEntryRef MM_union;
SvStringHashEntryRef MM_struct;
SvStringHashEntryRef MM_typedef;
SvStringHashEntryRef MM_SlotType;
@@ -141,7 +140,6 @@ HASH_INLINE(Container)
HASH_INLINE(ImageRotation)
HASH_INLINE(ImageReflection)
HASH_INLINE(ReadOnlyDoc)
-HASH_INLINE(union)
HASH_INLINE(struct)
HASH_INLINE(typedef)
HASH_INLINE(SlotType)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 2dc6c514..0cc7e3c 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -75,7 +75,7 @@ typedef tools::SvRef<SvMetaAttribute> SvMetaAttributeRef;
class SvMetaAttributeMemberList : public SvRefMemberList<SvMetaAttribute *> {};
enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE };
-enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION,
+enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
TYPE_CLASS, TYPE_POINTER };
class SvMetaType : public SvMetaExtern
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 704bbb4..d3ec6a7 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -350,12 +350,6 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
SetType( TYPE_STRUCT );
bOk = ReadNamesSvIdl( rBase, rInStm );
}
- else if( pTok->Is( SvHash_union() ) )
- {
- SetType( TYPE_UNION );
- if( ReadNameSvIdl( rBase, rInStm ) )
- return true;
- }
else if( pTok->Is( SvHash_enum() ) )
{
SetType( TYPE_ENUM );
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index f2181ec..4db8ca5 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -51,7 +51,7 @@ char const * SyntaxStrings[] = {
"\titem type item-name;\n",
"\ttype definition:",
-"\tstruct | union identifier",
+"\tstruct identifier",
"\t'{'",
"\t\t{ type idetifier }",
"\t'}'",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index cb4f967..0b35521 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -96,7 +96,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(ImageRotation)
A_ENTRY(ImageReflection)
A_ENTRY(ReadOnlyDoc)
- A_ENTRY(union)
A_ENTRY(struct)
A_ENTRY(typedef)
A_ENTRY(SlotType)
commit 71f2f88c1938f3fa7a80881e45daf3b5a8321172
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 12:57:22 2016 +0200
remove unused int/char/map/ItemName/AllConfig from .SDI files
Change-Id: Iaf2633d7591b705bd0e84a376e06a01c2ec22b9b
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 47776cd..74016d6 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 ab38cbd..ff487a9 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 c940902..69b70df 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 0cb6e1e..4a08b70 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 bdc1b4c..cb4f967 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)
commit 8cb1c1ec2bd5a48e17fa6474336a3e1f7b092739
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 12:47:08 2016 +0200
remove unused SlotId/Volatile from .SDI files
Change-Id: I29f039c2fec8433fa062c603b64afffa60e7b0d0
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index f91b7c1..47776cd 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 7be1205..ab38cbd 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 26ceba0..c940902 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 fb229a9..704bbb4 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 3ecc2f4..bdc1b4c 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" ) )
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index e804f50..37d478f 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -29,7 +29,6 @@
enum class SfxSlotMode {
NONE = 0x0000L, // default
- VOLATILE = 0x0002L, // per Timer every 2s get new,
TOGGLE = 0x0004L, // inverted for Execute old value
AUTOUPDATE = 0x0008L, // invalidated the status automatically
after execute
@@ -57,7 +56,7 @@ enum class SfxSlotMode {
namespace o3tl
{
- template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode,
0x1fec72eL> {};
+ template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode,
0x1fec72cL> {};
}
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 9e679b7..843169fb9 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -75,7 +75,6 @@ static sal_uInt16 nTimeOut = 300;
#define TIMEOUT_FIRST nTimeOut
#define TIMEOUT_UPDATING 20
-#define TIMEOUT_IDLE 2500
typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
@@ -505,9 +504,7 @@ void SfxBindings::Update
{
// Query Status
const SfxSlotServer* pMsgServer = pDispatcher ?
pCache->GetSlotServer(*pDispatcher, pImp->xProv) : nullptr;
- if ( !pCache->IsControllerDirty() &&
- ( !pMsgServer ||
- !pMsgServer->GetSlot()->IsMode(SfxSlotMode::VOLATILE) ) )
+ if ( !pCache->IsControllerDirty() )
{
pImp->bInUpdate = false;
InvalidateSlotsInMap_Impl();
@@ -1644,23 +1641,7 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer)
pImp->nMsgPos = 0;
- // check for volatile slots
- bool bVolatileSlotsPresent = false;
- for ( sal_uInt16 n = 0; n < nCount; ++n )
- {
- SfxStateCache* pCache = (*pImp->pCaches)[n];
- const SfxSlotServer *pSlotServer = pCache->GetSlotServer(*pDispatcher,
pImp->xProv);
- if ( pSlotServer &&
pSlotServer->GetSlot()->IsMode(SfxSlotMode::VOLATILE) )
- {
- pCache->Invalidate(false);
- bVolatileSlotsPresent = true;
- }
- }
-
- if (bVolatileSlotsPresent)
- pImp->aTimer.SetTimeout(TIMEOUT_IDLE);
- else
- pImp->aTimer.Stop();
+ pImp->aTimer.Stop();
// Update round is finished
pImp->bInNextJob = false;
commit 353b9b43da8dadf35012d658465bc957ceb242ce
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 11:49:35 2016 +0200
remove unused HelpContext/Name/UCHAR/USHORT from .SDI files
Change-Id: Ic837cfb952730f10d2669095134ab2eb10bd72e5
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index a0b3a09..b89c62f 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -88,7 +88,6 @@ class SvMetaObject : public SvRttiBase
{
protected:
SvString aName;
- SvHelpContext aHelpContext;
SvHelpText aHelpText;
SvString aDescription;
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 6448e71..6891d48 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -116,10 +116,6 @@ public:
};
-class SvHelpContext : public SvIdentifier
-{
-};
-
#endif // INCLUDED_IDL_INC_BASTYPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index cf8a835..f91b7c1 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -26,13 +26,9 @@
class SvClassManager;
struct SvGlobalHashNames
{
- SvStringHashEntryRef MM_Name;
SvStringHashEntryRef MM_module;
SvStringHashEntryRef MM_interface;
SvStringHashEntryRef MM_String;
- SvStringHashEntryRef MM_UCHAR;
- SvStringHashEntryRef MM_USHORT;
- SvStringHashEntryRef MM_HelpContext;
SvStringHashEntryRef MM_HelpText;
SvStringHashEntryRef MM_void;
SvStringHashEntryRef MM_shell;
@@ -112,10 +108,8 @@ inline SvStringHashEntry * SvHash_##Name()
\
return GetIdlApp().pGlobalNames->MM_##Name; \
}
-HASH_INLINE(Name)
HASH_INLINE(module)
HASH_INLINE(interface)
-HASH_INLINE(HelpContext)
HASH_INLINE(HelpText)
HASH_INLINE(shell)
HASH_INLINE(SlotId)
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 397ed7a..6942a71 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -90,14 +90,6 @@ bool SvMetaObject::ReadNameSvIdl( SvIdlDataBase & rBase,
void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
- sal_uInt32 nTokPos = rInStm.Tell();
- if( aName.ReadSvIdl( SvHash_Name(), rInStm ) )
- {
- if( !SetName( aName.getString(), &rBase ) )
- rInStm.Seek( nTokPos );
- }
-
- aHelpContext.ReadSvIdl( rBase, SvHash_HelpContext(), rInStm );
aHelpText.ReadSvIdl( rBase, rInStm );
aDescription.ReadSvIdl( SvHash_Description(), rInStm );
}
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index fe8ff3a..3ecc2f4 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -54,13 +54,9 @@ inline SvStringHashEntry * INS( const OString& rName )
#define A_ENTRY( Name ) , MM_##Name( INS( #Name ) )
SvGlobalHashNames::SvGlobalHashNames()
- : MM_Name( INS( "Name" ) )
- , MM_module( INS( "module" ) )
+ : MM_module( INS( "module" ) )
, MM_interface( INS( "interface" ) )
, MM_String( INS( "String" ) )
- , MM_UCHAR( INS( "UCHAR" ) )
- , MM_USHORT( INS( "USHORT" ) )
- , MM_HelpContext( INS( "HelpContext" ) )
, MM_HelpText( INS( "HelpText" ) )
, MM_void( INS( "void" ) )
, MM_shell( INS( "shell" ) )
commit 520bb089a0b41c15273f7387df95b62faa54f13e
Author: Noel Grandin <n...@peralex.com>
Date: Thu Feb 4 11:39:41 2016 +0200
remove unused in/out/inout from .SDI files
Change-Id: Ie8bedbc8bd751752cba4f6018161c773b4bd19d0
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 35026a6..cf8a835 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -29,9 +29,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_Name;
SvStringHashEntryRef MM_module;
SvStringHashEntryRef MM_interface;
- SvStringHashEntryRef MM_in;
- SvStringHashEntryRef MM_out;
- SvStringHashEntryRef MM_inout;
SvStringHashEntryRef MM_String;
SvStringHashEntryRef MM_UCHAR;
SvStringHashEntryRef MM_USHORT;
@@ -118,9 +115,6 @@ inline SvStringHashEntry * SvHash_##Name()
\
HASH_INLINE(Name)
HASH_INLINE(module)
HASH_INLINE(interface)
-HASH_INLINE(in)
-HASH_INLINE(out)
-HASH_INLINE(inout)
HASH_INLINE(HelpContext)
HASH_INLINE(HelpText)
HASH_INLINE(shell)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 9de51df..2dc6c514 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -79,8 +79,6 @@ enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
TYPE_UNION,
TYPE_CLASS, TYPE_POINTER };
class SvMetaType : public SvMetaExtern
{
- SvBOOL aIn; // input parameter
- SvBOOL aOut; // return parameter
Svint aCall0, aCall1;
SvIdentifier aCName;
SvIdentifier aBasicPostfix;
@@ -123,12 +121,6 @@ public:
bool IsItem() const { return bIsItem; }
bool IsShell() const { return bIsShell; }
- void SetIn( bool b ) { aIn = b; }
- bool GetIn() const;
-
- void SetOut( bool b ) { aOut = b; }
- bool GetOut() const;
-
void SetCall0( int e );
int GetCall0() const;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 61f83ca..fb229a9 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -268,22 +268,6 @@ const OString& SvMetaType::GetBasicName() const
return static_cast<SvMetaType*>(GetRef())->GetBasicName();
}
-bool SvMetaType::GetIn() const
-{
- if( aIn.IsSet() || !GetRef() )
- return aIn;
- else
- return static_cast<SvMetaType *>(GetRef())->GetIn();
-}
-
-bool SvMetaType::GetOut() const
-{
- if( aOut.IsSet() || !GetRef() )
- return aOut;
- else
- return static_cast<SvMetaType *>(GetRef())->GetOut();
-}
-
void SvMetaType::SetCall0( int e )
{
aCall0 = (int)e;
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index cfe2b5b..0cb6e1e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -285,8 +285,6 @@ SvMetaType * SvIdlDataBase::FindType( const OString& rName )
SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
{
- bool bIn = false;
- bool bOut = false;
int nCall0 = CALL_VALUE;
int nCall1 = CALL_VALUE;
bool bSet = false; // any attribute set
@@ -300,25 +298,6 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream &
rInStm )
while( nBeginPos != rInStm.Tell() )
{
nBeginPos = rInStm.Tell();
- if( pTok->Is( SvHash_in() ) )
- {
- bIn = true;
- pTok = rInStm.GetToken_Next();
- bSet = true;
- }
- if( pTok->Is( SvHash_out() ) )
- {
- bOut = true;
- pTok = rInStm.GetToken_Next();
- bSet = true;
- }
- if( pTok->Is( SvHash_inout() ) )
- {
- bIn = true;
- bOut = true;
- pTok = rInStm.GetToken_Next();
- bSet = true;
- }
}
}
@@ -365,8 +344,6 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream &
rInStm )
DBG_ASSERT( aTmpTypeList.front(), "mindestens ein Element" );
SvMetaTypeRef xType = new SvMetaType(
pType->GetName().getString(), 'h', "dummy" );
xType->SetRef( pType );
- xType->SetIn( bIn );
- xType->SetOut( bOut );
xType->SetCall0( nCall0 );
xType->SetCall1( nCall1 );
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index bcb82b5..fe8ff3a 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -57,9 +57,6 @@ SvGlobalHashNames::SvGlobalHashNames()
: MM_Name( INS( "Name" ) )
, MM_module( INS( "module" ) )
, MM_interface( INS( "interface" ) )
- , MM_in( INS( "in" ) )
- , MM_out( INS( "out" ) )
- , MM_inout( INS( "inout" ) )
, MM_String( INS( "String" ) )
, MM_UCHAR( INS( "UCHAR" ) )
, MM_USHORT( INS( "USHORT" ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
