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

[Caolán McNamara]

 sw/source/core/unocore/unostyle.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d27aba549cdbcad6825ac6c955ee7d603aba1989
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 30 11:35:15 2017 +0000

    Resolves: tdf#101664 dropcaps not set in styles on load
    
    regression from...
    
    commit 6766760e86b517c726204f9601b33a19cb0c5451
    Date:   Thu Jan 14 21:05:59 2016 +0100
    
        refactor out to limit scope: RES_PARATR_DROP
    
        Change-Id: I8813b5676504e6de2af70d181fa9e905538fb05c
    
    where MID_DROPCAP_CHAR_STYLE_NAME != nMemberId branch
    in the past went to the default handler, while in
    rework it ended up ignored
    
    Change-Id: I8efa131750a064f594c1a2354d7aad19c2dc6b16

diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index b7f383a..7ca4cf3 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1900,10 +1900,13 @@ void SwXStyle::SetPropertyValue<RES_TXTATR_CJK_RUBY>(const SfxItemPropertySimple
     SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, rValue, o_rStyleBase);
 }
 template<>
-void SwXStyle::SetPropertyValue<RES_PARATR_DROP>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
+void SwXStyle::SetPropertyValue<RES_PARATR_DROP>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
 {
     if(MID_DROPCAP_CHAR_STYLE_NAME != rEntry.nMemberId)
+    {
+        SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, rValue, o_rStyleBase);
         return;
+    }
     if(!rValue.has<OUString>())
         throw lang::IllegalArgumentException();
     SfxItemSet& rStyleSet(o_rStyleBase.GetItemSet());
commit 980451135b85dcaad038b0371b38e2e061a5d5cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 30 11:16:59 2017 +0000

    RES_PARATR_DROP listed here twice
    
    Change-Id: I552a50b612fc210020811423949dabd7365c51cf

diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index f43a03b..b7f383a 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1970,7 +1970,6 @@ void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const
             { SID_SWREGISTER_COLLECTION,     std::mem_fn(&SwXStyle::SetPropertyValue<SID_SWREGISTER_COLLECTION>)     },
             { RES_TXTATR_CJK_RUBY,           std::mem_fn(&SwXStyle::SetPropertyValue<RES_TXTATR_CJK_RUBY>)           },
             { RES_PARATR_DROP,               std::mem_fn(&SwXStyle::SetPropertyValue<RES_PARATR_DROP>)               },
-            { RES_PARATR_DROP,               std::mem_fn(&SwXStyle::SetPropertyValue<RES_PARATR_DROP>)               },
             { RES_PARATR_NUMRULE,            std::mem_fn(&SwXStyle::SetPropertyValue<RES_PARATR_NUMRULE>)            }
         });
     }