SwPaM: xub_StrLen to sal_Int32

Change-Id: I553f91c4f49c02b3bcd2a778cbaf871b397ed89b

5 files changed, 16 insertions, 16 deletions

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 6d543c1584c9..a95a2cf2c468 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -168,12 +168,12 @@ public:
            long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
     SwPaM( const SwNode& rMk, const SwNode& rPt,
            long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
-    SwPaM(  const SwNodeIndex& rMk, xub_StrLen nMkCntnt,
-            const SwNodeIndex& rPt, xub_StrLen nPtCntnt, SwPaM* pRing = 0 );
-    SwPaM(  const SwNode& rMk, xub_StrLen nMkCntnt,
-            const SwNode& rPt, xub_StrLen nPtCntnt, SwPaM* pRing = 0 );
-    SwPaM( const SwNode& rNd, xub_StrLen nCntnt = 0, SwPaM* pRing = 0 );
-    SwPaM( const SwNodeIndex& rNd, xub_StrLen nCntnt = 0, SwPaM* pRing = 0 );
+    SwPaM(  const SwNodeIndex& rMk, sal_Int32 nMkCntnt,
+            const SwNodeIndex& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
+    SwPaM(  const SwNode& rMk, sal_Int32 nMkCntnt,
+            const SwNode& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
+    SwPaM( const SwNode& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
+    SwPaM( const SwNodeIndex& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
     virtual ~SwPaM();
 
     /// @@@ semantic: no copy ctor.
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 15168f6f424f..0eaccbe3af33 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -370,8 +370,8 @@ SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
     m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
 }
 
-SwPaM::SwPaM( const SwNodeIndex& rMark , xub_StrLen nMarkCntnt,
-              const SwNodeIndex& rPoint, xub_StrLen nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
+              const SwNodeIndex& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rMark )
     , m_Bound2( rPoint )
@@ -383,8 +383,8 @@ SwPaM::SwPaM( const SwNodeIndex& rMark , xub_StrLen nMarkCntnt,
     m_pMark ->nContent.Assign( rMark .GetNode().GetCntntNode(), nMarkCntnt );
 }
 
-SwPaM::SwPaM( const SwNode& rMark , xub_StrLen nMarkCntnt,
-              const SwNode& rPoint, xub_StrLen nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
+              const SwNode& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rMark )
     , m_Bound2( rPoint )
@@ -398,7 +398,7 @@ SwPaM::SwPaM( const SwNode& rMark , xub_StrLen nMarkCntnt,
         nMarkCntnt );
 }
 
-SwPaM::SwPaM( const SwNode& rNode, xub_StrLen nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rNode )
     , m_Bound2( m_Bound1.nNode.GetNode().GetNodes() ) // default initialize
@@ -410,7 +410,7 @@ SwPaM::SwPaM( const SwNode& rNode, xub_StrLen nCntnt, SwPaM* pRing )
         nCntnt );
 }
 
-SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, xub_StrLen nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
     : Ring( pRing )
     , m_Bound1( rNodeIdx )
     , m_Bound2( rNodeIdx.GetNode().GetNodes() ) // default initialize
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 08701aff77cc..1b3761609085 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -1992,7 +1992,7 @@ CHECKTABLE(pTblNd->GetTable())
             for( sal_uInt16 i = pMoves->size(); i; )
             {
                 SwTxtNode* pTxtNd = 0;
-                sal_uInt16 nDelPos = 0;
+                sal_Int32 nDelPos = 0;
                 SwUndoMove* pUndo = &(*pMoves)[ --i ];
                 if( !pUndo->IsMoveRange() )
                 {
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index c378f0372b1d..8213e50bc965 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -220,7 +220,7 @@ void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, c
 
     SwTxtNode* pOldTxtNode = mpTxtNode;
 
-    SwPaM aPaM( *mpTxtNode, static_cast<sal_uInt16>(nPos), *mpTxtNode, static_cast<sal_uInt16>(nPos + nLen) );
+    SwPaM aPaM( *mpTxtNode, nPos, *mpTxtNode, nPos+nLen );
 
     UnoActionContext aAction( mpTxtNode->GetDoc() );
 
@@ -250,7 +250,7 @@ void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 n
     if ( !mpTxtNode )
         return;
 
-    SwPaM aPaM( *mpTxtNode, static_cast<sal_uInt16>(nPos), *mpTxtNode, static_cast<sal_uInt16>(nPos + nLen) );
+    SwPaM aPaM( *mpTxtNode, nPos, *mpTxtNode, nPos+nLen );
 
     UnoActionContext aAction( mpTxtNode->GetDoc() );
 
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index fcefbf09793a..80f1f47853b6 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -389,7 +389,7 @@ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException)
     SwTxtFtn const*const pTxtFtn = rFmt.GetTxtFtn();
     OSL_ENSURE(pTxtFtn, "no TextNode?");
     SwTxtNode& rTxtNode = const_cast<SwTxtNode&>(pTxtFtn->GetTxtNode());
-    const xub_StrLen nPos = *pTxtFtn->GetStart();
+    const sal_Int32 nPos = *pTxtFtn->GetStart();
     SwPaM aPam(rTxtNode, nPos, rTxtNode, nPos+1);
     GetDoc()->DeleteAndJoin( aPam );
 }