ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

n#820800: docx import of wrap polyon was based on dest size of picture

Browse Source 
... instead of the original size of it.

Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09
(cherry picked from commit ae6981601b0e9175efaf9849b1279290ea3380f6)
This commit is contained in:
Cédric Bosdonnat
2013-06-27 15:18:49 +02:00
parent bcb434b47f
commit ee80670695
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
writerfilter/source/dmapper/GraphicImport.cxx
+1 -2
View File
@@ -1536,8 +1536,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
if( aGraphicSize.Width && aGraphicSize.Height &&
m_pImpl->mpWrapPolygon.get() != NULL)
{
awt::Size aDstSize(m_pImpl->getXSize(), m_pImpl->getYSize());
WrapPolygon::Pointer_t pCorrected = m_pImpl->mpWrapPolygon->correctWordWrapPolygon(aGraphicSize, aDstSize);
WrapPolygon::Pointer_t pCorrected = m_pImpl->mpWrapPolygon->correctWordWrapPolygon(aGraphicSize);
aContourPolyPolygon <<= pCorrected->getPointSequenceSequence();
}
writerfilter/source/dmapper/WrapPolygonHandler.cxx
+4 -4
View File
@@ -104,7 +104,7 @@ WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fra
return pResult;
}
WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSrcSize, const awt::Size & rDstSize)
WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSrcSize)
{
WrapPolygon::Pointer_t pResult;
@@ -119,9 +119,9 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSr
Fraction aScaleY(nWrap100Percent, Fraction(nWrap100Percent) - aMove);
pResult = pResult->scale(aScaleX, aScaleY);
Fraction aScaleDestX(rDstSize.Width, nWrap100Percent);
Fraction aScaleDestY(rDstSize.Height, nWrap100Percent);
pResult = pResult->scale(aScaleDestX, aScaleDestY);
Fraction aScaleSrcX(rSrcSize.Width, nWrap100Percent);
Fraction aScaleSrcY(rSrcSize.Height, nWrap100Percent);
pResult = pResult->scale(aScaleSrcX, aScaleSrcY);
return pResult;
}
writerfilter/source/dmapper/WrapPolygonHandler.hxx
+1 -1
View File
@@ -55,7 +55,7 @@ public:
WrapPolygon::Pointer_t move(const awt::Point & rMove);
WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
WrapPolygon::Pointer_t correctWordWrapPolygon(const awt::Size & rSrcSize, const awt::Size & rDstSize);
WrapPolygon::Pointer_t correctWordWrapPolygon(const awt::Size & rSrcSize);
drawing::PointSequenceSequence getPointSequenceSequence() const;
};