summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2018-12-26 14:10:14 +0300
committerJustin Luth <justin_luth@sil.org>2018-12-27 06:14:22 +0100
commit7934d9085eeaf5903fee494195ed2d0c6fb74fbb (patch)
tree1e67b5802fba3da8fbd3b550d23a1ff25c1dafa1 /xmloff
parentf23b7a8a73114d65d1aa38e5a648e622a56f6ee6 (diff)
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_luth@sil.org>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtparae.cxx5
1 files changed, 3 insertions, 2 deletions
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 ) );