summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigmgr/qa/unit/data.xcd6
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu26
-rw-r--r--reportdesign/uiconfig/dbreport/menubar/menubar.xml12
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml15
-rwxr-xr-xsd/uiconfig/sdraw/menubar/menubar.xml15
-rwxr-xr-xsd/uiconfig/simpress/menubar/menubar.xml15
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc14
-rw-r--r--sfx2/sdi/appslots.sdi32
-rw-r--r--sfx2/sdi/sfx.sdi222
-rw-r--r--sfx2/source/appl/appserv.cxx46
-rwxr-xr-xstarmath/uiconfig/smath/menubar/menubar.xml12
-rw-r--r--svx/source/stbctrls/stbctrls.src48
-rw-r--r--sw/uiconfig/sglobal/menubar/menubar.xml12
-rw-r--r--sw/uiconfig/sweb/menubar/menubar.xml12
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml12
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml12
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml15
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml12
18 files changed, 495 insertions, 43 deletions
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index f4d54616633e..700339d1325d 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 58ad5be98ee7..ea498f3850d9 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 1ac58e4cb549..fd5b0d2b97c9 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -142,7 +142,17 @@
<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: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 af9f70148e3e..0c366539b266 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 965d14c0601a..dade19bcf33e 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 7c757370abf0..b4ca6bf5e766 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 f29902ecce2b..939a26b23d6b 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -856,9 +856,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)
@@ -984,6 +982,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 d6d4a8508d80..4fd62fabde65 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 b209baa7ba87..80d73c2c6330 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1965,6 +1965,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 11d5ec4e8162..917ccf4bd328 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -124,6 +124,7 @@
#include <sfx2/dialogs.hrc>
#include "sorgitm.hxx"
#include "sfx2/sfxhelp.hxx"
+#include <sfx2/zoomitem.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -601,6 +602,51 @@ 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:
+ {
+ // make sure aZoom is initialized with a proper value if SetType
+ // doesn't work
+ SvxZoomItem aZoom( SVX_ZOOM_PERCENT, 100 );
+
+ switch (rReq.GetSlot())
+ {
+ case SID_ZOOM_50_PERCENT:
+ aZoom.SetValue(50);
+ break;
+ case SID_ZOOM_75_PERCENT:
+ aZoom.SetValue(75);
+ break;
+ case SID_ZOOM_100_PERCENT:
+ aZoom.SetValue(100);
+ break;
+ case SID_ZOOM_150_PERCENT:
+ aZoom.SetValue(150);
+ break;
+ case SID_ZOOM_200_PERCENT:
+ aZoom.SetValue(200);
+ break;
+ case SID_ZOOM_OPTIMAL:
+ aZoom.SetType( SVX_ZOOM_OPTIMAL );
+ break;
+ case SID_ZOOM_ENTIRE_PAGE:
+ aZoom.SetType( SVX_ZOOM_WHOLEPAGE );
+ break;
+ case SID_ZOOM_PAGE_WIDTH:
+ aZoom.SetType( SVX_ZOOM_PAGEWIDTH );
+ break;
+ }
+
+ SfxViewFrame::Current()->GetDispatcher()->Execute(SID_ATTR_ZOOM, SFX_CALLMODE_ASYNCHRON, &aZoom, 0L);
+
+ 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 4f1d159f03a3..9716fc260dc1 100755
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -66,7 +66,17 @@
<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: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 e0f198a838ec..9d3fa59a0737 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -135,27 +135,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
{
@@ -165,21 +159,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 25e1f8f3e737..693048d0d96b 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -124,7 +124,17 @@
<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: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 902e8909ef6f..648d396cd688 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -97,7 +97,17 @@
<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: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 e69afcd21f4d..192894d61063 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -124,7 +124,17 @@
<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: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 e69afcd21f4d..192894d61063 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -124,7 +124,17 @@
<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: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 b0f707646712..03b0ee9fab3b 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 077a3f97a30a..afa86d7bf0b7 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -125,7 +125,17 @@
<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: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">
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 10:40:11 +0000