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

SmartArt: undo diagram elements' size change

Browse Source 
it should fix integer overflow in fdo79822.docx until we have
proper layout algorithm implemented

Change-Id: I7645ff0844ac47a004a309d1a9d3b19eeb3708dc
Reviewed-on: https://gerrit.libreoffice.org/39371
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Grzegorz Araminowicz
2017-06-28 18:38:17 +02:00
committed by Stephan Bergmann
parent c827e94a6b
commit 98befbb262
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
View File

@@ -300,8 +300,8 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
aCurrPos.Y + sz.Height); aCurrPos.Y + sz.Height);
// HACK: the spacing is arbitrary // HACK: the spacing is arbitrary
aCurrPos.X += nIncX*(sz.Width+50); aCurrPos.X += nIncX*(sz.Width+5);
aCurrPos.Y += nIncY*(sz.Height+50); aCurrPos.Y += nIncY*(sz.Height+5);
++aCurrShape; ++aCurrShape;
} }
@@ -330,8 +330,8 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
// HACK - count chars & paragraphs to come up with *some* // HACK - count chars & paragraphs to come up with *some*
// notion of necessary size // notion of necessary size
const sal_Int32 nHackyFontHeight=500; const sal_Int32 nHackyFontHeight=50;
const sal_Int32 nHackyFontWidth=400; const sal_Int32 nHackyFontWidth=20;
awt::Size aTotalSize; awt::Size aTotalSize;
for( size_t nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara ) for( size_t nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara )
{ {