move SwIterator into calbck.hxx

Change-Id: Icdcd46d392bbf1dbe45448328c310d9a327ba60d

84 files changed, 129 insertions, 156 deletions

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index a3bd078cde07..024804ba1bf5 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -27,6 +27,7 @@
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <typeinfo>
+#include <type_traits>
 
 
 class SwModify;
@@ -308,6 +309,52 @@ public:
     bool IsChanged() const { return m_pPosition != m_pCurrent; }
 };
 
+template< class TElementType, class TSource > class SwIterator SAL_FINAL
+{
+
+    static_assert(std::is_base_of<SwClient,TElementType>::value, "TElementType needs to be derived from SwClient");
+    SwClientIter aClientIter;
+public:
+
+    SwIterator( const TSource& rSrc ) : aClientIter(rSrc) {}
+    TElementType* First()
+    {
+        aClientIter.GoStart();
+        if(!aClientIter.m_pPosition)
+            return nullptr;
+        aClientIter.m_pCurrent = nullptr;
+        return Next();
+    }
+    TElementType* Last()
+    {
+        if(!aClientIter.m_pPosition)
+            aClientIter.m_pPosition = const_cast<SwClient*>(aClientIter.m_rRoot.GetDepends());
+        if(!aClientIter.m_pPosition)
+            return PTR_CAST(TElementType,aClientIter.m_pCurrent = nullptr);
+        while(aClientIter.GetRighOfPos())
+            aClientIter.m_pPosition = aClientIter.GetRighOfPos();
+        if(aClientIter.m_pPosition->IsA(TYPE(TElementType)))
+            return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition);
+        return Previous();
+    }
+    TElementType* Next()
+    {
+        if( aClientIter.m_pPosition == aClientIter.m_pCurrent )
+            aClientIter.m_pPosition = aClientIter.GetRighOfPos();
+        while(aClientIter.m_pPosition && !aClientIter.m_pPosition->IsA( TYPE(TElementType) ) )
+            aClientIter.m_pPosition = aClientIter.GetRighOfPos();
+        return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition);
+    }
+    TElementType* Previous()
+    {
+        aClientIter.m_pPosition = aClientIter.GetLeftOfPos();
+        while(aClientIter.m_pPosition && !aClientIter.m_pPosition->IsA( TYPE(TElementType) ) )
+            aClientIter.m_pPosition = aClientIter.GetLeftOfPos();
+        return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition);
+    }
+    bool IsChanged()          { return aClientIter.IsChanged(); }
+};
+
 SwClient::SwClient( SwModify* pToRegisterIn )
     : pRegisteredIn( nullptr )
 {
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx
deleted file mode 100644
index 82216429160b..000000000000
--- a/sw/inc/switerator.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_INC_SWITERATOR_HXX
-#define INCLUDED_SW_INC_SWITERATOR_HXX
-
-#include <type_traits>
-#include <calbck.hxx>
-#include <sal/log.hxx>
-
-template< class TElementType, class TSource > class SwIterator SAL_FINAL
-{
-
-    static_assert(std::is_base_of<SwClient,TElementType>::value, "TElementType needs to be derived from SwClient");
-    SwClientIter aClientIter;
-public:
-
-    SwIterator( const TSource& rSrc ) : aClientIter(rSrc) {}
-    TElementType* First()
-    {
-        aClientIter.GoStart();
-        if(!aClientIter.m_pPosition)
-            return nullptr;
-        aClientIter.m_pCurrent = nullptr;
-        return Next();
-    }
-    TElementType* Last()
-    {
-        if(!aClientIter.m_pPosition)
-            aClientIter.m_pPosition = const_cast<SwClient*>(aClientIter.m_rRoot.GetDepends());
-        if(!aClientIter.m_pPosition)
-            return PTR_CAST(TElementType,aClientIter.m_pCurrent = nullptr);
-        while(aClientIter.GetRighOfPos())
-            aClientIter.m_pPosition = aClientIter.GetRighOfPos();
-        if(aClientIter.m_pPosition->IsA(TYPE(TElementType)))
-            return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition);
-        return Previous();
-    }
-    TElementType* Next()
-    {
-        if( aClientIter.m_pPosition == aClientIter.m_pCurrent )
-            aClientIter.m_pPosition = aClientIter.GetRighOfPos();
-        while(aClientIter.m_pPosition && !aClientIter.m_pPosition->IsA( TYPE(TElementType) ) )
-            aClientIter.m_pPosition = aClientIter.GetRighOfPos();
-        return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition);
-    }
-    TElementType* Previous()
-    {
-        aClientIter.m_pPosition = aClientIter.GetLeftOfPos();
-        while(aClientIter.m_pPosition && !aClientIter.m_pPosition->IsA( TYPE(TElementType) ) )
-            aClientIter.m_pPosition = aClientIter.GetLeftOfPos();
-        return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition);
-    }
-    bool IsChanged()          { return aClientIter.IsChanged(); }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 0428889b7c49..0b5af1665ce2 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -70,7 +70,7 @@
 #include <ndtxt.hxx>
 #include <dflyobj.hxx>
 #include <prevwpage.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <boost/bind.hpp>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 79f2a5258478..4e56fbaeee75 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -28,7 +28,7 @@
 #include <rolbck.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <swtable.hxx>
 
 SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index f6b81a607f71..d66427fee1c6 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -24,7 +24,7 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentState.hxx>
 #include <fldbas.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <fmtfld.hxx>
 #include <docufld.hxx>
 #include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 0d05960fb067..bc863531f51b 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -64,7 +64,7 @@
 #include <fmturl.hxx>
 #include "txtfrm.hxx"
 #include <wrong.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <vcl/window.hxx>
 #include <docufld.hxx>
 
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index abfc556969db..8cb43080e5f5 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -33,7 +33,7 @@
 #include <cntfrm.hxx>
 #include <section.hxx>
 #include <docufld.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <cellatr.hxx>
 #include <swtable.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index fca66719cc36..908abb4aaedd 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -26,7 +26,7 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <view.hxx>
 #include <ndtxt.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <fmtfld.hxx>
 #include <rootfrm.hxx>
 #include <docufld.hxx>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6962da37e75e..e6f5d925acf1 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -134,7 +134,7 @@
 #include <osl/diagnose.h>
 #include <osl/interlck.h>
 #include <vbahelper/vbaaccesshelper.hxx>
