sal_uInt16 to sal_Int32

Change-Id: Ie88f25149e12fecb4f932954ddbe7adc868acfc2

sw/source/core/access/accportions.cxx

@@ -98,7 +98,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
     delete pSentences;
 }
 
-void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
+void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
 {
     OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
                 "portion exceeds model string!" );
@@ -132,7 +132,7 @@ void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
 }
 
 void SwAccessiblePortionData::Special(
-    sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
+    sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
 {
     OSL_ENSURE( nModelPosition >= 0, "illegal position" );
     OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
@@ -228,14 +228,14 @@ void SwAccessiblePortionData::Special(
         bLastIsSpecial = true;
 }
 
-void SwAccessiblePortionData::LineBreak(sal_uInt16 /*nWidth*/)
+void SwAccessiblePortionData::LineBreak(sal_Int32 /*nWidth*/)
 {
     OSL_ENSURE( !bFinished, "We are already done!" );
 
     aLineBreaks.push_back( aBuffer.getLength() );
 }
 
-void SwAccessiblePortionData::Skip(sal_uInt16 nLength)
+void SwAccessiblePortionData::Skip(sal_Int32 nLength)
 {
     OSL_ENSURE( !bFinished, "We are already done!" );
     OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" );

sw/source/core/access/accportions.hxx

@@ -97,10 +97,10 @@ public:
     virtual ~SwAccessiblePortionData();
 
     // SwPortionHandler methods
-    virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
-    virtual void Special(sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
-    virtual void LineBreak(sal_uInt16 nWidth) SAL_OVERRIDE;
-    virtual void Skip(sal_uInt16 nLength) SAL_OVERRIDE;
+    virtual void Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
+    virtual void Special(sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
+    virtual void LineBreak(sal_Int32 nWidth) SAL_OVERRIDE;
+    virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE;
     virtual void Finish() SAL_OVERRIDE;
 
     virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE;

sw/source/core/inc/SwPortionHandler.hxx

@@ -52,7 +52,7 @@ public:
      * model string.
      */
     virtual void Text(
-        sal_uInt16 nLength,      /// length of this portion in the model string
+        sal_Int32 nLength,      /// length of this portion in the model string
         sal_uInt16 nType,         /// type of this portion
         sal_Int32 nHeight = 0,   /// height of this portion
         sal_Int32 nWidth = 0     /// width of this portion
@@ -64,7 +64,7 @@ public:
      * the text which is displayed, and the type of the portion.
      */
     virtual void Special(
-        sal_uInt16 nLength,      /// length of this portion in the model string
+        sal_Int32 nLength,      /// length of this portion in the model string
         const OUString& rText, /// text which is painted on-screen
         sal_uInt16 nType,         /// type of this portion
         sal_Int32 nHeight = 0,     /// font height of the painted text
@@ -74,7 +74,7 @@ public:
     /** line break. This method is called whenever a line break in the
      * layout occurs.
      */
-    virtual void LineBreak(sal_uInt16 nWidth) = 0;
+    virtual void LineBreak(sal_Int32 nWidth) = 0;
 
     /** skip characters. The SwTxtFrame may only display partially
      * display a certain paragraph (e.g. when the paragaph is split
@@ -85,7 +85,7 @@ public:
      * Skip() between portions is not allowed.
      */
     virtual void Skip(
-        sal_uInt16 nLength   /// number of 'model string' characters to be skipped
+        sal_Int32 nLength   /// number of 'model string' characters to be skipped
         ) = 0;
 
     /** end of paragraph. This method is to be called when all the

sw/source/core/text/xmldump.cxx

@@ -27,7 +27,7 @@ class XmlPortionDumper:public SwPortionHandler
 {
   private:
     xmlTextWriterPtr writer;
-    sal_uInt16 ofs;
+    sal_Int32 ofs;
 
     const char* getTypeName( sal_uInt16 nType )
     {
@@ -115,7 +115,7 @@ class XmlPortionDumper:public SwPortionHandler
         @param rText
                 text which is painted on-screen
       */
-    virtual void Text( sal_uInt16 nLength,
+    virtual void Text( sal_Int32 nLength,
                        sal_uInt16 nType,
                        sal_Int32 nHeight,
                        sal_Int32 nWidth) SAL_OVERRIDE
@@ -146,7 +146,7 @@ class XmlPortionDumper:public SwPortionHandler
         @param nHeight
                 font size of the painted text
       */
-    virtual void Special( sal_uInt16 nLength,
+    virtual void Special( sal_Int32 nLength,
                           const OUString & rText,
                           sal_uInt16 nType,
                           sal_Int32 nHeight,
@@ -175,7 +175,7 @@ class XmlPortionDumper:public SwPortionHandler
         ofs += nLength;
     }
 
-    virtual void LineBreak( sal_uInt16 nWidth ) SAL_OVERRIDE
+    virtual void LineBreak( sal_Int32 nWidth ) SAL_OVERRIDE
     {
         xmlTextWriterStartElement( writer, BAD_CAST( "LineBreak" ) );
         if (nWidth > 0)
@@ -189,7 +189,7 @@ class XmlPortionDumper:public SwPortionHandler
       * @param nLength
       *         number of 'model string' characters to be skipped
       */
-    virtual void Skip( sal_uInt16 nLength ) SAL_OVERRIDE
+    virtual void Skip( sal_Int32 nLength ) SAL_OVERRIDE
     {
         xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) );
         xmlTextWriterWriteFormatAttribute( writer,