[Libreoffice-commits] core.git: 2 commits - officecfg/registry sw/source sw/uiconfig sw/UIConfig_sglobal.mk sw/UIConfig_sweb.mk sw/UIConfig_swform.mk sw/UIConfig_swreport.mk sw/UIConfig_swriter.mk sw/UIConfig_swxform.mk
Maxim Monastirsky
momonasmon at gmail.com
Sun Dec 13 15:06:14 PST 2015
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 3 +
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 10 +++++
sw/UIConfig_sglobal.mk | 1
sw/UIConfig_sweb.mk | 1
sw/UIConfig_swform.mk | 1
sw/UIConfig_swreport.mk | 1
sw/UIConfig_swriter.mk | 1
sw/UIConfig_swxform.mk | 1
sw/source/uibase/uiview/pview.cxx | 3 -
sw/uiconfig/sglobal/popupmenu/preview.xml | 18 ++++++++++
sw/uiconfig/sweb/popupmenu/preview.xml | 18 ++++++++++
sw/uiconfig/swform/popupmenu/preview.xml | 18 ++++++++++
sw/uiconfig/swreport/popupmenu/preview.xml | 18 ++++++++++
sw/uiconfig/swriter/popupmenu/preview.xml | 18 ++++++++++
sw/uiconfig/swxform/popupmenu/preview.xml | 18 ++++++++++
20 files changed, 153 insertions(+), 2 deletions(-)
New commits:
commit 121b7b880c4d17c1ce320ad6b1c560577c9953ed
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Mon Dec 14 00:58:18 2015 +0200
tdf#93837 Convert MN_PPREVIEW_POPUPMENU to xml
Change-Id: If490e8523dbedabdf4124b1bd1a5ba08678dc06e
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fed2bfc..269f788 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5127,6 +5127,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Print Pr~eview</value>
</prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Close Preview</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
</prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index e64c937..c5d927f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -20,6 +20,11 @@
<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="WriterFormWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Print Preview</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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 16821c2..3077b71 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -20,6 +20,11 @@
<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="WriterGlobalWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Print Preview</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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 6934c5b..60c42e5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -20,6 +20,11 @@
<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="WriterReportWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Print Preview</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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 0af4b5f..0218da2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -20,6 +20,11 @@
<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="WriterWebWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Print Preview</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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 29d1afe..7bbad92 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -20,6 +20,11 @@
<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="WriterWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Print Preview</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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 0fa135b..5a14108 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -20,6 +20,11 @@
<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="XFormsWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Print Preview</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>
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index f76ae87..63261f3 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/sw/UIConfig_sglobal.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sglobal,\
))
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\
+ sw/uiconfig/sglobal/popupmenu/preview \
sw/uiconfig/sglobal/popupmenu/table \
))
diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk
index ca6c6b8..a7e3ce1 100644
--- a/sw/UIConfig_sweb.mk
+++ b/sw/UIConfig_sweb.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\
))
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\
+ sw/uiconfig/sweb/popupmenu/preview \
sw/uiconfig/sweb/popupmenu/table \
))
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
index b7dfc49..0ed7fef 100644
--- a/sw/UIConfig_swform.mk
+++ b/sw/UIConfig_swform.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swform,\
))
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\
+ sw/uiconfig/swform/popupmenu/preview \
sw/uiconfig/swform/popupmenu/table \
))
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
index 8d0a2db..97bd1e7 100644
--- a/sw/UIConfig_swreport.mk
+++ b/sw/UIConfig_swreport.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swreport,\
))
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\
+ sw/uiconfig/swreport/popupmenu/preview \
sw/uiconfig/swreport/popupmenu/table \
))
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index f5e2ded..b8bbef9 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swriter,\
))
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\
+ sw/uiconfig/swriter/popupmenu/preview \
sw/uiconfig/swriter/popupmenu/table \
))
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
index 95e1442..05c455e 100644
--- a/sw/UIConfig_swxform.mk
+++ b/sw/UIConfig_swxform.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/swxform,\
))
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\
+ sw/uiconfig/swxform/popupmenu/preview \
sw/uiconfig/swxform/popupmenu/table \
))
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index a370305..48ee1ef 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -93,8 +93,7 @@ SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell)
void SwPagePreview::InitInterface_Impl()
{
- GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_PPREVIEW_POPUPMENU));
-
+ GetStaticInterface()->RegisterPopupMenu("preview");
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_CLIENT|SFX_VISIBILITY_FULLSCREEN|SFX_VISIBILITY_READONLYDOC,
RID_PVIEW_TOOLBOX);
}
diff --git a/sw/uiconfig/sglobal/popupmenu/preview.xml b/sw/uiconfig/sglobal/popupmenu/preview.xml
new file mode 100644
index 0000000..9581b12
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:PageUp"/>
+ <menu:menuitem menu:id=".uno:PageDown"/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPagePreview"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPreview"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/preview.xml b/sw/uiconfig/sweb/popupmenu/preview.xml
new file mode 100644
index 0000000..9581b12
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:PageUp"/>
+ <menu:menuitem menu:id=".uno:PageDown"/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPagePreview"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPreview"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/preview.xml b/sw/uiconfig/swform/popupmenu/preview.xml
new file mode 100644
index 0000000..9581b12
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:PageUp"/>
+ <menu:menuitem menu:id=".uno:PageDown"/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPagePreview"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPreview"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/preview.xml b/sw/uiconfig/swreport/popupmenu/preview.xml
new file mode 100644
index 0000000..9581b12
--- /dev/null
+++ b/sw/uiconfig/swreport/popupmenu/preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:PageUp"/>
+ <menu:menuitem menu:id=".uno:PageDown"/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPagePreview"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPreview"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swriter/popupmenu/preview.xml b/sw/uiconfig/swriter/popupmenu/preview.xml
new file mode 100644
index 0000000..9581b12
--- /dev/null
+++ b/sw/uiconfig/swriter/popupmenu/preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:PageUp"/>
+ <menu:menuitem menu:id=".uno:PageDown"/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPagePreview"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPreview"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swxform/popupmenu/preview.xml b/sw/uiconfig/swxform/popupmenu/preview.xml
new file mode 100644
index 0000000..9581b12
--- /dev/null
+++ b/sw/uiconfig/swxform/popupmenu/preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+ <menu:menuitem menu:id=".uno:PageUp"/>
+ <menu:menuitem menu:id=".uno:PageDown"/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPagePreview"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PrintPreview"/>
+</menu:menupopup>
commit 31689f989d453bd96f2d52fa8f0fa337ec6fb576
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Mon Dec 14 00:44:39 2015 +0200
Missed this file in 2657e31
Change-Id: If05602bf0fbbae0a669913e56add92ed902141c0
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index e77d5e2..0fa135b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -20,6 +20,11 @@
<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="XFormsWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <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/toolbar/standardbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,0</value>
More information about the Libreoffice-commits
mailing list