[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - sw/source

[Elie Roux]

 sw/source/core/unocore/unoframe.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f62c625c96bcff3694ceeeab989a4080f6d0982c
Author: Elie Roux <elie.roux at telecom-bretagne.eu>
Date:   Sun Jun 8 22:28:18 2014 +0200

    fix fdo#40073 : look for translated frame styles
    
    LO was looking for untranslated frame styles,
    while at this step, the style list contains only the
    translated ones.
    
    Change-Id: I36173fc871582f974184fc95bb4d1a82cd3de783
    Reviewed-on: https://gerrit.libreoffice.org/9683
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 6f6673c5d1b4e6ea4982621f2817eb5d5dc10377)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit dc59f010248fbb95d7a67ccb914e86c457dcea3a)
    Reviewed-on: https://gerrit.libreoffice.org/9692
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 43520a7..e2093aa 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -616,6 +616,7 @@ bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItem
     {
         OUString sStyle;
         *pStyleName >>= sStyle;
+        SwStyleNameMapper::FillUIName(sStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, true);
         pStyle = (SwDocStyleSheet*)pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle,
                                                     SFX_STYLE_FAMILY_FRAME);
     }