[Libreoffice-commits] core.git: 3 commits - officecfg/registry sw/source
Maxim Monastirsky
momonasmon at gmail.com
Mon Apr 4 12:39:23 UTC 2016
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 115 +++++++++
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 125 ++++++++++
sw/source/uibase/docvw/SidebarTxtControl.cxx | 12
4 files changed, 259 insertions(+), 1 deletion(-)
New commits:
commit ac8c392dc42534adf1dcfe23c9c850b05124f7a6
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Mon Apr 4 15:26:34 2016 +0300
tdf#93837 Add UI names for sd menus
Change-Id: I44e989504b441450ea566e64b5231f41ff8a9a49
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index fde167d..467be35 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -20,11 +20,126 @@
<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="DrawWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/3dobject" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">3D Object</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/3dscene" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">3D Scene</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/3dscene2" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">3D Scene (group)</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/connector" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Connector/Freeform Line</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/curve" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Curve</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Shape</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Shape Text</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/form" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Form Control</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Box Formatting</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/gluepoint" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Glue Point</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Image</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/group" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Group</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/layertab" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Layer Tabs bar</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/line" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Line/Arrow</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/measure" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Dimension Line</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Media</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/multiselect" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Multiple Selection</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">OLE Object</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/page" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Page</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/pagepane" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Page Pane</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/pagepanenosel" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Page Pane (no selection)</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/table" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Table</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/tabletext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Table Text</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/textbox" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box (drawing)</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>1,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 2ad7488..1a92c35 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -20,11 +20,136 @@
<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ImpressWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/3dobject" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">3D Object</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/3dscene" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">3D Scene</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/3dscene2" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">3D Scene (group)</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/connector" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Connector/Freeform Line</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/curve" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Curve</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Shape</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Shape Text</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/form" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Form Control</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Box Formatting</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/gluepoint" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Glue Point</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Image</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/group" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Group</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/line" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Line/Arrow</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/measure" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Dimension Line</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Media</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/multiselect" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Multiple Selection</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">OLE Object</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/outline" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Outline</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/page" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Slide</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/pagepane" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Slide Sorter/Pane</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/pagepanenosel" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Slide Sorter/Pane (no selection)</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/pagepanemaster" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Slide Master Sorter/Pane</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/pagepanenoselmaster" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Slide Master Sorter/Pane (no selection)</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/table" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Table</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/tabletext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Table Text</value>
+ </prop>
+ </node>
+ <node oor:name="private:resource/popupmenu/textbox" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box (drawing)</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>1,1</value>
commit 3a93a75fe1d89520692edc2f615b1c8d5cd0c52b
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Mon Apr 4 13:20:39 2016 +0300
Restore some erroneously removed code
Change-Id: Icc6fe929b86d494099bd1b7fafd5fc4c2787dbbd
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 51c2c04..c997b4a 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -376,7 +376,17 @@ void SidebarTextControl::Command( const CommandEvent& rCEvt )
GetTextView()->ExecuteSpellPopup(rCEvt.GetMousePosPixel(),&aLink);
}
else
- SfxDispatcher::ExecutePopup(this, &rCEvt.GetMousePosPixel());
+ {
+ Point aPos;
+ if (rCEvt.IsMouseEvent())
+ aPos = rCEvt.GetMousePosPixel();
+ else
+ {
+ const Size aSize = GetSizePixel();
+ aPos = Point( aSize.getWidth()/2, aSize.getHeight()/2 );
+ }
+ SfxDispatcher::ExecutePopup(this, &aPos);
+ }
}
else
if (rCEvt.GetCommand() == CommandEventId::Wheel)
commit 804209f6b37babf339874d599db7d03ce594fe4e
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Mon Apr 4 15:32:25 2016 +0300
Missing label for .uno:CloseObject
Change-Id: I988e0832086d0530d299de0636d9bd779f751b44
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 4e372f0..8a907b7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -3,6 +3,14 @@
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="DrawImpressCommands" oor:package="org.openoffice.Office.UI">
<node oor:name="UserInterface">
<node oor:name="Commands">
+ <node oor:name=".uno:CloseObject" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Close ~Object</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:ColorView" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Black & White View</value>
More information about the Libreoffice-commits
mailing list