mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsdialogs: apply .uno:FillColor in Calc

Browse Source 
Change-Id: I7cbd447c8a66f9240d6a093c9ab24a7c2dbb2024
Reviewed-on: https://gerrit.libreoffice.org/82293
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/82306
Tested-by: Jenkins
This commit is contained in:
Szymon Kłos
2019-11-08 13:29:13 +01:00
parent 3b16dfd80f
commit 85d947d52d
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sc/source/ui/drawfunc/drawsh.cxx
View File

@@ -56,12 +56,13 @@
#include <svx/xlnwtit.hxx> #include <svx/xlnwtit.hxx>
#include <svx/chrtitem.hxx> #include <svx/chrtitem.hxx>
#include <svx/xlnclit.hxx> #include <svx/xlnclit.hxx>
#include <svx/xflclit.hxx>
SFX_IMPL_INTERFACE(ScDrawShell, SfxShell) SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
namespace namespace
{ {
void lcl_convertStringArguments(std::unique_ptr<SfxItemSet>& pArgs) void lcl_convertStringArguments(sal_uInt16 nSlot, std::unique_ptr<SfxItemSet>& pArgs)
{ {
Color aColor; Color aColor;
OUString sColor; OUString sColor;
@@ -86,8 +87,22 @@ namespace
else else
aColor = Color(sColor.toInt32(16)); aColor = Color(sColor.toInt32(16));
XLineColorItem aLineColorItem(OUString(), aColor); switch (nSlot)
pArgs->Put(aLineColorItem); {
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;
}
}
} }
} }
} }
@@ -238,7 +253,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
if( pView->AreObjectsMarked() ) if( pView->AreObjectsMarked() )
{ {
std::unique_ptr<SfxItemSet> pNewArgs = rReq.GetArgs()->Clone(); std::unique_ptr<SfxItemSet> pNewArgs = rReq.GetArgs()->Clone();
lcl_convertStringArguments( pNewArgs ); lcl_convertStringArguments( rReq.GetSlot(), pNewArgs );
pView->SetAttrToMarked( *pNewArgs, false ); pView->SetAttrToMarked( *pNewArgs, false );
} }
else else