From 1f84470abc6087fc6a3d01defae5043772bdd95e Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Sun, 1 Mar 2020 15:51:15 +0300 Subject: clang-format lotuswordpro with under 5-percent lines of change Files which could become clang-format conformant with under 5-percent lines of change relative to the total count of lines in the file are found by using bin/find-clang-format.py, and fixed with /opt/lo/bin/clang-format -i There will be follow-up patches to fix all 'under-5-percent' files. Change-Id: I4527dcc9aaabd1fba3363c0aa2bf3217e42ef45e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89776 Tested-by: Jenkins Reviewed-by: Muhammet Kara --- lotuswordpro/inc/lwpbookmarkmgr.hxx | 5 +-- lotuswordpro/inc/lwpchangemgr.hxx | 7 ++-- lotuswordpro/inc/lwpdocdata.hxx | 11 +++--- lotuswordpro/inc/lwpdropcapmgr.hxx | 3 +- lotuswordpro/inc/xfilter/ixfattrlist.hxx | 8 ++--- lotuswordpro/inc/xfilter/xfcontent.hxx | 9 ++--- lotuswordpro/inc/xfilter/xfdate.hxx | 8 ++--- lotuswordpro/inc/xfilter/xfdefs.hxx | 14 ++++---- lotuswordpro/inc/xfilter/xfdrawline.hxx | 6 ++-- lotuswordpro/inc/xfilter/xfdrawpolygon.hxx | 2 +- lotuswordpro/inc/xfilter/xfendnoteconfig.hxx | 3 +- lotuswordpro/inc/xfilter/xffontfactory.hxx | 8 ++--- lotuswordpro/inc/xfilter/xfimage.hxx | 8 ++--- lotuswordpro/inc/xfilter/xfparagraph.hxx | 7 ++-- lotuswordpro/inc/xfilter/xfsection.hxx | 6 ++-- lotuswordpro/inc/xfilter/xftextboxstyle.hxx | 3 +- lotuswordpro/inc/xfilter/xftextcontent.hxx | 8 ++--- lotuswordpro/source/filter/bentoid.hxx | 3 +- lotuswordpro/source/filter/lwparrowstyles.hxx | 10 +++--- .../source/filter/lwpbackgroundoverride.cxx | 2 +- .../source/filter/lwpbackgroundoverride.hxx | 7 ++-- lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 8 ++--- lotuswordpro/source/filter/lwpchangemgr.cxx | 12 +++---- .../source/filter/lwpcharborderoverride.cxx | 4 +-- lotuswordpro/source/filter/lwpcharsetmgr.hxx | 8 ++--- lotuswordpro/source/filter/lwpcolor.cxx | 8 ++--- lotuswordpro/source/filter/lwpfilter.hxx | 3 +- lotuswordpro/source/filter/lwpfribsection.hxx | 9 ++--- lotuswordpro/source/filter/lwphyperlinkmgr.hxx | 7 ++-- .../source/filter/lwpnumberingoverride.cxx | 5 +-- lotuswordpro/source/filter/lwpobjfactory.cxx | 40 +++++++++------------- lotuswordpro/source/filter/lwppagehint.cxx | 8 ++--- lotuswordpro/source/filter/lwpprtinfo.hxx | 2 +- lotuswordpro/source/filter/lwpsdwfileloader.hxx | 5 +-- .../source/filter/lwpsdwgrouploaderv0102.hxx | 6 ++-- lotuswordpro/source/filter/lwpsdwrect.hxx | 8 ++--- lotuswordpro/source/filter/lwpusrdicts.hxx | 4 +-- lotuswordpro/source/filter/lwpverdocument.cxx | 9 ++--- lotuswordpro/source/filter/lwpverdocument.hxx | 3 +- lotuswordpro/source/filter/lwpvpointer.hxx | 5 +-- lotuswordpro/source/filter/xfilter/xfbase64.hxx | 2 +- .../source/filter/xfilter/xffloatframe.cxx | 8 ++--- lotuswordpro/source/filter/xfilter/xffontdecl.cxx | 1 - lotuswordpro/source/filter/xfilter/xfglobal.cxx | 8 ++--- 44 files changed, 154 insertions(+), 157 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/inc/lwpbookmarkmgr.hxx b/lotuswordpro/inc/lwpbookmarkmgr.hxx index 926d4e391934..9dbeb344e262 100644 --- a/lotuswordpro/inc/lwpbookmarkmgr.hxx +++ b/lotuswordpro/inc/lwpbookmarkmgr.hxx @@ -69,11 +69,12 @@ class LwpBookmarkMgr { public: - void AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark); - void AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* pMark); + void AddXFBookmarkEnd(const OUString& sName, XFBookmarkEnd* pMark); + void AddXFBookmarkStart(const OUString& sName, XFBookmarkStart* pMark); bool FindBookmark(const OUString& sName); ~LwpBookmarkMgr(); LwpBookmarkMgr(); + private: std::map> m_MapStart; std::map> m_MapEnd; diff --git a/lotuswordpro/inc/lwpchangemgr.hxx b/lotuswordpro/inc/lwpchangemgr.hxx index bbf00ba1ad49..fb39042aa232 100644 --- a/lotuswordpro/inc/lwpchangemgr.hxx +++ b/lotuswordpro/inc/lwpchangemgr.hxx @@ -81,10 +81,11 @@ public: void SetHeadFootChange(XFContentContainer* pCont); ~LwpChangeMgr(); LwpChangeMgr(); + private: - std::map* m_pFribMap; - std::map m_DocFribMap; - std::map m_HeadFootFribMap; + std::map* m_pFribMap; + std::map m_DocFribMap; + std::map m_HeadFootFribMap; std::vector> m_ChangeList; sal_uInt32 m_nCounter; }; diff --git a/lotuswordpro/inc/lwpdocdata.hxx b/lotuswordpro/inc/lwpdocdata.hxx index 68df1951844b..8866bedda731 100644 --- a/lotuswordpro/inc/lwpdocdata.hxx +++ b/lotuswordpro/inc/lwpdocdata.hxx @@ -156,24 +156,27 @@ struct LwpEditorAttr class LwpDocData : public LwpObject { public: - LwpDocData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); + LwpDocData(LwpObjectHeader const& objHdr, LwpSvStream* pStrm); + private: virtual ~LwpDocData() override; LwpDocOptions m_DocOptions; LwpDocInfo m_DocInfo; LwpDocControl m_DocControl; + private: LtTm m_nCreationTime; LtTm m_nLastRevisionTime; LtTm m_nTotalEditTime; + private: - static OUString DateTimeToOUString(LtTm const & dt); - static OUString TimeToOUString(LtTm const & dt); + static OUString DateTimeToOUString(LtTm const& dt); + static OUString TimeToOUString(LtTm const& dt); public: void Read() override; - void Parse(IXFStream *pOutputStream) override; + void Parse(IXFStream* pOutputStream) override; }; #endif diff --git a/lotuswordpro/inc/lwpdropcapmgr.hxx b/lotuswordpro/inc/lwpdropcapmgr.hxx index c46954eaa000..6ad122e6952e 100644 --- a/lotuswordpro/inc/lwpdropcapmgr.hxx +++ b/lotuswordpro/inc/lwpdropcapmgr.hxx @@ -69,7 +69,8 @@ public: LwpDropcapMgr(); ~LwpDropcapMgr(); void SetXFPara(XFParagraph* pXFPara); - XFParagraph* GetXFPara() { return m_pXFPara;} + XFParagraph* GetXFPara() { return m_pXFPara; } + private: XFParagraph* m_pXFPara; }; diff --git a/lotuswordpro/inc/xfilter/ixfattrlist.hxx b/lotuswordpro/inc/xfilter/ixfattrlist.hxx index af68a9ded324..1fb79b60db28 100644 --- a/lotuswordpro/inc/xfilter/ixfattrlist.hxx +++ b/lotuswordpro/inc/xfilter/ixfattrlist.hxx @@ -68,19 +68,19 @@ * Implement this interface for different sax writer. For OOo,i use the XDocumentHandler stream; * for outputting the local file system,It's just a vector container. */ -class IXFAttrList +class IXFAttrList { public: - virtual ~IXFAttrList(){} + virtual ~IXFAttrList() {} /** * @descr: Add an attribute to the attribute list. */ - virtual void AddAttribute(const OUString& name, const OUString& value) = 0; + virtual void AddAttribute(const OUString& name, const OUString& value) = 0; /** * @descr: Clear all the attributes in the attribute list. */ - virtual void Clear() = 0; + virtual void Clear() = 0; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfcontent.hxx b/lotuswordpro/inc/xfilter/xfcontent.hxx index ca5bfc4a9da3..cb3954b06dc8 100644 --- a/lotuswordpro/inc/xfilter/xfcontent.hxx +++ b/lotuswordpro/inc/xfilter/xfcontent.hxx @@ -75,23 +75,23 @@ class IXFStream; * Base class for all content object. * There is only two properties:style name and content type in this class. */ -class XFContent: public salhelper::SimpleReferenceObject +class XFContent : public salhelper::SimpleReferenceObject { public: /** * @short: return the content type. */ - virtual enumXFContent GetContentType() { return enumXFContentUnknown; } + virtual enumXFContent GetContentType() { return enumXFContentUnknown; } /** * @short: All content except XFTextContent can have a style. */ - virtual void SetStyleName(const OUString& style) {m_strStyleName = style;} + virtual void SetStyleName(const OUString& style) { m_strStyleName = style; } /** * @short: return the style name. */ - const OUString& GetStyleName() const {return m_strStyleName;} + const OUString& GetStyleName() const { return m_strStyleName; } void DoToXml(IXFStream* stream) { @@ -113,6 +113,7 @@ protected: virtual ~XFContent() override {} OUString m_strStyleName; + private: bool m_bDoingToXml; }; diff --git a/lotuswordpro/inc/xfilter/xfdate.hxx b/lotuswordpro/inc/xfilter/xfdate.hxx index 73393eb9f5c6..abeb7028c497 100644 --- a/lotuswordpro/inc/xfilter/xfdate.hxx +++ b/lotuswordpro/inc/xfilter/xfdate.hxx @@ -73,22 +73,22 @@ public: virtual ~XFDate() override; - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; private: - OUString m_strText; + OUString m_strText; }; class XFDateStart : public XFDate { public: - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; }; class XFDateEnd : public XFContent { public: - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfdefs.hxx b/lotuswordpro/inc/xfilter/xfdefs.hxx index 3211ef22899b..41e18c705b0c 100644 --- a/lotuswordpro/inc/xfilter/xfdefs.hxx +++ b/lotuswordpro/inc/xfilter/xfdefs.hxx @@ -62,7 +62,7 @@ #include -enum enumXFContent +enum enumXFContent { enumXFContentUnknown, enumXFContentText, @@ -78,7 +78,7 @@ enum enumXFContent enumXFContentContainer, }; -enum enumXFStyle +enum enumXFStyle { enumXFStyleUnknown, enumXFStyleText, @@ -475,16 +475,16 @@ enum enumXFFWStyle enumXFFWOff, enumXFFWRotate, enumXFFWUpright, - enumXFFWSlantX,//slant-x - enumXFFWSlantY//slant-y + enumXFFWSlantX, //slant-x + enumXFFWSlantY //slant-y }; enum enumXFFWAdjust { - enumXFFWAdjustAutosize,//autosize + enumXFFWAdjustAutosize, //autosize enumXFFWAdjustLeft, - enumXFFWAdjustCenter,//center - enumXFFWAdustRight//right + enumXFFWAdjustCenter, //center + enumXFFWAdustRight //right }; enum enumXFFWShadow diff --git a/lotuswordpro/inc/xfilter/xfdrawline.hxx b/lotuswordpro/inc/xfilter/xfdrawline.hxx index 32985e53cc8c..5d6309b25ad3 100644 --- a/lotuswordpro/inc/xfilter/xfdrawline.hxx +++ b/lotuswordpro/inc/xfilter/xfdrawline.hxx @@ -76,17 +76,17 @@ public: /** * @descr Set line start point. */ - void SetStartPoint(double x, double y); + void SetStartPoint(double x, double y); /** * @descr Set line end point. */ - void SetEndPoint(double x, double y); + void SetEndPoint(double x, double y); /** * @descr Output line object. */ - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; private: XFPoint m_aPoint1; diff --git a/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx index b64de2e504ed..901e5b6f67f9 100644 --- a/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx +++ b/lotuswordpro/inc/xfilter/xfdrawpolygon.hxx @@ -73,7 +73,7 @@ public: XFDrawPolygon(); public: - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx b/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx index 53c8d218dab8..25f2c818260c 100644 --- a/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx +++ b/lotuswordpro/inc/xfilter/xfendnoteconfig.hxx @@ -63,7 +63,8 @@ class XFEndnoteConfig : public XFFootnoteConfig { public: - XFEndnoteConfig() : XFFootnoteConfig() + XFEndnoteConfig() + : XFFootnoteConfig() { m_bIsFootnote = false; m_bInsertInPage = false; diff --git a/lotuswordpro/inc/xfilter/xffontfactory.hxx b/lotuswordpro/inc/xfilter/xffontfactory.hxx index d538f8bce501..df4827b70bfa 100644 --- a/lotuswordpro/inc/xfilter/xffontfactory.hxx +++ b/lotuswordpro/inc/xfilter/xffontfactory.hxx @@ -80,24 +80,24 @@ public: XFFontFactory(); ~XFFontFactory(); XFFontFactory(const XFFontFactory&) = delete; - XFFontFactory& operator=(XFFontFactory const &) = delete; + XFFontFactory& operator=(XFFontFactory const&) = delete; private: /** * @descr Add a font. if there exist a font with same properties with pFont, them the font object * will not be added. */ - void AddFont(rtl::Reference const & pFont); + void AddFont(rtl::Reference const& pFont); /** * @descr Find whether same font object exists. */ - rtl::Reference FindSameFont(rtl::Reference const & pFont); + rtl::Reference FindSameFont(rtl::Reference const& pFont); friend class XFStyleContainer; private: - std::vector< rtl::Reference > s_aFonts; + std::vector> s_aFonts; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfimage.hxx b/lotuswordpro/inc/xfilter/xfimage.hxx index 92410a6061f4..775d301ccf9f 100644 --- a/lotuswordpro/inc/xfilter/xfimage.hxx +++ b/lotuswordpro/inc/xfilter/xfimage.hxx @@ -76,22 +76,22 @@ public: /** * @descr Use file link source.a */ - void SetFileURL(const OUString& url); + void SetFileURL(const OUString& url); /** * @descr Use base64 stream. */ - void SetImageData(sal_uInt8 const *buf, int len); + void SetImageData(sal_uInt8 const* buf, int len); /** * @descr Output image. */ - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; private: OUString m_strImageFile; OUString m_strData; - bool m_bUseLink; + bool m_bUseLink; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfparagraph.hxx b/lotuswordpro/inc/xfilter/xfparagraph.hxx index f096b9b1837b..f7c1fd9da2e6 100644 --- a/lotuswordpro/inc/xfilter/xfparagraph.hxx +++ b/lotuswordpro/inc/xfilter/xfparagraph.hxx @@ -79,12 +79,11 @@ public: virtual ~XFParagraph() override; public: - bool HasContents() const; + bool HasContents() const; - virtual enumXFContent GetContentType() override; - - virtual void ToXml(IXFStream *pStrm) override; + virtual enumXFContent GetContentType() override; + virtual void ToXml(IXFStream* pStrm) override; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfsection.hxx b/lotuswordpro/inc/xfilter/xfsection.hxx index 7ed02943d7b7..2620da2cfb0d 100644 --- a/lotuswordpro/inc/xfilter/xfsection.hxx +++ b/lotuswordpro/inc/xfilter/xfsection.hxx @@ -79,11 +79,11 @@ public: /** * @descr Output section object. */ - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; private: - OUString m_strSectionName; - OUString m_strSourceLink; + OUString m_strSectionName; + OUString m_strSourceLink; }; #endif diff --git a/lotuswordpro/inc/xfilter/xftextboxstyle.hxx b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx index 02594509d1d7..23d100321573 100644 --- a/lotuswordpro/inc/xfilter/xftextboxstyle.hxx +++ b/lotuswordpro/inc/xfilter/xftextboxstyle.hxx @@ -74,10 +74,9 @@ public: virtual ~XFTextBoxStyle() override; public: - virtual enumXFStyle GetStyleFamily() override; - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; protected: }; diff --git a/lotuswordpro/inc/xfilter/xftextcontent.hxx b/lotuswordpro/inc/xfilter/xftextcontent.hxx index 7bce6c8bd4dd..c0c6050f67bc 100644 --- a/lotuswordpro/inc/xfilter/xftextcontent.hxx +++ b/lotuswordpro/inc/xfilter/xftextcontent.hxx @@ -69,7 +69,7 @@ class IXFStream; class XFTextContent : public XFContent { public: - XFTextContent(){} + XFTextContent() {} explicit XFTextContent(const OUString& text); @@ -79,14 +79,14 @@ public: /** * @descr Set the text. */ - void SetText(const OUString& text); + void SetText(const OUString& text); virtual enumXFContent GetContentType() override; - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; private: - OUString m_strText; + OUString m_strText; }; #endif diff --git a/lotuswordpro/source/filter/bentoid.hxx b/lotuswordpro/source/filter/bentoid.hxx index 663bfdc1ef8a..cb3d9fb27852 100644 --- a/lotuswordpro/source/filter/bentoid.hxx +++ b/lotuswordpro/source/filter/bentoid.hxx @@ -58,7 +58,6 @@ namespace OpenStormBento { - #define BEN_OBJID_TOC 1 // TOC object ID #define BEN_PROPID_TOC_SEED 2 // TOC object starting seed #define BEN_TYPEID_TOC_TYPE 19 // TOC object property value type @@ -90,7 +89,7 @@ namespace OpenStormBento #define BEN_READ_PAST_END_OF_TOC 50 // Our code #define BEN_NOOP 0xFF -}// end OpenStormBento namespace +} // end OpenStormBento namespace #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwparrowstyles.hxx b/lotuswordpro/source/filter/lwparrowstyles.hxx index 16d4c9714ed7..55b0a3b148f9 100644 --- a/lotuswordpro/source/filter/lwparrowstyles.hxx +++ b/lotuswordpro/source/filter/lwparrowstyles.hxx @@ -65,35 +65,35 @@ * There are three kinds: reversed arrow, reversed concave arrow and reversed * line arrow. This function should be called before the three arrows be used. */ -void RegisteArrowStyles() +void RegisteArrowStyles() { XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); if (!pXFStyleManager) return; //reversed arrow: std::unique_ptr pArrowStyle100(new XFArrowStyle()); - pArrowStyle100->SetArrowName( "arrow100" ); + pArrowStyle100->SetArrowName("arrow100"); pArrowStyle100->SetViewbox("0 0 140 200"); pArrowStyle100->SetSVGPath("M0 180 L70 0 L140 180 L120 180 L70 30 L20 180 L0 180"); pXFStyleManager->AddStyle(std::move(pArrowStyle100)); //reversed arrow: std::unique_ptr pArrowStyle1(new XFArrowStyle()); - pArrowStyle1->SetArrowName( "reverse arrow" ); + pArrowStyle1->SetArrowName("reverse arrow"); pArrowStyle1->SetViewbox("0 0 140 200"); pArrowStyle1->SetSVGPath("M0 0 L70 200 L140 0"); pXFStyleManager->AddStyle(std::move(pArrowStyle1)); //reversed concave arrow std::unique_ptr pArrowStyle2(new XFArrowStyle()); - pArrowStyle2->SetArrowName( "reverse concave arrow" ); + pArrowStyle2->SetArrowName("reverse concave arrow"); pArrowStyle2->SetViewbox("0 0 140 200"); pArrowStyle2->SetSVGPath("M0 0 L80 200 L160 0 L80 100"); pXFStyleManager->AddStyle(std::move(pArrowStyle2)); //reversed line arrow std::unique_ptr pArrowStyle3(new XFArrowStyle()); - pArrowStyle3->SetArrowName( "reverse line arrow" ); + pArrowStyle3->SetArrowName("reverse line arrow"); pArrowStyle3->SetViewbox("0 0 140 200"); pArrowStyle3->SetSVGPath("M0 0 L70 200 L140 0L110 0 L70 160 L20 0 L0 0"); pXFStyleManager->AddStyle(std::move(pArrowStyle3)); diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.cxx b/lotuswordpro/source/filter/lwpbackgroundoverride.cxx index 25ff18535fd9..4f3509dad5c7 100644 --- a/lotuswordpro/source/filter/lwpbackgroundoverride.cxx +++ b/lotuswordpro/source/filter/lwpbackgroundoverride.cxx @@ -9,7 +9,7 @@ #include "lwpbackgroundoverride.hxx" -LwpBackgroundOverride::LwpBackgroundOverride(LwpBackgroundOverride const &rOther) +LwpBackgroundOverride::LwpBackgroundOverride(LwpBackgroundOverride const& rOther) : LwpOverride(rOther) , m_aStuff(rOther.m_aStuff) { diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx index 050496e87c60..6044d7eff67d 100644 --- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx @@ -62,14 +62,13 @@ class LwpObjectStream; class LwpBackgroundOverride : public LwpOverride { - public: - LwpBackgroundOverride(){} + LwpBackgroundOverride() {} virtual LwpBackgroundOverride* clone() const override; public: - virtual void Read(LwpObjectStream *pStrm) override + virtual void Read(LwpObjectStream* pStrm) override { if (pStrm->QuickReadBool()) { @@ -91,7 +90,7 @@ private: LwpBackgroundOverride& operator=(LwpBackgroundOverride const& rOther) = delete; private: - LwpBackgroundStuff m_aStuff; + LwpBackgroundStuff m_aStuff; }; #endif diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx index 140ba4f499b3..7e57cb59b276 100644 --- a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx +++ b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx @@ -55,10 +55,10 @@ ************************************************************************/ #include -void LwpBookmarkMgr::AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* pMark) +void LwpBookmarkMgr::AddXFBookmarkStart(const OUString& sName, XFBookmarkStart* pMark) { auto iter = m_MapStart.find(sName); - if (iter == m_MapStart.end())//not find + if (iter == m_MapStart.end()) //not find { m_MapStart[sName] = pMark; } @@ -71,10 +71,10 @@ void LwpBookmarkMgr::AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* p m_MapStart[sName] = pMark; } } -void LwpBookmarkMgr::AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark) +void LwpBookmarkMgr::AddXFBookmarkEnd(const OUString& sName, XFBookmarkEnd* pMark) { auto iter = m_MapEnd.find(sName); - if (iter == m_MapEnd.end())//not find + if (iter == m_MapEnd.end()) //not find { m_MapEnd[sName] = pMark; } diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx index 9fbfc1906201..f24c1ddf72cb 100644 --- a/lotuswordpro/source/filter/lwpchangemgr.cxx +++ b/lotuswordpro/source/filter/lwpchangemgr.cxx @@ -92,7 +92,7 @@ LwpChangeMgr::LwpChangeMgr() LwpChangeMgr::~LwpChangeMgr() { - m_pFribMap=nullptr; + m_pFribMap = nullptr; m_DocFribMap.clear(); m_HeadFootFribMap.clear(); m_ChangeList.clear(); @@ -101,8 +101,8 @@ LwpChangeMgr::~LwpChangeMgr() void LwpChangeMgr::AddChangeFrib(LwpFrib* pFrib) { m_nCounter++; - OUString sID = "ct"+ OUString::number(m_nCounter); - m_pFribMap->insert(std::pair(pFrib,sID)); + OUString sID = "ct" + OUString::number(m_nCounter); + m_pFribMap->insert(std::pair(pFrib, sID)); pFrib->Register(m_pFribMap); } @@ -137,10 +137,10 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream) pStream->GetAttrList()->Clear(); if (m_ChangeList.empty()) - return; + return; // Add for disable change tracking - pStream->GetAttrList()->AddAttribute( "text:track-changes","false"); - pStream->StartElement( "text:tracked-changes" ); + pStream->GetAttrList()->AddAttribute("text:track-changes", "false"); + pStream->StartElement("text:tracked-changes"); for (auto const& elem : m_ChangeList) elem->ToXml(pStream); diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.cxx b/lotuswordpro/source/filter/lwpcharborderoverride.cxx index b50abc5365cf..acca8e2380eb 100644 --- a/lotuswordpro/source/filter/lwpcharborderoverride.cxx +++ b/lotuswordpro/source/filter/lwpcharborderoverride.cxx @@ -84,9 +84,7 @@ LwpCharacterBorderOverride::LwpCharacterBorderOverride(LwpCharacterBorderOverrid m_pMargins = std::move(pMargins); } -LwpCharacterBorderOverride::~LwpCharacterBorderOverride() -{ -} +LwpCharacterBorderOverride::~LwpCharacterBorderOverride() {} LwpCharacterBorderOverride* LwpCharacterBorderOverride::clone() const { diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.hxx b/lotuswordpro/source/filter/lwpcharsetmgr.hxx index c844e797e757..0443540a5357 100644 --- a/lotuswordpro/source/filter/lwpcharsetmgr.hxx +++ b/lotuswordpro/source/filter/lwpcharsetmgr.hxx @@ -67,17 +67,17 @@ class LwpCharSetMgr { public: - LwpCharSetMgr(){SetCodePageMap();} + LwpCharSetMgr() { SetCodePageMap(); } static LwpCharSetMgr* GetInstance(); void SetCodePageMap(); - rtl_TextEncoding GetTextCharEncoding(sal_uInt16 wordproCode); + rtl_TextEncoding GetTextCharEncoding(sal_uInt16 wordproCode); static rtl_TextEncoding GetTextCharEncoding() { - return RTL_TEXTENCODING_MS_1252;//here should be a default value,1252 or get from platform, 1-18 + return RTL_TEXTENCODING_MS_1252; //here should be a default value,1252 or get from platform, 1-18 } private: - std::map m_CodePageMap; + std::map m_CodePageMap; static LwpCharSetMgr* Instance; }; diff --git a/lotuswordpro/source/filter/lwpcolor.cxx b/lotuswordpro/source/filter/lwpcolor.cxx index fbf27a5d8c4a..14f580368554 100644 --- a/lotuswordpro/source/filter/lwpcolor.cxx +++ b/lotuswordpro/source/filter/lwpcolor.cxx @@ -65,15 +65,13 @@ */ sal_uInt32 LwpColor::To24Color() { - return ((m_nRed >> 8) | - (m_nGreen & 0xFF00) | - static_cast((m_nBlue & 0xFF00) << 8)); + return ((m_nRed >> 8) | (m_nGreen & 0xFF00) | static_cast((m_nBlue & 0xFF00) << 8)); } /** * @descr read color and then resolve the RGB values */ -void LwpColor::Read(LwpObjectStream *pStrm) +void LwpColor::Read(LwpObjectStream* pStrm) { m_nRed = pStrm->QuickReaduInt16(); m_nGreen = pStrm->QuickReaduInt16(); @@ -81,7 +79,7 @@ void LwpColor::Read(LwpObjectStream *pStrm) m_nExtra = pStrm->QuickReaduInt16(); // resolve RGB values per the extra bytes - switch(m_nExtra) + switch (m_nExtra) { case AGLRGB_RGB: break; diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 66e62b565785..c10ca24b0fa4 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -61,7 +61,8 @@ class SvStream; //test code -int ReadWordproFile(SvStream &rStream, css::uno::Reference const & XDoc); +int ReadWordproFile(SvStream& rStream, + css::uno::Reference const& XDoc); #endif diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx index 58e8c91a3e5f..0f1da0ff664f 100644 --- a/lotuswordpro/source/filter/lwpfribsection.hxx +++ b/lotuswordpro/source/filter/lwpfribsection.hxx @@ -86,7 +86,7 @@ private: bool IsNeedSection(); private: - bool m_bNewSection; + bool m_bNewSection; OUString m_FillerPageStyleName; OUString m_SectionStyleName; OUString m_StyleName; //master page style name @@ -101,18 +101,19 @@ private: */ class LwpSection; class XFIndex; -class LwpFribSection: public LwpFrib +class LwpFribSection : public LwpFrib { public: - explicit LwpFribSection(LwpPara* pPara ); + explicit LwpFribSection(LwpPara* pPara); virtual ~LwpFribSection() override; void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; - LwpSection * GetSection(); + LwpSection* GetSection(); void RegisterSectionStyle(); void ParseSection(); void SetSectionName(); LwpPageLayout* GetPageLayout(); + private: void SetDefaultAlphaIndex(XFIndex* pXFIndex); diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx index 0ec5b16b3210..71dc7a0f8037 100644 --- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx +++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx @@ -68,10 +68,11 @@ class LwpHyperlinkMgr public: LwpHyperlinkMgr(); ~LwpHyperlinkMgr(); - void SetHyperlinkFlag(bool bFlag){m_bIsHyperlink = bFlag;} - bool GetHyperlinkFlag() const {return m_bIsHyperlink;} + void SetHyperlinkFlag(bool bFlag) { m_bIsHyperlink = bFlag; } + bool GetHyperlinkFlag() const { return m_bIsHyperlink; } void SetHyperlink(const OUString& hyperlink); - const OUString& GetHyperlink() const { return m_Hyperlink;} + const OUString& GetHyperlink() const { return m_Hyperlink; } + private: OUString m_Hyperlink; bool m_bIsHyperlink; diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx index e04851bfd7be..a478f7112903 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx @@ -62,7 +62,8 @@ #include LwpNumberingOverride::LwpNumberingOverride() - : m_nLevel(0), m_nPosition(0) + : m_nLevel(0) + , m_nPosition(0) { } @@ -78,7 +79,7 @@ LwpNumberingOverride* LwpNumberingOverride::clone() const return new LwpNumberingOverride(*this); } -void LwpNumberingOverride::Read(LwpObjectStream *pStrm) +void LwpNumberingOverride::Read(LwpObjectStream* pStrm) { if (pStrm->QuickReadBool()) { diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx index bd24168882ba..412d8919da77 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.cxx +++ b/lotuswordpro/source/filter/lwpobjfactory.cxx @@ -104,26 +104,21 @@ LwpObjectFactory::LwpObjectFactory(LwpSvStream* pSvStream) m_IdToObjList.clear(); } -LwpObjectFactory::~LwpObjectFactory() -{ -} +LwpObjectFactory::~LwpObjectFactory() {} /** * @descr read the index manager */ -void LwpObjectFactory::ReadIndex(LwpSvStream* pStrm) -{ - m_IndexMgr.Read(pStrm); -} +void LwpObjectFactory::ReadIndex(LwpSvStream* pStrm) { m_IndexMgr.Read(pStrm); } /** * @descr create all kinds of objects except lwp7 */ -rtl::Reference LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader &objHdr) +rtl::Reference LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader& objHdr) { rtl::Reference newObj; - SAL_WARN_IF(type>=300, "lwp", "invalid type: " << type); - switch(type) + SAL_WARN_IF(type >= 300, "lwp", "invalid type: " << type); + switch (type) { case VO_DOCUMENT: { @@ -309,7 +304,7 @@ rtl::Reference LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj newObj = new LwpTabPiece(objHdr, m_pSvStream); break; } - case VO_PARABACKGROUNDPIECE: //perhaps wrong. + case VO_PARABACKGROUNDPIECE: //perhaps wrong. { newObj = new LwpBackgroundPiece(objHdr, m_pSvStream); break; @@ -673,14 +668,14 @@ rtl::Reference LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj * @descr query object by object id * object is created if not in the factory */ -rtl::Reference LwpObjectFactory::QueryObject(const LwpObjectID &objID) +rtl::Reference LwpObjectFactory::QueryObject(const LwpObjectID& objID) { - rtl::Reference obj = FindObject( objID ); - if(!obj.is()) + rtl::Reference obj = FindObject(objID); + if (!obj.is()) { //Read the object from file sal_uInt32 nStreamOffset = m_IndexMgr.GetObjOffset(objID); - if(nStreamOffset == BAD_OFFSET) //does not find the offset in index manager + if (nStreamOffset == BAD_OFFSET) //does not find the offset in index manager return nullptr; sal_Int64 nDesiredPos = nStreamOffset + LwpSvStream::LWP_STREAM_BASE; @@ -697,7 +692,8 @@ rtl::Reference LwpObjectFactory::QueryObject(const LwpObjectID &objID return nullptr; } - if (std::find(m_aObjsIDInCreation.begin(), m_aObjsIDInCreation.end(), objID) != m_aObjsIDInCreation.end()) + if (std::find(m_aObjsIDInCreation.begin(), m_aObjsIDInCreation.end(), objID) + != m_aObjsIDInCreation.end()) throw std::runtime_error("recursion in object creation"); m_aObjsIDInCreation.push_back(objID); @@ -710,10 +706,11 @@ rtl::Reference LwpObjectFactory::QueryObject(const LwpObjectID &objID /** * @descr find object in the factory per the object id */ -rtl::Reference LwpObjectFactory::FindObject(const LwpObjectID &objID) +rtl::Reference LwpObjectFactory::FindObject(const LwpObjectID& objID) { - LwpIdToObjMap::const_iterator it = m_IdToObjList.find(objID); - if (it != m_IdToObjList.end()) { + LwpIdToObjMap::const_iterator it = m_IdToObjList.find(objID); + if (it != m_IdToObjList.end()) + { return (*it).second; } else @@ -724,9 +721,6 @@ rtl::Reference LwpObjectFactory::FindObject(const LwpObjectID &objID) /** * @descr release object in the factory per the object id */ -void LwpObjectFactory::ReleaseObject(const LwpObjectID &objID) -{ - m_IdToObjList.erase(objID); -} +void LwpObjectFactory::ReleaseObject(const LwpObjectID& objID) { m_IdToObjList.erase(objID); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwppagehint.cxx b/lotuswordpro/source/filter/lwppagehint.cxx index a164f48d4281..21fbf3d99cbc 100644 --- a/lotuswordpro/source/filter/lwppagehint.cxx +++ b/lotuswordpro/source/filter/lwppagehint.cxx @@ -78,8 +78,8 @@ void LwpFootnoteSeenHead::Read(LwpObjectStream* pObjStrm) pObjStrm->SkipExtra(); } -LwpPageHint::LwpPageHint(LwpObjectHeader const &objHdr, LwpSvStream *pStrm) - : LwpDLVList(objHdr,pStrm) +LwpPageHint::LwpPageHint(LwpObjectHeader const& objHdr, LwpSvStream* pStrm) + : LwpDLVList(objHdr, pStrm) , m_nLastFootnoteSeen(0) , m_nLastFootnoteProcessed(0) , m_nFlags(0) @@ -117,8 +117,6 @@ void LwpPageHint::Read() m_pObjStrm->SkipExtra(); } -void LwpPageHint::Parse(IXFStream * /*pOutputStream*/) -{ -} +void LwpPageHint::Parse(IXFStream* /*pOutputStream*/) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx index 30f2a2484c36..43bcad605fde 100644 --- a/lotuswordpro/source/filter/lwpprtinfo.hxx +++ b/lotuswordpro/source/filter/lwpprtinfo.hxx @@ -73,7 +73,7 @@ public: explicit LwpPrinterInfo(LwpObjectStream* pStrm); public: - static void Skip(LwpObjectStream *pStrm); + static void Skip(LwpObjectStream* pStrm); }; #endif diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx index d8335475b499..81ca55072ea3 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx @@ -74,12 +74,13 @@ class LwpSdwFileLoader private: SvStream* m_pStream; LwpGraphicObject* m_pGraphicObj; + public: LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj); ~LwpSdwFileLoader(); -public: - void CreateDrawObjects(std::vector< rtl::Reference >* pDrawObjVector); +public: + void CreateDrawObjects(std::vector>* pDrawObjVector); }; #endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSDWFILELOADER_HXX diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx index deea9627bba7..b941826d0ec9 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx @@ -73,16 +73,16 @@ class LwpSdwGroupLoaderV0102 private: SvStream* m_pStream; LwpGraphicObject* m_pGraphicObj; - std::vector< rtl::Reference >* m_pDrawObjVector; + std::vector>* m_pDrawObjVector; DrawingOffsetAndScale m_aTransformData; public: LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj); ~LwpSdwGroupLoaderV0102(); -public: - void BeginDrawObjects(std::vector< rtl::Reference >* pDrawObjVector); +public: + void BeginDrawObjects(std::vector>* pDrawObjVector); XFDrawGroup* CreateDrawGroupObject(); XFFrame* CreateDrawObject(); }; diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx index 25a8daf12159..19fac58a2c99 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.hxx +++ b/lotuswordpro/source/filter/lwpsdwrect.hxx @@ -94,20 +94,18 @@ public: std::array m_nRectCorner; public: - SdwRectangle(); - SdwRectangle(const Point& rPt0, const Point& rPt1, - const Point& rPt2, const Point& rPt3); + SdwRectangle(const Point& rPt0, const Point& rPt1, const Point& rPt2, const Point& rPt3); public: /* * @short: Get the flag whether if the rectangle has been rotated. * @return: m_bRotated rotation flag. */ - bool IsRectRotated() const { return m_bRotated;} + bool IsRectRotated() const { return m_bRotated; } - Point GetRectCenter() const ; + Point GetRectCenter() const; long GetWidth() const; diff --git a/lotuswordpro/source/filter/lwpusrdicts.hxx b/lotuswordpro/source/filter/lwpusrdicts.hxx index 1ed9555b7004..d52d642c6b43 100644 --- a/lotuswordpro/source/filter/lwpusrdicts.hxx +++ b/lotuswordpro/source/filter/lwpusrdicts.hxx @@ -69,8 +69,8 @@ class LwpUserDictFiles { public: - explicit LwpUserDictFiles(LwpObjectStream *pStrm); - static void Read(LwpObjectStream *pStrm); + explicit LwpUserDictFiles(LwpObjectStream* pStrm); + static void Read(LwpObjectStream* pStrm); }; #endif diff --git a/lotuswordpro/source/filter/lwpverdocument.cxx b/lotuswordpro/source/filter/lwpverdocument.cxx index 894a9008d97f..4a228a7a68ab 100644 --- a/lotuswordpro/source/filter/lwpverdocument.cxx +++ b/lotuswordpro/source/filter/lwpverdocument.cxx @@ -67,10 +67,11 @@ #include #include -LwpVerDocument::LwpVerDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm) +LwpVerDocument::LwpVerDocument(LwpObjectHeader const& objHdr, LwpSvStream* pStrm) : LwpObject(objHdr, pStrm) , m_nTabSpacing(0) -{} +{ +} void LwpVerDocument::Read() { @@ -92,8 +93,8 @@ void LwpVerDocument::Read() void LwpVerDocument::RegisterStyle() { std::unique_ptr pDefault(new XFDefaultParaStyle); - double len =static_cast(m_nTabSpacing)/UNITS_PER_INCH*CM_PER_INCH; - if(len < 0.001) + double len = static_cast(m_nTabSpacing) / UNITS_PER_INCH * CM_PER_INCH; + if (len < 0.001) { len = 1.27; //0.5 inch } diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx index e80e412b44d0..b77bd7badc80 100644 --- a/lotuswordpro/source/filter/lwpverdocument.hxx +++ b/lotuswordpro/source/filter/lwpverdocument.hxx @@ -70,9 +70,10 @@ class LwpVerDocument : public LwpObject { public: - LwpVerDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm); + LwpVerDocument(LwpObjectHeader const& objHdr, LwpSvStream* pStrm); void Read() override; virtual void RegisterStyle() override; + private: virtual ~LwpVerDocument() override {} diff --git a/lotuswordpro/source/filter/lwpvpointer.hxx b/lotuswordpro/source/filter/lwpvpointer.hxx index 3ed6356dbc64..bce43a204068 100644 --- a/lotuswordpro/source/filter/lwpvpointer.hxx +++ b/lotuswordpro/source/filter/lwpvpointer.hxx @@ -67,11 +67,12 @@ class LwpVersionedPointer final : public LwpObject { public: - LwpVersionedPointer(LwpObjectHeader const & objHdr, LwpSvStream* pStrm); + LwpVersionedPointer(LwpObjectHeader const& objHdr, LwpSvStream* pStrm); void Read() override; void RegisterStyle() override; void Parse(IXFStream* pOutputStream) override; - LwpObjectID& GetPointer(){return m_PointerID;} + LwpObjectID& GetPointer() { return m_PointerID; } + private: LwpObjectID m_PointerID; virtual ~LwpVersionedPointer() override {} diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx index 234649d204f5..f8bcb5157f40 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx @@ -75,7 +75,7 @@ public: /** * @descr Encode binary buffer to base64 encoding. */ - static OUString Encode(sal_uInt8 const *buf, sal_Int32 len); + static OUString Encode(sal_uInt8 const* buf, sal_Int32 len); }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx index 80bf6171de28..0f4532e45f61 100644 --- a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx @@ -67,16 +67,16 @@ XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, bool all) SetAnchorType(enumXFAnchorPage); } -void XFFloatFrame::ToXml(IXFStream *pStrm) +void XFFloatFrame::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - for( int i=m_nStart; i<=m_nEnd; i++ ) + for (int i = m_nStart; i <= m_nEnd; i++) { XFFrame::SetAnchorPage(i); XFFrame::ToXml(pStrm); - if( !m_bAll ) + if (!m_bAll) i++; } } diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index 0949ac271456..b971a20731fa 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -65,5 +65,4 @@ XFFontDecl::XFFontDecl(const OUString& name, const OUString& family) m_strFontFamily = family; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx b/lotuswordpro/source/filter/xfilter/xfglobal.cxx index 85425aeeb3bc..43d9ca9c9ae3 100644 --- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx +++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx @@ -113,7 +113,7 @@ OUString XFGlobal::GenImageName() return sResult; } -void XFGlobal::Reset() +void XFGlobal::Reset() { s_nSectionID = 1; s_nFrameID = 1; @@ -122,10 +122,10 @@ void XFGlobal::Reset() s_nAreaID = 1; } -void XFGlobalReset() +void XFGlobalReset() { -// XFFontFactory::Reset(); -// XFStyleManager::Reset(); + // XFFontFactory::Reset(); + // XFStyleManager::Reset(); XFGlobal::Reset(); } -- cgit