Kaydet (Commit) e497edc2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Work around MSC "'override' cannot be used with 'inline'" bug

Change-Id: I2ac787ff911ecc37d28fdd2ea0c2a11e31b720fe
üst a7458fba
...@@ -175,7 +175,7 @@ class LwpParaBorderProperty : public LwpParaProperty ...@@ -175,7 +175,7 @@ class LwpParaBorderProperty : public LwpParaProperty
public: public:
LwpParaBorderProperty(LwpObjectStream* pStrm); LwpParaBorderProperty(LwpObjectStream* pStrm);
inline sal_uInt32 GetType() SAL_OVERRIDE; sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BORDER; }
inline LwpParaBorderOverride* GetLocalParaBorder(); inline LwpParaBorderOverride* GetLocalParaBorder();
...@@ -188,17 +188,12 @@ inline LwpParaBorderOverride* LwpParaBorderProperty::GetLocalParaBorder() ...@@ -188,17 +188,12 @@ inline LwpParaBorderOverride* LwpParaBorderProperty::GetLocalParaBorder()
return m_pParaBorderOverride; return m_pParaBorderOverride;
} }
inline sal_uInt32 LwpParaBorderProperty::GetType()
{
return PP_LOCAL_BORDER;
}
class LwpParaBreaksProperty : public LwpParaProperty class LwpParaBreaksProperty : public LwpParaProperty
{ {
public: public:
LwpParaBreaksProperty(LwpObjectStream* pStrm); LwpParaBreaksProperty(LwpObjectStream* pStrm);
inline sal_uInt32 GetType() SAL_OVERRIDE; sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BREAKS; }
inline LwpBreaksOverride* GetLocalParaBreaks(); inline LwpBreaksOverride* GetLocalParaBreaks();
...@@ -207,10 +202,6 @@ private: ...@@ -207,10 +202,6 @@ private:
}; };
inline sal_uInt32 LwpParaBreaksProperty::GetType()
{
return PP_LOCAL_BREAKS;
}
inline LwpBreaksOverride* LwpParaBreaksProperty::GetLocalParaBreaks() inline LwpBreaksOverride* LwpParaBreaksProperty::GetLocalParaBreaks()
{ {
return m_pBreaks; return m_pBreaks;
...@@ -223,7 +214,7 @@ public: ...@@ -223,7 +214,7 @@ public:
virtual ~LwpParaBulletProperty(); virtual ~LwpParaBulletProperty();
inline sal_uInt32 GetType() SAL_OVERRIDE; sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_BULLET; }
inline LwpBulletOverride* GetLocalParaBullet(); inline LwpBulletOverride* GetLocalParaBullet();
...@@ -231,10 +222,6 @@ private: ...@@ -231,10 +222,6 @@ private:
LwpBulletOverride* m_pBullet; LwpBulletOverride* m_pBullet;
}; };
inline sal_uInt32 LwpParaBulletProperty::GetType()
{
return PP_LOCAL_BULLET;
}
inline LwpBulletOverride* LwpParaBulletProperty::GetLocalParaBullet() inline LwpBulletOverride* LwpParaBulletProperty::GetLocalParaBullet()
{ {
return m_pBullet; return m_pBullet;
...@@ -245,16 +232,13 @@ class LwpParaNumberingProperty : public LwpParaProperty ...@@ -245,16 +232,13 @@ class LwpParaNumberingProperty : public LwpParaProperty
public: public:
LwpParaNumberingProperty(LwpObjectStream* pStrm); LwpParaNumberingProperty(LwpObjectStream* pStrm);
inline sal_uInt32 GetType() SAL_OVERRIDE; sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_NUMBERING; }
inline LwpNumberingOverride* GetLocalNumbering() const; inline LwpNumberingOverride* GetLocalNumbering() const;
private: private:
LwpNumberingOverride* m_pNumberingOverride; LwpNumberingOverride* m_pNumberingOverride;
}; };
inline sal_uInt32 LwpParaNumberingProperty::GetType()
{
return PP_LOCAL_NUMBERING;
}
inline LwpNumberingOverride* LwpParaNumberingProperty::GetLocalNumbering() const inline LwpNumberingOverride* LwpParaNumberingProperty::GetLocalNumbering() const
{ {
return m_pNumberingOverride; return m_pNumberingOverride;
...@@ -265,7 +249,7 @@ class LwpParaTabRackProperty : public LwpParaProperty ...@@ -265,7 +249,7 @@ class LwpParaTabRackProperty : public LwpParaProperty
public: public:
LwpParaTabRackProperty(LwpObjectStream* pStrm); LwpParaTabRackProperty(LwpObjectStream* pStrm);
~LwpParaTabRackProperty(void); ~LwpParaTabRackProperty(void);
inline sal_uInt32 GetType() SAL_OVERRIDE; sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_TABRACK; }
inline LwpTabOverride* GetTab(); inline LwpTabOverride* GetTab();
...@@ -278,11 +262,6 @@ inline LwpTabOverride* LwpParaTabRackProperty::GetTab() ...@@ -278,11 +262,6 @@ inline LwpTabOverride* LwpParaTabRackProperty::GetTab()
return m_pTabOverride; return m_pTabOverride;
} }
inline sal_uInt32 LwpParaTabRackProperty::GetType(void)
{
return PP_LOCAL_TABRACK;
}
class LwpParaBackGroundProperty : public LwpParaProperty class LwpParaBackGroundProperty : public LwpParaProperty
{ {
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment