[Libreoffice-commits] .: Branch 'libreoffice-3-6' - framework/source

[Caolán McNamara]

 framework/source/jobs/jobdata.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55f5b676d49f5660c6241b03f1fb5a2bf556a969
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 5 16:03:17 2012 +0100

    extra trailing NUL char in string
    
    This began life as ::rtl::OUString::createFromAscii which stops at the first
    NULL terminator. So drop the \0 to get the same results
    
    Change-Id: I7d9abbff2a6e6131ef5e7208e05cfd13178418cb
    (cherry picked from commit 0665c3e52b0b0053c3d622d3fa975d4234801bdd)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index c1cbcf8..a6cf7c4 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -583,7 +583,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
         we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated
         to "~" ...
      */
-    static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*\0");
+    static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*");
     WildCard aISOPattern(PATTERN_ISO8601);
 
     sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);