summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/basobj.hxx13
-rw-r--r--idl/inc/bastype.hxx22
-rw-r--r--idl/inc/database.hxx1
-rw-r--r--idl/inc/module.hxx2
-rw-r--r--idl/inc/object.hxx2
-rw-r--r--idl/inc/slot.hxx3
-rw-r--r--idl/inc/types.hxx22
7 files changed, 6 insertions, 59 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 1768e0c9655f..5524df033f40 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -88,9 +88,8 @@ protected:
SvString aName;
SvHelpText aHelpText;
- bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
- char c = '\0' );
+ bool ReadNameSvIdl( SvTokenStream & rInStm );
+ void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
@@ -101,9 +100,9 @@ public:
static void Back2Delemitter( SvStream & );
static void WriteStars( SvStream & );
- virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr );
- virtual const SvString & GetName() const { return aName; }
- virtual const SvString & GetHelpText() const { return aHelpText; }
+ void SetName( const OString& rName );
+ virtual const SvString & GetName() const { return aName; }
+ virtual const SvString & GetHelpText() const { return aHelpText; }
virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -167,8 +166,6 @@ class SvMetaExtern : public SvMetaReference
public:
SvMetaExtern();
- SvMetaModule * GetModule() const;
-
void SetModule( SvIdlDataBase & rBase );
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
};
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 6891d48260e4..f571a029b172 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -29,21 +29,6 @@ class SvIdlDataBase;
class SvStream;
class SvTokenStream;
-class Svint
-{
- int bVal;
- bool bSet;
-public:
- Svint() { bVal = 0; bSet = false; }
- Svint( int n ) : bVal( n ), bSet( true ) {}
- Svint( int n, bool bSetP ) : bVal( n ), bSet( bSetP ) {}
- Svint & operator = ( int n ) { bVal = n; bSet = true; return *this; }
-
- operator int ()const { return bVal; }
- bool IsSet() const { return bSet; }
-};
-
-
class SvBOOL
{
bool bVal:1,
@@ -80,8 +65,6 @@ public:
void SetValue( sal_uInt32 bVal ) { nValue = bVal; }
void ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- void ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
- SvTokenStream & rInStm );
};
@@ -99,11 +82,6 @@ public:
{
return m_aStr;
}
- bool IsSet() const
- {
- return !m_aStr.isEmpty();
- }
-
bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
};
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index f7c8e7b12c4b..7852e80d2d83 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -87,7 +87,6 @@ public:
SvRefMemberList<SvMetaType *>& GetTypeList();
SvRefMemberList<SvMetaClass *>& GetClassList() { return aClassList; }
SvRefMemberList<SvMetaModule *>& GetModuleList() { return aModuleList; }
- SvMetaModule * GetModule( const OString& rName );
// list of used types while writing
SvRefMemberList<SvMetaType *> aUsedTypes;
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index b09ae4eaf0d9..3a052641f5ee 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -41,8 +41,6 @@ protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
public:
- virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ) override;
-
SvMetaModule( bool bImported );
bool IsImported() const { return bImported; }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 4e1e38a8d259..6399b007f692 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -78,8 +78,6 @@ class SvMetaClass : public SvMetaType
const OString& rPrefix, SvIdlDataBase& rBase );
protected:
- virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
- SvTokenStream & rInStm ) override;
virtual void ReadContextSvIdl( SvIdlDataBase &,
SvTokenStream & rInStm ) override;
public:
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 8fab390eece9..b3c096882cc8 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -28,7 +28,6 @@ class SvMetaSlot : public SvMetaAttribute
tools::SvRef<SvMetaType> aSlotType;
tools::SvRef<SvMetaAttribute> aMethod;
SvIdentifier aGroupId;
- SvIdentifier aConfigId;
SvIdentifier aExecMethod;
SvIdentifier aStateMethod;
SvBOOL aPseudoSlots;
@@ -115,12 +114,10 @@ public:
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
const OString& GetGroupId() const;
- const OString& GetConfigId() const;
const OString& GetExecMethod() const;
const OString& GetStateMethod() const;
const OString& GetDisableFlags() const;
bool GetPseudoSlots() const;
- bool GetVolatile() const;
bool GetToggle() const;
bool GetAutoUpdate() const;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 54100bc32c38..2356f5dc6e43 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -37,7 +37,6 @@ class SvMetaAttribute : public SvMetaReference
SvIdentifier aSlotId;
SvBOOL aExport;
SvBOOL aReadOnlyDoc;
- bool bNewAttr;
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
@@ -46,8 +45,6 @@ public:
SvMetaAttribute();
SvMetaAttribute( SvMetaType * );
- void SetNewAttribute( bool bNew )
- { bNewAttr = bNew; }
void SetSlotId( const SvIdentifier & rId )
{ aSlotId = rId; }
const SvIdentifier & GetSlotId() const;
@@ -72,9 +69,7 @@ enum MetaTypeType { Method, Struct, Base, Enum, Class };
class SvMetaType : public SvMetaExtern
{
- SvIdentifier aCName;
SvIdentifier aBasicPostfix;
- SvIdentifier aBasicName;
SvRefMemberList<SvMetaAttribute *>* pAttrList;
MetaTypeType nType;
bool bIsItem;
@@ -84,18 +79,14 @@ class SvMetaType : public SvMetaExtern
void WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
- bool ReadNamesSvIdl( SvIdlDataBase & rBase,
- SvTokenStream & rInStm );
+ bool ReadNamesSvIdl( SvTokenStream & rInStm );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
public:
SvMetaType();
- SvMetaType( const OString& rTypeName, char cParserChar,
- const OString& rCName );
SvMetaType( const OString& rTypeName,
char cParserChar,
- const OString& rCName, const OString& rBasicName,
const OString& rBasicPostfix );
virtual ~SvMetaType();
@@ -113,23 +104,12 @@ public:
bool IsItem() const { return bIsItem; }
bool IsShell() const { return bIsShell; }
- void SetBasicName(const OString& rName)
- { aBasicName.setString(rName); }
-
- const OString& GetBasicName() const;
- const OString& GetCName() const;
- char GetParserChar() const { return cParserChar; }
-
- virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ) override;
-
-
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
- OString GetParserString() const;
};
class SvMetaTypeString : public SvMetaType