diff options
author | Gulsah Kose <gulsah.1004@gmail.com> | 2016-02-18 16:21:01 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-19 11:52:53 +0000 |
commit | 9829d866468cf4f1b69fc74131fb3ad711645289 (patch) | |
tree | 77d69c4143edc7a6085cd900d46d2d7888ec618b /sw | |
parent | 75da70ccbf7946d3c8de2572d98c2f9cf534b751 (diff) |
tdf#89646 Implement "uno:LineToolbox" command into writer.
Change-Id: Ifd50d16a87f8b9197f80a3b1c9de1803adfd462f
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/22479
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/UIConfig_swriter.mk | 1 | ||||
-rw-r--r-- | sw/sdi/viewsh.sdi | 5 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/toolbar/drawbar.xml | 6 | ||||
-rw-r--r-- | sw/uiconfig/swriter/toolbar/linesbar.xml | 24 |
5 files changed, 38 insertions, 3 deletions
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index e34bbefe8086..1457d21f5f03 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -57,6 +57,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\ sw/uiconfig/swriter/toolbar/graffilterbar \ sw/uiconfig/swriter/toolbar/graphicobjectbar \ sw/uiconfig/swriter/toolbar/insertbar \ + sw/uiconfig/swriter/toolbar/linesbar \ sw/uiconfig/swriter/toolbar/mediaobjectbar \ sw/uiconfig/swriter/toolbar/moreformcontrols \ sw/uiconfig/swriter/toolbar/navigationobjectbar \ diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index 30dd84da766c..370e4609a0d9 100644 --- a/sw/sdi/viewsh.sdi +++ b/sw/sdi/viewsh.sdi @@ -38,6 +38,11 @@ interface ListInText interface TextEditView : BaseTextEditView { // Slots, which are not needed in the WebDocShell + SID_DRAWTBX_LINES + [ + StateMethod = GetState ; + ] + FN_INSERT_OBJ_CTRL [ StateMethod = GetState ; diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 77dfe152560b..884f0477a4b0 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -86,6 +86,11 @@ void SwView::GetState(SfxItemSet &rSet) } break; + case SID_DRAWTBX_LINES: + if ( bWeb ) + rSet.DisableItem(nWhich); + break; + case SID_INSERT_GRAPHIC: if( m_pWrtShell->CursorInsideInputField() ) { diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml index b025ff567d44..52986b5d07f8 100644 --- a/sw/uiconfig/swriter/toolbar/drawbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawbar.xml @@ -21,11 +21,11 @@ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/> - <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/> + <toolbar:toolbaritem xlink:href=".uno:LineToolbox"/> <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397"/> + <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:helpid="10397" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395"/> + <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:helpid="10395" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:visible="false"/> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/swriter/toolbar/linesbar.xml b/sw/uiconfig/swriter/toolbar/linesbar.xml new file mode 100644 index 000000000000..74976c91f77d --- /dev/null +++ b/sw/uiconfig/swriter/toolbar/linesbar.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> +<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar"> + <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled"/> + <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled"/> + <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled"/> +</toolbar:toolbar> |