diff options
| -rw-r--r-- | cui/uiconfig/ui/optfltrembedpage.ui | 10 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optlingupage.ui | 4 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/filterdropdown.ui | 8 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/optcaptionpage.ui | 5 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/optcompatpage.ui | 5 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 1 |
6 files changed, 21 insertions, 12 deletions
diff --git a/cui/uiconfig/ui/optfltrembedpage.ui b/cui/uiconfig/ui/optfltrembedpage.ui index 899825752e99..9bdff46c1491 100644 --- a/cui/uiconfig/ui/optfltrembedpage.ui +++ b/cui/uiconfig/ui/optfltrembedpage.ui @@ -28,10 +28,6 @@ <column type="gboolean"/> <!-- column-name weight1 --> <column type="gint"/> - <!-- column-name weight2 --> - <column type="gint"/> - <!-- column-name weight3 --> - <column type="gint"/> <!-- column-name sensitive1 --> <column type="gboolean"/> <!-- column-name sensitive2 --> @@ -96,7 +92,7 @@ <child> <object class="GtkCellRendererToggle" id="cellrenderer5"/> <attributes> - <attribute name="sensitive">14</attribute> + <attribute name="sensitive">12</attribute> <attribute name="visible">5</attribute> <attribute name="active">0</attribute> </attributes> @@ -104,7 +100,7 @@ <child> <object class="GtkCellRendererToggle" id="cellrenderer8"/> <attributes> - <attribute name="sensitive">15</attribute> + <attribute name="sensitive">13</attribute> <attribute name="visible">6</attribute> <attribute name="active">1</attribute> </attributes> @@ -120,7 +116,7 @@ <child> <object class="GtkCellRendererToggle" id="cellrenderer7"/> <attributes> - <attribute name="sensitive">16</attribute> + <attribute name="sensitive">14</attribute> <attribute name="visible">7</attribute> <attribute name="active">2</attribute> </attributes> diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index ad8ee3da1ca7..e1b1868e0f90 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -46,6 +46,8 @@ <column type="gint"/> <!-- column-name sensitive1 --> <column type="gboolean"/> + <!-- column-name sensitive2 --> + <column type="gboolean"/> </columns> </object> <!-- n-columns=1 n-rows=3 --> @@ -416,7 +418,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderer444"/> <attributes> - <attribute name="sensitive">6</attribute> + <attribute name="sensitive">7</attribute> <attribute name="text">1</attribute> </attributes> </child> diff --git a/sc/uiconfig/scalc/ui/filterdropdown.ui b/sc/uiconfig/scalc/ui/filterdropdown.ui index 8fa9e8f98395..403a270150df 100644 --- a/sc/uiconfig/scalc/ui/filterdropdown.ui +++ b/sc/uiconfig/scalc/ui/filterdropdown.ui @@ -58,6 +58,8 @@ <column type="gint"/> <!-- column-name sensitive1 --> <column type="gboolean"/> + <!-- column-name sensitive2 --> + <column type="gboolean"/> </columns> </object> <object class="GtkTreeStore" id="treestore2"> @@ -76,6 +78,8 @@ <column type="gint"/> <!-- column-name sensitive1 --> <column type="gboolean"/> + <!-- column-name sensitive2 --> + <column type="gboolean"/> </columns> </object> <object class="GtkPopover" id="FilterDropDown"> @@ -321,7 +325,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderer4"/> <attributes> - <attribute name="sensitive">6</attribute> + <attribute name="sensitive">7</attribute> <attribute name="text">1</attribute> </attributes> </child> @@ -373,7 +377,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderer2"/> <attributes> - <attribute name="sensitive">6</attribute> + <attribute name="sensitive">7</attribute> <attribute name="text">1</attribute> </attributes> </child> diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui index 29dc5ec08c69..4577a33eeb06 100644 --- a/sw/uiconfig/swriter/ui/optcaptionpage.ui +++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui @@ -18,6 +18,8 @@ <column type="gint"/> <!-- column-name sensitive1 --> <column type="gboolean"/> + <!-- column-name sensitive2 --> + <column type="gboolean"/> </columns> </object> <object class="GtkBox" id="OptCaptionPage"> @@ -612,6 +614,7 @@ <object class="GtkCellRendererToggle" id="cellrenderer2"/> <attributes> <attribute name="active">0</attribute> + <attribute name="sensitive">6</attribute> </attributes> </child> </object> @@ -625,7 +628,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderer1"/> <attributes> - <attribute name="sensitive">6</attribute> + <attribute name="sensitive">7</attribute> <attribute name="text">1</attribute> </attributes> </child> diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui index 4d55aa3195fc..4cbd6b66516f 100644 --- a/sw/uiconfig/swriter/ui/optcompatpage.ui +++ b/sw/uiconfig/swriter/ui/optcompatpage.ui @@ -18,6 +18,8 @@ <column type="gint"/> <!-- column-name sensitive1 --> <column type="gboolean"/> + <!-- column-name sensitive2 --> + <column type="gboolean"/> </columns> </object> <object class="GtkBox" id="OptCompatPage"> @@ -75,6 +77,7 @@ <attribute name="visible">3</attribute> <attribute name="active">0</attribute> <attribute name="inconsistent">4</attribute> + <attribute name="sensitive">7</attribute> </attributes> </child> </object> @@ -86,7 +89,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderer4"/> <attributes> - <attribute name="sensitive">6</attribute> + <attribute name="sensitive">7</attribute> <attribute name="text">1</attribute> </attributes> </child> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d2453e230d6e..d83d209f7974 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -14984,6 +14984,7 @@ public: g_signal_connect(G_OBJECT(pCellRenderer), "toggled", G_CALLBACK(signalCellToggled), this); m_aToggleVisMap[nIndex] = -1; m_aToggleTriStateMap[nIndex] = -1; + m_aSensitiveMap[nIndex] = -1; } else if (GTK_IS_CELL_RENDERER_PIXBUF(pCellRenderer)) { |