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

[Libreoffice Gerrit user]

 xmloff/source/text/txtparae.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fa1354861fffa69da2a1d1613f979f2f26242d24
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Wed Dec 26 14:14:51 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Fri Dec 28 06:43:07 2018 +0100

    related tdf#47471 textgraphic: use stylename if autostyle missing
    
    The same fix for 47471 should also be useful for textgraphics.
    
    Change-Id: I27cef6bd22fbc4f2a94fb17231a3c385987364e0
    Reviewed-on: https://gerrit.libreoffice.org/65619
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 5065fed7ae69..c59198bb92b3 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3076,8 +3076,9 @@ void XMLTextParagraphExport::_exportTextGraphic(
         rPropSet->getPropertyValue( gsFrameStyleName ) >>= sStyle;
     }
 
-    OUString sAutoStyle( sStyle );
-    sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, sStyle );
+    OUString sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, sStyle );
+    if ( sAutoStyle.isEmpty() )
+        sAutoStyle = sStyle;
     if( !sAutoStyle.isEmpty() )
         GetExport().AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME,
                                   GetExport().EncodeStyleName( sAutoStyle ) );