summaryrefslogtreecommitdiff
path: root/vcl/source/filter/sgvmain.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-27 13:07:42 +0200
committerNoel Grandin <noel@peralex.com>2015-09-08 09:20:31 +0200
commit751c771adc45cb150fa42bc70397e2571b28a60b (patch)
treebe54e28005ac5c4d00a0c01dca2119f80d7f8119 /vcl/source/filter/sgvmain.hxx
parentf36f17f691903a389a7d98e85af12e08b75f6876 (diff)
loplugin:mergeclass, merge BiNode with NameNode, Obj0Type with ObjkType
Change-Id: Icbc0dfc6096a6e2c651dad4fe9f78d176f389390
Diffstat (limited to 'vcl/source/filter/sgvmain.hxx')
-rw-r--r--vcl/source/filter/sgvmain.hxx11
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index e0f9de836a3d..77c4981bef38 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -137,14 +137,8 @@ public:
void SetFont(sal_uInt32 FontID);
};
-class Obj0Type { // SuperClass for Apple-VMT
-public:
- virtual void Draw(OutputDevice& rOut);
- virtual ~Obj0Type() {}
-};
-
#define ObjkSize 20 /* should be 21. due to alignment we shifted the flag */
-class ObjkType: public Obj0Type { // basic componenents of all Stardraw objects
+class ObjkType { // basic componenents of all Stardraw objects
public:
sal_uInt32 Last;
sal_uInt32 Next;
@@ -161,9 +155,10 @@ public:
, Layer(0)
{
}
+ virtual ~ObjkType() {}
friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk);
friend bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk);
- virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE;
+ virtual void Draw(OutputDevice& rOut);
};
#define StrkSize 38