[Libreoffice-commits] core.git: officecfg/registry sd/sdi svx/sdi sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk
Gulsah Kose
gulsah.1004 at gmail.com
Fri Feb 19 11:53:22 UTC 2016
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8 ---
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8 +++
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 14 +++++
sd/sdi/sdraw.sdi | 18 -------
svx/sdi/svx.sdi | 17 +++++++
sw/UIConfig_swriter.mk | 1
sw/sdi/viewsh.sdi | 5 ++
sw/source/uibase/uiview/viewstat.cxx | 5 ++
sw/uiconfig/swriter/toolbar/drawbar.xml | 6 +-
sw/uiconfig/swriter/toolbar/linesbar.xml | 24 ++++++++++
10 files changed, 77 insertions(+), 29 deletions(-)
New commits:
commit 9829d866468cf4f1b69fc74131fb3ad711645289
Author: Gulsah Kose <gulsah.1004 at gmail.com>
Date: Thu Feb 18 16:21:01 2016 +0200
tdf#89646 Implement "uno:LineToolbox" command into writer.
Change-Id: Ifd50d16a87f8b9197f80a3b1c9de1803adfd462f
Signed-off-by: Gulsah Kose <gulsah.1004 at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/22479
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d75f825..0d54ece 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1131,14 +1131,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:LineToolbox" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Curve</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:ConnectorLineArrows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Straight Connector with Arrows</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 61445ba..24dc9ba 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4318,6 +4318,14 @@
<value>7</value>
</prop>
</node>
+ <node oor:name=".uno:LineToolbox" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Curve</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:Freeline" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Freeform Line, Filled</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index a5bc600..7ae2339c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -152,6 +152,20 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="private:resource/toolbar/linesbar" oor:op="replace">
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Lines</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,1</value>
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index e6d6731..98842f2 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -2600,24 +2600,6 @@ SfxVoidItem LineTo SID_LINETO
GroupId = GID_DRAWING;
]
-SfxVoidItem LineToolbox SID_DRAWTBX_LINES
-
-[
- AutoUpdate = FALSE,
- FastCall = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
-
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
- GroupId = GID_DRAWING;
-]
-
SfxVoidItem ManageLinks SID_MANAGE_LINKS
()
[
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index b220975..169c086 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -72,6 +72,23 @@ SfxVoidItem AddTable SID_FM_ADDTABLE
GroupId = GID_TABLE;
]
+SfxVoidItem LineToolbox SID_DRAWTBX_LINES
+
+[
+ AutoUpdate = FALSE,
+ FastCall = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_DRAWING;
+]
SfxVoidItem AlignCenter SID_OBJECT_ALIGN_CENTER
()
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index e34bbef..1457d21 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 30dd84d..370e460 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 77dfe15..884f047 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 b025ff5..52986b5 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 0000000..74976c9
--- /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>
More information about the Libreoffice-commits
mailing list