summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-08 13:25:26 +0200
committerNoel Grandin <noel@peralex.com>2016-02-08 14:00:38 +0200
commitd61b45016ee4048068b8410c5e2635e8d84f9849 (patch)
tree16596fe4ec1c98ef4f664decd8103bfa1b20201a /idl/inc
parent04e22bee0a79008a39dc9d78a460941f738020a6 (diff)
SvString is a just thin wrapper around OString
eliminate it Change-Id: Icb91d25cc7bffb3060b9392f71d37e5a95844aa3
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/basobj.hxx8
-rw-r--r--idl/inc/bastype.hxx17
-rw-r--r--idl/inc/module.hxx2
-rw-r--r--idl/inc/slot.hxx2
4 files changed, 7 insertions, 22 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 4a2b2528d194..bcc3f0a70eba 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -80,7 +80,7 @@ public:
class SvMetaObject : public SvRttiBase
{
protected:
- SvString aName;
+ OString aName;
bool ReadNameSvIdl( SvTokenStream & rInStm );
void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -95,7 +95,7 @@ public:
static void WriteStars( SvStream & );
void SetName( const OString& rName );
- virtual const SvString & GetName() const { return aName; }
+ virtual const OString & GetName() const { return aName; }
virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -130,10 +130,10 @@ protected:
public:
SvMetaReference();
- const SvString & GetName() const override
+ const OString & GetName() const override
{
return ( !aRef.Is()
- || !SvMetaObject::GetName().getString().isEmpty() )
+ || !SvMetaObject::GetName().isEmpty() )
? SvMetaObject::GetName()
: aRef->GetName();
}
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 220c5360b752..ef7a88c2e144 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -68,22 +68,7 @@ public:
};
-class SvString
-{
-private:
- OString m_aStr;
-public:
- SvString() {}
- void setString(const OString& rStr)
- {
- m_aStr = rStr;
- }
- const OString& getString() const
- {
- return m_aStr;
- }
- bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-};
+bool ReadStringSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, OString& aString );
#endif // INCLUDED_IDL_INC_BASTYPE_HXX
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index dd09519fa8fb..897356535c1a 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -27,7 +27,7 @@ class SvMetaModule : public SvMetaReference
{
SvRefMemberList<SvMetaClass *> aClassList;
// browser
- SvString aSlotIdFile;
+ OString aSlotIdFile;
bool bImported : 1,
bIsModified : 1;
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 999263aa0f02..a73a3b8ff412 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -50,7 +50,7 @@ class SvMetaSlot : public SvMetaAttribute
SvBOOL aImageRotation;
SvBOOL aImageReflection;
SvIdentifier aPseudoPrefix;
- SvString aDisableFlags;
+ OString aDisableFlags;
SvMetaSlot* pLinkedSlot;
SvMetaSlot* pNextSlot;
sal_uLong nListPos;