tdf#87026 Move accessibility relations to .ui files

Change-Id: I78dab5edf222503a8e7c5cd6f5dd523777df5731
Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com>

6 files changed, 95 insertions, 32 deletions

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index f43174b0b3f1..836821b64579 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -153,8 +153,6 @@ void AreaPropertyPanelBase::Initialize()
     maGradientRect = maGradientLinear;
     maGradientRect.SetGradientStyle(css::awt::GradientStyle_RECT);
 
-    mpLbFillType->SetAccessibleName("Fill");    //wj acc
-    mpLbFillAttr->SetAccessibleName("Fill");    //wj acc
 
     mpLbFillType->SetSelectHdl( LINK( this, AreaPropertyPanelBase, SelectFillTypeHdl ) );
 
@@ -165,12 +163,10 @@ void AreaPropertyPanelBase::Initialize()
     mpLbFillGradTo->SetSelectHdl( aLink );
 
     mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl));
-    mpLBTransType->SetAccessibleName("Transparency");    //wj acc
 
     SetTransparency( 50 );
     mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanelBase, ModifyTransparentHdl_Impl));
     mpSldTransparent->SetSlideHdl(LINK(this, AreaPropertyPanelBase, ModifyTransSliderHdl));
-    mpMTRTransparent->SetAccessibleName("Transparency");    //wj acc
 
     const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
     mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( nIdGradient ) | ToolBoxItemBits::DROPDOWNONLY );
@@ -179,14 +175,6 @@ void AreaPropertyPanelBase::Initialize()
     mpBTNGradient->SetSelectHdl( aLink2 );
     mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
     mpBTNGradient->Hide();
-
-    mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT);
-    mpLbFillAttr->SetAccessibleRelationLabeledBy(mpLbFillAttr);
-    mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor);
-    mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT);
-    mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent);
-    mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient);
-
     mpSidebarController = sfx2::sidebar::SidebarController::GetSidebarControllerForFrame(mxFrame);
     mpSidebarController->NotifyResize();
 }
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index d8fe13bca084..d68bff3685e9 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -97,18 +97,14 @@ void GraphicPropertyPanel::dispose()
 void GraphicPropertyPanel::Initialize()
 {
     mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyBrightnessHdl ) );
-    mpMtrBrightness->SetAccessibleName("Brightness");
     mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) );
-    mpMtrContrast->SetAccessibleName("Contrast");
     mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) );
-    mpMtrTrans->SetAccessibleName("Transparency");
 
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD));
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS));
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO));
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK));
     mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl ));
-    mpLBColorMode->SetAccessibleName("Color mode");
 
     mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) );
     mpMtrGreen->SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) );
@@ -117,12 +113,6 @@ void GraphicPropertyPanel::Initialize()
     mpMtrRed->SetAccessibleName(mpMtrRed->GetQuickHelpText());
     mpMtrGreen->SetAccessibleName(mpMtrGreen->GetQuickHelpText());
     mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText());
-    mpMtrGamma->SetAccessibleName("Gamma value");
-
-    mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed);
-    mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen);
-    mpMtrBlue->SetAccessibleRelationLabeledBy(mpMtrBlue);
-    mpMtrGamma->SetAccessibleRelationLabeledBy(mpMtrGamma);
 
     // Fix left position of some controls that may be wrong due to
     // rounding errors.
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index ea924bddd13b..2c99eb90a2f8 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -259,11 +259,6 @@ void LinePropertyPanelBase::Initialize()
     mpLBEnd->AdaptDropDownLineCountToMaximum();
 
     mpMFTransparent->SetModifyHdl(LINK(this, LinePropertyPanelBase, ChangeTransparentHdl));
-    mpMFTransparent->SetAccessibleName("Transparency");  //wj acc
-
-    mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth);
-    mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTransparency);
-    mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd);
 
     mpLBEdgeStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl ) );
     mpLBEdgeStyle->SetAccessibleName("Corner Style");
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 5321824dde9e..8d03ca35def2 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -85,6 +85,14 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Select the effect to apply.</property>
                     <property name="tooltip_text" translatable="yes">Select the effect to apply.</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="filllabel"/>
+                    </accessibility>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="fillattr-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Hatching/Bitmap</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -121,6 +129,14 @@
                 <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
+                <accessibility>
+                  <relation type="labelled-by" target="fillstyle"/>
+                </accessibility>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="fillstyle-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Fill Type</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -171,6 +187,14 @@
                   <item translatable="yes">Quadratic</item>
                   <item translatable="yes">Square</item>
                 </items>
