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

[Luboš Luňák]

 filter/source/xsltfilter/XSLTFilter.cxx |    2 +-
 sw/source/core/txtnode/ndtxt.cxx        |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3f7ead7ffee808f99bf9cf76bbd247af04707242
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sun Feb 17 11:19:29 2013 +0100

    apparently there's no ssize_t on windows
    
    Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4bc16af..c5ffa22 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1710,8 +1710,8 @@ OUString 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);
     SAL_WARN_IF(nOverflow > 0, "sw.core",
             "SwTxtNode::InsertText: node text with insertion > TXTNODE_MAX.");
     OUString const sInserted(
@@ -3328,8 +3328,8 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const xub_StrLen nDelLen,
             rStart.GetIndex() + nDelLen <= m_Text.Len(),
             "SwTxtNode::ReplaceText: index out of bounds" );
 
-    ssize_t const nOverflow(static_cast<ssize_t>(m_Text.Len())
-            + static_cast<ssize_t>(rStr.Len()) - nDelLen - TXTNODE_MAX);
+    long const nOverflow(static_cast<long>(m_Text.Len())
+            + static_cast<long>(rStr.Len()) - nDelLen - TXTNODE_MAX);
     SAL_WARN_IF(nOverflow > 0, "sw.core",
             "SwTxtNode::ReplaceText: node text with insertion > TXTNODE_MAX.");
     OUString const sInserted(
commit d7f563ba35f9a6b565224b9076dbb238b423e225
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sun Feb 17 11:15:46 2013 +0100

    fix build, caused by fast string concat
    
    Change-Id: I07025171f0865b34de9a85b7820321e5eac46758

diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index a16627f..2b77274 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -241,7 +241,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
         Exception e;
         if (a >>= e)
         {
-            OSL_FAIL("XSLTFilter::error was called: " + OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
+            SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << e.Message);
         }
         m_bError = sal_True;
         osl_setCondition(m_cTransformed);