Related: #i17171# big xub_Strlen -> sal_Int32 changes

Change-Id: I31bce794c95062abfa1171c13cf565498688b5f3

11 files changed, 30 insertions, 30 deletions

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 271266fdd1de..4256155c9431 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -143,7 +143,7 @@ class IDocumentMarkAccess
         */
         virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode,
             const SwPosition& rNewPos,
-            const xub_StrLen nOffset) =0;
+            const sal_Int32 nOffset) =0;
 
         /** Corrects marks (relative)
             This method uses the previous position of the mark in the paragraph as offset
@@ -161,7 +161,7 @@ class IDocumentMarkAccess
         */
         virtual void correctMarksRelative(const SwNodeIndex& rOldNode,
             const SwPosition& rNewPos,
-            const xub_StrLen nOffset) =0;
+            const sal_Int32 nOffset) =0;
 
         /** Deletes marks in a range
 
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 6a1d318acb99..91e56ce4de83 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -31,7 +31,7 @@ class SwMsgPoolItem;
 class SwUndoField : public SwUndo
 {
     sal_uLong nNodeIndex;
-    xub_StrLen nOffset;
+    sal_Int32 nOffset;
 
 protected:
     SwDoc * pDoc;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index cfb409f7e041..4bcbf35262ca 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -286,7 +286,7 @@ protected:
 
     // set all PaMs in OldNode to NewPos + Offset
     void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
-                    const xub_StrLen nOffset = 0 );
+                    const sal_Int32 nOffset = 0 );
 
     bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
 
@@ -690,7 +690,7 @@ public:
 
     // get the nth character from the start or end of the  current selection
     sal_Unicode GetChar( sal_Bool bEnd = sal_True, long nOffset = 0 );
-    sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, xub_StrLen nCount = 1 );
+    sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, sal_Int32 nCount = 1 );
 
     // Place only the visible cursor at the given position in the document.
     // Return FALSE if SPoint was corrected by layout.
@@ -717,8 +717,8 @@ public:
     bool CrsrInsideInputFld() const;
     bool PosInsideInputFld( const SwPosition& rPos ) const;
     bool DocPtInsideInputFld( const Point& rDocPt ) const;
-    xub_StrLen StartOfInputFldAtPos( const SwPosition& rPos ) const;
-    xub_StrLen EndOfInputFldAtPos( const SwPosition& rPos ) const;
+    sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos ) const;
+    sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos ) const;
 
     // Return number of cursors in ring (The flag indicates whether
     // only cursors containing selections are requested).
@@ -799,8 +799,8 @@ public:
     bool GotoINetAttr( const SwTxtINetFmt& rAttr );
     const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
 
-    sal_Bool SelectTxt( const xub_StrLen nStart,
-                        const xub_StrLen nEnd );
+    sal_Bool SelectTxt( const sal_Int32 nStart,
+                        const sal_Int32 nEnd );
 
     sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
     void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4f2bea99bf0f..025668d7053a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -867,7 +867,7 @@ public:
     virtual bool InsertString(const SwPaM &rRg, const OUString&,
               const enum InsertFlags nInsertMode = INS_EMPTYEXPAND );
     virtual bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 );
-    virtual bool UpdateRsid( const SwPaM &rRg, xub_StrLen nLen );
+    virtual bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen );
     virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
                         const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
     virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
@@ -1470,7 +1470,7 @@ public:
     void CorrAbs(
         const SwNodeIndex& rOldNode,
         const SwPosition& rNewPos,
-        const xub_StrLen nOffset = 0,
+        const sal_Int32 nOffset = 0,
         sal_Bool bMoveCrsr = sal_False );
 
     /// Set everything in the range of [rStartNode, rEndNode] to rNewPos.
@@ -1490,7 +1490,7 @@ public:
     void CorrRel(
         const SwNodeIndex& rOldNode,
         const SwPosition& rNewPos,
-        const xub_StrLen nOffset = 0,
+        const sal_Int32 nOffset = 0,
         sal_Bool bMoveCrsr = sal_False );
 
     /// Query / set rules for Outline.
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 5f3ffc009197..5db74a35d1a0 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -85,27 +85,27 @@ public:
 class SwDelChr: public SwMsgPoolItem
 {
 public:
-    xub_StrLen nPos;
+    sal_Int32 nPos;
 
-    SwDelChr( xub_StrLen nP );
+    SwDelChr( sal_Int32 nP );
 };
 
 class SwDelTxt: public SwMsgPoolItem
 {
 public:
-    xub_StrLen nStart;
-    xub_StrLen nLen;
+    sal_Int32 nStart;
+    sal_Int32 nLen;
 
-    SwDelTxt( xub_StrLen nS, xub_StrLen nL );
+    SwDelTxt( sal_Int32 nS, sal_Int32 nL );
 };
 
 class SwUpdateAttr: public SwMsgPoolItem
 {
 public:
-    xub_StrLen nStart;
-    xub_StrLen nEnd;
+    sal_Int32 nStart;
+    sal_Int32 nEnd;
     sal_uInt16 nWhichAttr;
-    SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, sal_uInt16 nW );
+    SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW );
 };
 
 
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 1acbf88320e4..1c50d6d5f1d1 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -449,7 +449,7 @@ public:
     void CreateBookmarkTbl();
     // Search alle Bookmarks in the range and return it in the Array.
     sal_uInt16 GetBookmarks( const SwCntntNode& rNd,
-                        xub_StrLen nStt, xub_StrLen nEnd,
+                        sal_Int32 nStt, sal_Int32 nEnd,
                         std::vector< const ::sw::mark::IMark* >& rArr );
 
     // Create new PaM at position.
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index a134a9e6752c..5dc18ecd303c 100755
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -30,7 +30,7 @@ class SwTxtAnnotationFld : public SwTxtFld
 public:
     SwTxtAnnotationFld(
         SwFmtFld & rAttr,
-        xub_StrLen const nStart,
+        sal_Int32 const nStart,
         bool const bInClipboard );
 
     virtual ~SwTxtAnnotationFld();
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 9539397b35c2..2c879250d2fb 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -38,7 +38,7 @@ class SwTxtCharFmt : public SwTxtAttrEnd
     sal_uInt16 m_nSortNumber;
 
 public:
-    SwTxtCharFmt( SwFmtCharFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd );
+    SwTxtCharFmt( SwFmtCharFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
     virtual ~SwTxtCharFmt( );
 
     // Passed from SwFmtCharFmt (no derivation from SwClient!).
@@ -59,7 +59,7 @@ class SwTxtAttrNesting : public SwTxtAttrEnd
 {
 protected:
     SwTxtAttrNesting( SfxPoolItem & i_rAttr,
-        const xub_StrLen i_nStart, const xub_StrLen i_nEnd );
+        const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
     virtual ~SwTxtAttrNesting();
 };
 
@@ -67,14 +67,14 @@ class SwTxtMeta : public SwTxtAttrNesting
 {
 private:
     SwTxtMeta( SwFmtMeta & i_rAttr,
-        const xub_StrLen i_nStart, const xub_StrLen i_nEnd );
+        const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
 
 public:
     static SwTxtMeta * CreateTxtMeta(
         ::sw::MetaFieldManager & i_rTargetDocManager,
         SwTxtNode *const i_pTargetTxtNode,
         SwFmtMeta & i_rAttr,
-        xub_StrLen const i_nStart, xub_StrLen const i_nEnd,
+        sal_Int32 const i_nStart, sal_Int32 const i_nEnd,
         bool const i_bIsCopy);
 
     virtual ~SwTxtMeta();
@@ -91,7 +91,7 @@ class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient
 protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
 public:
-    SwTxtRuby( SwFmtRuby& rAttr, xub_StrLen nStart, xub_StrLen nEnd );
+    SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
     virtual ~SwTxtRuby();
     TYPEINFO();
 
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index 70d8edfee672..cd1f73dd8fc5 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -34,7 +34,7 @@ class SwTxtFlyCnt : public SwTxtAttr
     SwFlyInCntFrm  *_GetFlyFrm( const SwFrm *pCurrFrm );
 
 public:
-    SwTxtFlyCnt( SwFmtFlyCnt& rAttr, xub_StrLen nStart );
+    SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart );
 
     // Sets anchor in pFmt and
     void    SetAnchor( const SwTxtNode *pNode );
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 35eb042d6af6..b5e60d979b4a 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr
     sal_uInt16 m_nSeqNo;
 
 public:
-    SwTxtFtn( SwFmtFtn& rAttr, xub_StrLen nStart );
+    SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStart );
     virtual ~SwTxtFtn();
 
     inline SwNodeIndex *GetStartNode() const { return m_pStartNode; }
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 44cc5605594e..f2d78460584f 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -38,7 +38,7 @@ protected:
 virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
 
 public:
-    SwTxtINetFmt( SwFmtINetFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd );
+    SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
     virtual ~SwTxtINetFmt();
     TYPEINFO();