CWS svxsplit: merge with m71

3 files changed, 15 insertions, 10 deletions

diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 36d9b53fd030..e72003e1ad10 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -438,7 +438,7 @@ const SwFrm *SwAccessibleFrame::GetParent( const SwFrmOrObj& rFrmOrObj,
             const SwFlyFrm *pFly = static_cast< const SwFlyFrm *>( pFrm );
             if( pFly->IsFlyInCntFrm() )
             {
-                // For FLY_IN_CNTNT the parent is the anchor
+                // For FLY_AS_CHAR the parent is the anchor
                 aParent = pFly->GetAnchorFrm();
                 ASSERT( aParent.IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
@@ -471,9 +471,9 @@ const SwFrm *SwAccessibleFrame::GetParent( const SwFrmOrObj& rFrmOrObj,
         {
             const SwFrmFmt *pFrmFmt = pContact->GetFmt();
             ASSERT( pFrmFmt, "frame format is missing" );
-            if( pFrmFmt && FLY_IN_CNTNT == pFrmFmt->GetAnchor().GetAnchorId() )
+            if (pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId())
             {
-                // For FLY_IN_CNTNT the parent is the anchor
+                // For FLY_AS_CHAR the parent is the anchor
                 aParent = pContact->GetAnchorFrm();
                 ASSERT( aParent.IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index f16d11692c9c..c7822e80ea72 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -59,8 +59,10 @@ sal_Bool SwFrmOrObj::IsBoundAsChar() const
     else
     {
         const SwFrmFmt *pFrmFmt = pObj ? ::FindFrmFmt( pObj ) : 0;
-        return pFrmFmt ? static_cast<sal_Bool>(FLY_IN_CNTNT == pFrmFmt->GetAnchor().GetAnchorId())
-                       : sal_False;
+        return (pFrmFmt)
+            ? static_cast<sal_Bool>(FLY_AS_CHAR ==
+                    pFrmFmt->GetAnchor().GetAnchorId())
+            : sal_False;
     }
 }
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 0d9491f48aa4..c78ffffae650 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -30,10 +30,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <txtfrm.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
-#include <unoobj.hxx>
+#include <unotextrange.hxx>
+#include <unocrsrhelper.hxx>
 #include <crstate.hxx>
 #include <accmap.hxx>
 #include "fesh.hxx"
@@ -63,7 +65,6 @@
 #include <unotools/charclass.hxx>   // for GetWordBoundary
 // for get/setCharacterAttribute(...)
 #include "unocrsr.hxx"
-#include "unoobj.hxx"
 #include "unoport.hxx"
 #include "doc.hxx"
 #include "crsskip.hxx"
@@ -1532,7 +1533,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
         SfxItemSet aCharAttrsAtPaM( pPaM->GetDoc()->GetAttrPool(),
                                     RES_CHRATR_BEGIN, RES_CHRATR_END -1,
                                     0 );
-        SwXTextCursor::GetCrsrAttr( *pPaM, aCharAttrsAtPaM, TRUE, TRUE );
+        SwUnoCursorHelper::GetCrsrAttr(*pPaM, aCharAttrsAtPaM, TRUE, TRUE);
         aSet.Put( aCharAttrsAtPaM );
     }
     // <--
@@ -2104,8 +2105,10 @@ sal_Bool SwAccessibleParagraph::replaceText(
             aEndPos.nContent = nEnd;
 
             // now create XTextRange as helper and set string
-            SwXTextRange::CreateTextRangeFromPosition(
-                pNode->GetDoc(), aStartPos, &aEndPos)->setString(sReplacement);
+            const uno::Reference<text::XTextRange> xRange(
+                SwXTextRange::CreateXTextRange(
+                    *pNode->GetDoc(), aStartPos, &aEndPos));
+            xRange->setString(sReplacement);
 
             // delete portion data
             ClearPortionData();