sd/source/ui/func/fuconbez.cxx | 52 ++++++++++++++++++++---------------------
1 file changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 8ca55f57c9d0d982356f85e25edec03249ea8cc3
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Wed Mar 27 18:08:40 2019 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 27 21:44:23 2019 +0100
Sync fuconbez.cxx with master
Change-Id: I2e898f5bfbbaa55c5e403185cd445af605300d1e
Reviewed-on: https://gerrit.libreoffice.org/69837
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index b6de7982701a..ad62133b0d8e 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -104,35 +104,35 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest&
rReq )
const SfxItemSet* pArgs = rReq.GetArgs();
- if( pArgs )
+ if( !pArgs )
+ return;
+
+ const SfxPoolItem* pPoolItem = nullptr;
+ if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, true,
&pPoolItem ) )
+ maTargets = static_cast<const SfxUnoAnyItem*>( pPoolItem )->GetValue();
+
+ if (nSlotId == SID_DRAW_FREELINE_NOFILL)
{
- const SfxPoolItem* pPoolItem = nullptr;
- if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH,
true, &pPoolItem ) )
- maTargets = static_cast<const SfxUnoAnyItem*>( pPoolItem
)->GetValue();
+ const SfxUInt16Item* pTransparence =
rReq.GetArg<SfxUInt16Item>(FN_PARAM_1);
+ const SfxStringItem* pColor =
rReq.GetArg<SfxStringItem>(FN_PARAM_2);
+ const SfxUInt16Item* pWidth =
rReq.GetArg<SfxUInt16Item>(FN_PARAM_3);
+ const SfxStringItem* pShapeName =
rReq.GetArg<SfxStringItem>(SID_SHAPE_NAME);
- if (nSlotId == SID_DRAW_FREELINE_NOFILL)
+ if (pTransparence && pTransparence->GetValue() > 0)
{
- const SfxUInt16Item* pTransparence =
rReq.GetArg<SfxUInt16Item>(FN_PARAM_1);
- const SfxStringItem* pColor =
rReq.GetArg<SfxStringItem>(FN_PARAM_2);
- const SfxUInt16Item* pWidth =
rReq.GetArg<SfxUInt16Item>(FN_PARAM_3);
- const SfxStringItem* pShapeName =
rReq.GetArg<SfxStringItem>(SID_SHAPE_NAME);
-
- if (pTransparence && pTransparence->GetValue() > 0)
- {
- mnTransparence = pTransparence->GetValue();
- }
- if (pColor && !pColor->GetValue().isEmpty())
- {
- msColor = pColor->GetValue();
- }
- if (pWidth && pWidth->GetValue() > 0)
- {
- mnWidth = pWidth->GetValue();
- }
- if (pShapeName && !pShapeName->GetValue().isEmpty())
- {
- msShapeName = pShapeName->GetValue();
- }
+ mnTransparence = pTransparence->GetValue();
+ }
+ if (pColor && !pColor->GetValue().isEmpty())
+ {
+ msColor = pColor->GetValue();
+ }
+ if (pWidth && pWidth->GetValue() > 0)
+ {
+ mnWidth = pWidth->GetValue();
+ }
+ if (pShapeName && !pShapeName->GetValue().isEmpty())
+ {
+ msShapeName = pShapeName->GetValue();
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
