diff options
author | Justin Luth <justin_luth@sil.org> | 2015-09-07 08:19:22 +0300 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2015-10-17 13:50:51 +0000 |
commit | fbd1c167851a04c60d91daa830cf93e5b2ad7b4d (patch) | |
tree | 4805db732536a2a2819ad2565bc1ffd22300cea0 /sw/inc | |
parent | 1769074bd556e21e0c6ed29d9059960f998e28d1 (diff) |
tdf#36117 .doc preserve page vertical alignment after RT
MSWord has a page-style vertical alignment (center/bottom/justify)
setting that was lost after round-tripping through LibreOffice.
Writer does not currently have the ability to vertically align text
outside of a frame, but the setting should be preserved for
interoperability.
Change-Id: I91ae841b91ca2f2dd1b68212fdcdf830c7cef22a
Reviewed-on: https://gerrit.libreoffice.org/18480
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/pagedesc.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index b258ec1fc155..258f63464b81 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -26,6 +26,9 @@ #include <frmfmt.hxx> #include <editeng/numitem.hxx> #include <editeng/borderline.hxx> +#include <com/sun/star/drawing/TextVerticalAdjust.hpp> + +using namespace ::com::sun::star; class SfxPoolItem; class SwTextFormatColl; @@ -143,6 +146,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify SwPageDesc *m_pFollow; sal_uInt16 m_nRegHeight; ///< Sentence spacing and fontascent of style. sal_uInt16 m_nRegAscent; ///< For grid alignment (Registerhaltigkeit). + drawing::TextVerticalAdjust m_nVerticalAdjustment; // doc/docx: vertically center / justify / bottom UseOnPage m_eUse; bool m_IsLandscape; bool m_IsHidden; @@ -216,6 +220,9 @@ public: void SetRegHeight(sal_uInt16 const nNew) { m_nRegHeight = nNew; } void SetRegAscent(sal_uInt16 const nNew) { m_nRegAscent = nNew; } + drawing::TextVerticalAdjust GetVerticalAdjustment () const {return m_nVerticalAdjustment; } + void SetVerticalAdjustment (const drawing::TextVerticalAdjust nVA) {m_nVerticalAdjustment = nVA; } + inline void SetFollow( const SwPageDesc* pNew ); const SwPageDesc* GetFollow() const { return m_pFollow; } SwPageDesc* GetFollow() { return m_pFollow; } |