diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-06-18 11:46:10 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-06-27 07:14:20 +0200 |
| commit | 79e434948d65dd9eba150bc986e968bcb3754631 (patch) | |
| tree | d4ba5a9e5b9fc9377c7fd0b9144754c3f48f0cbd /svx | |
| parent | 4964cb80ec603a1ce9937f230fc6ed6b761a6e1f (diff) | |
tdf#117904 Don't allow copying signed shapes
Instead just copy the "unsigned" graphic
Change-Id: I5183b0b33be0469dceaace142d73aa403cc32ef2
Reviewed-on: https://gerrit.libreoffice.org/56472
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 0dc387891990..aefebe7b3a7c 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -884,7 +884,6 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj ) return *this; SdrRectObj::operator=( rObj ); - mpGraphicObject->SetGraphic( rObj.GetGraphic(), &rObj.GetGraphicObject() ); aFileName = rObj.aFileName; aFilterName = rObj.aFilterName; bMirrored = rObj.bMirrored; @@ -898,6 +897,10 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj ) mbIsSignatureLineShowSignDate = rObj.mbIsSignatureLineShowSignDate; mbIsSignatureLineCanAddComment = rObj.mbIsSignatureLineCanAddComment; mpSignatureLineUnsignedGraphic = rObj.mpSignatureLineUnsignedGraphic; + if (mbIsSignatureLine && rObj.mpSignatureLineUnsignedGraphic) + mpGraphicObject->SetGraphic(rObj.mpSignatureLineUnsignedGraphic); + else + mpGraphicObject->SetGraphic( rObj.GetGraphic(), &rObj.GetGraphicObject() ); if( rObj.IsLinkedGraphic() ) { |