diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-06-07 10:51:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-08 15:37:27 +0200 |
| commit | d6314796499be812004c35b28a65142bc06aa86e (patch) | |
| tree | 824b671a7138d079d7fd8a5eed754e5883fb8c30 /writerfilter | |
| parent | 595be045da4f868eb2df8f937446e6ae2f81cca8 (diff) | |
n#757905 fix VML import of mso-wrap-style:none
There were two problems here:
1) SimpleShape::implConvertAndInsert() did not set the anchor type
2) DomainMapper_Impl::PushShapeContext() tried to overwrite it
Change-Id: I2c32016c4bb15c891cf287d8208e10817c6291e6
(cherry picked from commit 9e8957de203bb9abb208516ad32aee9527feb67b)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 88a29d1f613b..08e189b0823f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1539,7 +1539,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape uno::Reference<text::XTextRange> xTextRange(xTextAppend->createTextCursorByRange(xTextAppend->getEnd()), uno::UNO_QUERY_THROW); xTextAppend->insertTextContent(xTextRange, xTextContent, sal_False); } - else + else if (nAnchorType != text::TextContentAnchorType_AS_CHARACTER) { xProps->setPropertyValue( rPropNameSupplier.GetName( PROP_ANCHOR_TYPE ), bIsGraphic ? uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny( text::TextContentAnchorType_AT_PARAGRAPH ) ); } |