diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-12-07 16:09:47 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-12-08 18:51:33 +0100 |
| commit | 09da6dfcfb732dd621670f2b919eb5b5bf09b7ec (patch) | |
| tree | e6660d4991781c7ce23fa10b6d79696e1ec68fc6 /include | |
| parent | a26c4448e6e5ffcd285cc691bfc4eb6c7edf76bc (diff) | |
tdf#114308 Export Watermark size as is
* 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 <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/vml/vmlformatting.hxx | 1 | ||||
| -rw-r--r-- | include/svx/msdffdef.hxx | 2 |
2 files changed, 3 insertions, 0 deletions
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<OUString> moString; ///< Specifies the string of the textpath. OptValue<OUString> moStyle; ///< Specifies the style of the textpath. + OptValue<bool> 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 }; |