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

[Caolán McNamara]

 sw/source/core/crsr/bookmrk.cxx             |    3 ++-
 writerfilter/source/rtftok/rtftokenizer.cxx |   15 ++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit c708c9351bf2ef578e2f200ee834731c31d80261
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 19 15:57:02 2016 +0100

    fftester: isAsciiLowerCase has a isUnicodeCodePoint assert
    
    which is not helpful when the data is incoming from the outside
    world
    
    Change-Id: I00304ed0d577944a33f5fa6af155f1d130ab7d59

diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 8ca7433..5727b14 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -170,24 +170,17 @@ int RTFTokenizer::asHex(char ch)
         ret = ch - '0';
     else
     {
-        if (rtl::isAsciiLowerCase(ch))
-        {
-            if (ch < 'a' || ch > 'f')
-                return -1;
+        if (ch >= 'a' && ch <= 'f')
             ret = ch - 'a';
-        }
-        else
-        {
-            if (ch < 'A' || ch > 'F')
-                return -1;
+        else if (ch >= 'A' && ch <= 'F')
             ret = ch - 'A';
-        }
+        else
+            return -1;
         ret += 10;
     }
     return ret;
 }
 
-
 void RTFTokenizer::pushGroup()
 {
     m_nGroup++;
commit 8d5db645ca0c910fc624d3513be7d312aea4a49c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 19 15:38:09 2016 +0100

    fftester: only decrement if there's a valid position before it
    
    Change-Id: I64bddeb805ac5c2ad6d76e2b3271ae8a216d603f

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 08594bc..26ec9f9 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -133,7 +133,8 @@ namespace
         if ( ch_end == aEndMark )
         {
             SwPaM aEnd(rEnd, rEnd);
-            --aEnd.Start()->nContent;
+            if (aEnd.Start()->nContent > 0)
+                --aEnd.Start()->nContent;
             io_pDoc->getIDocumentContentOperations().DeleteRange(aEnd);
         }