[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sw/source

[Luboš Luňák]

 sw/source/core/txtnode/ndtxt.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f287987414948081d07dfa9fc4798a010ba750be
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Sun Feb 17 11:19:29 2013 +0100

    apparently there's no ssize_t on windows
    
    (cherry picked from commit 3f7ead7ffee808f99bf9cf76bbd247af04707242)
    
    Signed-off-by: Michael Stahl <mst...@redhat.com>
    
    Conflicts:
        sw/source/core/txtnode/ndtxt.cxx
    
    Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 42c4d51..8debbb2 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1722,8 +1722,8 @@ void SwTxtNode::InsertText( const XubString & rStr, const 
SwIndex & rIdx,
 
     xub_StrLen aPos = rIdx.GetIndex();
     xub_StrLen nLen = m_Text.Len() - aPos;
-    ssize_t const nOverflow(static_cast<ssize_t>(m_Text.Len())
-            + static_cast<ssize_t>(rStr.Len()) - TXTNODE_MAX);
+    long const nOverflow(static_cast<long>(m_Text.Len())
+            + static_cast<long>(rStr.Len()) - TXTNODE_MAX);
     m_Text.Insert((nOverflow > 0) ? rStr.Copy(0, rStr.Len() - nOverflow) : 
rStr,
             aPos);
     assert(m_Text.Len() <= TXTNODE_MAX);

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits