sw/sdi/viewsh.sdi | 5 +++++
sw/source/uibase/ribbar/conrect.cxx | 1 +
sw/source/uibase/ribbar/drawbase.cxx | 2 +-
sw/source/uibase/uiview/viewdraw.cxx | 1 +
sw/source/uibase/uiview/viewstat.cxx | 1 +
sw/uiconfig/swriter/toolbar/arrowsbar.xml | 1 +
6 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit c3f95221b83f2302778e315330ff8ccf2998a397
Author: Gulsah Kose <gulsah.1...@gmail.com>
Date: Thu Oct 13 14:54:24 2016 +0300
tdf#101390 Add "Diagonal Line" command to the writer arrowsbar.
Change-Id: If21ea239289b985e6a7cea717b41e073bc591c62
Signed-off-by: Gulsah Kose <gulsah.1...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/29768
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
Tested-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 56a2d6e..c6d83c8 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -82,6 +82,11 @@ interface TextEditView : BaseTextEditView
ExecMethod = ExecDraw ;
StateMethod = GetDrawState ;
]
+ SID_DRAW_XLINE
+ [
+ ExecMethod = ExecDraw ;
+ StateMethod = GetDrawState ;
+ ]
SID_LINE_ARROW_END
[
ExecMethod = ExecDraw ;
diff --git a/sw/source/uibase/ribbar/conrect.cxx
b/sw/source/uibase/ribbar/conrect.cxx
index 2e0542f..39ccea5 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -167,6 +167,7 @@ void ConstRectangle::Activate(const sal_uInt16 nSlotId)
case SID_LINE_SQUARE_ARROW:
case SID_LINE_ARROWS:
case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
m_pWin->SetSdrDrawMode(OBJ_LINE);
break;
diff --git a/sw/source/uibase/ribbar/drawbase.cxx
b/sw/source/uibase/ribbar/drawbase.cxx
index 48526fb..820a99e 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -621,7 +621,7 @@ Point SwDrawBase::GetDefaultCenterPos()
// #i33136#
bool SwDrawBase::doConstructOrthogonal() const
{
- return ( m_nSlotId == SID_DRAW_XPOLYGON || m_nSlotId ==
SID_DRAW_XPOLYGON_NOFILL );
+ return ( m_nSlotId == SID_DRAW_XPOLYGON || m_nSlotId ==
SID_DRAW_XPOLYGON_NOFILL || m_nSlotId == SID_DRAW_XLINE );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewdraw.cxx
b/sw/source/uibase/uiview/viewdraw.cxx
index 750caf8..dbe74d5 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -253,6 +253,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
case SID_LINE_SQUARE_ARROW:
case SID_LINE_ARROWS:
case SID_DRAW_LINE:
+ case SID_DRAW_XLINE:
case SID_DRAW_MEASURELINE:
case SID_DRAW_RECT:
case SID_DRAW_ELLIPSE:
diff --git a/sw/source/uibase/uiview/viewstat.cxx
b/sw/source/uibase/uiview/viewstat.cxx
index 1de3fc7..3f01b80 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -495,6 +495,7 @@ void SwView::GetDrawState(SfxItemSet &rSet)
switch(nWhich)
{
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/sw/uiconfig/swriter/toolbar/arrowsbar.xml
b/sw/uiconfig/swriter/toolbar/arrowsbar.xml
index cfe177a..40d7238 100644
--- a/sw/uiconfig/swriter/toolbar/arrowsbar.xml
+++ b/sw/uiconfig/swriter/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
