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

Fix refs to tdf#124029

Browse Source 
Change-Id: I451d9c1abbe0c03a3a55b3cc153ba2852a1bbc26
Reviewed-on: https://gerrit.libreoffice.org/84584
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2019-12-05 21:24:54 +01:00
parent 86f148afbb
commit 20e5399cfe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
filter/source/msfilter/msdffimp.cxx
View File

@@ -4590,7 +4590,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
}
// mso_sptArc special treating
// tdf#124026: A new custom shape is generated from prototype 'msoArc'. Values, which are
// tdf#124029: A new custom shape is generated from prototype 'msoArc'. Values, which are
// read here, are adapted and merged. The shape type is changed, so this code
// applies only if importing arcs from MS Office.
if ( aObjData.eShapeType == mso_sptArc )
@@ -4684,7 +4684,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
// MS Office uses for mso_sptArc a frame rectangle (=resize handles)
// which encloses only the sector, LibreOffice uses for custom shapes as
// default a frame rectangle, which encloses the entire ellipse. That would
// result in wrong positions in Writer and Calc, see tdf#124026.
// result in wrong positions in Writer and Calc, see tdf#124029.
// We workaround this problem, by setting a suitable viewBox.
bool bIsImportPPT(GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_IMPORT_PPT);
css::awt::Rectangle aViewBox_LO; // in LO coordinate system