diff options
-rw-r--r-- | cui/source/tabpages/page.cxx | 3 | ||||
-rw-r--r-- | cui/uiconfig/ui/pageformatpage.ui | 377 | ||||
-rw-r--r-- | extensions/source/dbpilots/groupboxwiz.cxx | 4 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/columnpage.ui | 27 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/indexentry.ui | 96 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/outlinepositionpage.ui | 23 |
10 files changed, 212 insertions, 326 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index da66d7c94bc1..afb4f0d007ea 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -348,9 +348,6 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr m_pBottomMarginEdit->SetMax(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); m_pBottomMarginEdit->SetLast(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); - m_pPortraitBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); - m_pLandscapeBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); - // Get the i18n framework numberings and add them to the listbox. SvxNumOptionsTabPage::GetI18nNumbering( *m_pNumberFormatBox, ::std::numeric_limits<sal_uInt16>::max()); } diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui index dd12f7ef38af..2a25d38bd7a4 100644 --- a/cui/uiconfig/ui/pageformatpage.ui +++ b/cui/uiconfig/ui/pageformatpage.ui @@ -1,7 +1,136 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> + <object class="GtkListStore" id="liststoreNumberFormat"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + <!-- column-name gint1 --> + <column type="gint"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">1, 2, 3, ...</col> + <col id="1">4</col> + </row> + <row> + <col id="0" translatable="yes">A, B, C, ...</col> + <col id="1">0</col> + </row> + <row> + <col id="0" translatable="yes">a, b, c, ...</col> + <col id="1">1</col> + </row> + <row> + <col id="0" translatable="yes">I, II, III, ...</col> + <col id="1">2</col> + </row> + <row> + <col id="0" translatable="yes">i, ii, iii, ...</col> + <col id="1">3</col> + </row> + <row> + <col id="0" translatable="yes">None</col> + <col id="1">5</col> + </row> + <row> + <col id="0" translatable="yes">A, .., AA, .., AAA, ...</col> + <col id="1">9</col> + </row> + <row> + <col id="0" translatable="yes">a, .., aa, .., aaa, ...</col> + <col id="1">10</col> + </row> + <row> + <col id="0" translatable="yes">Native Numbering</col> + <col id="1">12</col> + </row> + <row> + <col id="0" translatable="yes">А, Б, .., Аа, Аб, ... (Bulgarian)</col> + <col id="1">38</col> + </row> + <row> + <col id="0" translatable="yes">а, б, .., аа, аб, ... (Bulgarian)</col> + <col id="1">39</col> + </row> + <row> + <col id="0" translatable="yes">А, Б, .., Аа, Бб, ... (Bulgarian)</col> + <col id="1">40</col> + </row> + <row> + <col id="0" translatable="yes">а, б, .., аа, бб, ... (Bulgarian)</col> + <col id="1">41</col> + </row> + <row> + <col id="0" translatable="yes">А, Б, .., Аа, Аб, ... (Russian)</col> + <col id="1">42</col> + </row> + <row> + <col id="0" translatable="yes">а, б, .., аа, аб, ... (Russian)</col> + <col id="1">43</col> + </row> + <row> + <col id="0" translatable="yes">А, Б, .., Аа, Бб, ... (Russian)</col> + <col id="1">44</col> + </row> + <row> + <col id="0" translatable="yes">а, б, .., аа, бб, ... (Russian)</col> + <col id="1">45</col> + </row> + <row> + <col id="0" translatable="yes">А, Б, .., Аа, Аб, ... (Serbian)</col> + <col id="1">48</col> + </row> + <row> + <col id="0" translatable="yes">а, б, .., аа, аб, ... (Serbian)</col> + <col id="1">49</col> + </row> + <row> + <col id="0" translatable="yes">А, Б, .., Аа, Бб, ... (Serbian)</col> + <col id="1">50</col> + </row> + <row> + <col id="0" translatable="yes">а, б, .., аа, бб, ... (Serbian)</col> + <col id="1">51</col> + </row> + <row> + <col id="0" translatable="yes">Α, Β, Γ, ... (Greek Upper Letter)</col> + <col id="1">52</col> + </row> + <row> + <col id="0" translatable="yes">α, β, γ, ... (Greek Lower Letter)</col> + <col id="1">53</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststorePageLayout"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + <!-- column-name gint1 --> + <column type="gint"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Right and left</col> + <col id="1">0</col> + </row> + <row> + <col id="0" translatable="yes">Mirrored</col> + <col id="1">0</col> + </row> + <row> + <col id="0" translatable="yes">Only right</col> + <col id="1">0</col> + </row> + <row> + <col id="0" translatable="yes">Only left</col> + <col id="1">0</col> + </row> + </data> + </object> <object class="GtkGrid" id="PageFormatPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -42,16 +171,14 @@ <object class="GtkLabel" id="labelFormat"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Format:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboPageFormat</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -62,24 +189,20 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="labelWidth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Width:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinWidth:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -94,24 +217,20 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="labelHeight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Height:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinHeight:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -125,24 +244,20 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="labelOrientation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Orientation:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">radiobuttonPortrait</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -157,12 +272,13 @@ <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">radiobuttonLandscape</property> + <accessibility> + <relation type="member-of" target="labelOrientation"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -177,28 +293,27 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">radiobuttonPortrait</property> + <accessibility> + <relation type="member-of" target="labelOrientation"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="labelTextFlow"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Text direction:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboTextFlowBox</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -209,8 +324,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -220,8 +333,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -249,7 +360,6 @@ <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -257,16 +367,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Paper _tray:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboPaperTray</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -277,8 +385,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -287,8 +393,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -309,8 +413,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -345,32 +447,28 @@ <object class="GtkLabel" id="labelTopMargin"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Top:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinMargTop:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="labelBottomMargin"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Bottom:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinMargBot:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -383,8 +481,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -397,8 +493,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -411,8 +505,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -425,23 +517,21 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="valign">center</property> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="labelRightMargin"> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Right:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinMargRight:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -452,10 +542,10 @@ <child> <object class="GtkLabel" id="labelOuter"> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">O_uter:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinMargRight:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -467,23 +557,21 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="valign">center</property> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="labelLeftMargin"> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Left:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinMargLeft:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -494,10 +582,10 @@ <child> <object class="GtkLabel" id="labelInner"> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">I_nner:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinMargLeft:0.00cm</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -509,8 +597,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -531,8 +617,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -560,16 +644,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Page layout:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboPageLayout</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -577,16 +659,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Format:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboLayoutFormat</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -603,7 +683,6 @@ <property name="left_attach">0</property> <property name="top_attach">2</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -615,8 +694,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -628,8 +705,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -637,16 +712,14 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Table alignment:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">checkbuttonHorz</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -662,8 +735,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -679,8 +750,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -699,7 +768,6 @@ <property name="left_attach">0</property> <property name="top_attach">6</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -717,10 +785,10 @@ <object class="GtkLabel" id="labelRegisterStyle"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Reference _Style:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboRegisterStyle</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -746,7 +814,6 @@ <property name="left_attach">0</property> <property name="top_attach">3</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -770,16 +837,12 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -792,139 +855,9 @@ Do you still want to apply these settings?</property> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> - <object class="GtkListStore" id="liststoreNumberFormat"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name gint1 --> - <column type="gint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">1, 2, 3, ...</col> - <col id="1">4</col> - </row> - <row> - <col id="0" translatable="yes">A, B, C, ...</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">a, b, c, ...</col> - <col id="1">1</col> - </row> - <row> - <col id="0" translatable="yes">I, II, III, ...</col> - <col id="1">2</col> - </row> - <row> - <col id="0" translatable="yes">i, ii, iii, ...</col> - <col id="1">3</col> - </row> - <row> - <col id="0" translatable="yes">None</col> - <col id="1">5</col> - </row> - <row> - <col id="0" translatable="yes">A, .., AA, .., AAA, ...</col> - <col id="1">9</col> - </row> - <row> - <col id="0" translatable="yes">a, .., aa, .., aaa, ...</col> - <col id="1">10</col> - </row> - <row> - <col id="0" translatable="yes">Native Numbering</col> - <col id="1">12</col> - </row> - <row> - <col id="0" translatable="yes">А, Б, .., Аа, Аб, ... (Bulgarian)</col> - <col id="1">38</col> - </row> - <row> - <col id="0" translatable="yes">а, б, .., аа, аб, ... (Bulgarian)</col> - <col id="1">39</col> - </row> - <row> - <col id="0" translatable="yes">А, Б, .., Аа, Бб, ... (Bulgarian)</col> - <col id="1">40</col> - </row> - <row> - <col id="0" translatable="yes">а, б, .., аа, бб, ... (Bulgarian)</col> - <col id="1">41</col> - </row> - <row> - <col id="0" translatable="yes">А, Б, .., Аа, Аб, ... (Russian)</col> - <col id="1">42</col> - </row> - <row> - <col id="0" translatable="yes">а, б, .., аа, аб, ... (Russian)</col> - <col id="1">43</col> - </row> - <row> - <col id="0" translatable="yes">А, Б, .., Аа, Бб, ... (Russian)</col> - <col id="1">44</col> - </row> - <row> - <col id="0" translatable="yes">а, б, .., аа, бб, ... (Russian)</col> - <col id="1">45</col> - </row> - <row> - <col id="0" translatable="yes">А, Б, .., Аа, Аб, ... (Serbian)</col> - <col id="1">48</col> - </row> - <row> - <col id="0" translatable="yes">а, б, .., аа, аб, ... (Serbian)</col> - <col id="1">49</col> - </row> - <row> - <col id="0" translatable="yes">А, Б, .., Аа, Бб, ... (Serbian)</col> - <col id="1">50</col> - </row> - <row> - <col id="0" translatable="yes">а, б, .., аа, бб, ... (Serbian)</col> - <col id="1">51</col> - </row> - <row> - <col id="0" translatable="yes">Α, Β, Γ, ... (Greek Upper Letter)</col> - <col id="1">52</col> - </row> - <row> - <col id="0" translatable="yes">α, β, γ, ... (Greek Lower Letter)</col> - <col id="1">53</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststorePageLayout"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name gint1 --> - <column type="gint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Right and left</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Mirrored</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Only right</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Only left</col> - <col id="1">0</col> - </row> - </data> - </object> <object class="GtkSizeGroup" id="sizegroup1"> <property name="ignore_hidden">True</property> <widgets> diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 7a65327e624a..66237014d9af 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -200,8 +200,6 @@ namespace dbp m_pExistingRadios->EnableMultiSelection(true); getDialog()->defaultButton(m_pMoveRight.get()); - - m_pExistingRadios->SetAccessibleRelationMemberOf(m_pExistingRadios); } ORadioSelectionPage::~ORadioSelectionPage() @@ -389,8 +387,6 @@ namespace dbp get(m_pOptions, "radiobuttons"); m_pOptions->SetSelectHdl(LINK(this, OOptionValuesPage, OnOptionSelected)); - - m_pOptions->SetAccessibleRelationMemberOf(m_pOptions); } OOptionValuesPage::~OOptionValuesPage() diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 0280380736da..d56141c5fc8d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -445,7 +445,6 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) : mpIconView->SetAccessibleRelationLabeledBy(mpIconView); else mpIconView->SetAccessibleRelationLabeledBy(maInfoBar.get()); - mpIconView->SetAccessibleRelationMemberOf(mpIconView); } GalleryBrowser2::~GalleryBrowser2() @@ -750,7 +749,6 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) mpIconView->SetAccessibleRelationLabeledBy(mpIconView); else mpIconView->SetAccessibleRelationLabeledBy(maInfoBar.get()); - mpIconView->SetAccessibleRelationMemberOf(mpIconView); } void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 5f9737aed922..f1575fedc870 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -449,9 +449,6 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); - VclFrame *pSpacing = get<VclFrame>("spacing"); - m_pBtnNext->SetAccessibleRelationMemberOf(pSpacing->get_label_widget()); - m_pDefaultVS->SetColCount( 5 ); for (int i = 0; i < 5; ++i) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index ef95072e5e23..ac7e0c099d44 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -96,7 +96,6 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, rDialog.get(m_pTypeFT, "typeft"); rDialog.get(m_pTypeDCB, "typecb"); rDialog.get(m_pNewBT, "new"); - m_pNewBT->SetAccessibleRelationMemberOf(m_pFrame->get_label_widget()); rDialog.get(m_pEntryED, "entryed"); rDialog.get(m_pPhoneticFT0, "phonetic0ft"); rDialog.get(m_pPhoneticED0, "phonetic0ed"); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 3cbe02204b8d..e44175fd4798 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -103,8 +103,6 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, SetExchangeSupport(); m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); - m_pStandardPB->SetAccessibleRelationMemberOf(m_pPositionFrame->get_label_widget()); - m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); m_pAlign2LB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index 782f1f655c26..96f4db0adac5 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> @@ -131,8 +131,8 @@ <object class="GtkLabel" id="columnft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Column:</property> + <property name="xalign">1</property> <accessibility> <relation type="label-for" target="back"/> <relation type="label-for" target="next"/> @@ -192,8 +192,8 @@ <object class="GtkLabel" id="widthft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Width:</property> + <property name="xalign">1</property> <accessibility> <relation type="label-for" target="width3mf:0.00cm"/> <relation type="label-for" target="width2mf:0.00cm"/> @@ -263,8 +263,8 @@ <object class="GtkLabel" id="distft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Spacing:</property> + <property name="xalign">1</property> <accessibility> <relation type="label-for" target="spacing1mf:0.00cm"/> <relation type="label-for" target="spacing2mf:0.00cm"/> @@ -403,6 +403,9 @@ </attributes> </object> </child> + <accessibility> + <relation type="member-of" target="label4"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -431,10 +434,10 @@ <object class="GtkLabel" id="linestyleft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">St_yle:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">linestylelb</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -445,10 +448,10 @@ <object class="GtkLabel" id="linewidthft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">_Width:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">linewidthmf:0.00pt</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -459,10 +462,10 @@ <object class="GtkLabel" id="lineheightft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">H_eight:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">linewidthmf:0.00pt</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">2</property> @@ -473,10 +476,10 @@ <object class="GtkLabel" id="lineposft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">_Position:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">lineposlb</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">2</property> @@ -549,10 +552,10 @@ <object class="GtkLabel" id="linecolorft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">_Color:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">colorlb</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">4</property> @@ -625,10 +628,10 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Columns:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">colsnf</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -694,9 +697,9 @@ <object class="GtkLabel" id="applytoft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">1</property> <property name="label" translatable="yes">_Apply to:</property> <property name="use_underline">True</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -718,9 +721,9 @@ <object class="GtkLabel" id="textdirectionft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Text _direction:</property> <property name="use_underline">True</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index 37e4e0b86a89..0c21605c39d0 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">10</property> @@ -8,6 +9,22 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="stock">gtk-index</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-back</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-forward</property> + </object> <object class="GtkImage" id="image4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -126,8 +143,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -142,8 +157,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -158,8 +171,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -174,8 +185,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -218,16 +227,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Index</property> <property name="use_underline">True</property> <property name="mnemonic_widget">typecb</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -239,8 +246,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -250,12 +255,13 @@ <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">New User-defined Index</property> <property name="image">image1</property> + <accessibility> + <relation type="member-of" target="label1"/> + </accessibility> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -263,16 +269,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Entry</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entryed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -285,7 +289,6 @@ <property name="left_attach">1</property> <property name="top_attach">1</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -294,16 +297,14 @@ <property name="sensitive">False</property> <property name="can_focus">False</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">1st key</property> <property name="use_underline">True</property> <property name="mnemonic_widget">key1cb</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -312,16 +313,14 @@ <property name="sensitive">False</property> <property name="can_focus">False</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">2nd key</property> <property name="use_underline">True</property> <property name="mnemonic_widget">key2cb</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -329,16 +328,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Level</property> <property name="use_underline">True</property> <property name="mnemonic_widget">levelnf</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -353,7 +350,6 @@ <property name="left_attach">1</property> <property name="top_attach">4</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -369,7 +365,6 @@ <property name="left_attach">0</property> <property name="top_attach">5</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -385,7 +380,6 @@ <property name="left_attach">0</property> <property name="top_attach">6</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -402,7 +396,6 @@ <property name="left_attach">0</property> <property name="top_attach">7</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -419,7 +412,6 @@ <property name="left_attach">0</property> <property name="top_attach">8</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -428,16 +420,14 @@ <property name="no_show_all">True</property> <property name="margin_left">12</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Phonetic reading</property> <property name="use_underline">True</property> <property name="mnemonic_widget">phonetic0ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -446,16 +436,14 @@ <property name="no_show_all">True</property> <property name="margin_left">12</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Phonetic reading</property> <property name="use_underline">True</property> <property name="mnemonic_widget">phonetic1ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -464,16 +452,14 @@ <property name="no_show_all">True</property> <property name="margin_left">12</property> <property name="margin_right">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Phonetic reading</property> <property name="use_underline">True</property> <property name="mnemonic_widget">phonetic2ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -485,8 +471,6 @@ <packing> <property name="left_attach">4</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -498,8 +482,6 @@ <packing> <property name="left_attach">4</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -511,8 +493,6 @@ <packing> <property name="left_attach">4</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -534,7 +514,6 @@ <property name="left_attach">1</property> <property name="top_attach">2</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -557,7 +536,6 @@ <property name="left_attach">1</property> <property name="top_attach">3</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -627,20 +605,4 @@ <action-widget response="0">delete</action-widget> </action-widgets> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="stock">gtk-index</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-back</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-forward</property> - </object> </interface> diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index 2b8d923949a5..ba59094d4740 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> @@ -134,10 +134,10 @@ <object class="GtkLabel" id="numalign"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Numbering alignment:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">numalignlb</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -159,12 +159,12 @@ <object class="GtkLabel" id="numdist"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Minimum space between numbering and text:</property> <property name="use_underline">True</property> <property name="justify">right</property> <property name="mnemonic_widget">numdistmf:0.00cm</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -188,10 +188,10 @@ numbering and text:</property> <object class="GtkLabel" id="numberingwidth"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Width of numbering:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">numberingwidthmf:0.00cm</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -230,10 +230,10 @@ numbering and text:</property> <object class="GtkLabel" id="indent"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Indent:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">indentmf:0.00cm</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -257,10 +257,10 @@ numbering and text:</property> <object class="GtkLabel" id="indentat"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Indent at:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">indentatmf:0.00cm</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -283,10 +283,10 @@ numbering and text:</property> <object class="GtkLabel" id="num2align"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Numbering alignment:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">num2alignlb</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -307,10 +307,10 @@ numbering and text:</property> <object class="GtkLabel" id="alignedat"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Aligned at:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">alignedatmf:0.00cm</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -333,10 +333,10 @@ numbering and text:</property> <object class="GtkLabel" id="at"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> <property name="label" translatable="yes">at:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">atmf:0.00cm</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -371,10 +371,10 @@ numbering and text:</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="xalign">1</property> <property name="label" translatable="yes">Numbering followed by:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">numfollowedbylb</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -419,6 +419,9 @@ numbering and text:</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="valign">end</property> + <accessibility> + <relation type="member-of" target="label10"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> |