diff options
20 files changed, 148 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index fed2bfc90262..269f7889bb91 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 e64c937fd027..c5d927f57983 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 16821c2ca23a..3077b7133e24 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 6934c5bb2148..60c42e5a0515 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 0af4b5f28e9b..0218da2127c3 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 29d1afe567b0..7bbad929c8f9 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 0fa135b435f7..5a14108e9634 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 f76ae87a3c8d..63261f3f8378 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 ca6c6b85cca3..a7e3ce189ad4 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 b7dfc49226b3..0ed7fef84235 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 8d0a2db32444..97bd1e75d3a7 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 f5e2deddd3ea..b8bbef991d9e 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 95e144221fcc..05c455eb120c 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 a3703054ff52..48ee1ef7cf09 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 000000000000..9581b125c69e --- /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 000000000000..9581b125c69e --- /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 000000000000..9581b125c69e --- /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 000000000000..9581b125c69e --- /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 000000000000..9581b125c69e --- /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 000000000000..9581b125c69e --- /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> |