mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DOCX import: fix vertical position of inline images

Browse Source 
(regression of commit ab81e3bff2)

Change-Id: Ie78f8be059b18cdd81c83a8d01f2d865ac3fec2b
This commit is contained in:
László Németh
2015-05-26 12:07:31 +02:00
parent 0394b69cf0
commit 2cc3adf3a5
1 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
writerfilter/source/dmapper/GraphicImport.cxx
View File

@@ -1220,6 +1220,8 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
uno::makeAny(true)); uno::makeAny(true));
sal_Int32 nWidth = m_pImpl->nRightPosition - m_pImpl->nLeftPosition; sal_Int32 nWidth = m_pImpl->nRightPosition - m_pImpl->nLeftPosition;
if (m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
{
//adjust margins //adjust margins
if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT && if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
(m_pImpl->nHoriRelation == text::RelOrientation::PAGE_PRINT_AREA || (m_pImpl->nHoriRelation == text::RelOrientation::PAGE_PRINT_AREA ||
@@ -1245,7 +1247,6 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM && if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
m_pImpl->nVertRelation == text::RelOrientation::PAGE_PRINT_AREA ) m_pImpl->nVertRelation == text::RelOrientation::PAGE_PRINT_AREA )
m_pImpl->nBottomMargin = 0; m_pImpl->nBottomMargin = 0;
//adjust alignment //adjust alignment
if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE && if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
m_pImpl->nHoriRelation == text::RelOrientation::PAGE_FRAME ) m_pImpl->nHoriRelation == text::RelOrientation::PAGE_FRAME )
@@ -1283,6 +1284,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_CONTOUR_OUTSIDE ), xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_CONTOUR_OUTSIDE ),
uno::makeAny(m_pImpl->bContourOutside)); uno::makeAny(m_pImpl->bContourOutside));
m_pImpl->applyMargins(xGraphicObjectProperties); m_pImpl->applyMargins(xGraphicObjectProperties);
}
if( m_pImpl->eColorMode == drawing::ColorMode_STANDARD && if( m_pImpl->eColorMode == drawing::ColorMode_STANDARD &&
m_pImpl->nContrast == -70 && m_pImpl->nContrast == -70 &&