summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBevilacqua Jean-Sebastien <realitix@gmail.com>2018-08-27 12:15:47 +0200
committerAndrés Maldonado <amaldona@etu.utc.fr>2019-07-11 11:20:49 +0200
commit6dc6efa49a990e826fd3978de8ba506e60a58662 (patch)
tree2fcfd758c8fea55c1671d1d0d35a073b473b1bc3
parent220b31924ada52304c259f5da4800f7c2abfbde3 (diff)
tosca#24347: Pb ombrage dans impress
This is a squash of all commits in distro/linagora/linagora-6-2-3-2 related to tosca#24347. -Andrés Change-Id: If1d12e81aeb57c57412d743fab18c5772105c211
-rw-r--r--sd/source/ui/view/drviews2.cxx7
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.cxx6
2 files changed, 10 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c0d53ba92a55..b4caebeec73b 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -561,6 +561,13 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
sal_uInt16 nSId = rReq.GetSlot();
+ if (nSId == SID_ATTR_FILL_SHADOW) {
+ // TOSCA#24347
+ SfxItemSet itemSet( GetPool(), svl::Items<SDRATTR_SHADOWTRANSPARENCE, SDRATTR_SHADOWTRANSPARENCE>{} );
+ itemSet.Put( SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE, 1 ) );
+ mpDrawView->SetAttributes( itemSet );
+ }
+
switch ( nSId )
{
case SID_OUTLINE_TEXT_AUTOFIT:
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 7b39c5fcf53b..06afe9e656f8 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -127,7 +127,7 @@ void ShadowPropertyPanel::Initialize()
mpLBShadowColor->SetSelectHdl( LINK( this, ShadowPropertyPanel, ModifyShadowColorHdl ) );
mpShadowAngle->SetModifyHdl( LINK(this, ShadowPropertyPanel, ModifyShadowDistanceHdl) );
mpShadowDistance->SetModifyHdl( LINK(this, ShadowPropertyPanel, ModifyShadowDistanceHdl) );
- mpShadowTransSlider->SetRange(Range(0,100));
+ mpShadowTransSlider->SetRange(Range(1,100));
mpShadowTransSlider->SetUpdateMode(true);
mpShadowTransSlider->SetSlideHdl( LINK(this, ShadowPropertyPanel, ModifyShadowTransSliderHdl) );
for(sal_uInt16 i = 0; i <= 20 ; i++)
@@ -294,11 +294,11 @@ void ShadowPropertyPanel::NotifyItemUpdate(
const SdrPercentItem* pTransparencyItem = dynamic_cast< const SdrPercentItem* >(pState);
if(pTransparencyItem)
{
- const sal_uInt16 nVal = pTransparencyItem->GetValue();
+ sal_uInt16 nVal = pTransparencyItem->GetValue();
SetTransparencyValue(nVal);
}
else
- SetTransparencyValue(0);
+ SetTransparencyValue(1);
}
}
break;