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/source/core/layout | |
| 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/source/core/layout')
| -rw-r--r-- | sw/source/core/layout/pagedesc.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index aa53e362fd88..a236b1c3740b 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -36,8 +36,6 @@ #include <poolfmt.hxx> #include <calbck.hxx> -using namespace ::com::sun::star; - SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc *const pDoc) : SwModify(nullptr) , m_StyleName( rName ) @@ -49,6 +47,7 @@ SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc *con , m_pFollow( this ) , m_nRegHeight( 0 ) , m_nRegAscent( 0 ) + , m_nVerticalAdjustment( drawing::TextVerticalAdjust_TOP ) , m_eUse( (UseOnPage)(nsUseOnPage::PD_ALL | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE | nsUseOnPage::PD_FIRSTSHARE) ) , m_IsLandscape( false ) , m_IsHidden( false ) @@ -67,6 +66,7 @@ SwPageDesc::SwPageDesc( const SwPageDesc &rCpy ) , m_pFollow( rCpy.m_pFollow ) , m_nRegHeight( rCpy.GetRegHeight() ) , m_nRegAscent( rCpy.GetRegAscent() ) + , m_nVerticalAdjustment( rCpy.GetVerticalAdjustment() ) , m_eUse( rCpy.ReadUseOn() ) , m_IsLandscape( rCpy.GetLandscape() ) , m_IsHidden( rCpy.IsHidden() ) @@ -90,6 +90,7 @@ SwPageDesc & SwPageDesc::operator = (const SwPageDesc & rSrc) m_nRegHeight = rSrc.m_nRegHeight; m_nRegAscent = rSrc.m_nRegAscent; + m_nVerticalAdjustment = rSrc.m_nVerticalAdjustment; m_eUse = rSrc.m_eUse; m_IsLandscape = rSrc.m_IsLandscape; return *this; |