use UnoCursorPointer in ParagraphFrameEnumeration

Change-Id: I5fdf0bdd8609aa07c49b155cc75cade8bdb2c292

sw/source/core/inc/unoparaframeenum.hxx

@@ -22,42 +22,49 @@
 
 #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/implbase.hxx>
 
+#include <calbck.hxx>
 #include <unobaseclass.hxx>
 
+
 class SwDepend;
 class SwNodeIndex;
 class SwPaM;
 class SwFrameFormat;
 
-struct FrameDependSortListEntry
+namespace sw
+{
+    struct FrameClient : public SwClient
+    {
+        FrameClient(SwModify* pModify) : SwClient(pModify) {};
+    };
+}
+struct FrameClientSortListEntry
 {
     sal_Int32 nIndex;
     sal_uInt32 nOrder;
-    ::boost::shared_ptr<SwDepend> pFrameDepend;
+    std::shared_ptr<sw::FrameClient> pFrameClient;
 
-    FrameDependSortListEntry (sal_Int32 const i_nIndex,
-                sal_uInt32 const i_nOrder, SwDepend * const i_pDepend)
-        : nIndex(i_nIndex), nOrder(i_nOrder), pFrameDepend(i_pDepend) { }
+    FrameClientSortListEntry (sal_Int32 const i_nIndex,
+                sal_uInt32 const i_nOrder, sw::FrameClient* const i_pClient)
+        : nIndex(i_nIndex), nOrder(i_nOrder), pFrameClient(i_pClient) { }
 };
 
-typedef ::std::deque< FrameDependSortListEntry >
-    FrameDependSortList_t;
+typedef ::std::deque< FrameClientSortListEntry >
+    FrameClientSortList_t;
 
-typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
-    FrameDependList_t;
+typedef ::std::deque< std::shared_ptr<sw::FrameClient> >
+    FrameClientList_t;
 
 // #i28701# - adjust 4th parameter
-void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
-                         FrameDependSortList_t & rFrames,
-                         const bool _bAtCharAnchoredObjs );
+void CollectFrameAtNode( const SwNodeIndex& rIdx,
+                         FrameClientSortList_t& rFrames,
+                         const bool bAtCharAnchoredObjs );
 
 enum ParaFrameMode
 {

sw/source/core/unocore/unoportenum.cxx

@@ -80,7 +80,7 @@ static void lcl_CreatePortions(
     TextRangeList_t & i_rPortions,
     uno::Reference< text::XText > const& i_xParentText,
     SwUnoCrsr* pUnoCrsr,
-    FrameDependSortList_t & i_rFrames,
+    FrameClientSortList_t & i_rFrames,
     const sal_Int32 i_nStartPos, const sal_Int32 i_nEndPos );
 
 namespace
@@ -371,8 +371,8 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration(
             "start or end value invalid!");
 
     // find all frames, graphics and OLEs that are bound AT character in para
-    FrameDependSortList_t frames;
-    ::CollectFrameAtNode(*this, m_pUnoCrsr->GetPoint()->nNode, frames, true);
+    FrameClientSortList_t frames;
+    ::CollectFrameAtNode(m_pUnoCrsr->GetPoint()->nNode, frames, true);
     lcl_CreatePortions(m_Portions, xParentText, m_pUnoCrsr.get(), frames, nStart, nEnd);
 }
 
@@ -1187,7 +1187,7 @@ static sal_Int32 lcl_ExportFrames(
     TextRangeList_t & rPortions,
     Reference<XText> const & i_xParent,
     SwUnoCrsr * const i_pUnoCrsr,
-    FrameDependSortList_t & i_rFrames,
+    FrameClientSortList_t & i_rFrames,
     sal_Int32 const i_nCurrentIndex)
 {
     // Ignore frames which are not exported, as we are exporting a selection
@@ -1200,7 +1200,7 @@ static sal_Int32 lcl_ExportFrames(
     // do not check for i_nEnd here; this is done implicity by lcl_MoveCursor
     {
         const SwModify * const pFrame =
-            i_rFrames.front().pFrameDepend->GetRegisteredIn();
+            i_rFrames.front().pFrameClient->GetRegisteredIn();
         if (pFrame) // Frame could be disposed
         {
             SwXTextPortion* pPortion = new SwXTextPortion(i_pUnoCrsr, i_xParent,
@@ -1243,7 +1243,7 @@ static void lcl_CreatePortions(
         TextRangeList_t & i_rPortions,
         uno::Reference< text::XText > const & i_xParentText,
         SwUnoCrsr * const pUnoCrsr,
-        FrameDependSortList_t & i_rFrames,
+        FrameClientSortList_t & i_rFrames,
         const sal_Int32 i_nStartPos,
         const sal_Int32 i_nEndPos )
 {