[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - svx/source

[Xisco Faulí (via logerrit)]

 svx/source/svdraw/svdxcgv.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 25937732b9ef881651611f99d4178e90888642a2
Author: Xisco Faulí 
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit: Xisco Faulí 
CommitDate: Tue Feb 18 10:01:48 2020 +0100

tdf#130614: Revert "tdf#125520 Fix OLE objects drag&drop with 'Insert as 
Copy'"

This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 09e6824bc868990095233825c415556399dd0652)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88500
Reviewed-by: Xisco Faulí 
(cherry picked from commit d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88502
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: Mike Kaganski 
Tested-by: Xisco Faulí 

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f18d536b7bf2..8fcd742ec71f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr 
SdrExchangeView::CreateMarkedObjModel() const
 
 if(nullptr == pNewObj)
 {
-// not cloned yet
-if (pObj->GetObjIdentifier() == OBJ_OLE2)
-{
-// tdf#125520
-pNewObj = 
pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-}
-else
-{
-// use default way
-pNewObj = pObj->CloneSdrObject(*pNewModel);
-}
+// not cloned yet, use default way
+pNewObj = pObj->CloneSdrObject(*pNewModel);
 }
 
 if(pNewObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - svx/source

[Noel Grandin (via logerrit)]

 svx/source/dialog/_bmpmask.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit ab6430960c92efa09b549cd70ee9e4eed47a01fe
Author: Noel Grandin 
AuthorDate: Fri Feb 14 12:12:07 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 17 15:37:07 2020 +0100

tdf#130373 substitute color only works if left set to transparent.

regression from
commit e27be9dfbcf8636a7440f828435b1860dfa38977
Date:   Wed Jul 3 15:07:44 2019 +0200
move some Bitmap replace logic inside vcl

Change-Id: I0d985314367e26134c940e54f485db373d4c3642
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88675
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 407c45d54c189d5e9488e868e503f02955825b82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88696
Reviewed-by: Xisco Faulí 
(cherry picked from commit ed9bee5429294833476685b66f3e662ae27809b0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88700
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Noel Grandin 

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index b978311b0b7f..9dd2fb32d308 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -1006,6 +1006,10 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
 if ( aBitmapEx.GetSizePixel().Width() && 
aBitmapEx.GetSizePixel().Height() )
 {
 ImpMask( aBitmapEx );
+if ( aGraphic.IsTransparent() )
+aGraphic = Graphic( BitmapEx( 
aBitmapEx.GetBitmap(), aBitmapEx.GetMask() ) );
+else
+aGraphic = aBitmapEx;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits