swunolocking1: #i105557#: unoobj.hxx: split out unoparaframeenum.hxx:

 move SwXParaFrameEnumeration from unoobj.hxx to new unoparaframeenum.hxx.
 move FrameDependSortList_t, CollectFrameAtNode to unoparaframeenum.hxx.

6 files changed, 142 insertions, 70 deletions

diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index d43a4a7105e1..ae9eaa205a3b 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -50,27 +50,10 @@
 
 #include <unomid.h>
 
-#include <deque>
-#include <boost/shared_ptr.hpp>
-
 
 class GetCurTxtFmtColl;
 
 
-struct FrameDependSortListEntry {
-    xub_StrLen nIndex;
-    sal_uInt32 nOrder;
-    ::boost::shared_ptr<SwDepend> pFrameDepend;
-    FrameDependSortListEntry (xub_StrLen const i_nIndex,
-                sal_uInt32 const i_nOrder, SwDepend * const i_pDepend)
-        : nIndex(i_nIndex), nOrder(i_nOrder), pFrameDepend(i_pDepend) { }
-};
-typedef ::std::deque< FrameDependSortListEntry >
-    FrameDependSortList_t;
-
-typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
-    FrameDependList_t;
-
 
 /* -----------------26.06.98 16:18-------------------
  *
@@ -79,10 +62,6 @@ typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
 SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName);
 ::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
 
-// OD 2004-05-07 #i28701# - adjust 4th parameter
-void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
-                         FrameDependSortList_t & rFrames,
-                         const bool _bAtCharAnchoredObjs );
 
 /*-----------------04.03.98 11:54-------------------
     Start/EndAction oder Start/EndAllAction
@@ -168,53 +147,6 @@ public:
 
 --------------------------------------------------*/
 
-/* -----------------23.03.99 12:57-------------------
- *
- * --------------------------------------------------*/
-#define PARAFRAME_PORTION_PARAGRAPH     0
-#define PARAFRAME_PORTION_CHAR          1
-#define PARAFRAME_PORTION_TEXTRANGE     2
-
-class SwXParaFrameEnumeration : public cppu::WeakImplHelper2
-<
-    ::com::sun::star::container::XEnumeration,
-    ::com::sun::star::lang::XServiceInfo
->,
-    public SwClient
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
-        m_xNextObject;    // created by hasMoreElements
-    FrameDependList_t m_Frames;
-
-    SwUnoCrsr*          GetCursor() const
-    {return static_cast<SwUnoCrsr*>(const_cast<SwModify*>(GetRegisteredIn()));}
-
-public:
-    SwXParaFrameEnumeration(const SwPaM& rPaM,
-        sal_uInt8 nParaFrameMode, SwFrmFmt* pFmt = 0);
-    ~SwXParaFrameEnumeration();
-
-    // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
-        throw( ::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::lang::WrappedTargetException,
-               ::com::sun::star::uno::RuntimeException );
-
-    // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException );
-
-    //SwClient
-    virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-};
-
 
 /* -----------------29.09.98 09:01-------------------
  *
diff --git a/sw/inc/unoparaframeenum.hxx b/sw/inc/unoparaframeenum.hxx
new file mode 100644
index 000000000000..d05fccfed46d
--- /dev/null
+++ b/sw/inc/unoparaframeenum.hxx
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unoobj.hxx,v $
+ *
+ * $Revision: 1.49 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SW_UNOPARAFRAMEENUM_HXX
+#define SW_UNOPARAFRAMEENUM_HXX
+
+#include <deque>
+
+#include <boost/shared_ptr.hpp>
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+#include <calbck.hxx>
+#include <unocrsr.hxx>
+
+
+class SwNodeIndex;
+class SwPaM;
+class SwUnoCrsr;
+class SwFrmFmt;
+
+
+struct FrameDependSortListEntry
+{
+    xub_StrLen nIndex;
+    sal_uInt32 nOrder;
+    ::boost::shared_ptr<SwDepend> pFrameDepend;
+
+    FrameDependSortListEntry (xub_StrLen const i_nIndex,
+                sal_uInt32 const i_nOrder, SwDepend * const i_pDepend)
+        : nIndex(i_nIndex), nOrder(i_nOrder), pFrameDepend(i_pDepend) { }
+};
+
+typedef ::std::deque< FrameDependSortListEntry >
+    FrameDependSortList_t;
+
+typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
+    FrameDependList_t;
+
+
+// OD 2004-05-07 #i28701# - adjust 4th parameter
+void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
+                         FrameDependSortList_t & rFrames,
+                         const bool _bAtCharAnchoredObjs );
+
+
+/* -----------------23.03.99 12:57-------------------
+ *
+ * --------------------------------------------------*/
+
+#define PARAFRAME_PORTION_PARAGRAPH     0
+#define PARAFRAME_PORTION_CHAR          1
+#define PARAFRAME_PORTION_TEXTRANGE     2
+
+
+typedef ::cppu::WeakImplHelper2
+<   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XEnumeration
+> SwXParaFrameEnumeration_Base;
+
+class SwXParaFrameEnumeration
+    : public SwXParaFrameEnumeration_Base
+    , public SwClient
+{
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
+        m_xNextObject;    // created by hasMoreElements
+    FrameDependList_t m_Frames;
+
+    SwUnoCrsr*          GetCursor() const
+    {return static_cast<SwUnoCrsr*>(const_cast<SwModify*>(GetRegisteredIn()));}
+
+    virtual ~SwXParaFrameEnumeration();
+
+public:
+
+    SwXParaFrameEnumeration(const SwPaM& rPaM,
+        sal_uInt8 nParaFrameMode, SwFrmFmt* pFmt = 0);
+
+    // SwClient
+    virtual void    Modify(SfxPoolItem *pOld, SfxPoolItem *pNew);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService(
+            const ::rtl::OUString& rServiceName)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XEnumeration
+    virtual sal_Bool SAL_CALL hasMoreElements()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
+        throw (::com::sun::star::container::NoSuchElementException,
+               ::com::sun::star::lang::WrappedTargetException,
+               ::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOPARAFRAMEENUM_HXX
+
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index aa6a35526866..506cc5d81cdf 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <rtl/ustrbuf.hxx>
 #include <swtypes.hxx>
 #include <hintids.hxx>
@@ -78,6 +77,7 @@
 #include <txtrfmrk.hxx>
 #include <unoclbck.hxx>
 #include <unoobj.hxx>
+#include <unoparaframeenum.hxx>
 #include <unofootnote.hxx>
 #include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 8a47c71ebd75..dd809240151e 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -31,10 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <cmdid.h>
 #include <unomid.h>
 #include <unoobj.hxx>
+#include <unoparaframeenum.hxx>
 #include <unotext.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index f7b2e40fa440..eba2f9e923d3 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -39,6 +39,7 @@
 #include <unocrsrhelper.hxx>
 #include <unoport.hxx>
 #include <unoobj.hxx>
+#include <unoparaframeenum.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unomap.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index f9379cbd476f..214336dce955 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -47,6 +47,7 @@
 #include <tox.hxx>
 #include <unoclbck.hxx>
 #include <unoobj.hxx>
+#include <unoparaframeenum.hxx>
 #include <unotextcursor.hxx>
 #include <unorefmark.hxx>
 #include <unobookmark.hxx>