[Libreoffice-commits] core.git: editeng/source

[Stephan Bergmann]

 editeng/source/items/numitem.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb509502995aea38e71bb189a8b9e7dc6e9d442b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 22 10:41:10 2016 +0100

    Further uninitialized SvxNumberFormat::mbNumAdjustChanged fixing
    
    The uninitialized read during CppunitTest_sd_html_export_tests mentioned in
    d90a20833a815362c344b82fc16b4bbcff0ebf07 "Missing initialization of
    SvxNumberFormat::mbNumAdjustChanged" is rather caused by the SvxNumberFormat
    copy ctor callling the SvxNumberFormat copy assignment op, which calls
    SvxNumberFormat::SetNumberingType before assigning mbNumAdjustChanged.
    
    What is probably wanted here is to simply copy the nNumType member without doing
    the eNumAdjust adjustments anyway.  But a rather brittle design, that.
    
    Change-Id: Ic587687038f1ea71173461412350e6b2dee13aa4

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index b44c924..40bdebb 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -336,7 +336,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
 {
     if (& rFormat == this) { return *this; }
 
-    SetNumberingType(rFormat.GetNumberingType());
+    SvxNumberType::SetNumberingType(rFormat.GetNumberingType());
         eNumAdjust          = rFormat.eNumAdjust ;
         mbNumAdjustChanged  = rFormat.mbNumAdjustChanged;
         nInclUpperLevels    = rFormat.nInclUpperLevels ;