+                <accessibility>
+                  <relation type="labelled-by" target="transparencylabel"/>
+                </accessibility>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="transtype-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Transparency Type</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -210,9 +234,14 @@
               <object class="GtkSpinButton" id="gradangle:0degrees">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="adjustment">adjustment2</property>
                 <property name="tooltip_markup" translatable="yes">Select the gradient angle.</property>
                 <property name="tooltip_text" translatable="yes">Select the gradient angle.</property>
+                <property name="adjustment">adjustment2</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="gradangle:0degrees-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Gradient angle</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -223,6 +252,8 @@
               <object class="GtkComboBoxText" id="gradientstyle">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="tooltip_markup" translatable="yes">Select the gradient style.</property>
+                <property name="tooltip_text" translatable="yes">Select the gradient style.</property>
                 <items>
                   <item translatable="yes">Linear</item>
                   <item translatable="yes">Axial</item>
@@ -231,8 +262,11 @@
                   <item translatable="yes">Quadratic</item>
                   <item translatable="yes">Square</item>
                 </items>
-                <property name="tooltip_markup" translatable="yes">Select the gradient style.</property>
-                <property name="tooltip_text" translatable="yes">Select the gradient style.</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="gradientstyle-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Gradient Type</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -258,11 +292,11 @@
               <object class="GtkScale" id="transparencyslider">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+                <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="hexpand">True</property>
                 <property name="round_digits">1</property>
                 <property name="draw_value">False</property>
-                <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
-                <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -283,6 +317,11 @@
                 <property name="adjustment">adjustment1</property>
                 <property name="climb_rate">5</property>
                 <property name="numeric">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="settransparency:0%-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">3</property>
diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui
index e894a6f53a34..138139e749b4 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -63,6 +63,14 @@
                 <property name="invisible_char">•</property>
                 <property name="adjustment">plusminus100adjustment</property>
                 <property name="climb_rate">1</property>
+                <accessibility>
+                    <relation type="labelled-by" target="brightnesslabel"/>
+                </accessibility>
+                    <child internal-child="accessible">
+                        <object class="AtkObject" id="setbrightness:%in">
+                            <property name="AtkObject::accessible-name" translatable="yes">Brightness</property>
+                        </object>
+                    </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -93,6 +101,14 @@
                 <property name="invisible_char">•</property>
                 <property name="adjustment">plusminus100adjustment</property>
                 <property name="climb_rate">1</property>
+              <accessibility>
+                <relation type="labelled-by" target="contrastlabel"/>
+              </accessibility>
+              <child internal-child="accessible">
+                <object class="AtkObject" id="setcontrast:%in">
+                    <property name="AtkObject::accessible-name" translatable="yes">Contrast</property>
+                </object>
+              </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -117,6 +133,14 @@
               <object class="GtkComboBoxText" id="setcolormode">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <accessibility>
+                    <relation type="labelled-by" target="colorlmodelabel"/>
+                </accessibility>
+                <child internal-child="accessible">
+                    <object class="AtkObject" id="setcolormode-in">
+                        <property name="AtkObject::accessible-name" translatable="yes">Color mode</property>
+                    </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -147,6 +171,14 @@
                 <property name="invisible_char">•</property>
                 <property name="adjustment">0to100adjustment</property>
                 <property name="climb_rate">1</property>
+                <accessibility>
+                    <relation type="labelled-by" target="transparencylabel"/>
+                </accessibility>
+                <child internal-child="accessible">
+                    <object class="AtkObject" id="settransparency:%in">
+                        <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+                    </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -310,6 +342,14 @@
                     <property name="adjustment">gammaadjustment</property>
                     <property name="climb_rate">0.10000000000000001</property>
                     <property name="digits">2</property>
+                    <accessibility>
+                        <relation target="image4"/>
+                    </accessibility>
+                    <child internal-child="accessible">
+                        <object class="AtkObject" id="setgamma:0in">
+                            <property name="AtkObject::accessible-name" translatable="yes">Gamma value</property>
+                        </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index c706aebc155d..16013098e326 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -125,6 +125,9 @@
                         <property name="action_name">.uno:SelectWidth</property>
                         <property name="use_underline">True</property>
                       </object>
+                      <accessibility>
+                        <relation type="labelled-by" target="widthlabel"/>
+                      </accessibility>
                       <packing>
                         <property name="expand">True</property>
                         <property name="homogeneous">True</property>
@@ -211,6 +214,14 @@
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
                     <property name="climb_rate">5</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="translabel"/>
+                    </accessibility>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="linetransparency:0%-atkobject">
+                          <property name="AtkObject::accessible-name" translatable="yes">Transparency</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>