diff options
| author | Gulsah Kose <gulsah.1004@gmail.com> | 2016-10-13 14:54:24 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-13 17:29:36 +0000 |
| commit | c3f95221b83f2302778e315330ff8ccf2998a397 (patch) | |
| tree | 51e7861dada8d80f883c3a581254f98a59586173 | |
| parent | ab32758ea8378b56df04fb2a47791e0379adb5a2 (diff) | |
tdf#101390 Add "Diagonal Line" command to the writer arrowsbar.
Change-Id: If21ea239289b985e6a7cea717b41e073bc591c62
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/29768
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
| -rw-r--r-- | sw/sdi/viewsh.sdi | 5 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/conrect.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/drawbase.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/toolbar/arrowsbar.xml | 1 |
6 files changed, 10 insertions, 1 deletions
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index 56a2d6e1f676..c6d83c8c32a2 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 2e0542f45c15..39ccea5766ab 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 48526fb5a520..820a99e14052 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 750caf8c845d..dbe74d50549a 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 1de3fc75951a..3f01b803d667 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 cfe177a1c792..40d7238daf82 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> |