diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 13:53:57 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 13:53:57 +0200 |
| commit | e24a29c86c8b0bc967455a1469e4eda85736c770 (patch) | |
| tree | b0f7559cbc75c632ac993f335404ce790ffcf080 /svx | |
| parent | 2b74969b50186346b77c1e877db17b89b5eae684 (diff) | |
| parent | 365f051ff0ff640518d69e3441f715bb15a3e23d (diff) | |
CWS-TOOLING: integrate CWS aw083_OOO330
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 7 | ||||
| -rw-r--r-- | svx/source/svdraw/svdopath.cxx | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index fb497d09d3..a1dcc0c2fe 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -273,9 +273,16 @@ namespace sdr // init extractor, guarantee existance, set page there mpExtractor->SetStartPage(pPage); + // #i105548# also need to copy the VOCRedirector for sub-content creation + mpExtractor->SetViewObjectContactRedirector(GetObjectContact().GetViewObjectContactRedirector()); + // create page content xPageContent = mpExtractor->createPrimitive2DSequenceForPage(rDisplayInfo); + // #i105548# reset VOCRedirector to not accidentially have a pointer to a + // temporary class, so calls to it are avoided safely + mpExtractor->SetViewObjectContactRedirector(0); + // reset recursion flag bInCreatePrimitive2D = false; } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 063a847b75..a96e6c272d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2927,7 +2927,8 @@ sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: aScale = aCorrectedRangeNoCurve.getRange(); // define matrix for move polygon to zero point - aMoveToZeroMatrix.translate(-aCorrectedRangeNoCurve.getMinX(), aCorrectedRangeNoCurve.getMinY()); + // #i112280# Added missing minus for Y-Translation + aMoveToZeroMatrix.translate(-aCorrectedRangeNoCurve.getMinX(), -aCorrectedRangeNoCurve.getMinY()); } else { |