summaryrefslogtreecommitdiff
path: root/oox/source/export
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-05-31 00:03:06 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-06-08 09:22:19 +0200
commitf6f52c526cda640dd7595abd45727cb615c2b167 (patch)
tree345ba8f5105add1f0bf7d275a18d1be415168c55 /oox/source/export
parentd72d2a7c981066b795bb7679583b8b6665597c2c (diff)
Watermark: VML export/import font size
Change-Id: I11409dfc621018a761c70a640938e18ae679d3f5 Reviewed-on: https://gerrit.libreoffice.org/38254 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox/source/export')
-rw-r--r--oox/source/export/vmlexport.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index ff121025acd3..d5b829d41c3f 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -812,6 +812,13 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle&
OUString aTextPathFont = SvxMSDffManager::MSDFFReadZString(aStream, aFont.nPropSize, true);
aStyle += "font-family:\"" + aTextPathFont + "\"";
}
+ sal_uInt32 nSize;
+ if (rProps.GetOpt(ESCHER_Prop_gtextSize, nSize))
+ {
+ float nSizeF = (sal_Int32)nSize / 65536;
+ OUString aSize = OUString::number(nSizeF);
+ aStyle += ";font-size:" + aSize + "pt";
+ }
if (!aStyle.isEmpty())
pAttrList->add(XML_style, OUStringToOString(aStyle, RTL_TEXTENCODING_UTF8));
m_pSerializer->singleElementNS(XML_v, XML_textpath, XFastAttributeListRef(pAttrList));