Hi, I am working on a new zoom sub menu which should have the same functionality as the Zoom dialog. http://www.mail-archive.com/design@global.libreoffice.org/msg03561.html I have added the sub menu globally so I am able to react to inputs in sfx2/source/appl/appserv.cxx but the problem is that I am unable to pass along the SvxZoomItem because it depends on sfx2. Does anybody have an idea how to change the Zoom from appserv.cxx? Maybe it is possible to use the functions of the original zoom dialog ( cui/source/dialogs/zoom.cxx )? Otherwise I would have to add the menu to every LO app locally and create the needed Execute points for each of them. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/
From caa4e8ca64c8405f2b30e81899a5f8f9d212c8be Mon Sep 17 00:00:00 2001
From: Tim Hardeck <thardeck@suse.com>
Date: Wed, 2 May 2012 11:39:19 +0200
Subject: [PATCH] Added Zoom sub-menu to View
Added Zoom sub-menu to View with the same entries of the zoom status bar
right mouse button menu.
Additionally the zoom menu entries were sorted in a more logical way.
Change-Id: I88c8fa1af98a89b260adf72e61b1987a42156d67
---
configmgr/qa/unit/data.xcd | 6 +-
.../org/openoffice/Office/UI/GenericCommands.xcu | 26 ++-
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 15 +-
sc/uiconfig/scalc/menubar/menubar.xml | 15 +-
sd/uiconfig/sdraw/menubar/menubar.xml | 15 +-
sd/uiconfig/simpress/menubar/menubar.xml | 15 +-
sfx2/inc/sfx2/sfxsids.hrc | 14 +-
sfx2/sdi/appslots.sdi | 32 +++
sfx2/sdi/sfx.sdi | 222 ++++++++++++++++++++
sfx2/source/appl/appserv.cxx | 12 ++
starmath/uiconfig/smath/menubar/menubar.xml | 15 +-
svx/source/stbctrls/stbctrls.src | 48 ++---
sw/uiconfig/sglobal/menubar/menubar.xml | 15 +-
sw/uiconfig/sweb/menubar/menubar.xml | 15 +-
sw/uiconfig/swform/menubar/menubar.xml | 15 +-
sw/uiconfig/swreport/menubar/menubar.xml | 15 +-
sw/uiconfig/swriter/menubar/menubar.xml | 15 +-
sw/uiconfig/swxform/menubar/menubar.xml | 15 +-
18 files changed, 482 insertions(+), 43 deletions(-)
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index f4d5461..700339d 100755
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -1787,7 +1787,7 @@
</node>
<node oor:name=".uno:Zoom100Percent" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Zoom 100%</value>
+ <value xml:lang="x-no-translate"></value><value xml:lang="en-US">100%</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1803,7 +1803,7 @@
</node>
<node oor:name=".uno:ZoomPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Zoom Page</value>
+ <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Entire Page</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -2660,7 +2660,7 @@
</node>
<node oor:name=".uno:ZoomPageWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Zoom Page Width</value>
+ <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Page Width</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 58ad5be..ea498f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1698,14 +1698,34 @@
<value xml:lang="en-US">~Options...</value>
</prop>
</node>
+ <node oor:name=".uno:Zoom200Percent" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">200%</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:Zoom150Percent" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">150%</value>
+ </prop>
+ </node>
<node oor:name=".uno:Zoom100Percent" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Zoom 100%</value>
+ <value xml:lang="en-US">100%</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:Zoom75Percent" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">75%</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:Zoom50Percent" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">50%</value>
+ </prop>
+ </node>
<node oor:name=".uno:GrafGamma" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Gamma</value>
@@ -1716,7 +1736,7 @@
</node>
<node oor:name=".uno:ZoomPage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Zoom Page</value>
+ <value xml:lang="en-US">Entire Page</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -2612,7 +2632,7 @@
</node>
<node oor:name=".uno:ZoomPageWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Zoom Page Width</value>
+ <value xml:lang="en-US">Page Width</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index 1ac58e4..9d29b31 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -142,7 +142,20 @@
<menu:menuitem menu:id=".uno:HelplinesMove"/>
</menu:menupopup>
</menu:menu>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu" >
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 45bafb9..91221e6 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -127,7 +127,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 965d14c..dade19b 100755
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -110,7 +110,20 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Navigator"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 7c75737..b4ca6bf 100755
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -125,7 +125,20 @@
<menu:menuitem menu:id=".uno:Navigator"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:HeaderAndFooter"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index c6fbdc4..d201bbf 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -855,9 +855,7 @@
#define SID_ZOOM_OUT (SID_SVX_START + 97)
#define SID_ZOOM_IN (SID_SVX_START + 98)
#define SID_SIZE_REAL (SID_SVX_START + 99)
-#define SID_ZOOM_100_PERCENT (SID_SIZE_REAL)
#define SID_SIZE_PAGE (SID_SVX_START + 100)
-#define SID_ZOOM_PAGE (SID_SIZE_PAGE)
#define SID_SHOW_BROWSER (SID_SVX_START + 163)
#define SID_GALLERY_BG_BRUSH (SID_SVX_START + 279)
#define SID_SEARCH_OPTIONS (SID_SVX_START + 281)
@@ -983,6 +981,18 @@
//-----------------------------------------------------------------------
+#define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL)
+#define SID_ZOOM_ENTIRE_PAGE (SID_SIZE_PAGE)
+#define SID_ZOOM_PAGE_WIDTH (SID_SVX_START + 1420)
+#define SID_ZOOM_50_PERCENT (SID_SVX_START + 1421)
+#define SID_ZOOM_75_PERCENT (SID_SVX_START + 1422)
+#define SID_ZOOM_100_PERCENT (SID_SIZE_REAL)
+#define SID_ZOOM_150_PERCENT (SID_SVX_START + 1423)
+#define SID_ZOOM_200_PERCENT (SID_SVX_START + 1424)
+
+
+//-----------------------------------------------------------------------
+
#define SID_ATTR_CHAR_FILLCOLOR (SID_SFX_START + 1551)
// SfxScriptOrganizerItem
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index d6d4a85..4fd62fa 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -187,6 +187,38 @@ interface Application
ExecMethod = MiscExec_Impl ;
StateMethod = MiscState_Impl ;
]
+ SID_ZOOM_ENTIRE_PAGE
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_OPTIMAL
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_PAGE_WIDTH
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_50_PERCENT
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_75_PERCENT
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_100_PERCENT
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_150_PERCENT
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
+ SID_ZOOM_200_PERCENT
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
SID_HELP_TUTORIALS
[
ExecMethod = MiscExec_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 7ae6fd2..67121de 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1992,6 +1992,228 @@ SfxBoolItem FullScreen SID_WIN_FULLSCREEN
]
//--------------------------------------------------------------------------
+SfxVoidItem ZoomPageWidth SID_ZOOM_PAGE_WIDTH
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+
+//--------------------------------------------------------------------------
+SfxVoidItem ZoomOptimal SID_ZOOM_OPTIMAL
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+
+//--------------------------------------------------------------------------
+SfxVoidItem ZoomPage SID_ZOOM_ENTIRE_PAGE
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+
+//--------------------------------------------------------------------------
+SfxVoidItem Zoom200Percent SID_ZOOM_200_PERCENT
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+
+//--------------------------------------------------------------------------
+SfxVoidItem Zoom150Percent SID_ZOOM_150_PERCENT
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+
+//--------------------------------------------------------------------------
+SfxVoidItem Zoom100Percent SID_ZOOM_100_PERCENT
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+
+//--------------------------------------------------------------------------
+SfxVoidItem Zoom75Percent SID_ZOOM_75_PERCENT
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+//--------------------------------------------------------------------------
+SfxVoidItem Zoom50Percent SID_ZOOM_50_PERCENT
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_VIEW;
+]
+
+//--------------------------------------------------------------------------
SfxObjectItem GetFrameWindow SID_FILLFRAME
(SfxStringItem WindowName SID_FILLFRAME)
[
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d39bc40..d058c93 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -602,6 +602,18 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
bDone = true;
break;
+ case SID_ZOOM_50_PERCENT:
+ case SID_ZOOM_75_PERCENT:
+ case SID_ZOOM_100_PERCENT:
+ case SID_ZOOM_150_PERCENT:
+ case SID_ZOOM_200_PERCENT:
+ case SID_ZOOM_OPTIMAL:
+ case SID_ZOOM_ENTIRE_PAGE:
+ case SID_ZOOM_PAGE_WIDTH:
+ {
+ printf("Zoom functions\n");
+ break;
+ }
case SID_AVAILABLE_TOOLBARS:
{
SfxStringItem const * pToolbarName = static_cast< SfxStringItem const *>(
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml
b/starmath/uiconfig/smath/menubar/menubar.xml
index 4f1d159..aced2d7 100755
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -66,7 +66,20 @@
<menu:menuitem menu:id=".uno:ZoomIn"/>
<menu:menuitem menu:id=".uno:ZoomOut"/>
<menu:menuitem menu:id=".uno:Adjust"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:FormatMenu">
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index dea916d..e2b21bb 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -109,27 +109,21 @@ Menu RID_SVXMNU_ZOOM
{
MenuItem
{
- Identifier = ZOOM_200 ;
- HelpId = HID_MNU_ZOOM_200 ;
- Text = "200%" ;
- };
- MenuItem
- {
- Identifier = ZOOM_150 ;
- HelpId = HID_MNU_ZOOM_150 ;
- Text = "150%" ;
+ Identifier = ZOOM_WHOLE_PAGE ;
+ HelpId = HID_MNU_ZOOM_WHOLE_PAGE ;
+ Text [ en-US ] = "Entire Page" ;
};
MenuItem
{
- Identifier = ZOOM_100 ;
- HelpId = HID_MNU_ZOOM_100 ;
- Text = "100%" ;
+ Identifier = ZOOM_PAGE_WIDTH ;
+ HelpId = HID_MNU_ZOOM_PAGE_WIDTH ;
+ Text [ en-US ] = "Page Width" ;
};
MenuItem
{
- Identifier = ZOOM_75 ;
- HelpId = HID_MNU_ZOOM_75 ;
- text = "75%" ;
+ Identifier = ZOOM_OPTIMAL ;
+ HelpId = HID_MNU_ZOOM_OPTIMAL ;
+ Text [ en-US ] = "Optimal" ;
};
MenuItem
{
@@ -139,21 +133,27 @@ Menu RID_SVXMNU_ZOOM
};
MenuItem
{
- Identifier = ZOOM_OPTIMAL ;
- HelpId = HID_MNU_ZOOM_OPTIMAL ;
- Text [ en-US ] = "Optimal" ;
+ Identifier = ZOOM_75 ;
+ HelpId = HID_MNU_ZOOM_75 ;
+ text = "75%" ;
};
MenuItem
{
- Identifier = ZOOM_PAGE_WIDTH ;
- HelpId = HID_MNU_ZOOM_PAGE_WIDTH ;
- Text [ en-US ] = "Page Width" ;
+ Identifier = ZOOM_100 ;
+ HelpId = HID_MNU_ZOOM_100 ;
+ Text = "100%" ;
};
MenuItem
{
- Identifier = ZOOM_WHOLE_PAGE ;
- HelpId = HID_MNU_ZOOM_WHOLE_PAGE ;
- Text [ en-US ] = "Entire Page" ;
+ Identifier = ZOOM_150 ;
+ HelpId = HID_MNU_ZOOM_150 ;
+ Text = "150%" ;
+ };
+ MenuItem
+ {
+ Identifier = ZOOM_200 ;
+ HelpId = HID_MNU_ZOOM_200 ;
+ Text = "200%" ;
};
};
};
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 25e1f8f..abd8750 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -124,7 +124,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 902e890..5a9ceb1 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -97,7 +97,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index e69afcd..dbf1d0f 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -124,7 +124,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index e69afcd..dbf1d0f 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -124,7 +124,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 206af98..b0420149 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -127,7 +127,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 077a3f9..452635a 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -125,7 +125,20 @@
<menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
- <menu:menuitem menu:id=".uno:Zoom"/>
+ <menu:menu menu:id=".uno:Zoom">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ZoomPage"/>
+ <menu:menuitem menu:id=".uno:ZoomPageWidth"/>
+ <menu:menuitem menu:id=".uno:ZoomOptimal"/>
+ <menu:menuitem menu:id=".uno:Zoom50Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom75Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom100Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom150Percent"/>
+ <menu:menuitem menu:id=".uno:Zoom200Percent"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Zoom"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
--
1.7.9.2
Attachment:
signature.asc
Description: OpenPGP digital signature