fix constness of SwFmtsBase::GetFmt()

And covariant return type while I'm at it.

Change-Id: Iab8459e73fa6743eae17094d9826c83b0f53c3f5

8 files changed, 26 insertions, 18 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 {
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index abc11490fb60..de9496de27a1 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -2118,7 +2118,7 @@ bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
 /// Check if this AutoCollection is already/still in use
 bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
 {
-    SwFmt *pNewFmt = 0;
+    const SwFmt *pNewFmt = 0;
     const SwFmtsBase* pArray[ 2 ];
     sal_uInt16 nArrCnt = 1;
     bool bFnd = true;
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 6a497248dece..e106ddbf59ae 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -28,6 +28,7 @@
 #include <sortedobjs.hxx>
 #include <anchoredobject.hxx>
 #include <cntfrm.hxx>
+#include <docary.hxx>
 
 #include <editeng/unoprnms.hxx>
 #include <editeng/charrotateitem.hxx>
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index 5ccf26b3c12d..812c881d1dec 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -674,7 +674,7 @@ void SwFrmFmts::dumpAsXml(xmlTextWriterPtr w, const char* pName) const
         writer.startElement(pName);
         for (size_t i = 0; i < size(); ++i)
         {
-            SwFrmFmt* pFmt = static_cast<SwFrmFmt*>(GetFmt(i));
+            const SwFrmFmt* pFmt = GetFmt(i);
             writer.startElement("swfrmfmt");
             OString aName = OUStringToOString(pFmt->GetName(), RTL_TEXTENCODING_UTF8);
             writer.writeFormatAttribute("ptr", "%p", pFmt);
@@ -709,7 +709,7 @@ void SwCharFmts::dumpAsXml(xmlTextWriterPtr w) const
         writer.startElement("swcharfmts");
         for (size_t i = 0; i < size(); ++i)
         {
-            SwCharFmt* pFmt = static_cast<SwCharFmt*>(GetFmt(i));
+            const SwCharFmt* pFmt = GetFmt(i);
             writer.startElement("swcharfmt");
             OString aName = OUStringToOString(pFmt->GetName(), RTL_TEXTENCODING_UTF8);
             writer.writeFormatAttribute("name", "%s", BAD_CAST(aName.getStr()));
@@ -729,7 +729,7 @@ void SwSectionFmts::dumpAsXml(xmlTextWriterPtr w) const
         writer.startElement("swsectionfmts");
         for (size_t i = 0; i < size(); ++i)
         {
-            SwSectionFmt* pFmt = static_cast<SwSectionFmt*>(GetFmt(i));
+            const SwSectionFmt* pFmt = GetFmt(i);
             writer.startElement("swsectionfmt");
             lcl_dumpSfxItemSet(writer, &pFmt->GetAttrSet());
             writer.endElement();
@@ -746,7 +746,7 @@ void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr w) const
         writer.startElement("swtxtfmtcolls");
         for (size_t i = 0; i < size(); ++i)
         {
-            SwTxtFmtColl* pColl = static_cast<SwTxtFmtColl*>(GetFmt(i));
+            const SwTxtFmtColl* pColl = GetFmt(i);
             writer.startElement("swtxtfmtcoll");
             OString aName = OUStringToOString(pColl->GetName(), RTL_TEXTENCODING_UTF8);
             writer.writeFormatAttribute("name", "%s", BAD_CAST(aName.getStr()));
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 2ebfe735a023..aa57f73657f2 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -32,6 +32,7 @@
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <edtwin.hxx>
+#include <docary.hxx>
 
 #include "viewimp.hxx"
 #include "pagefrm.hxx"
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 628ba094d650..cbf90520ec43 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -54,6 +54,7 @@
 #include <layouter.hxx>
 #include <switerator.hxx>
 #include <DocumentSettingManager.hxx>
+#include <docary.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 42ab1e0c7e2f..c95fd50f4fbb 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -48,6 +48,7 @@
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 #include <unotools/docinfohelper.hxx>
+#include <docary.hxx>
 #if OSL_DEBUG_LEVEL > 1
 #include <iostream>
 #endif