xmloff/source/text/txtparae.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7934d9085eeaf5903fee494195ed2d0c6fb74fbb
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Wed Dec 26 14:10:14 2018 +0300
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Thu Dec 27 06:14:22 2018 +0100
related tdf#47471 textframe: use stylename if autostyle missing
The same fix for 47471 should also be useful for textframes.
Change-Id: I58b345eaa81dddf750f042610015ef45cd955c06
Reviewed-on: https://gerrit.libreoffice.org/65617
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 3d27ac07ffeb..5065fed7ae69 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2913,10 +2913,11 @@ void XMLTextParagraphExport::_exportTextFrame(
rPropSet->getPropertyValue( gsFrameStyleName ) >>= sStyle;
}
- OUString sAutoStyle( sStyle );
OUString aMinHeightValue;
OUString sMinWidthValue;
- 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 ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
