From cab9dfaedddf81d84a5987f19f531b93afa23246 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 27 Mar 2011 17:02:29 +0200 Subject: WaE: overloaded virtual --- lotuswordpro/source/filter/lwpfootnote.cxx | 2 +- lotuswordpro/source/filter/lwpfootnote.hxx | 2 +- lotuswordpro/source/filter/lwpfribptr.cxx | 6 +++--- lotuswordpro/source/filter/lwpfribtable.cxx | 4 ++-- lotuswordpro/source/filter/lwpfribtable.hxx | 2 +- lotuswordpro/source/filter/lwpnotes.cxx | 2 +- lotuswordpro/source/filter/lwpnotes.hxx | 2 +- lotuswordpro/source/filter/lwppagelayout.hxx | 2 ++ lotuswordpro/source/filter/lwptablelayout.cxx | 6 +++--- lotuswordpro/source/filter/lwptablelayout.hxx | 5 +++-- lotuswordpro/source/filter/xfilter/xfcell.hxx | 2 ++ lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx | 2 ++ lotuswordpro/source/filter/xfilter/xfframe.hxx | 2 ++ 13 files changed, 24 insertions(+), 15 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx index 650ce8ee63e2..e366bccbc10c 100644 --- a/lotuswordpro/source/filter/lwpfootnote.cxx +++ b/lotuswordpro/source/filter/lwpfootnote.cxx @@ -89,7 +89,7 @@ void LwpFribFootnote::Read(LwpObjectStream * pObjStrm, sal_uInt16 /*len*/) /** * @descr Register footnote style by calling LwpFootnote::RegisterStyle() */ -void LwpFribFootnote::RegisterStyle() +void LwpFribFootnote::RegisterNewStyle() { LwpFootnote* pFootnote = GetFootnote(); if(pFootnote) diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx index c62fe7c76d08..680cc71ecdf8 100644 --- a/lotuswordpro/source/filter/lwpfootnote.hxx +++ b/lotuswordpro/source/filter/lwpfootnote.hxx @@ -108,7 +108,7 @@ public: LwpFribFootnote(LwpPara* pPara ); ~LwpFribFootnote(){} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len); - void RegisterStyle(); + void RegisterNewStyle(); void XFConvert(XFContentContainer* pCont); LwpFootnote* GetFootnote(); diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 6b3478f9a030..7815cc2c3d34 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -546,19 +546,19 @@ void LwpFribPtr::RegisterStyle() case FRIB_TAG_TABLE: { LwpFribTable* tableFrib = static_cast(pFrib); - tableFrib->RegisterStyle(); + tableFrib->RegisterNewStyle(); } break; case FRIB_TAG_FOOTNOTE: { LwpFribFootnote* pFribFootnote = static_cast(pFrib); - pFribFootnote->RegisterStyle(); + pFribFootnote->RegisterNewStyle(); } break; case FRIB_TAG_NOTE: { LwpFribNote* pNoteFrib = static_cast(pFrib); - pNoteFrib->RegisterStyle(); + pNoteFrib->RegisterNewStyle(); break; } case FRIB_TAG_PAGENUMBER: diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx index 92b8e88a9024..67c320fa1cd0 100644 --- a/lotuswordpro/source/filter/lwpfribtable.cxx +++ b/lotuswordpro/source/filter/lwpfribtable.cxx @@ -76,9 +76,9 @@ LwpSuperTableLayout* LwpFribTable::GetSuperTable() return static_cast(m_objTable.obj()); } -void LwpFribTable::RegisterStyle() +void LwpFribTable::RegisterNewStyle() { - GetSuperTable()->RegisterStyle(); + GetSuperTable()->RegisterNewStyle(); XFParaStyle* pOldStyle = m_pPara->GetXFParaStyle(); if(HasNextFrib()) { diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx index eabbdee5a748..20f312292577 100644 --- a/lotuswordpro/source/filter/lwpfribtable.hxx +++ b/lotuswordpro/source/filter/lwpfribtable.hxx @@ -66,7 +66,7 @@ public: ~LwpFribTable(){} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len); LwpSuperTableLayout* GetSuperTable(); - void RegisterStyle(); + void RegisterNewStyle(); void Parse(IXFStream* pOutputStream); virtual void XFConvert(XFContentContainer* pCont); private: diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx index faba60737902..c11b72f8551f 100644 --- a/lotuswordpro/source/filter/lwpnotes.cxx +++ b/lotuswordpro/source/filter/lwpnotes.cxx @@ -83,7 +83,7 @@ void LwpFribNote::Read(LwpObjectStream *pObjStrm, sal_uInt16 /*len*/) /** * @descr Register style */ -void LwpFribNote::RegisterStyle() +void LwpFribNote::RegisterNewStyle() { LwpObject* pLayout = m_Layout.obj(); if(pLayout) diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx index c353143d0d5a..1ca0e19c307a 100644 --- a/lotuswordpro/source/filter/lwpnotes.hxx +++ b/lotuswordpro/source/filter/lwpnotes.hxx @@ -77,7 +77,7 @@ public: LwpFribNote(LwpPara* pPara ); ~LwpFribNote(){} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len); - void RegisterStyle(); + void RegisterNewStyle(); void XFConvert(XFContentContainer* pCont); private: LwpObjectID m_Layout; diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx index 489c3761cfec..c3f348313f16 100644 --- a/lotuswordpro/source/filter/lwppagelayout.hxx +++ b/lotuswordpro/source/filter/lwppagelayout.hxx @@ -121,6 +121,7 @@ public: LwpHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); ~LwpHeaderLayout(); virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_HEADER_LAYOUT;} + using LwpPlacableLayout::RegisterStyle; void RegisterStyle( XFPageMaster* pm1 ); void RegisterStyle( XFMasterPage* mp1 ); protected: @@ -146,6 +147,7 @@ public: LwpFooterLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); ~LwpFooterLayout(); virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_FOOTER_LAYOUT;} + using LwpPlacableLayout::RegisterStyle; void RegisterStyle(XFPageMaster* pm1); void RegisterStyle(XFMasterPage* mp1); protected: diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 1148d82fe657..ffe00f33e17c 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -160,7 +160,7 @@ LwpTableHeadingLayout* LwpSuperTableLayout::GetTableHeadingLayout() /** * @short Register super table layout style */ -void LwpSuperTableLayout::RegisterStyle() +void LwpSuperTableLayout::RegisterNewStyle() { // if this layout is style of real table entry LwpTableLayout* pTableLayout = GetTableLayout(); @@ -758,7 +758,7 @@ void LwpTableLayout::RegisterStyle() RegisterRows(); // Parse table - Parse(); + ParseTable(); //Comment:The old code doesn't check if the LwpFoundry pointer is NULL, @@ -773,7 +773,7 @@ void LwpTableLayout::RegisterStyle() * @short read table layout * @param none */ -void LwpTableLayout::Parse() +void LwpTableLayout::ParseTable() { // get super table layout LwpSuperTableLayout * pSuper = GetSuperTableLayout(); diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index 33f89e272fb9..f38a3683510b 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -109,7 +109,7 @@ protected: void TraverseTable(); void RegisterColumns(); void RegisterRows(); - void Parse(); + void ParseTable(); void PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_uInt16 nColID); sal_uInt16 m_nRows; @@ -163,7 +163,7 @@ public: LwpSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); virtual ~LwpSuperTableLayout(); virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_SUPERTABLE_LAYOUT;} - void RegisterStyle(); + void RegisterNewStyle(); // for table style // add by , 06/03/2005 void ApplyPatternFill(XFTableStyle* pTableStyle); @@ -203,6 +203,7 @@ public: virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_COLUMN_LAYOUT;} sal_uInt32 GetColumnID(){return ccolid;} double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(cwidth);} + using LwpVirtualLayout::RegisterStyle; void RegisterStyle(double dCalculatedWidth); sal_Bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);} protected: diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx index 4a8122493385..30ba90be8e64 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx @@ -83,6 +83,8 @@ public: virtual ~XFCell(); public: + using XFContentContainer::Add; + /** * @descr Add content for table cell. */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx index 9a2121b594a3..81cc0ff9ef61 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx @@ -74,6 +74,8 @@ public: XFDrawGroup(){} public: + using XFDrawObject::Add; + /** * @descr Add a drawing object to the group. */ diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index 16e058ece017..b1bef37bd214 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -85,6 +85,8 @@ public: virtual ~XFFrame(); public: + using XFContentContainer::Add; + /** * @descr override the add function to adjust z-index. */ -- cgit