-#include "switerator.hxx"
+#include <calbck.hxx>
 
 /* @@@MAINTAINABILITY-HORROR@@@
    Probably unwanted dependency on SwDocShell
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 3dbc5f7fc9c1..54eeeb1787a7 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -67,7 +67,7 @@
 #include <svx/svditer.hxx>
 
 #include <vector>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 69e49669cd05..0bfeee404a6d 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -62,7 +62,7 @@
 #include <poolfmt.hrc>
 
 #include <SwUndoField.hxx>
-#include "switerator.hxx"
+#include <calbck.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 428e758ac1ca..a7a4adf534ff 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -59,7 +59,7 @@
 #include <fmtcnct.hxx>
 #include <dflyobj.hxx>
 #include <undoflystrattr.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <boost/scoped_ptr.hpp>
 
 //UUUU
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 71e5e4f9c4dd..8c017967f98a 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -46,7 +46,7 @@
 #include <section.hxx>
 #include <doctxm.hxx>
 #include <poolfmt.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4e7812a7cdd2..c2fe4377b0a4 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -53,7 +53,7 @@
 #include <SwStyleNameMapper.hxx>
 #include <SwNodeNum.hxx>
 #include <list.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <comphelper/string.hxx>
 #include <tools/datetimeutils.hxx>
 
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 69e578b10081..2cdccf6bf966 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -68,7 +68,7 @@
 #include <breakit.hxx>
 #include <editsh.hxx>
 #include <scriptinfo.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <ToxTextGenerator.hxx>
 #include <ToxTabStopTokenHandler.hxx>
 #include <tools/datetimeutils.hxx>
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 4d9d28ec61ff..c700cf453777 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -32,7 +32,7 @@
 #include <node.hxx>
 #include <numrule.hxx>
 #include <paratr.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <svl/intitem.hxx>
 
 TYPEINIT1( SwTxtFmtColl, SwFmtColl );
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 1520adb45091..3b3ba7f11795 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -39,7 +39,7 @@
 #include "viewopt.hxx"
 #include "htmltbl.hxx"
 #include "ndindex.hxx"
-#include "switerator.hxx"
+#include <calbck.hxx>
 #include <o3tl/numeric.hxx>
 #ifdef DBG_UTIL
 #include "tblrwcl.hxx"
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index ea2dae73dd04..1e3eaac8c775 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -58,7 +58,7 @@
 #include <o3tl/numeric.hxx>
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <docary.hxx>
 
 using namespace com::sun::star;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 98a854fddb41..0fc4eaef3804 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -91,7 +91,7 @@
 #include <algorithm>
 #include <rootfrm.hxx>
 #include <fldupde.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <o3tl/numeric.hxx>
 #include <tools/datetimeutils.hxx>
 
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index a116ab256313..0031e0e02108 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -48,7 +48,7 @@
 #include "docary.hxx"
 #include "ndindex.hxx"
 #include "undobj.hxx"
-#include "switerator.hxx"
+#include <calbck.hxx>
 #include <UndoTable.hxx>
 
 using ::editeng::SvxBorderLine;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 511838540f50..31d6f5a485b2 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -64,7 +64,7 @@
 #include <IDocumentLinksAdministration.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include "ndole.hxx"
 
 using namespace ::com::sun::star::i18n;
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 832e9e77a650..0e10b9d73a47 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <calbck.hxx>
 #include <node.hxx>
 #include <ndindex.hxx>
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 14ef8d405964..cd9eaa98db27 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -61,7 +61,7 @@
 #include <fmteiro.hxx>
 #include <swerror.h>
 #include <unosection.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <svl/smplhint.hxx>
 #include <algorithm>
 #include <ndsect.hxx>
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 70204f3d2618..3cb90bc9f8aa 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -50,7 +50,7 @@
 #include <tabfrm.hxx>
 #include <cntfrm.hxx>
 #include <htmltbl.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 040a4984f0cc..24e256823314 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -66,7 +66,7 @@
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <com/sun/star/text/WritingMode2.hpp>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <algorithm>
 #include <txtfly.hxx>
 
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index e2b655b0a87d..2adece7b60c3 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -36,7 +36,7 @@
 #include <dbmgr.hxx>
 #include <swddetbl.hxx>
 #include <hints.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <fieldhint.hxx>
 #include <DocumentSettingManager.hxx>
 #include <IDocumentContentOperations.hxx>
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 1591cd253fa2..ca14b58372ef 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -31,7 +31,7 @@
 #include <fmtfld.hxx>
 #include <edimp.hxx>
 #include <flddat.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 2f8066e15402..7e9bb4764b53 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -61,7 +61,7 @@
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
 #include <unocrsr.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 56060cd35373..b78deba70f87 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -39,7 +39,7 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <unofldmid.h>
 #include <unoprnms.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <unomid.h>
 
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index c81dec16341b..0d2f01a3668d 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -38,7 +38,7 @@
 #include <expfld.hxx>
 #include <txtatr.hxx>
 #include <unofldmid.h>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 5d2a2b148aa7..d43a2b352e5d 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -33,7 +33,7 @@
 #include <swddetbl.hxx>
 #include <unofldmid.h>
 #include <hints.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 407b4e73f92c..7da9b37322e6 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -95,7 +95,7 @@
 
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <docary.hxx>
 
 #define URL_DECODE  INetURLObject::DECODE_UNAMBIGUOUS
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index a67a9512bf1a..24ba569756fd 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -56,7 +56,7 @@
 #include <SwStyleNameMapper.hxx>
 #include <unofldmid.h>
 #include <numrule.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 8333ad8e9e57..dc0e6d57cdc3 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -46,7 +46,7 @@
 #include <comcore.hrc>
 #include <docary.hxx>
 #include <authfld.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 using namespace nsSwDocInfoSubType;
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 6a134491781d..72d92c1c3ebf 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "switerator.hxx"
+#include <calbck.hxx>
 #include "editsh.hxx"
 #include "doc.hxx"
 #include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 91aab4cceb70..fdce8999502c 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -34,7 +34,7 @@
 #include <redline.hxx>
 #include <scriptinfo.hxx>
 #include <editeng/charhiddenitem.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 class Point;
 
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 869950b61ee3..18bcf2ae76b1 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -56,7 +56,7 @@
 #include <comcore.hrc>
 #include <numrule.hxx>
 #include <SwNodeNum.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #include <set>
 #include <map>
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 2f2087f00d3b..738152bd0f27 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <cntfrm.hxx>
 #include <doc.hxx>
 #include <pam.hxx>
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 0394e84a75a1..4697c92970f1 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -81,7 +81,7 @@
 #include <sortedobjs.hxx>
 #include <HandleAnchorNodeChg.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 22851d577b11..86d36f70cbce 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -46,7 +46,7 @@
 #include <mvsave.hxx>
 #include <sectfrm.hxx>
 #include <frmtool.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <deque>
 
 // see also swtable.cxx
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c1d3ae6087bf..c9aa05207bc7 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -73,7 +73,7 @@
 #include <svx/svdundo.hxx>
 #include <sortedobjs.hxx>
 #include <HandleAnchorNodeChg.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <pagedeschint.hxx>
 #ifndef NDEBUG
 #include <ndtxt.hxx>
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index b0823d3001e7..e139895fca66 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -27,7 +27,7 @@
 #include "bodyfrm.hxx"
 #include "rootfrm.hxx"
 #include "sectfrm.hxx"
-#include "switerator.hxx"
+#include <calbck.hxx>
 #include "ftnfrm.hxx"
 #include <IDocumentState.hxx>
 #include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index cdc8bafbab44..6552055491f3 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -30,7 +30,7 @@
 #include "txtftn.hxx"
 #include "fmtftn.hxx"
 #include <txtfrm.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 /// Searches the first CntntFrm in BodyText below the page.
 SwLayoutFrm *SwFtnBossFrm::FindBodyCont()
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 8c3bf1b51f6a..f4a67d49f33a 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -52,7 +52,7 @@
 #include <sortedobjs.hxx>
 #include <layouter.hxx>
 #include <fmtfollowtextflow.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentDrawModelAccess.hxx>
 
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 6d98fe886080..f8c0db074ba1 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -58,7 +58,7 @@
 #include "flyfrms.hxx"
 #include "sectfrm.hxx"
 #include <vcl/svapp.hxx>
-#include "switerator.hxx"
+#include <calbck.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <textboxhelper.hxx>
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index 135e5c32f10a..b0ecb2894e9c 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -23,7 +23,7 @@
 #include "dcontact.hxx"
 #include "flyfrm.hxx"
 #include "dflyobj.hxx"
-#include "switerator.hxx"
+#include <calbck.hxx>
 
 bool SwPosFlyFrmCmp::operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const
 {
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index a964d801cd77..37a7dac32fa5 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -60,7 +60,7 @@
 #include <paratr.hxx>
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <DocumentSettingManager.hxx>
 #include <IDocumentTimerAccess.hxx>
 #include <IDocumentRedlineAccess.hxx>
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 880cc9be639f..04a55df847c2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -32,7 +32,7 @@
 #include <sectfrm.hxx>
 #include <objectformatter.hxx>
 #include "viewopt.hxx"
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #define ENDNOTE 0x80000000
 
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index d812aa3edd97..60774d71f2b3 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -21,7 +21,7 @@
 #include <txtfrm.hxx>
 #include <rowfrm.hxx>
 #include <pagefrm.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 SwMovedFwdFrmsByObjPos::SwMovedFwdFrmsByObjPos()
 {
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 62de3e720f03..ac888b8173d3 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -53,7 +53,7 @@
 #include "pagedesc.hxx"
 #include <editeng/frmdiritem.hxx>
 #include <sortedobjs.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <txtfly.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 0d05037df14c..fffe9df4079e 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -34,7 +34,7 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <poolfmt.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d2372ace8860..dfdf6a373f09 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -27,7 +27,7 @@
 #include <svx/framelink.hxx>
 #include <drawdoc.hxx>
 #include <tgrditem.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtclds.hxx>
 #include <comcore.hrc>
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 85fb7834565b..96f91903ddfb 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -23,7 +23,7 @@
 #include "frmfmt.hxx"
 #include "rowfrm.hxx"
 #include "tabfrm.hxx"
-#include "switerator.hxx"
+#include <calbck.hxx>
 
 void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
 {
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 2a6e97a11095..e5b89cbb367c 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -52,7 +52,7 @@
 #include <sortedobjs.hxx>
 #include <objectformatter.hxx>
 #include <layouter.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <DocumentSettingManager.hxx>
 #include <docary.hxx>
 
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 8a10f5d62f1a..dbb1d007d41d 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -40,7 +40,7 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/protitem.hxx>
 #include <swtblfmt.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #ifdef DBG_UTIL
 #define CHECK_TABLE(t) (t).CheckConsistency();
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index d082e474ae2e..100745ddefd3 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -58,7 +58,7 @@
 #include <viewsh.hxx>
 #include <redline.hxx>
 #include <list>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #ifdef DBG_UTIL
 #define CHECK_TABLE(t) (t).CheckConsistency();
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 6e169d4e2818..054451073c9f 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -72,7 +72,7 @@
 #include <IMark.hxx>
 #include <printdata.hxx>
 #include <SwNodeNum.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <stack>
 
 #include <tools/globname.hxx>
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index cfa3dcb92168..b16996f91794 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -54,7 +54,7 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <editeng/lrspitem.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star;
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 4df3cbbd24cd..2213428416bd 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -46,7 +46,7 @@
 #include <docary.hxx>
 #include <redline.hxx>
 #include <section.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <IDocumentRedlineAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentContentOperations.hxx>
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index c6842687d724..ba8a3e367328 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -36,7 +36,7 @@
 #include <editeng/langitem.hxx>
 #include <charatr.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index ddd658bf2cc0..43947ed83e62 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -74,7 +74,7 @@
 #include <swtable.hxx>
 #include <fldupde.hxx>
 #include <IGrammarContact.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <ftnidx.hxx>
 
 TYPEINIT1( SwTxtFrm, SwCntntFrm );
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 63faef10089d..66c86db13a31 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -32,7 +32,7 @@
 #include <SwStyleNameMapper.hxx>
 #include <hints.hxx>
 #include <functional>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index b5ce09bae32b..d82afbc2935b 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -33,7 +33,7 @@
 #include "txtfrm.hxx"
 #include "flyfrms.hxx"
 #include <objectformatter.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt )
     : SfxPoolItem( RES_TXTATR_FLYCNT ),
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index a71f11cd0b6b..5ccaa1f325ec 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -34,7 +34,7 @@
 #include <ndindex.hxx>
 #include <fmtftntx.hxx>
 #include <section.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 namespace {
     /// Get a sorted list of the used footnote reference numbers.
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index c630288584cc..17b399244f30 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -83,7 +83,7 @@
 #include <svl/intitem.hxx>
 #include <list.hxx>
 #include <sortedobjs.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <attrhint.hxx>
 #include <memory>
 
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 1e00de147573..837754ccbc79 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -57,7 +57,7 @@
 #include <redline.hxx>
 #include <section.hxx>
 #include <charfmt.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 SwUndoFmtAttrHelper::SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSvDrwPt )
     : SwClient( &rFmt )
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 990418e5db05..9bcf55ee4de7 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -62,7 +62,7 @@
 #include <fmtanchr.hxx>
 #include <comcore.hrc>
 #include <unochart.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <memory>
 #include <vector>
 
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 4d115097c9b9..abff74932613 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -71,7 +71,7 @@
 #include <unorefmark.hxx>
 #include <unometa.hxx>
 #include "docsh.hxx"
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <com/sun/star/document/XCodeNameQuery.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 375e8c6eee1c..d2df9ec085f7 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -65,7 +65,7 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <com/sun/star/drawing/PointSequence.hpp>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 75d59a8820e2..92de98615fba 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -93,7 +93,7 @@
 #include <editeng/outliner.hxx>
 #include <docsh.hxx>
 #include <fmtmeta.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <rtl/strbuf.hxx>
 #include <vector>
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 39e74f2847a8..6a3ffd19d4bf 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -116,7 +116,7 @@
 #include <fmtfollowtextflow.hxx>
 #include <fmtwrapinfluenceonobjpos.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 4980ed0df7b3..58a7101f2ad0 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -110,7 +110,7 @@
 #include <algorithm>
 #include <iterator>
 #include <boost/bind.hpp>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 964d1f49f374..80c1abde888c 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -54,7 +54,7 @@
 #include <unocoll.hxx>
 #include <redline.hxx>
 #include <crsskip.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <docufld.hxx>
 #include <osl/mutex.hxx>
 #include <txtfld.hxx>
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 94891fb31d42..4d15d2c5eeb0 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -32,7 +32,7 @@
 #include <IDocumentStylePoolAccess.hxx>
 #include <docary.hxx>
 #include <redline.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index ee4d66fec2a5..5b74c2fcf8e8 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -94,7 +94,7 @@
 #include <sortopt.hxx>
 #include <rtl/math.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 37a17c0d9808..5fdaf05ba411 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -39,7 +39,7 @@
 #include <ndgrf.hxx>
 #include <ndindex.hxx>
 #include <accessibilityoptions.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 void SwViewShell::Init( const SwViewOption *pNewOpt )
 {
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9b4f78c931dc..95b0010f856e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -317,7 +317,7 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
     }
 }
 
-#include "switerator.hxx"
+#include <calbck.hxx>
 
 void MSWordExportBase::GatherChapterFields()
 {
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 9849a90435e7..a12e5ae119cd 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -54,7 +54,7 @@
 #include <ndole.hxx>
 #include <docsh.hxx>
 #include <sfx2/docfile.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 49205e8e3f08..a8d2b4a179fc 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -37,7 +37,7 @@
 #include <cmdid.h>
 #include <globals.hrc>
 #include <sfx2/bindings.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 12b4aeb14c28..84c428520b61 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -119,7 +119,7 @@
 #include <unotextrange.hxx>
 
 #include <sfx2/Metadatable.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 27c2f338fb45..51f89520af34 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -122,7 +122,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <swserv.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 
 #include <vcl/GraphicNativeTransform.hxx>
 #include <vcl/GraphicNativeMetadata.hxx>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index fa8f58d10d76..85834017931d 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -78,7 +78,7 @@
 #include "annotsh.hxx"
 #include "swabstdlg.hxx"
 #include "swevent.hxx"
-#include "switerator.hxx"
+#include <calbck.hxx>
 #include <boost/scoped_ptr.hpp>
 
 // distance between Anchor Y and initial note position
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 84931755dd39..31bbd379c5e4 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -69,7 +69,7 @@
 #include <app.hrc>
 #include <edtwin.hxx>
 #include <PostItMgr.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include <boost/scoped_ptr.hpp>
 
 using namespace nsSwDocInfoSubType;
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 37b835c55233..fff7af2313b7 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -69,7 +69,7 @@
 #include <unocrsrhelper.hxx>
 #include <unotextrange.hxx>
 #include <sfx2/docfile.hxx>
-#include <switerator.hxx>
+#include <calbck.hxx>
 #include "swdtflvr.hxx"
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>