diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2014-11-08 18:19:04 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2014-11-09 19:45:16 +0100 |
commit | c41346f96f201c4e8b6c15d5b3fe65aa2590e86a (patch) | |
tree | 253e11abf884b355d47dc828fd160d195b86df92 /sw/inc | |
parent | bb00a0097900ae054401f7758a915047cfde4065 (diff) |
fix constness of SwFmtsBase::GetFmt()
And covariant return type while I'm at it.
Change-Id: Iab8459e73fa6743eae17094d9826c83b0f53c3f5
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/docary.hxx | 28 | ||||
-rw-r--r-- | sw/inc/node.hxx | 2 |
2 files changed, 17 insertions, 13 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 097a1b28cc05..2f388b1f65e7 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -26,19 +26,13 @@ #include <o3tl/sorted_vector.hxx> class SwFieldType; -class SwFmt; -class SwFrmFmt; -class SwCharFmt; class SwTOXType; class SwUndo; -class SwSectionFmt; class SwNumRule; class SwRangeRedline; class SwExtraRedline; class SwUnoCrsr; class SwOLENode; -class SwTxtFmtColl; -class SwGrfFmtColl; class SwTable; class SwTableLine; class SwTableBox; @@ -49,6 +43,10 @@ namespace com { namespace sun { namespace star { namespace i18n { #include <swtypes.hxx> #include <ndarr.hxx> +#include <charfmt.hxx> +#include <fmtcol.hxx> +#include <frmfmt.hxx> +#include <section.hxx> /** provides some methods for generic operations on lists that contain SwFmt* subclasses. */ @@ -56,7 +54,8 @@ class SwFmtsBase { public: virtual size_t GetFmtCount() const = 0; - virtual SwFmt* GetFmt(size_t idx) const = 0; + virtual const SwFmt* GetFmt(size_t idx) const = 0; + virtual SwFmt* GetFmt(size_t idx) = 0; virtual ~SwFmtsBase() = 0; }; @@ -67,7 +66,8 @@ private: public: virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } - virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } + virtual const SwGrfFmtColl* GetFmt(size_t idx) const SAL_OVERRIDE { return operator[](idx); } + virtual SwGrfFmtColl* GetFmt(size_t idx) SAL_OVERRIDE { return operator[](idx); } size_t size() const { return mvColls.size(); } SwGrfFmtColl *operator[](size_t idx) const { return mvColls[idx]; } void push_back(SwGrfFmtColl* pColl) { mvColls.push_back(pColl); } @@ -85,7 +85,8 @@ class SW_DLLPUBLIC SwFrmFmts : public SwFrmFmts_Base, public SwFmtsBase { public: virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } - virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } + virtual const SwFrmFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return operator[](idx); } + virtual SwFrmFmt* GetFmt(size_t idx) SAL_OVERRIDE { return operator[](idx); } sal_uInt16 GetPos(const SwFrmFmt* pFmt) const; bool Contains(const SwFrmFmt* pFmt) const; void dumpAsXml(xmlTextWriterPtr w, const char* pName) const; @@ -97,7 +98,8 @@ class SwCharFmts : public std::vector<SwCharFmt*>, public SwFmtsBase { public: virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } - virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } + virtual const SwCharFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return operator[](idx); } + virtual SwCharFmt* GetFmt(size_t idx) SAL_OVERRIDE { return operator[](idx); } sal_uInt16 GetPos(const SwCharFmt* pFmt) const; bool Contains(const SwCharFmt* pFmt) const; void dumpAsXml(xmlTextWriterPtr w) const; @@ -109,7 +111,8 @@ class SwTxtFmtColls : public std::vector<SwTxtFmtColl*>, public SwFmtsBase { public: virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } - virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } + virtual const SwTxtFmtColl* GetFmt(size_t idx) const SAL_OVERRIDE { return operator[](idx); } + virtual SwTxtFmtColl* GetFmt(size_t idx) SAL_OVERRIDE { return operator[](idx); } sal_uInt16 GetPos(const SwTxtFmtColl* pFmt) const; void dumpAsXml(xmlTextWriterPtr w) const; virtual ~SwTxtFmtColls() {} @@ -120,7 +123,8 @@ class SW_DLLPUBLIC SwSectionFmts : public std::vector<SwSectionFmt*>, public SwF { public: virtual size_t GetFmtCount() const SAL_OVERRIDE { return size(); } - virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return (SwFmt*)operator[](idx); } + virtual const SwSectionFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return operator[](idx); } + virtual SwSectionFmt* GetFmt(size_t idx) SAL_OVERRIDE { return operator[](idx); } sal_uInt16 GetPos(const SwSectionFmt* pFmt) const; bool Contains(const SwSectionFmt* pFmt) const; void dumpAsXml(xmlTextWriterPtr w) const; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index f3ec9f04081b..64a7e5c8e803 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -33,7 +33,6 @@ #include <ndtyp.hxx> #include <index.hxx> #include <fmtcol.hxx> -#include "docary.hxx" // forward declarations @@ -73,6 +72,7 @@ class IDocumentFieldsAccess; class IDocumentContentOperations; class IDocumentListItems; class Point; +typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx //UUUU namespace drawinglayer { namespace attribute { |