[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b6e508fc47ecb3650fd82c5e174e6d6a084e9ec6
Author: A_GAN
AuthorDate: Mon Aug 17 13:03:25 2020 +0200
Commit: Mike Kaganski
CommitDate: Mon Aug 17 21:02:36 2020 +0200
tdf#134052:shadow appears solid instead of blurry in presentation mode
Add shadow primitive id into the switch case to run
ProcessPrimitive2DOnPixelProcessor function.
Change-Id: I059771ba4c56eca50c74aad81c4dec193b454dca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100861
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 174b529e82a5..73fb76012889 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -930,6 +930,7 @@ void VclMetafileProcessor2D::processBasePrimitive2D(const
primitive2d::BasePrimi
static_cast(rCandidate));
break;
}
+case PRIMITIVE2D_ID_SHADOWPRIMITIVE2D:
case PRIMITIVE2D_ID_GLOWPRIMITIVE2D:
case PRIMITIVE2D_ID_SOFTEDGEPRIMITIVE2D:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/inc/cuitabarea.hxx|1 +
cui/source/tabpages/tpshadow.cxx | 25 +
cui/uiconfig/ui/shadowtabpage.ui | 37 +++--
3 files changed, 61 insertions(+), 2 deletions(-)
New commits:
commit 6dbfbebad37fd84208e4c336f0864d26019db153
Author: A_GAN
AuthorDate: Mon Jul 27 20:28:53 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue Jul 28 17:38:53 2020 +0200
Add spin button for shadow blur radius in area dialog
Update shadow tab in area dialog with spin button to control blur radius of
the shadow.
Change-Id: I41f072ef10d280df4b118afae7a7c058eb975417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99557
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 849b009c35df..fe16ad2c3bf2 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -312,6 +312,7 @@ private:
std::unique_ptr m_xMtrDistance;
std::unique_ptr m_xLbShadowColor;
std::unique_ptr m_xMtrTransparent;
+std::unique_ptr m_xLbShadowBlurMetric;
std::unique_ptr m_xCtlPosition;
std::unique_ptr m_xCtlXRectPreview;
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index de448b197fd4..a02d7d6b92b8 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -45,9 +45,11 @@ const sal_uInt16 SvxShadowTabPage::pShadowRanges[] =
{
SDRATTR_SHADOWCOLOR,
SDRATTR_SHADOWTRANSPARENCE,
+SDRATTR_SHADOWBLUR,
SID_ATTR_FILL_SHADOW,
SID_ATTR_FILL_SHADOW,
SID_ATTR_SHADOW_TRANSPARENCE,
+SID_ATTR_SHADOW_BLUR,
SID_ATTR_SHADOW_YDISTANCE,
0
};
@@ -66,6 +68,7 @@ SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage,
weld::DialogControlle
, m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE",
FieldUnit::CM))
, m_xLbShadowColor(new
ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"),
pController->getDialog()))
,
m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_SHADOW_TRANSPARENT",
FieldUnit::PERCENT))
+,
m_xLbShadowBlurMetric(m_xBuilder->weld_metric_spin_button("LB_SHADOW_BLUR",
FieldUnit::POINT))
, m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION",
m_aCtlPosition))
, m_xCtlXRectPreview(new weld::CustomWeld(*m_xBuilder,
"CTL_COLOR_PREVIEW", m_aCtlXRectPreview))
{
@@ -151,6 +154,7 @@ SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage,
weld::DialogControlle
m_xTsbShowShadow->connect_toggled(LINK( this, SvxShadowTabPage,
ClickShadowHdl_Impl));
m_xLbShadowColor->SetSelectHdl( LINK( this, SvxShadowTabPage,
SelectShadowHdl_Impl ) );
Link aLink = LINK( this, SvxShadowTabPage,
ModifyShadowHdl_Impl );
+m_xLbShadowBlurMetric->connect_value_changed(aLink);
m_xMtrTransparent->connect_value_changed(aLink);
m_xMtrDistance->connect_value_changed(aLink);
}
@@ -160,6 +164,7 @@ SvxShadowTabPage::~SvxShadowTabPage()
m_xCtlXRectPreview.reset();
m_xLbShadowColor.reset();
m_xCtlPosition.reset();
+m_xLbShadowBlurMetric.reset();
}
void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
@@ -315,6 +320,17 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
+if (m_xLbShadowBlurMetric->get_value_changed_from_saved())
+{
+SdrMetricItem aItem(SDRATTR_SHADOWBLUR,
m_xLbShadowBlurMetric->get_value(FieldUnit::MM_100TH));
+pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWBLUR );
+if ( !pOld || !( *static_cast(pOld) == aItem ) )
+{
+rAttrs->Put( aItem );
+bModified = true;
+}
+}
+
rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,
static_cast(m_nPageType)));
return bModified;
@@ -398,10 +414,19 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
else
m_xMtrTransparent->set_text("");
+if( rAttrs->GetItemState( SDRATTR_SHADOWBLUR ) != SfxItemState::DONTCARE )
+{
+sal_uInt16 nBlur = rAttrs->Get( SDRATTR_SHADOWBLUR ).GetValue();
+m_xLbShadowBlurMetric->set_value(nBlur, FieldUnit::MM_100TH);
+}
+else
+m_xLbShadowBlurMetric->set_text("");
+
//aCtlPosition
m_xMtrDistance->save_value();
m_xLbShadowColor->SaveValue();
m_xTsbShowShadow->save_state();
+m_xLbShadowBlurMetric->save_value();
// #66832# This field was not saved, but used to determine changes.
// Why? Seems to be the error.
diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui
index f5e674d99c72..2cb49674b9e5 100644
--- a/cui/uiconfig/ui/shadowtabpage.ui
+++ b/cui/uiconfig/ui/shadowtabpage.ui
@@ -12,6 +12,11 @@
5
10
+
+150
+1
+10
+
True
False
@@ -61,7 +66,7 @@
True
False
-3
+
[Libreoffice-commits] core.git: sc/sdi sd/sdi sd/source svx/sdi svx/source svx/uiconfig
sc/sdi/drawsh.sdi |2 + sd/sdi/_drvwsh.sdi|5 +++ sd/source/ui/view/drviews2.cxx|2 + sd/source/ui/view/drviewsf.cxx|1 svx/sdi/svx.sdi | 17 ++ svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 35 -- svx/source/sidebar/shadow/ShadowPropertyPanel.hxx |4 ++ svx/uiconfig/ui/sidebarshadow.ui | 33 8 files changed, 96 insertions(+), 3 deletions(-) New commits: commit 710edb329fe73433f17e81839313ac9551a4aec4 Author: A_GAN AuthorDate: Tue Jul 14 12:42:30 2020 +0200 Commit: Tomaž Vajngerl CommitDate: Fri Jul 17 10:19:07 2020 +0200 Add UI for blur radius in shadow panel Update shadow property panel with spin button to control blur radius of the shadow. Change-Id: I5856e86a7963682c81d9e53a1bef857aba2f3c21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98718 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index b29cf20da73f..9abf9618681a 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -75,6 +75,8 @@ interface TableDraw [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] SID_ATTR_SHADOW_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] +SID_ATTR_SHADOW_BLUR +[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] SID_ATTR_SHADOW_XDISTANCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ] SID_ATTR_SHADOW_YDISTANCE diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 6d5d5740a8ed..63f956e55591 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -1829,6 +1829,11 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetAttrState ; ] +SID_ATTR_SHADOW_BLUR +[ +ExecMethod = FuTemporary ; +StateMethod = GetAttrState ; +] SID_ATTR_SHADOW_XDISTANCE [ ExecMethod = FuTemporary; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 16a31a5f9ebe..322829ac152a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -666,6 +666,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_FILL_SHADOW: case SID_ATTR_SHADOW_COLOR: case SID_ATTR_SHADOW_TRANSPARENCE: +case SID_ATTR_SHADOW_BLUR: case SID_ATTR_SHADOW_XDISTANCE: case SID_ATTR_SHADOW_YDISTANCE: case SID_ATTR_FILL_TRANSPARENCE: @@ -698,6 +699,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_FILL_SHADOW: case SID_ATTR_SHADOW_COLOR: case SID_ATTR_SHADOW_TRANSPARENCE: +case SID_ATTR_SHADOW_BLUR: case SID_ATTR_SHADOW_XDISTANCE: case SID_ATTR_SHADOW_YDISTANCE: case SID_ATTR_FILL_STYLE: diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index bcaea408d937..4446bb657fa1 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -413,6 +413,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_FILL_SHADOW: case SID_ATTR_SHADOW_COLOR: case SID_ATTR_SHADOW_TRANSPARENCE: +case SID_ATTR_SHADOW_BLUR: case SID_ATTR_SHADOW_XDISTANCE: case SID_ATTR_SHADOW_YDISTANCE: case SID_ATTR_FILL_TRANSPARENCE: diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index b7d5283fcb86..b647dbeb3676 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -7708,6 +7708,23 @@ SdrPercentItem FillShadowTransparency SID_ATTR_SHADOW_TRANSPARENCE GroupId = SfxGroupId::Document; ] +SdrMetricItem ShadowBlur SID_ATTR_SHADOW_BLUR + +[ +AutoUpdate = TRUE, +FastCall = FALSE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; + +AccelConfig = FALSE, +MenuConfig = FALSE, +ToolBoxConfig = FALSE, +GroupId = SfxGroupId::Document; +] + SdrMetricItem FillShadowXDistance SID_ATTR_SHADOW_XDISTANCE [ diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 4fec06b5bcc5..0d69afa1520e 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -34,6 +34,7 @@ ShadowPropertyPanel::ShadowPropertyPanel( : PanelLayout(pParent, "ShadowPropertyPanel", "svx/ui/sidebarshadow.ui", rxFrame), maShadowController(SID_ATTR_FILL_SHADOW, *pBindings, *this), maShadowTransController(SID_ATTR_SHADOW_TRANSPARENCE, *pBindings, *this), +
[Libreoffice-commits] core.git: include/xmloff oox/source schema/libreoffice sd/qa sw/qa xmloff/source
include/xmloff/xmltoken.hxx |1
oox/source/export/drawingml.cxx | 15 ++-
schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |6 ++
sd/qa/unit/data/odg/shadow-blur.odg |binary
sd/qa/unit/export-tests-ooxml2.cxx | 16 +++
sd/qa/unit/export-tests.cxx | 25
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |4 -
xmloff/source/core/xmltoken.cxx |1
xmloff/source/draw/sdpropls.cxx |1
xmloff/source/token/tokens.txt |1
10 files changed, 66 insertions(+), 4 deletions(-)
New commits:
commit 2803b09ec024cb0b8cf25ec6fe08412649f40d5e
Author: A_GAN
AuthorDate: Mon Jun 22 23:39:16 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Jun 29 18:32:57 2020 +0200
OOXML/ODF Support for Shadow blur radius
Adding export support for OOXML. Adding import/export support for ODF
Changing some values in test cases as convertEMUtoHmm round the fraction.
Add two test functions for OOXML and ODF export.
Change-Id: Ie5d862b46b5264ead4954f407fee2837b5151cd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96907
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 49178ebdc996..83c0f8bf3193 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1655,6 +1655,7 @@ namespace xmloff::token {
XML_SHADOW_OFFSET_Y,
XML_SHADOW_SLANT,
XML_SHADOW_TRANSPARENCY,
+XML_SHADOW_BLUR,
XML_SHAPE,
XML_SHAPE_ID,
XML_SHAPES,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 607db7a33ae7..a5a44cc3e7fe 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3618,7 +3618,7 @@ void DrawingML::WriteShapeEffect( const OUString& sName,
const Sequence< Propert
}
else if( rOuterShdwProp.Name == "blurRad" )
{
-sal_Int32 nVal = 0;
+sal_Int64 nVal = 0;
rOuterShdwProp.Value >>= nVal;
aOuterShdwAttrList->add( XML_blurRad, OString::number(
nVal ).getStr() );
}
@@ -3802,16 +3802,20 @@ void DrawingML::WriteShapeEffects( const Reference<
XPropertySet >& rXPropSet )
if( bHasShadow )
{
Sequence< PropertyValue > aShadowGrabBag( 3 );
-Sequence< PropertyValue > aShadowAttribsGrabBag( 2 );
+Sequence< PropertyValue > aShadowAttribsGrabBag( 3 );
double dX = +0.0, dY = +0.0;
+sal_Int32 nBlur =0;
rXPropSet->getPropertyValue( "ShadowXDistance" ) >>= dX;
rXPropSet->getPropertyValue( "ShadowYDistance" ) >>= dY;
+rXPropSet->getPropertyValue( "ShadowBlur" ) >>= nBlur;
aShadowAttribsGrabBag[0].Name = "dist";
aShadowAttribsGrabBag[0].Value <<= lcl_CalculateDist(dX, dY);
aShadowAttribsGrabBag[1].Name = "dir";
aShadowAttribsGrabBag[1].Value <<= lcl_CalculateDir(dX, dY);
+aShadowAttribsGrabBag[2].Name = "blurRad";
+aShadowAttribsGrabBag[2].Value <<=
oox::drawingml::convertHmmToEmu(nBlur);
aShadowGrabBag[0].Name = "Attribs";
aShadowGrabBag[0].Value <<= aShadowAttribsGrabBag;
@@ -3836,8 +3840,11 @@ void DrawingML::WriteShapeEffects( const Reference<
XPropertySet >& rXPropSet )
rOuterShdwProp.Value >>= aAttribsProps;
double dX = +0.0, dY = +0.0;
+sal_Int32 nBlur =0;
rXPropSet->getPropertyValue( "ShadowXDistance" ) >>= dX;
rXPropSet->getPropertyValue( "ShadowYDistance" ) >>= dY;
+rXPropSet->getPropertyValue( "ShadowBlur" ) >>= nBlur;
+
for( auto& rAttribsProp : aAttribsProps )
{
@@ -3849,6 +3856,10 @@ void DrawingML::WriteShapeEffects( const Reference<
XPropertySet >& rXPropSet )
{
rAttribsProp.Value <<= lcl_CalculateDir(dX, dY);
}
+else if( rAttribsProp.Name == "blurRad" )
+{
+rAttribsProp.Value <<=
oox::drawingml::convertHmmToEmu(nBlur);
+}
}
rOuterShdwProp.Value <<= aAttribsProps;
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 90e240a5a2a1..bd66081734c1 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++
[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer oox/source sd/qa svx/source
drawinglayer/source/primitive2d/shadowprimitive2d.cxx| 10 --
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx |1 +
drawinglayer/source/processor3d/shadow3dextractor.cxx|1 +
include/drawinglayer/primitive2d/shadowprimitive2d.hxx | 10 --
oox/source/drawingml/effectproperties.cxx|3 ++-
sd/qa/unit/import-tests.cxx |2 +-
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |1 +
7 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit b90d0a9dc8e7b4e6a683b35939a7ce0c3090e888
Author: A_GAN
AuthorDate: Wed Jun 3 05:55:46 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Jun 4 18:43:51 2020 +0200
Update ShadowPrimitive2D to support shadow blur
Add attribute for the blur radius and get function.
give more range for the shadow depends on the size of the blur radius.
update the blur radius to be imported in Hmm and the test function.
Change-Id: I32faaf02884d9a6b2f11a9033178b3b6bb419580
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95388
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index 8cb8311494a5..e2c0be36ec9e 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -23,6 +23,8 @@
#include
#include
+#include
+#include
using namespace com::sun::star;
@@ -32,10 +34,12 @@ namespace drawinglayer::primitive2d
ShadowPrimitive2D::ShadowPrimitive2D(
const basegfx::B2DHomMatrix& rShadowTransform,
const basegfx::BColor& rShadowColor,
+double fShadowBlur,
const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren),
maShadowTransform(rShadowTransform),
-maShadowColor(rShadowColor)
+maShadowColor(rShadowColor),
+mfShadowBlur(fShadowBlur)
{
}
@@ -46,7 +50,8 @@ namespace drawinglayer::primitive2d
const ShadowPrimitive2D& rCompare = static_cast< const
ShadowPrimitive2D& >(rPrimitive);
return (getShadowTransform() == rCompare.getShadowTransform()
-&& getShadowColor() == rCompare.getShadowColor());
+&& getShadowColor() == rCompare.getShadowColor()
+&& getShadowBlur() == rCompare.getShadowBlur());
}
return false;
@@ -55,6 +60,7 @@ namespace drawinglayer::primitive2d
basegfx::B2DRange ShadowPrimitive2D::getB2DRange(const
geometry::ViewInformation2D& rViewInformation) const
{
basegfx::B2DRange
aRetval(getChildren().getB2DRange(rViewInformation));
+aRetval.grow(getShadowBlur());
aRetval.transform(getShadowTransform());
return aRetval;
}
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 28e9eccdacc5..afc841fcf3bd 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -235,6 +235,7 @@ namespace drawinglayer::primitive2d
aShadow = new ShadowPrimitive2D(
aShadowTransform,
aShadowColor,
+0, // fShadowBlur = 0, there's no blur
for text shadow yet.
aRetval);
}
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx
b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 45fca6d8dd38..0b653236eb1b 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -74,6 +74,7 @@ namespace drawinglayer::processor3d
primitive2d::BasePrimitive2D* pNew = new
primitive2d::ShadowPrimitive2D(
rPrimitive.getShadowTransform(),
rPrimitive.getShadowColor(),
+0, // shadow3d doesn't have
rPrimitive.getShadowBlur() yet.
aNewSubList);
if(basegfx::fTools::more(rPrimitive.getShadowTransparence(), 0.0))
diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 4bff4c7aa89c..f384049862a9 100644
--- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
namespace drawinglayer::primitive2d
@@ -51,17 +52,22 @@ namespace drawinglayer::primitive2d
/// the shadow color to which all geometry is to be forced
[Libreoffice-commits] core.git: include/svx offapi/com oox/source sd/qa svx/source
include/svx/strings.hrc |1 +
include/svx/svxids.hrc |4 +++-
offapi/com/sun/star/drawing/ShadowProperties.idl |5 +
oox/source/drawingml/effectproperties.cxx|9 +
oox/source/drawingml/effectproperties.hxx|1 +
oox/source/drawingml/effectpropertiescontext.cxx |1 +
oox/source/token/properties.txt |1 +
sd/qa/unit/data/pptx/shape-blur-effect.pptx |binary
sd/qa/unit/import-tests.cxx | 18 ++
svx/source/svdraw/svdattr.cxx|2 ++
10 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 68095e63a8ad8f6079b15e475179a14a64da36d3
Author: A_GAN
AuthorDate: Fri May 29 02:10:49 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue Jun 2 23:29:30 2020 +0200
OOXML support for shadow blur
Add a new property for the blur radius and define an ID
for it to support the import of OOX files. Add a test for
importing the blur radius from PPTX file
Change-Id: Iffaa33ff7159019ce9478cee558622bd61bcf60e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95090
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 14da2224acf4..22253551048d 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -364,6 +364,7 @@
#define SIP_SA_SHADOWXDIST
NC_("SIP_SA_SHADOWXDIST", "Shadow spacing X")
#define SIP_SA_SHADOWYDIST
NC_("SIP_SA_SHADOWYDIST", "Shadow spacing Y")
#define SIP_SA_SHADOWTRANSPARENCE
NC_("SIP_SA_SHADOWTRANSPARENCE", "Shadow transparency")
+#define SIP_SA_SHADOWBLUR
NC_("SIP_SA_SHADOWBLUR", "Shadow blur")
#define SIP_SA_SHADOW3D
NC_("SIP_SA_SHADOW3D", "3D shadow")
#define SIP_SA_SHADOWPERSP
NC_("SIP_SA_SHADOWPERSP", "Perspective shadow")
#define SIP_SA_CAPTIONTYPE
NC_("SIP_SA_CAPTIONTYPE", "Type of legend")
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 8d0c608b6751..be93603f8444 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -654,7 +654,9 @@ class SvxSetItem;
#define SID_FM_FILTER_NAVIGATOR_CONTROL ( SID_SVX_START + 752 )
#define SID_INSERT_GRIDCONTROL ( SID_SVX_START + 753 )
#define SID_PARAGRAPH_CHANGE_STATE ( SID_SVX_START + 754 )
-//FREE
+
+#define SID_ATTR_SHADOW_BLUR( SID_SVX_START + 755 )
+
//FREE
//FREE
//FREE
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl
b/offapi/com/sun/star/drawing/ShadowProperties.idl
index e97b484f2f9e..7d7ad37d76ed 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -59,6 +59,11 @@ published service ShadowProperties
*/
[property] long ShadowYDistance;
+/** This defines the degree of blur of the shadow in points.
+ */
+[property,optional] long ShadowBlur;
+
+
};
diff --git a/oox/source/drawingml/effectproperties.cxx
b/oox/source/drawingml/effectproperties.cxx
index 4d0c7c334ab5..d6a1b9a749c6 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -34,6 +34,8 @@ void EffectShadowProperties::assignUsed(const
EffectShadowProperties& rSourcePro
moShadowSx.assignIfUsed( rSourceProps.moShadowSx );
moShadowSy.assignIfUsed( rSourceProps.moShadowSy );
moShadowColor.assignIfUsed( rSourceProps.moShadowColor );
+moShadowBlur.assignIfUsed( rSourceProps.moShadowBlur );
+
}
void EffectProperties::assignUsed( const EffectProperties& rSourceProps )
@@ -62,6 +64,7 @@ void EffectProperties::pushToPropMap( PropertyMap& rPropMap,
sal_Int32 nAttrDir = 0, nAttrDist = 0;
sal_Int32 nAttrSizeX = 10, nAttrSizeY = 10; // If shadow
size is %100=10 (means equal to object's size), sx sy is not exists,
// Default
values of sx, sy should be 10 in this case.
+sal_Int32 nAttrBlur = 0;
std::map< OUString, css::uno::Any >::const_iterator attribIt =
it->maAttribs.find( "dir" );
if( attribIt != it->maAttribs.end() )
@@ -79,6 +82,10 @@ void EffectProperties::pushToPropMap( PropertyMap& rPropMap,
if( attribIt != it->maAttribs.end() )
attribIt->second >>= nAttrSizeY;
+attribIt = it->maAttribs.find( "blurRad" );
+if( attribIt != it->maAttribs.end() )
+attribIt->second >>= nAttrBlur;
+
// Negative X or Y dist indicates left or up, respectively
// Negative X or Y dist indicates left or up, respectively
[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer include/editeng include/svx svx/source
drawinglayer/source/attribute/sdrshadowattribute.cxx | 14 +-
include/drawinglayer/attribute/sdrshadowattribute.hxx |2 ++
include/editeng/unoprnms.hxx |1 +
include/svx/svddef.hxx|3 ++-
include/svx/unoshprp.hxx |4 +++-
svx/source/sdr/primitive2d/sdrattributecreator.cxx|4 +++-
svx/source/svdraw/svdattr.cxx |1 +
7 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit 4c48de44ad933ef6dd19777b3ebf1a51db5e14e3
Author: A_GAN
AuthorDate: Sun May 17 00:51:09 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Fri May 29 09:09:58 2020 +0200
Add blur attributies and definitons into shadow classes and properities
Change-Id: I365f4bcfc8d772ea77cec1e4ce139b9fc16d9d7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95000
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx
b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index 01ff66162ea5..9e379acaae28 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -32,16 +32,19 @@ namespace drawinglayer::attribute
basegfx::B2DVector maOffset; //
shadow offset 1/100th mm
basegfx::B2DVector maSize; //
[0.0 .. 2.0]
double mfTransparence; //
[0.0 .. 1.0], 0.0==no transp.
+sal_Int32 mnBlur; //
[0 .. 180], radius of the blur
basegfx::BColor maColor;//
color of shadow
ImpSdrShadowAttribute(
const basegfx::B2DVector& rOffset,
const basegfx::B2DVector& rSize,
double fTransparence,
+sal_Int32 nBlur,
const basegfx::BColor& rColor)
: maOffset(rOffset),
maSize(rSize),
mfTransparence(fTransparence),
+mnBlur(nBlur),
maColor(rColor)
{
}
@@ -50,6 +53,7 @@ namespace drawinglayer::attribute
: maOffset(basegfx::B2DVector()),
maSize(basegfx::B2DVector()),
mfTransparence(0.0),
+mnBlur(0),
maColor(basegfx::BColor())
{
}
@@ -58,6 +62,7 @@ namespace drawinglayer::attribute
const basegfx::B2DVector& getOffset() const { return maOffset; }
const basegfx::B2DVector& getSize() const { return maSize; }
double getTransparence() const { return mfTransparence; }
+sal_Int32 getBlur() const { return mnBlur; }
const basegfx::BColor& getColor() const { return maColor; }
bool operator==(const ImpSdrShadowAttribute& rCandidate) const
@@ -65,6 +70,7 @@ namespace drawinglayer::attribute
return (getOffset() == rCandidate.getOffset()
&& getSize() == rCandidate.getSize()
&& getTransparence() == rCandidate.getTransparence()
+&& getBlur() == rCandidate.getBlur()
&& getColor() == rCandidate.getColor());
}
};
@@ -80,9 +86,10 @@ namespace drawinglayer::attribute
const basegfx::B2DVector& rOffset,
const basegfx::B2DVector& rSize,
double fTransparence,
+sal_Int32 nBlur,
const basegfx::BColor& rColor)
: mpSdrShadowAttribute(ImpSdrShadowAttribute(
-rOffset, rSize, fTransparence, rColor))
+rOffset, rSize, fTransparence,nBlur, rColor))
{
}
@@ -130,6 +137,11 @@ namespace drawinglayer::attribute
return mpSdrShadowAttribute->getTransparence();
}
+sal_Int32 SdrShadowAttribute::getBlur() const
+{
+return mpSdrShadowAttribute->getBlur();
+}
+
const basegfx::BColor& SdrShadowAttribute::getColor() const
{
return mpSdrShadowAttribute->getColor();
diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx
b/include/drawinglayer/attribute/sdrshadowattribute.hxx
index fc797dc9d0a0..789edd459706 100644
--- a/include/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -54,6 +54,7 @@ namespace drawinglayer
const basegfx::B2DVector& rOffset,
const basegfx::B2DVector& rSize,
double fTransparence,
+sal_Int32 nBlur,
const basegfx::BColor& rColor);
SdrShadowAttribute();
SdrShadowAttribute(const SdrShadowAttribute&);
@@ -72,6 +73,7 @@ namespace
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f2db813374b8d65e1edec1387fa0c534b40885e1 Author: A_GAN AuthorDate: Thu Feb 27 00:52:07 2020 +0200 Commit: Heiko Tietze CommitDate: Thu Feb 27 18:20:31 2020 +0100 tdf#92484 UI: lock toolbar by default Change-Id: I29f283fcc3a55e535c01efe36e19db74244cef02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89603 Tested-by: Jenkins Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs index 940bae73a5e2..75f332feb0f4 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs @@ -30,7 +30,7 @@ A locked user interface element cannot be moved or undocked by the user. This property is only active when the user interface element is in a docked state. -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source configmgr/source connectivity/source desktop/source extensions/source include/basegfx include/vcl jvmfwk/plugins lingucomponent/source onlineupdate/sourc
avmedia/source/vlc/vlcplayer.cxx |2 +-
avmedia/source/vlc/wrapper/Player.cxx |6 +++---
avmedia/source/vlc/wrapper/SymbolLoader.hxx|4 ++--
configmgr/source/components.cxx|2 +-
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |2 +-
desktop/source/app/app.cxx |2 +-
desktop/source/app/crashreport.cxx |8
desktop/source/app/officeipcthread.cxx |2 +-
desktop/source/app/updater.cxx |2 +-
extensions/source/config/ldap/ldapaccess.hxx |4 ++--
include/basegfx/numeric/ftools.hxx |2 +-
include/vcl/vclptr.hxx |4 ++--
include/vcl/vclreferencebase.hxx |2 +-
jvmfwk/plugins/sunmajor/pluginlib/util.cxx |4 ++--
lingucomponent/source/lingutil/lingutil.cxx|2 +-
onlineupdate/source/update/updater/archivereader.cxx |2 +-
onlineupdate/source/update/updater/progressui_win.cxx |2 +-
onlineupdate/source/update/updater/updater.cxx |6 +++---
salhelper/source/simplereferenceobject.cxx |8
sfx2/source/appl/openuriexternally.cxx |2 +-
sfx2/source/appl/shutdownicon.hxx |2 +-
soltools/mkdepend/collectdircontent.cxx|4 ++--
soltools/mkdepend/collectdircontent.hxx|2 +-
sw/qa/extras/odfexport/odfexport.cxx |2 +-
sw/qa/extras/uiwriter/uiwriter.cxx |2 +-
sw/qa/extras/uiwriter/uiwriter2.cxx|2 +-
toolkit/source/awt/vclxtoolkit.cxx |4 ++--
ucb/source/ucp/file/prov.cxx |2 +-
unotools/source/ucbhelper/tempfile.cxx |4 ++--
vcl/source/gdi/print3.cxx |2 +-
vcl/source/window/builder.cxx |2 +-
vcl/source/window/layout.cxx |2 +-
32 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 42e811a80a3c6f0ca5da359c4a526a1cc3e0d528
Author: A_GAN
AuthorDate: Sat Jan 25 04:33:09 2020 +0200
Commit: Mike Kaganski
CommitDate: Sat Jan 25 22:02:16 2020 +0100
tdf#130137 Replace remaining uses of WNT define checks with _WIN32
Change-Id: If95f1ea5a81de62eb4f725e5fcb30ccb8530062a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87372
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index bbb386240998..bd2cc92baeec 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -173,7 +173,7 @@ namespace
#if defined MACOSX
const intptr_t id = reinterpret_cast( pEnvData->mpNSView );
-#elif defined WNT
+#elif defined _WIN32
const intptr_t id = reinterpret_cast( pEnvData->hWnd );
#else
const intptr_t id = static_cast( pEnvData->aWindow );
diff --git a/avmedia/source/vlc/wrapper/Player.cxx
b/avmedia/source/vlc/wrapper/Player.cxx
index acdda3754129..e80b8df043bb 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -40,7 +40,7 @@ namespace { extern "C" {
void ( *libvlc_media_player_set_xwindow ) ( libvlc_media_player_t *p_mi,
uint32_t drawable );
#elif defined MACOSX
void ( *libvlc_media_player_set_nsobject ) ( libvlc_media_player_t *p_mi,
void *drawable );
-#elif defined WNT
+#elif defined _WIN32
void ( *libvlc_media_player_set_hwnd ) ( libvlc_media_player_t *p_mi, void
*drawable );
#else
#error unknown OS
@@ -83,7 +83,7 @@ namespace avmedia::vlc::wrapper
SYM_MAP( libvlc_media_player_set_xwindow ),
#elif defined MACOSX
SYM_MAP( libvlc_media_player_set_nsobject ),
-#elif defined WNT
+#elif defined _WIN32
SYM_MAP( libvlc_media_player_set_hwnd ),
#endif
SYM_MAP( libvlc_media_player_has_vout ),
@@ -220,7 +220,7 @@ namespace avmedia::vlc::wrapper
libvlc_media_player_set_xwindow( mPlayer, static_cast(id) );
#elif defined MACOSX
libvlc_media_player_set_nsobject( mPlayer, reinterpret_cast( id
) );
-#elif defined WNT
+#elif defined _WIN32
libvlc_media_player_set_hwnd( mPlayer, reinterpret_cast( id ) );
#endif
}
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index aae124cb2575..03952eaff371 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -40,7 +40,7 @@ struct ApiMap
const char LibName[] = "libvlc.so.5";
#elif defined( MACOSX )
const char LibName[] =
