[Libreoffice-commits] core.git: 3 commits - boost/boost_1_44_0-gcc4.8.patch sdext/source sd/source

Caolán McNamara caolanm at redhat.com
Tue Jun 25 01:27:19 PDT 2013


 boost/boost_1_44_0-gcc4.8.patch                  |  117 +++++++++++++++++++++++
 sd/source/ui/framework/tools/FrameworkHelper.cxx |    1 
 sdext/source/pdfimport/pdfparse/pdfentries.cxx   |    4 
 3 files changed, 119 insertions(+), 3 deletions(-)

New commits:
commit 59eee3c0a492e05c47e85cb53eeb25ad6bf0322a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 25 09:21:47 2013 +0100

    coverity#1019312 check inflateInit return value
    
    Change-Id: I5ec18176291e128c79d3e51e39b8a42b17a27b30

diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 99243b4..90b4de6 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -737,14 +737,14 @@ static void unzipToBuffer( const char* pBegin, unsigned int nLen,
     aZStr.zalloc        = ( alloc_func )0;
     aZStr.zfree         = ( free_func )0;
     aZStr.opaque        = ( voidpf )0;
-    inflateInit(&aZStr);
+
+    int err = inflateInit(&aZStr);
 
     const unsigned int buf_increment_size = 16384;
 
     *pOutBuf = (sal_uInt8*)rtl_reallocateMemory( *pOutBuf, buf_increment_size );
     aZStr.next_out      = (Bytef*)*pOutBuf;
     aZStr.avail_out     = buf_increment_size;
-    int err = Z_OK;
     *pOutLen = buf_increment_size;
     while( err != Z_STREAM_END && err >= Z_OK && aZStr.avail_in )
     {
commit e5b3a644437a4e74f85a197eb6a8c4a2d0f71e24
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 25 09:07:28 2013 +0100

    WaE: at higher debug levels
    
    Change-Id: I3a4c16995ac46bbb53923b9c47101826673cdded

diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
index 891f70c..fe23c0c 100644
--- a/boost/boost_1_44_0-gcc4.8.patch
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -433,3 +433,120 @@
              typedef typename ScannerT::iterator_t   iterator_t;
  
              iterator_t const s(scan.first);
+--- misc/boost_1_44_0/boost/date_time/time_facet.hpp
++++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp
+@@ -439,31 +439,31 @@
+                               time_dur_arg.get_rep().as_special());
+       }
+ 
+-      string_type format(m_time_duration_format);
++      string_type lcl_format(m_time_duration_format);
+       if (time_dur_arg.is_negative()) {
+         // replace %- with minus sign.  Should we use the numpunct facet?
+-        boost::algorithm::replace_all(format,
++        boost::algorithm::replace_all(lcl_format,
+                                       duration_sign_negative_only,
+                                       negative_sign);
+           // remove all the %+ in the string with '-'
+-        boost::algorithm::replace_all(format,
++        boost::algorithm::replace_all(lcl_format,
+                                       duration_sign_always,
+                                       negative_sign);
+       }
+       else { //duration is positive
+         // remove all the %- combos from the string
+-        boost::algorithm::erase_all(format, duration_sign_negative_only);
++        boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
+         // remove all the %+ in the string with '+'
+-        boost::algorithm::replace_all(format,
++        boost::algorithm::replace_all(lcl_format,
+                                       duration_sign_always,
+                                       positive_sign);
+       }
+ 
+       // %T and %R have to be replaced here since they are not standard
+-      boost::algorithm::replace_all(format,
++      boost::algorithm::replace_all(lcl_format,
+         boost::as_literal(formats_type::full_24_hour_time_format),
+         boost::as_literal(formats_type::full_24_hour_time_expanded_format));
+-      boost::algorithm::replace_all(format,
++      boost::algorithm::replace_all(lcl_format,
+         boost::as_literal(formats_type::short_24_hour_time_format),
+         boost::as_literal(formats_type::short_24_hour_time_expanded_format));
+ 
+@@ -476,22 +476,22 @@
+        * here ourself.
+        */
+       string_type hours_str;
+-      if (format.find(unrestricted_hours_format) != string_type::npos) {
++      if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
+         hours_str = hours_as_string(time_dur_arg);
+-        boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
++        boost::algorithm::replace_all(lcl_format, unrestricted_hours_format, hours_str);
+       }
+       // We still have to process restricted hours format specifier. In order to
+       // support parseability of durations in ISO format (%H%M%S), we'll have to
+       // restrict the stringified hours length to 2 characters.
+-      if (format.find(hours_format) != string_type::npos) {
++      if (lcl_format.find(hours_format) != string_type::npos) {
+         if (hours_str.empty())
+           hours_str = hours_as_string(time_dur_arg);
+         BOOST_ASSERT(hours_str.length() <= 2);
+-        boost::algorithm::replace_all(format, hours_format, hours_str);
++        boost::algorithm::replace_all(lcl_format, hours_format, hours_str);
+       }
+ 
+       string_type frac_str;
+-      if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
++      if (lcl_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
+         // replace %s with %S.nnn
+         frac_str =
+           fractional_seconds_as_string(time_dur_arg, false);
+@@ -500,21 +500,21 @@
+         string_type replace_string(seconds_format);
+         replace_string += sep;
+         replace_string += frac_str;
+-        boost::algorithm::replace_all(format,
++        boost::algorithm::replace_all(lcl_format,
+                                       seconds_with_fractional_seconds_format,
+                                       replace_string);
+       }
+-      if (format.find(fractional_seconds_format) != string_type::npos) {
++      if (lcl_format.find(fractional_seconds_format) != string_type::npos) {
+         // replace %f with nnnnnnn
+         if (!frac_str.size()) {
+           frac_str = fractional_seconds_as_string(time_dur_arg, false);
+         }
+-        boost::algorithm::replace_all(format,
++        boost::algorithm::replace_all(lcl_format,
+                                       fractional_seconds_format,
+                                       frac_str);
+       }
+ 
+-      if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
++      if (lcl_format.find(fractional_seconds_or_none_format) != string_type::npos) {
+         // replace %F with nnnnnnn or nothing if fs == 0
+         frac_str =
+           fractional_seconds_as_string(time_dur_arg, true);
+@@ -523,18 +523,18 @@
+           string_type replace_string;
+           replace_string += sep;
+           replace_string += frac_str;
+-          boost::algorithm::replace_all(format,
++          boost::algorithm::replace_all(lcl_format,
+                                         fractional_seconds_or_none_format,
+                                         replace_string);
+         }
+         else {
+-          boost::algorithm::erase_all(format,
++          boost::algorithm::erase_all(lcl_format,
+                                       fractional_seconds_or_none_format);
+         }
+       }
+ 
+       return this->do_put_tm(next_arg, ios_arg, fill_arg,
+-                       to_tm(time_dur_arg), format);
++                       to_tm(time_dur_arg), lcl_format);
+     }
+ 
+     OutItrT put(OutItrT next, std::ios_base& ios_arg,
commit 2a51960c6ba81c2c0d9c17794c249f4b22441a07
Author: Jian Fang Zhang <zhangjf at apache.org>
Date:   Wed Sep 5 02:18:30 2012 +0000

    Resolves: #i120677# prevent putting non singleton object...
    
    FrameworkHelper into SdGlobalResourceContainer
    
    Found by: zhangjf
    Patch by: zhangjf
    (cherry picked from commit 939e2900d024c38866b5c6f020e547a5d720d291)
    
    Change-Id: Ic053c02b02add045e60bac5c7dd7d8e8c2752f0c

diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 3fe13aa..44585df 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -380,7 +380,6 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
                 FrameworkHelper::Deleter());
             pHelper->Initialize();
             OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-            SdGlobalResourceContainer::Instance().AddResource(pHelper);
             maInstanceMap[&rBase] = pHelper;
         }
     }


More information about the Libreoffice-commits mailing list