summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-20 10:44:13 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-06-21 22:53:55 +0200
commitfb7f91acecb6a3fa7adbe59603cdfdbc36a6b891 (patch)
tree031d761c20336718c49406295d1f663b9f006519 /sw
parentc7621ff47d053c242b6140627a48e114759c3e8f (diff)
these checkbox group entries are mutually exclusive
so they're closer to radio buttons than checkboxes though this isn't great either as there are possibilites that are not listed, in which case all are unchecked, and when is selected like buletting it cannot be turned off from the menu (cherry picked from commit 4d7054947d87174decf12ad204c09532f33599f8) Change-Id: Ifa9650cdde5575807c0bd876e859c3ba3748e580 Reviewed-on: https://gerrit.libreoffice.org/39008 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml40
-rw-r--r--sw/uiconfig/swriter/popupmenu/table.xml10
-rw-r--r--sw/uiconfig/swriter/popupmenu/text.xml10
3 files changed, 30 insertions, 30 deletions
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index f7ca5750f37e..5e7dbb6374a4 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -564,26 +564,26 @@
</menu:menu>
<menu:menu menu:id=".uno:FormatStylesMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&amp;FamilyName:string=ParagraphStyles" menu:style="radio"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml
index a65f150522f5..5d6992de58b6 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -77,11 +77,11 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml
index da39a8239b48..6f689036a5c6 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -48,11 +48,11 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Citation&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>