[Libreoffice-commits] core.git: 2 commits - sw/source

[Matteo Casalin]

 sw/source/core/table/swtable.cxx  |    4 ++--
 sw/source/filter/ww1/fltshell.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 65e6d651ceef55f569521a4f4e609f7e5e88847b
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date:   Tue Dec 17 00:12:03 2013 +0100

    xub_StrLen/sal_uInt16 to sal_Int32
    
    Change-Id: I61b717f080b9c667b75eac8dd3b5bd4cb50e6881

diff --git a/sw/source/filter/ww1/fltshell.cxx 
b/sw/source/filter/ww1/fltshell.cxx
index bc8f395..5342ed1 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -767,9 +767,9 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
         return;
 
     SwNodeIndex aStartNode(pStt->nNode, -1);
-    sal_uInt16 nStartIdx = pStt->nContent.GetIndex();
+    const sal_Int32 nStartIdx = pStt->nContent.GetIndex();
     SwNodeIndex aEndNode(pEnd->nNode, -1);
-    sal_uInt16 nEndIdx = pEnd->nContent.GetIndex();
+    const sal_Int32 nEndIdx = pEnd->nContent.GetIndex();
 
     //We don't support deleting content that is over one node, or removing a 
node.
     OSL_ENSURE(aEndNode == aStartNode, "nodes must be the same, or this method 
extended");
@@ -817,7 +817,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
             continue;
         }
 
-        xub_StrLen nCntntDiff = nEndIdx - nStartIdx;
+        const sal_Int32 nCntntDiff = nEndIdx - nStartIdx;
 
         //to be adjusted
         if (bEntryStartAfterSelStart)
commit a85d10e0c1a0f79fc807007dbd49975f35f218fe
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date:   Mon Dec 16 23:39:58 2013 +0100

    xub_StrLen to sal_Int32
    
    Change-Id: I614c8a7e3bf508b2f69ae50b07db33c7df691c2e

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 59e4487..1a7ed99 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -167,7 +167,7 @@ void SwTableBox::setDummyFlag( bool bDummy )
 static OUString& lcl_TabToBlankAtSttEnd( OUString& rTxt )
 {
     sal_Unicode c;
-    xub_StrLen n;
+    sal_Int32 n;
 
     for( n = 0; n < rTxt.getLength() && ' ' >= ( c = rTxt[n] ); ++n )
         if( '\x9' == c )
@@ -2536,7 +2536,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( sal_Bool 
bCheckAttr ) const
                 // Flys/fields/...
                 if( pHts )
                 {
-                    xub_StrLen nNextSetField = 0;
+                    sal_Int32 nNextSetField = 0;
                     for( sal_uInt16 n = 0; n < pHts->Count(); ++n )
                     {
                         const SwTxtAttr* pAttr = (*pHts)[ n ];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits