summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-04 13:18:36 +0200
committerNoel Grandin <noel@peralex.com>2016-02-05 09:35:29 +0200
commitd932eb95f4009a34af85b063df11aac83368950a (patch)
treeefa46d3354ea0d7dc71a52d5ccb543e67b22bae6 /idl
parent6b0279c095406095200e48efe746fe9b23e4cf4e (diff)
remove unused Hidden/Description/UnoName from .SDI files
Change-Id: I9660690b29da411dcdf148007242ffa944957f78
Diffstat (limited to 'idl')
-rw-r--r--idl/inc/basobj.hxx9
-rw-r--r--idl/inc/globals.hxx6
-rw-r--r--idl/inc/slot.hxx4
-rw-r--r--idl/inc/types.hxx1
-rw-r--r--idl/source/objects/basobj.cxx1
-rw-r--r--idl/source/objects/slot.cxx7
-rw-r--r--idl/source/objects/types.cxx9
-rw-r--r--idl/source/prj/globals.cxx3
8 files changed, 4 insertions, 36 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index b89c62fb0324..9639b87ef6c6 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 692f8262f919..1bb51985380a 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 ff487a917de3..cdcc14f0208c 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 0cc7e3c0c8fd..849db75795b7 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 6942a71c0b98..9d52d9326b20 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 69b70df60db7..805a37d4215f 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 56ce729c6ece..b5d1c154e48f 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 932c08fcafe7..439e7d47b4bd 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: */