sc/sdi/tabvwsh.sdi | 1 +
sc/source/ui/drawfunc/fuconrec.cxx | 2 ++
sc/source/ui/drawfunc/fupoor.cxx | 4 +++-
sc/source/ui/view/tabvwsh2.cxx | 2 ++
sc/uiconfig/scalc/toolbar/arrowsbar.xml | 1 +
5 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 19dc5d725791388f1b7b17af2e48b0abdf8990bd
Author: Gulsah Kose <gulsah.1...@gmail.com>
Date: Thu Oct 13 15:17:25 2016 +0300
tdf#101390 Add "Diagonal Line" command to the calc arrowsbar.
Change-Id: I1e29cd9a63424771576d1a5a47558d30faf53dda
Signed-off-by: Gulsah Kose <gulsah.1...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/29769
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
Tested-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index f7da47f..ec44746 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -88,6 +88,7 @@ interface BaseSelection
SID_OBJECT_SELECT [ ExecMethod = ExecDraw; StateMethod =
GetDrawState; ]
SID_DRAW_LINE [ ExecMethod = ExecDraw; StateMethod =
GetDrawState; ]
+ SID_DRAW_XLINE [ ExecMethod = ExecDraw; StateMethod =
GetDrawState; ]
SID_LINE_ARROW_END [ ExecMethod = ExecDraw; StateMethod =
GetDrawState; ]
SID_LINE_ARROW_CIRCLE [ ExecMethod = ExecDraw; StateMethod =
GetDrawState; ]
SID_LINE_ARROW_SQUARE [ ExecMethod = ExecDraw; StateMethod =
GetDrawState; ]
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx
b/sc/source/ui/drawfunc/fuconrec.cxx
index ebc2611..d76b1ef 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -196,6 +196,7 @@ void FuConstRectangle::Activate()
switch (aSfxRequest.GetSlot() )
{
case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
case SID_LINE_ARROW_END:
case SID_LINE_ARROW_CIRCLE:
case SID_LINE_ARROW_SQUARE:
@@ -403,6 +404,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const
sal_uInt16 nID, const Rec
switch(nID)
{
case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
case SID_LINE_ARROW_END:
case SID_LINE_ARROW_CIRCLE:
case SID_LINE_ARROW_SQUARE:
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 94829ea..03a6646 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -308,7 +308,9 @@ bool FuPoor::doConstructOrthogonal() const
return bIsMediaSelected;
}
}
- else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON ||
aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL)
+ else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON
+ || aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL
+ || aSfxRequest.GetSlot() == SID_DRAW_XLINE)
return true;
return false;
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 13c32a8..a3982db 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -218,6 +218,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
break;
case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
case SID_LINE_ARROW_END:
case SID_LINE_ARROW_CIRCLE:
case SID_LINE_ARROW_SQUARE:
@@ -369,6 +370,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
break;
case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
case SID_LINE_ARROW_END:
case SID_LINE_ARROW_CIRCLE:
case SID_LINE_ARROW_SQUARE:
diff --git a/sc/uiconfig/scalc/toolbar/arrowsbar.xml
b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
index cfe177a..40d7238 100644
--- a/sc/uiconfig/scalc/toolbar/arrowsbar.xml
+++ b/sc/uiconfig/scalc/toolbar/arrowsbar.xml
@@ -29,4 +29,5 @@
<toolbar:toolbaritem xlink:href=".uno:Line"/>
<toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:MeasureLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal"/>
</toolbar:toolbar>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
