UI Wrap InBackground: transition to wrapthru transparency toggle

The UI for placing a frame in the background is confusing because:
-in menus, the icon looks like a checkbox, but functions as a radio button
-it isn't obvious that "in background" is the opposite of "wrap through"
-it doesn't act like the checkboxes below it like "First paragraph"
-in dialog boxes, it is actually implemented as a checkbox toggle.

So it looks like a checkbox, and you can enable the checkbox, but
once enabled it can never be disabled.  (The currently designed way is to
select wrap off/page/optimal/through in order to disable in background.)

This patch creates FN_FRAME_WRAPTHRU_TOGGLE to replace
most uses of the previous function.

Change-Id: Ia46ddbd47899e8ca569bf3adb2b1c4ad7cfa1920
Reviewed-on: https://gerrit.libreoffice.org/39673
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>

7 files changed, 7 insertions, 7 deletions

diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 6f85776d74db..3f61b2e67d80 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -285,7 +285,7 @@
           <menu:menuitem menu:id=".uno:WrapOn"/>
           <menu:menuitem menu:id=".uno:WrapIdeal"/>
           <menu:menuitem menu:id=".uno:WrapThrough"/>
-          <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+          <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
           <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:WrapContour"/>
           <menu:menuitem menu:id=".uno:ContourDialog"/>
diff --git a/sw/uiconfig/swform/popupmenu/draw.xml b/sw/uiconfig/swform/popupmenu/draw.xml
index fc12e15ae0bb..0f2c33cf4dd4 100644
--- a/sw/uiconfig/swform/popupmenu/draw.xml
+++ b/sw/uiconfig/swform/popupmenu/draw.xml
@@ -26,7 +26,7 @@
       <menu:menuitem menu:id=".uno:WrapOn"/>
       <menu:menuitem menu:id=".uno:WrapIdeal"/>
       <menu:menuitem menu:id=".uno:WrapThrough"/>
-      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapContour"/>
       <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
diff --git a/sw/uiconfig/swform/popupmenu/form.xml b/sw/uiconfig/swform/popupmenu/form.xml
index 6c2cf9e9da5c..af77788a519f 100644
--- a/sw/uiconfig/swform/popupmenu/form.xml
+++ b/sw/uiconfig/swform/popupmenu/form.xml
@@ -45,7 +45,7 @@
       <menu:menuitem menu:id=".uno:WrapOn"/>
       <menu:menuitem menu:id=".uno:WrapIdeal"/>
       <menu:menuitem menu:id=".uno:WrapThrough"/>
-      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapContour"/>
       <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
diff --git a/sw/uiconfig/swform/popupmenu/frame.xml b/sw/uiconfig/swform/popupmenu/frame.xml
index 3cd900b12283..3820491d9333 100644
--- a/sw/uiconfig/swform/popupmenu/frame.xml
+++ b/sw/uiconfig/swform/popupmenu/frame.xml
@@ -22,7 +22,7 @@
       <menu:menuitem menu:id=".uno:WrapRight"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapThrough"/>
-      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapContour"/>
       <menu:menuitem menu:id=".uno:ContourDialog"/>
diff --git a/sw/uiconfig/swform/popupmenu/graphic.xml b/sw/uiconfig/swform/popupmenu/graphic.xml
index ae7bad963939..689b6a3fd358 100644
--- a/sw/uiconfig/swform/popupmenu/graphic.xml
+++ b/sw/uiconfig/swform/popupmenu/graphic.xml
@@ -28,7 +28,7 @@
       <menu:menuitem menu:id=".uno:WrapRight"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapThrough"/>
-      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapContour"/>
       <menu:menuitem menu:id=".uno:ContourDialog"/>
diff --git a/sw/uiconfig/swform/popupmenu/media.xml b/sw/uiconfig/swform/popupmenu/media.xml
index 30b6baae954a..92da6abb5744 100644
--- a/sw/uiconfig/swform/popupmenu/media.xml
+++ b/sw/uiconfig/swform/popupmenu/media.xml
@@ -41,7 +41,7 @@
       <menu:menuitem menu:id=".uno:WrapOn"/>
       <menu:menuitem menu:id=".uno:WrapIdeal"/>
       <menu:menuitem menu:id=".uno:WrapThrough"/>
-      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapContour"/>
       <menu:menuitem menu:id=".uno:WrapAnchorOnly"/>
diff --git a/sw/uiconfig/swform/popupmenu/oleobject.xml b/sw/uiconfig/swform/popupmenu/oleobject.xml
index 3cd900b12283..3820491d9333 100644
--- a/sw/uiconfig/swform/popupmenu/oleobject.xml
+++ b/sw/uiconfig/swform/popupmenu/oleobject.xml
@@ -22,7 +22,7 @@
       <menu:menuitem menu:id=".uno:WrapRight"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapThrough"/>
-      <menu:menuitem menu:id=".uno:WrapThroughTransparent"/>
+      <menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WrapContour"/>
       <menu:menuitem menu:id=".uno:ContourDialog"/>