|
|
ebc4bd |
From 7e787af122ebcef29b284e8c46d84a12c0625cd8 Mon Sep 17 00:00:00 2001
|
|
|
ebc4bd |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
ebc4bd |
Date: Mon, 12 Jan 2015 15:45:19 +0000
|
|
|
ebc4bd |
Subject: [PATCH] radio check top/center/bottom alignment for table cells
|
|
|
ebc4bd |
|
|
|
ebc4bd |
Change-Id: I30b51510ac5fbfb3c1dd09e0f86a246a8b516f1e
|
|
|
ebc4bd |
(cherry picked from commit 2aa40ecebb2cb1e5d2cf85d7ada70b5e541bad67)
|
|
|
ebc4bd |
---
|
|
|
ebc4bd |
sw/source/ui/app/mn.src | 3 +++
|
|
|
ebc4bd |
sw/uiconfig/sglobal/menubar/menubar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/sweb/menubar/menubar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swform/menubar/menubar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swreport/menubar/menubar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swriter/menubar/menubar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swxform/menubar/menubar.xml | 6 +++---
|
|
|
ebc4bd |
7 files changed, 21 insertions(+), 18 deletions(-)
|
|
|
ebc4bd |
|
|
|
ebc4bd |
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
|
|
|
ebc4bd |
index 4fa9b14..4bb40ac 100644
|
|
|
ebc4bd |
--- a/sw/source/ui/app/mn.src
|
|
|
ebc4bd |
+++ b/sw/source/ui/app/mn.src
|
|
|
ebc4bd |
@@ -397,18 +397,21 @@
|
|
|
ebc4bd |
SEPARATOR ; \
|
|
|
ebc4bd |
MenuItem\
|
|
|
ebc4bd |
{\
|
|
|
ebc4bd |
+ RadioCheck = TRUE ; \
|
|
|
ebc4bd |
Identifier = SID_TABLE_VERT_NONE ; \
|
|
|
ebc4bd |
HelpId = CMD_SID_TABLE_VERT_NONE ; \
|
|
|
ebc4bd |
Text [ en-US ] = "~Top" ; \
|
|
|
ebc4bd |
};\
|
|
|
ebc4bd |
MenuItem\
|
|
|
ebc4bd |
{\
|
|
|
ebc4bd |
+ RadioCheck = TRUE ; \
|
|
|
ebc4bd |
Identifier = SID_TABLE_VERT_CENTER ; \
|
|
|
ebc4bd |
HelpId = CMD_SID_TABLE_VERT_CENTER ; \
|
|
|
ebc4bd |
Text [ en-US ] = "C~enter" ; \
|
|
|
ebc4bd |
};\
|
|
|
ebc4bd |
MenuItem\
|
|
|
ebc4bd |
{\
|
|
|
ebc4bd |
+ RadioCheck = TRUE ; \
|
|
|
ebc4bd |
Identifier = SID_TABLE_VERT_BOTTOM ; \
|
|
|
ebc4bd |
HelpId = CMD_SID_TABLE_VERT_BOTTOM ; \
|
|
|
ebc4bd |
Text [ en-US ] = "~Bottom" ; \
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
|
|
|
ebc4bd |
index d5736a5..6f09ae8 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
|
|
|
ebc4bd |
@@ -304,9 +304,9 @@
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuseparator/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
|
|
|
ebc4bd |
</menu:menupopup>
|
|
|
ebc4bd |
</menu:menu>
|
|
|
ebc4bd |
<menu:menu menu:id=".uno:ArrangeMenu">
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
|
|
|
ebc4bd |
index ee78c24..87115d4 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/sweb/menubar/menubar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
|
|
|
ebc4bd |
@@ -248,9 +248,9 @@
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuseparator/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
|
|
|
ebc4bd |
</menu:menupopup>
|
|
|
ebc4bd |
</menu:menu>
|
|
|
ebc4bd |
<menu:menu menu:id=".uno:ArrangeMenu">
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
|
|
|
ebc4bd |
index ddf914f..7305ceb 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swform/menubar/menubar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swform/menubar/menubar.xml
|
|
|
ebc4bd |
@@ -303,9 +303,9 @@
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuseparator/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
|
|
|
ebc4bd |
</menu:menupopup>
|
|
|
ebc4bd |
</menu:menu>
|
|
|
ebc4bd |
<menu:menu menu:id=".uno:ArrangeMenu">
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
|
|
|
ebc4bd |
index fab0914..a41c3c2 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swreport/menubar/menubar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
|
|
|
ebc4bd |
@@ -304,9 +304,9 @@
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuseparator/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
|
|
|
ebc4bd |
</menu:menupopup>
|
|
|
ebc4bd |
</menu:menu>
|
|
|
ebc4bd |
<menu:menu menu:id=".uno:ArrangeMenu">
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
|
|
|
ebc4bd |
index b26b980..f5b3fa9 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swriter/menubar/menubar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
|
|
|
ebc4bd |
@@ -312,9 +312,9 @@
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuseparator/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
|
|
|
ebc4bd |
</menu:menupopup>
|
|
|
ebc4bd |
</menu:menu>
|
|
|
ebc4bd |
<menu:menu menu:id=".uno:ArrangeMenu">
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
|
|
|
ebc4bd |
index ec9f631..4c08ef2 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swxform/menubar/menubar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
|
|
|
ebc4bd |
@@ -305,9 +305,9 @@
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
|
|
|
ebc4bd |
<menu:menuseparator/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
|
|
|
ebc4bd |
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
|
|
|
ebc4bd |
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
|
|
|
ebc4bd |
</menu:menupopup>
|
|
|
ebc4bd |
</menu:menu>
|
|
|
ebc4bd |
<menu:menu menu:id=".uno:ArrangeMenu">
|
|
|
ebc4bd |
--
|
|
|
ebc4bd |
1.9.3
|
|
|
ebc4bd |
|