sc/source/ui/drawfunc/drawsh.cxx | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 506d2abdd6f68a9f6d895d3aadb06b40b05624c5
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Nov 8 13:29:13 2019 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Nov 8 15:01:38 2019 +0100
jsdialogs: apply .uno:FillColor in Calc
Change-Id: I7cbd447c8a66f9240d6a093c9ab24a7c2dbb2024
Reviewed-on: https://gerrit.libreoffice.org/82293
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 8f0a955940b2..c8a17511143c 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -62,12 +62,13 @@
#include <svx/xlnwtit.hxx>
#include <svx/chrtitem.hxx>
#include <svx/xlnclit.hxx>
+#include <svx/xflclit.hxx>
SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
namespace
{
- void lcl_convertStringArguments(std::unique_ptr<SfxItemSet>& pArgs)
+ void lcl_convertStringArguments(sal_uInt16 nSlot,
std::unique_ptr<SfxItemSet>& pArgs)
{
Color aColor;
OUString sColor;
@@ -92,8 +93,22 @@ namespace
else
aColor = Color(sColor.toInt32(16));
- XLineColorItem aLineColorItem(OUString(), aColor);
- pArgs->Put(aLineColorItem);
+ switch (nSlot)
+ {
+ case SID_ATTR_LINE_COLOR:
+ {
+ XLineColorItem aLineColorItem(OUString(), aColor);
+ pArgs->Put(aLineColorItem);
+ break;
+ }
+
+ case SID_ATTR_FILL_COLOR:
+ {
+ XFillColorItem aFillColorItem(OUString(), aColor);
+ pArgs->Put(aFillColorItem);
+ break;
+ }
+ }
}
}
}
@@ -244,7 +259,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
if( pView->AreObjectsMarked() )
{
std::unique_ptr<SfxItemSet> pNewArgs =
rReq.GetArgs()->Clone();
- lcl_convertStringArguments( pNewArgs );
+ lcl_convertStringArguments( rReq.GetSlot(), pNewArgs );
pView->SetAttrToMarked( *pNewArgs, false );
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
