From 09da6dfcfb732dd621670f2b919eb5b5bf09b7ec Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Thu, 7 Dec 2017 16:09:47 +0100 Subject: tdf#114308 Export Watermark size as is MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactoring * removed size hack * export/import "trim" attribute * DOC: export set of parameters to fit shape & frame Change-Id: Ib00654626ae1e10ac5110d22eada7528e03357e7 Reviewed-on: https://gerrit.libreoffice.org/46036 Tested-by: Jenkins Reviewed-by: Szymon Kłos --- include/oox/vml/vmlformatting.hxx | 1 + include/svx/msdffdef.hxx | 2 ++ 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index 5bfb0c09e0fb..1c589897ebcc 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -254,6 +254,7 @@ struct OOX_DLLPUBLIC TextpathModel { OptValue moString; ///< Specifies the string of the textpath. OptValue moStyle; ///< Specifies the style of the textpath. + OptValue moTrim; ///< Specifies whether extra space is removed above and below the text TextpathModel(); diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 0c62f5e6d0d2..238ab5280fd8 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -848,8 +848,10 @@ enum MSO_SYSCOLORINDEX { enum MSO_TextGeometryProperties { use_gtextFBestFit = 0x00000100, + use_gtextFShrinkFit = 0x00000200, use_gtextFStretch = 0x00000400, gtextFBestFit = 0x01000000, + gtextFShrinkFit = 0x02000000, gtextFStretch = 0x04000000 }; -- cgit