diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-10 17:07:47 +0300 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-11 10:36:20 +0200 |
| commit | ea0e3b2d657c1d3183e16d72f9b7188a048deabe (patch) | |
| tree | ff9b542c9a74c7fe2aa37332d73bf332871cf7b4 /xmloff | |
| parent | b91cdb8d22db1c0f15848eb2528d79113031f86c (diff) | |
tdf#109229: Set "TextBox" prop before filling textbox-related props
Otherwise those properties aren't set, and defaults are used
Change-Id: Ib6671c019ff652ec5b59d9cbbf02a4e536a17817
Reviewed-on: https://gerrit.libreoffice.org/60267
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit c3422cd205d8da852f5c310b5f08028d6c4c5eb4)
Reviewed-on: https://gerrit.libreoffice.org/60299
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 3d74d57f0853..44218ceb0e25 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -695,6 +695,15 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) } } + // Writer shapes: if this one has a TextBox, set it here. We need to do it before + // pDocStyle->FillPropertySet, because setting some properties depend on the format + // having RES_CNTNT attribute (e.g., UNO_NAME_TEXT_(LEFT|RIGHT|UPPER|LOWER)DIST; see + // SwTextBoxHelper::syncProperty, which indirectly calls SwTextBoxHelper::isTextBox) + uno::Reference<beans::XPropertySetInfo> xPropertySetInfo + = xPropSet->getPropertySetInfo(); + if (xPropertySetInfo->hasPropertyByName("TextBox")) + xPropSet->setPropertyValue("TextBox", uno::makeAny(mbTextBox)); + // if this is an auto style, set its properties if(bAutoStyle && pDocStyle) { @@ -702,11 +711,6 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) pDocStyle->FillPropertySet(xPropSet); } - // Writer shapes: if this one has a TextBox, set it here. - uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropSet->getPropertySetInfo(); - if (xPropertySetInfo->hasPropertyByName("TextBox")) - xPropSet->setPropertyValue("TextBox", uno::makeAny(mbTextBox)); - } while(false); // try to set text auto style |