drawinglayer/source/processor2d/vclprocessor2d.cxx | 6 ++++--
svx/source/svdraw/svdedtv2.cxx | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 3db00c554b38ee6c1b6e969768da53db4dc2f92a
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 29 10:11:28 2014 +0100
Resolves: fdo#62038 EPS not rendered in drawinglayer code paths
It attempts to see if the outputdevice can draw the true EPS
but if the outputdevice is in record-only mode it just stashs a
new eps metaaction, and this time with no fallback image, and
happily returns ok so the drawing layer ends up with a new
replacement eps metaction, except with no preview anymore.
Perhaps DrawEPS should return false here, but its safer this way
Change-Id: I0e0b16e4b2be00802a1af1f8147500d816a3c5de
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index b7c3bfe..d23e5b5 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1353,12 +1353,14 @@ namespace drawinglayer
if(!aRectangle.IsEmpty())
{
+ bool bWillReallyRender =
mpOutputDevice->IsDeviceOutputNecessary();
// try to paint EPS directly without fallback visualisation
- const bool bEPSPaintedDirectly(mpOutputDevice->DrawEPS(
+ const bool bEPSPaintedDirectly = bWillReallyRender &&
+ mpOutputDevice->DrawEPS(
aRectangle.TopLeft(),
aRectangle.GetSize(),
rEpsPrimitive2D.getGfxLink(),
- 0));
+ 0);
if(!bEPSPaintedDirectly)
{
commit e34c437d2e98753159c9bd82516386143d707d93
Author: Armin Le Grand <a...@apache.org>
Date: Mon Apr 28 16:57:14 2014 +0000
Resolves: #i124760# ensure that only the created object is selected
(cherry picked from commit b6189665e0143d68cf2fe225eca77bcf0454a107)
Conflicts:
svx/source/svdraw/svdedtv2.cxx
Change-Id: I4ebf95a5c42fd2348dbb79f99881217a74301197
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 055e3f0..056947c 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1136,6 +1136,12 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
pInsOL->InsertObject(pPath, nInsPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
+
+ // #i124760# To have a correct selection with only the new object
it is necessary to
+ // unmark all objects first. If not doing so, there may remain
invalid pointers to objects
+ //TTTT:Not needed for aw080 (!)
+ UnmarkAllObj(pInsPV);
+
MarkObj(pPath, pInsPV, false, true);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
