diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-01 15:51:15 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-02 13:26:02 +0100 |
commit | 1f84470abc6087fc6a3d01defae5043772bdd95e (patch) | |
tree | 5f88ea1e31b1d59a8a33111e78fd2f8dcb86bdea /lotuswordpro/inc | |
parent | 6ad2ec4e98157618a9ff5b9097d84b45d16c7038 (diff) |
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 <path-of-the-file>
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 <muhammet.kara@collabora.com>
Diffstat (limited to 'lotuswordpro/inc')
-rw-r--r-- | lotuswordpro/inc/lwpbookmarkmgr.hxx | 5 | ||||
-rw-r--r-- | lotuswordpro/inc/lwpchangemgr.hxx | 7 | ||||
-rw-r--r-- | lotuswordpro/inc/lwpdocdata.hxx | 11 | ||||
-rw-r--r-- | lotuswordpro/inc/lwpdropcapmgr.hxx | 3 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/ixfattrlist.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfcontent.hxx | 9 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfdate.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfdefs.hxx | 14 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfdrawline.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfdrawpolygon.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfendnoteconfig.hxx | 3 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xffontfactory.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfimage.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfparagraph.hxx | 7 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfsection.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xftextboxstyle.hxx | 3 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xftextcontent.hxx | 8 |
17 files changed, 61 insertions, 55 deletions
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<OUString, rtl::Reference<XFBookmarkStart>> m_MapStart; std::map<OUString, rtl::Reference<XFBookmarkEnd>> 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<LwpFrib*,OUString>* m_pFribMap; - std::map<LwpFrib*,OUString> m_DocFribMap; - std::map<LwpFrib*,OUString> m_HeadFootFribMap; + std::map<LwpFrib*, OUString>* m_pFribMap; + std::map<LwpFrib*, OUString> m_DocFribMap; + std::map<LwpFrib*, OUString> m_HeadFootFribMap; std::vector<rtl::Reference<XFChangeRegion>> 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 <sal/types.h> -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<XFFont> const & pFont); + void AddFont(rtl::Reference<XFFont> const& pFont); /** * @descr Find whether same font object exists. */ - rtl::Reference<XFFont> FindSameFont(rtl::Reference<XFFont> const & pFont); + rtl::Reference<XFFont> FindSameFont(rtl::Reference<XFFont> const& pFont); friend class XFStyleContainer; private: - std::vector< rtl::Reference<XFFont> > s_aFonts; + std::vector<rtl::Reference<XFFont>> 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 |