diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-04 19:37:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-04 20:18:01 +0200 |
| commit | 9835a5823e0f559aabbc0e15ea126c82229c4bc7 (patch) | |
| tree | 12b77a17bf437e248ef02cc06634ab1dc458a99c /sw | |
| parent | ad5e8b30ac66a00d0110fcdaf4d064181247585b (diff) | |
sw textboxes: reimplement ODF import/export
Turns out that for normal TextFrames and rectangular drawinglayer
shapes, the engine is written in ODF implicitly. Use the same trick to
describe if the shape content should be rendered by SW or editeng.
This reverts 9d310ecfce3c2fc481b125e1493a534e2107a68e (sw textboxes:
implement ODF import/export, 2014-06-02).
Change-Id: Id8afa6368bedcd293e578244abb58e18949bec8d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/odfexport/data/textbox-rounded-corners.odt | bin | 13260 -> 13249 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/data/fdo82191.odt | bin | 10913 -> 10888 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt | bin | 12362 -> 12356 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/data/shape-textbox-vertadjust.odt | bin | 12076 -> 12049 bytes | |||
| -rw-r--r-- | sw/qa/extras/uiwriter/data/shape-textbox.odt | bin | 10723 -> 10689 bytes | |||
| -rw-r--r-- | sw/source/core/doc/textboxhelper.cxx | 1 |
6 files changed, 1 insertions, 0 deletions
diff --git a/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt b/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt Binary files differindex 385185021ab3..add7512c6ca2 100644 --- a/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt +++ b/sw/qa/extras/odfexport/data/textbox-rounded-corners.odt diff --git a/sw/qa/extras/uiwriter/data/fdo82191.odt b/sw/qa/extras/uiwriter/data/fdo82191.odt Binary files differindex d0759c04dd1c..e34105834f78 100644 --- a/sw/qa/extras/uiwriter/data/fdo82191.odt +++ b/sw/qa/extras/uiwriter/data/fdo82191.odt diff --git a/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt b/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt Binary files differindex 8877c7215426..1d2c86671fcf 100644 --- a/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt +++ b/sw/qa/extras/uiwriter/data/shape-textbox-autosize.odt diff --git a/sw/qa/extras/uiwriter/data/shape-textbox-vertadjust.odt b/sw/qa/extras/uiwriter/data/shape-textbox-vertadjust.odt Binary files differindex dfb26bfa3912..f5fabcfe8fc7 100644 --- a/sw/qa/extras/uiwriter/data/shape-textbox-vertadjust.odt +++ b/sw/qa/extras/uiwriter/data/shape-textbox-vertadjust.odt diff --git a/sw/qa/extras/uiwriter/data/shape-textbox.odt b/sw/qa/extras/uiwriter/data/shape-textbox.odt Binary files differindex 0fe0e9b9cb89..5f278af358a7 100644 --- a/sw/qa/extras/uiwriter/data/shape-textbox.odt +++ b/sw/qa/extras/uiwriter/data/shape-textbox.odt diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index d00398333812..655458863ac0 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -97,6 +97,7 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape) syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_POSITION, xShapePropertySet->getPropertyValue(UNO_NAME_HORI_ORIENT_POSITION)); syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, xShapePropertySet->getPropertyValue(UNO_NAME_VERT_ORIENT_POSITION)); syncProperty(pShape, RES_FRM_SIZE, MID_FRMSIZE_IS_AUTO_HEIGHT, xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_AUTOGROWHEIGHT)); + syncProperty(pShape, RES_TEXT_VERT_ADJUST, 0, xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_VERT_ADJUST)); } } |