move SetAccessibleRelationLabeledBy relations into .ui and out of code

Change-Id: Iaf1a4a5ed813f48f9241f9e3ae7a732c22b7b9e5

8 files changed, 27 insertions, 47 deletions

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a0be598a5f43..4163afc14d8d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -200,7 +200,6 @@ SvInsertOleDlg::SvInsertOleDlg
     m_pRbObjectFromfile->SetClickHdl( aLink );
     m_pRbNewObject->Check( sal_True );
     RadioHdl( NULL );
-    m_pBtnFilepath->SetAccessibleRelationMemberOf(m_pFileFrame->get_label_widget());
 }
 
 short SvInsertOleDlg::Execute()
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index de5997f3a968..a3d538789f9f 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -196,12 +196,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
     m_pUserEdit->SetLast( nMax );
     m_pUserEdit->SetValue( nValue );
 
-    m_pUserEdit->SetAccessibleRelationLabeledBy(m_pUserBtn);
     m_pUserEdit->SetAccessibleName(m_pUserBtn->GetText());
-    m_pColumnsEdit->SetAccessibleRelationLabeledBy(m_pColumnsBtn);
     m_pColumnsEdit->SetAccessibleName(m_pColumnsBtn->GetText());
     m_pColumnsEdit->SetAccessibleRelationMemberOf(m_pColumnsBtn);
-    m_pBookModeChk->SetAccessibleRelationLabeledBy(m_pColumnsBtn);
     m_pBookModeChk->SetAccessibleRelationMemberOf(m_pColumnsBtn);
 
     const SfxPoolItem& rItem = rSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_ZOOM ) );
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index d31adc9560c7..7cd9c79b4882 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -106,7 +106,7 @@ private:
     NumericField*           m_pEdLeadZeroes;
     CheckBox*               m_pBtnThousand;
 
-    FixedText*              m_pFtEdFormat;
+    VclContainer*           m_pFormatCodeFrame;
     Edit*                   m_pEdFormat;
     PushButton*             m_pIbAdd;
     PushButton*             m_pIbInfo;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index f5c6d4ac557c..4f3f0ff37646 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -379,9 +379,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC
     FillColorValueSets_Impl();
 
     m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) );
-
-    m_pWndPosition->SetAccessibleRelationLabeledBy(m_pBtnPosition);
-    m_pBackgroundColorSet->SetAccessibleRelationLabeledBy(m_pBackGroundColorFrame->get_label_widget());
 }
 
 //------------------------------------------------------------------------
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9e2cb5ec0833..0969da75a600 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -246,7 +246,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent,
     get(m_pFtLeadZeroes, "leadzerosft");
     get(m_pEdLeadZeroes, "leadzerosed");
     get(m_pBtnThousand, "thousands");
-    get(m_pFtEdFormat, "formatft");
+    get(m_pFormatCodeFrame, "formatcode");
     get(m_pEdFormat, "formated");
     get(m_pIbAdd, "add");
     get(m_pIbInfo, "edit");
@@ -324,13 +324,6 @@ void SvxNumberFormatTabPage::Init_Impl()
     {
         m_pLbLanguage->InsertLanguage( xLang[i] );
     }
-
-    m_pIbAdd->SetAccessibleRelationLabeledBy(m_pFtEdFormat);
-    m_pIbInfo->SetAccessibleRelationLabeledBy(m_pFtEdFormat);
-    m_pIbRemove->SetAccessibleRelationLabeledBy(m_pFtEdFormat);
-    m_pIbAdd->SetAccessibleRelationMemberOf(m_pIbAdd);
-    m_pIbInfo->SetAccessibleRelationMemberOf(m_pIbInfo);
-    m_pIbRemove->SetAccessibleRelationMemberOf(m_pIbRemove);
 }
 
 /*************************************************************************
@@ -657,13 +650,7 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl()
     m_pBtnNegRed->Enable( bEnable );
     m_pBtnThousand->Enable( bEnable );
     m_pFtOptions->Enable( bEnable );
-    m_pFtEdFormat->Enable( bEnable );
-    m_pEdFormat->Enable( bEnable );
-    m_pIbAdd->Enable( bEnable );
-    m_pIbRemove->Enable( bEnable );
-    m_pIbInfo->Enable( bEnable );
-    m_pFtComment->Enable( bEnable );
-    m_pEdComment->Enable( bEnable );
+    m_pFormatCodeFrame->Enable( bEnable );
     m_pLbFormat->Invalidate(); // #i43322#
 }
 
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index 462cb1369e31..bea099bb8a98 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -417,6 +417,9 @@
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
+                              <accessibility>
+                                <relation type="labelled-by" target="positionrb"/>
+                              </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -441,6 +444,9 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">arearb</property>
+                                <accessibility>
+                                  <relation type="label-for" target="windowpos"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index d3b7e11ff1d9..1366dd3fb33e 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -204,6 +204,7 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Decimal places</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">decimalsed</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -218,6 +219,7 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Leading _zeroes</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">leadzerosed</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index ad7042879d8f..bb978158b82e 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -24,12 +24,10 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -41,11 +39,9 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -57,11 +53,9 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -102,11 +96,9 @@
                         <child>
                           <object class="GtkRadioButton" id="optimal">
                             <property name="label" translatable="yes">Optimal</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -121,11 +113,9 @@
                         <child>
                           <object class="GtkRadioButton" id="fitwandh">
                             <property name="label" translatable="yes">Fit width and height</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -140,11 +130,9 @@
                         <child>
                           <object class="GtkRadioButton" id="fitw">
                             <property name="label" translatable="yes">Fit width</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -159,11 +147,9 @@
                         <child>
                           <object class="GtkRadioButton" id="100pc">
                             <property name="label" translatable="yes">100%</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -183,15 +169,16 @@
                             <child>
                               <object class="GtkRadioButton" id="variable">
                                 <property name="label" translatable="yes">Variable</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">optimal</property>
+                                <accessibility>
+                                  <relation type="label-for" target="zoomsb:0%"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -204,6 +191,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">●</property>
+                                <accessibility>
+                                  <relation type="labelled-by" target="variable"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -258,11 +248,9 @@
                         <child>
                           <object class="GtkRadioButton" id="automatic">
                             <property name="label" translatable="yes">Automatic</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -277,11 +265,9 @@
                         <child>
                           <object class="GtkRadioButton" id="singlepage">
                             <property name="label" translatable="yes">Single page</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -301,15 +287,17 @@
                             <child>
                               <object class="GtkRadioButton" id="columns">
                                 <property name="label" translatable="yes">Columns</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">automatic</property>
+                                <accessibility>
+                                  <relation type="label-for" target="columnssb:0"/>
+                                  <relation type="label-for" target="bookmode"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -323,6 +311,9 @@
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">●</property>
                                 <property name="adjustment">adjustment1</property>
+                                <accessibility>
+                                  <relation type="labelled-by" target="columns"/>
+                                </accessibility>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -345,13 +336,14 @@
                             <child>
                               <object class="GtkCheckButton" id="bookmode">
                                 <property name="label" translatable="yes">Book mode</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
+                                <accessibility>
+                                  <relation type="labelled-by" target="columns"/>
+                                </accessibility>
                               </object>
                             </child>
                           </object>