diff options
| author | Juan Picca <jumapico@gmail.com> | 2015-01-31 21:24:42 -0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-02 11:50:39 +0000 |
| commit | c32aa53a7df7af4ef23b8d235483eabb51463183 (patch) | |
| tree | 80b1cd27e68d83b559703fc9190c08e1728c4f75 /sc/source/filter | |
| parent | e76bc369b8ee58094f45a2f5451cf9374163e979 (diff) | |
fdo#88826: replace MM100toEMU() by convertHmmToEmu()
Change-Id: I9ca79dfa0c214e3f58b7f45a78ad0877d4c7d10a
Reviewed-on: https://gerrit.libreoffice.org/14266
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index acf29b8f2c72..946b6774d86a 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1120,8 +1120,8 @@ void XclExpChartObj::WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, XML_rot, nRotation ? I32S( nRotation ) : NULL, FSEND ); - pFS->singleElementNS( XML_a, XML_off, XML_x, IS( MM100toEMU( aPos.X ) ), XML_y, IS( MM100toEMU( aPos.Y ) ), FSEND ); - pFS->singleElementNS( XML_a, XML_ext, XML_cx, IS( MM100toEMU( aSize.Width ) ), XML_cy, IS( MM100toEMU( aSize.Height ) ), FSEND ); + pFS->singleElementNS( XML_a, XML_off, XML_x, IS( oox::drawingml::convertHmmToEmu( aPos.X ) ), XML_y, IS( oox::drawingml::convertHmmToEmu( aPos.Y ) ), FSEND ); + pFS->singleElementNS( XML_a, XML_ext, XML_cx, IS( oox::drawingml::convertHmmToEmu( aSize.Width ) ), XML_cy, IS( oox::drawingml::convertHmmToEmu( aSize.Height ) ), FSEND ); pFS->endElementNS( XML_xdr, XML_xfrm ); } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 9ed9f94c344e..be7b4855adf3 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1010,20 +1010,20 @@ void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& FSEND ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_col ), (sal_Int32) aRange.aStart.Col() ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_colOff ), - MM100toEMU( aLocation.Left() - aRangeRect.Left() ) ); + oox::drawingml::convertHmmToEmu( aLocation.Left() - aRangeRect.Left() ) ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_row ), (sal_Int32) aRange.aStart.Row() ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_rowOff ), - MM100toEMU( aLocation.Top() - aRangeRect.Top() ) ); + oox::drawingml::convertHmmToEmu( aLocation.Top() - aRangeRect.Top() ) ); pDrawing->endElement( FSNS( XML_xdr, XML_from ) ); pDrawing->startElement( FSNS( XML_xdr, XML_to ), FSEND ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_col ), (sal_Int32) aRange.aEnd.Col() ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_colOff ), - MM100toEMU( aLocation.Right() - aRangeRect.Right() ) ); + oox::drawingml::convertHmmToEmu( aLocation.Right() - aRangeRect.Right() ) ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_row ), (sal_Int32) aRange.aEnd.Row() ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_rowOff ), - MM100toEMU( aLocation.Bottom() - aRangeRect.Bottom() ) ); + oox::drawingml::convertHmmToEmu( aLocation.Bottom() - aRangeRect.Bottom() ) ); pDrawing->endElement( FSNS( XML_xdr, XML_to ) ); } |