Resolves: #i17171# Writer paragraph cannot be longer than 65534 characters

Change-Id: I2052ae96571cba8fe2191dff53b1c61c95c94c60

7 files changed, 20 insertions, 19 deletions

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index eebd616870f5..a50b1fd15812 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -676,7 +676,7 @@ public:
     void HyphIgnore();
 
     /// For Inserting SoftHyphen. Position is offset within the syllabificated word.
-    void InsertSoftHyph( const xub_StrLen nHyphPos );
+    void InsertSoftHyph( const sal_Int32 nHyphPos );
 
     const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts,  ///< ALL_TBL_INS_ATTR
                                 sal_uInt16 nRows, sal_uInt16 nCols,
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 01d07cc73244..fc2caa527aba 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -23,7 +23,6 @@
 
 #include "rtl/instance.hxx"
 #include <tools/solar.h>
-#include <tools/string.hxx>
 #include <tools/rtti.hxx>
 #include <swdllapi.h>
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 7895d617d92b..73f3884879d9 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -270,7 +270,7 @@ public:
     void ShowOriginal( sal_uInt16 nLoop = 0 );
 
     /// Calculates the intersection with text node number nNdIdx.
-    void CalcStartEnd( sal_uLong nNdIdx, xub_StrLen& rStart, xub_StrLen& rEnd ) const;
+    void CalcStartEnd(sal_uLong nNdIdx, sal_Int32& rStart, sal_Int32& rEnd) const;
 
     /// Initiate the layout.
     void InvalidateRange();
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 32ec4769012f..8dec3ff60331 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -58,6 +58,8 @@ typedef long SwTwips;
 
 #define MM50   283  // 1/2 cm in TWIPS.
 
+const sal_Int32 COMPLETE_STRING = SAL_MAX_INT32;
+
 const SwTwips cMinHdFtHeight = 56;
 
 #define MINFLY 23   // Minimal size for FlyFrms.
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index fd75e8834558..5ee6d11b23f3 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -23,8 +23,8 @@
 #include <sal/types.h>
 #include <editeng/langitem.hxx>
 #include <hintids.hxx>
+#include <swtypes.hxx>
 #include <deque>
-#include <tools/string.hxx>
 
 class SwTxtNode;
 class SwTxtAttr;
@@ -39,14 +39,14 @@ class SwScriptIterator
     bool bForward;
 
 public:
-    SwScriptIterator( const OUString& rStr, xub_StrLen nStart = 0,
+    SwScriptIterator( const OUString& rStr, sal_Int32 nStart = 0,
                       bool bFrwrd = true );
 
     bool Next();
 
-    sal_uInt16 GetCurrScript() const        { return nCurScript; }
-    xub_StrLen GetScriptChgPos() const      { return (m_nChgPos == -1) ? STRING_LEN : m_nChgPos; }
-    const OUString& GetText() const         { return m_rText; }
+    sal_uInt16 GetCurrScript() const { return nCurScript; }
+    sal_Int32 GetScriptChgPos() const { return (m_nChgPos == -1) ? COMPLETE_STRING : m_nChgPos; }
+    const OUString& GetText() const { return m_rText; }
 };
 
 
@@ -56,7 +56,7 @@ class SwTxtAttrIterator
     std::deque<const SwTxtAttr*> aStack;
     const SwTxtNode& rTxtNd;
     const SfxPoolItem *pParaItem, *pCurItem;
-    xub_StrLen nChgPos;
+    sal_Int32 nChgPos;
     sal_uInt16 nAttrPos, nWhichId;
     bool bIsUseGetWhichOfScript;
 
@@ -65,19 +65,19 @@ class SwTxtAttrIterator
 
 public:
     SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId,
-                        xub_StrLen nStart = 0, bool bUseGetWhichOfScript = true );
+                        sal_Int32 nStart = 0, bool bUseGetWhichOfScript = true );
 
     bool Next();
 
     const SfxPoolItem& GetAttr() const  { return *pCurItem; }
-    xub_StrLen GetChgPos() const        { return nChgPos; }
+    sal_Int32 GetChgPos() const        { return nChgPos; }
 };
 
 
 class SwLanguageIterator : public SwTxtAttrIterator
 {
 public:
-    SwLanguageIterator( const SwTxtNode& rTxtNode, xub_StrLen nStart = 0,
+    SwLanguageIterator( const SwTxtNode& rTxtNode, sal_Int32 nStart = 0,
                         sal_uInt16 nWhich = RES_CHRATR_LANGUAGE,
                         bool bUseGetWhichOfScript = true )
         : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript )
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index c40d229a8351..98e3c31eba4f 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -153,10 +153,10 @@ protected:
     // MoveFrom:    moves from the UndoNodesArray into the NodesArray.
     void MoveToUndoNds( SwPaM& rPam,
                         SwNodeIndex* pNodeIdx = 0,
-                        sal_uLong* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 );
+                        sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 );
     void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
                           SwPosition& rInsPos,
-                          sal_uLong* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 );
+                          sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 );
 
     // These two methods move the SPoint back/forth from PaM. With it
     // a range can be spanned for Undo/Redo. (In this case the SPoint
@@ -207,7 +207,7 @@ class SwUndRng
 {
 public:
     sal_uLong nSttNode, nEndNode;
-    xub_StrLen nSttCntnt, nEndCntnt;
+    sal_Int32 nSttCntnt, nEndCntnt;
 
     SwUndRng();
     SwUndRng( const SwPaM& );
@@ -267,7 +267,7 @@ class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
 protected:
     SwFrmFmt* pFrmFmt;          // The saved FlyFormat.
     sal_uLong nNdPgPos;
-    xub_StrLen nCntPos;         // Page at/in paragraph.
+    sal_Int32 nCntPos;         // Page at/in paragraph.
     sal_uInt16 nRndId;
     sal_Bool bDelFmt;           // Delete saved format.
 
@@ -287,9 +287,9 @@ public:
 class SwUndoInsLayFmt : public SwUndoFlyBase
 {
     sal_uLong mnCrsrSaveIndexPara;           // Cursor position
-    xub_StrLen mnCrsrSaveIndexPos;            // for undo
+    sal_Int32 mnCrsrSaveIndexPos;            // for undo
 public:
-    SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, xub_StrLen nCntIdx );
+    SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
 
     virtual ~SwUndoInsLayFmt();
 
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index a19effc78793..ae5ffd920f74 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -78,7 +78,7 @@ namespace SwUnoCursorHelper
     };
 
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
-        GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex,
+        GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex,
             bool const bParent);
 
     bool                    getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry