sc/source/ui/dbgui/filtdlg.cxx | 47 --------
sc/source/ui/miscdlgs/optsolver.cxx | 10 -
sc/uiconfig/scalc/ui/solverdlg.ui | 146 ++++++++++++---------------
sc/uiconfig/scalc/ui/standardfilterdialog.ui | 96 +++++++++++++++++
svx/source/dialog/rubydialog.cxx | 8 -
svx/uiconfig/ui/asianphoneticguidedialog.ui | 42 ++++++-
sw/source/ui/misc/srtdlg.cxx | 3
sw/uiconfig/swriter/ui/sortdialog.ui | 15 ++
8 files changed, 213 insertions(+), 154 deletions(-)
New commits:
commit 837c1e2e9cc6886e74e4f32d6296d07daf23a2e1
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
Date: Mon Jun 6 08:55:36 2016 +0300
Move accessibility relations to .ui files, Part 7: tdf#87026
By removing unnecessary variables/strings/funciton calls,
and making proper changes in the related .ui files.
Change-Id: I059bf02bc6ea29bf1b92d21f5a10a76548ecd1fc
Reviewed-on: https://gerrit.libreoffice.org/25973
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 01b29e6..47d7fd1 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -109,53 +109,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow*
pCW, vcl::Window* pPar
pTimer = new Timer("ScFilterTimer");
pTimer->SetTimeout( 50 ); // Wait 50ms
pTimer->SetTimeoutHdl( LINK( this, ScFilterDlg, TimeOutHdl ) );
-
- OUStringBuffer aBuf;
-
- OUString sAccName = SC_RESSTR(RID_FILTER_OPERATOR);
- aBuf.append(sAccName);
- aBuf.append(" 1");
- pLbConnect1->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 2");
- pLbConnect2->SetAccessibleName(aBuf.makeStringAndClear());
-
- sAccName = SC_RESSTR(RID_FILTER_FIELDNAME);
- aBuf.append(sAccName);
- aBuf.append(" 1");
- pLbField1->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 2");
- pLbField2->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 3");
- pLbField3->SetAccessibleName(aBuf.makeStringAndClear());
-
- sAccName = SC_RESSTR(RID_FILTER_CONDITION);
- aBuf.append(sAccName);
- aBuf.append(" 1");
- pLbCond1->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 2");
- pLbCond2->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 3");
- pLbCond3->SetAccessibleName(aBuf.makeStringAndClear());
-
- sAccName = SC_RESSTR(RID_FILTER_VALUE);
- aBuf.append(sAccName);
- aBuf.append(" 1");
- pEdVal1->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 2");
- pEdVal2->SetAccessibleName(aBuf.makeStringAndClear());
- aBuf.append(sAccName);
- aBuf.append(" 3");
- pEdVal3->SetAccessibleName(aBuf.makeStringAndClear());
-
- pLbCopyArea->SetAccessibleName(ScResId(STR_COPY_AREA_TO));
- pEdCopyArea->SetAccessibleName(ScResId(STR_COPY_AREA_TO));
-
}
ScFilterDlg::~ScFilterDlg()
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx
b/sc/source/ui/miscdlgs/optsolver.cxx
index d8276e0..e5b1cf1 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -283,16 +283,6 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB,
SfxChildWindow* pCW, vcl::Windo
mpOperator[3] = m_pLbOp4;
mpDelButton[3] = m_pBtnDel4;
- m_pEdLeft2->SetAccessibleName(m_pFtCellRef->GetText());
- m_pLbOp2->SetAccessibleName(m_pFtOperator->GetText());
- m_pEdRight2->SetAccessibleName(m_pFtConstraint->GetText());
- m_pEdLeft3->SetAccessibleName(m_pFtCellRef->GetText());
- m_pLbOp3->SetAccessibleName(m_pFtOperator->GetText());
- m_pEdRight3->SetAccessibleName(m_pFtConstraint->GetText());
- m_pEdLeft4->SetAccessibleName(m_pFtCellRef->GetText());
- m_pLbOp4->SetAccessibleName(m_pFtOperator->GetText());
- m_pEdRight4->SetAccessibleName(m_pFtConstraint->GetText());
-
Init( aCursorPos );
}
diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui
b/sc/uiconfig/scalc/ui/solverdlg.ui
index aa708c0..8f9361c 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -1,7 +1,8 @@
<?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="GtkDialog" id="SolverDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -103,45 +104,39 @@
<object class="GtkLabel" id="targetlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Target
cell</property>
<property name="use_underline">True</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>
<object class="GtkLabel" id="result">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Optimize result
to</property>
<property name="xalign">0</property>
<property name="yalign">0.029999999329447746</property>
- <property name="label" translatable="yes">Optimize result
to</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>
<object class="GtkLabel" id="changelabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_By changing
cells</property>
<property name="use_underline">True</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>
@@ -161,8 +156,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>
@@ -183,8 +176,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>
@@ -222,8 +213,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>
@@ -261,8 +250,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>
@@ -333,8 +320,6 @@
<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>
@@ -378,30 +363,27 @@
<object class="GtkLabel" id="cellreflabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Cell
reference</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<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>
<object class="GtkLabel" id="oplabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">_Operator</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</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>
@@ -409,15 +391,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">V_alue</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
<property name="width">4</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -427,12 +408,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">20</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="ref1edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Cell reference</property>
+ </object>
+ </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>
@@ -442,12 +426,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">20</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="ref2edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Cell reference</property>
+ </object>
+ </child>
</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>
@@ -457,12 +444,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">20</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="ref3edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Cell reference</property>
+ </object>
+ </child>
</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>
@@ -472,12 +462,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">20</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="ref4edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Cell reference</property>
+ </object>
+ </child>
</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>
@@ -489,8 +482,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>
@@ -502,8 +493,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>
@@ -515,8 +504,6 @@
<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>
@@ -528,8 +515,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>
@@ -545,12 +530,15 @@
<item translatable="yes">Integer</item>
<item translatable="yes">Binary</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="op1list-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -566,12 +554,15 @@
<item translatable="yes">Integer</item>
<item translatable="yes">Binary</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="op2list-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -587,12 +578,15 @@
<item translatable="yes">Integer</item>
<item translatable="yes">Binary</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="op3list-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -608,12 +602,15 @@
<item translatable="yes">Integer</item>
<item translatable="yes">Binary</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="op4list-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -624,12 +621,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">15</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="val1edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value</property>
+ </object>
+ </child>
</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>
@@ -640,12 +640,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">15</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="val2edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value</property>
+ </object>
+ </child>
</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>
@@ -656,12 +659,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">15</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="val3edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value</property>
+ </object>
+ </child>
</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>
@@ -672,12 +678,15 @@
<property name="hexpand">True</property>
<property name="invisible_char">â</property>
<property name="width_chars">15</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="val4edit-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -689,8 +698,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>
@@ -702,8 +709,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>
@@ -715,8 +720,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>
@@ -728,8 +731,6 @@
<packing>
<property name="left_attach">4</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -744,8 +745,6 @@
<packing>
<property name="left_attach">5</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -760,8 +759,6 @@
<packing>
<property name="left_attach">5</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -776,8 +773,6 @@
<packing>
<property name="left_attach">5</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -792,8 +787,6 @@
<packing>
<property name="left_attach">5</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -806,7 +799,6 @@
<packing>
<property name="left_attach">6</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
<property name="height">4</property>
</packing>
</child>
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index b638d30..441c043 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.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"/>
@@ -121,6 +121,11 @@
<accessibility>
<relation type="labelled-by" target="label2"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="connect1-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator 1</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -138,6 +143,11 @@
<accessibility>
<relation type="labelled-by" target="label2"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="connect2-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator 2</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -152,6 +162,11 @@
<item translatable="yes">AND</item>
<item translatable="yes">OR</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="connect3-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator 3</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -166,6 +181,11 @@
<item translatable="yes">AND</item>
<item translatable="yes">OR</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="connect4-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Operator 4</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -223,6 +243,11 @@
<accessibility>
<relation type="labelled-by" target="label3"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="field1-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Field Name 1</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -236,6 +261,11 @@
<accessibility>
<relation type="labelled-by" target="label3"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="field2-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Field Name 2</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -249,6 +279,11 @@
<accessibility>
<relation type="labelled-by" target="label3"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="field3-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Field Name 3</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -259,6 +294,11 @@
<object class="GtkComboBoxText" id="field4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="field4-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Field Name 4</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -290,6 +330,11 @@
<accessibility>
<relation type="labelled-by" target="label4"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="cond1-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Condition 1</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -321,6 +366,11 @@
<accessibility>
<relation type="labelled-by" target="label4"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="cond2-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Condition 2</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -352,6 +402,11 @@
<accessibility>
<relation type="labelled-by" target="label4"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="cond3-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Condition 3</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -380,6 +435,11 @@
<item translatable="yes">Ends with</item>
<item translatable="yes">Does not end with</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="cond4-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Condition 4</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -400,6 +460,11 @@
<accessibility>
<relation type="labelled-by" target="label5"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="val1-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value 1</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
@@ -420,6 +485,11 @@
<accessibility>
<relation type="labelled-by" target="label5"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="val2-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value 2</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
@@ -440,6 +510,11 @@
<accessibility>
<relation type="labelled-by" target="label5"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="val3-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value 3</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
@@ -457,6 +532,11 @@
<property name="can_focus">False</property>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="val4-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Value 4</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
@@ -627,6 +707,11 @@
<accessibility>
<relation type="labelled-by" target="copyresult"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lbcopyarea-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Copy results to</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -644,6 +729,11 @@
<accessibility>
<relation type="labelled-by" target="copyresult"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="edcopyarea-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Copy results to</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -679,8 +769,8 @@
<object class="GtkLabel" id="dbarealabel">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Data
range:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -692,8 +782,8 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">dummy</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index b3e48e2..076e447 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -260,14 +260,6 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings* pBind,
SfxChildWindow* pCW, vcl::Windo
}
UpdateColors();
-
- OUString leftLabelName = m_pLeftFT->GetText(), rightLabelName =
m_pRightFT->GetText();
- m_pLeft2ED->SetAccessibleName(leftLabelName);
- m_pLeft3ED->SetAccessibleName(leftLabelName);
- m_pLeft4ED->SetAccessibleName(leftLabelName);
- m_pRight2ED->SetAccessibleName(rightLabelName);
- m_pRight3ED->SetAccessibleName(rightLabelName);
- m_pRight4ED->SetAccessibleName(rightLabelName);
}
SvxRubyDialog::~SvxRubyDialog()
diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui
b/svx/uiconfig/ui/asianphoneticguidedialog.ui
index 8826743..63bc466 100644
--- a/svx/uiconfig/ui/asianphoneticguidedialog.ui
+++ b/svx/uiconfig/ui/asianphoneticguidedialog.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"/>
@@ -86,7 +86,7 @@
<object class="GtkLabel" id="basetextft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Base text
</property>
+ <property name="label" translatable="yes">Base
text</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -136,6 +136,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="Left2ED-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Base text</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -167,6 +172,11 @@
<object class="svxlo-RubyEdit" id="Right2ED">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="Right2ED-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Ruby text</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -177,6 +187,11 @@
<object class="svxlo-RubyEdit" id="Left3ED">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="Left3ED-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Base text</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -187,6 +202,11 @@
<object class="svxlo-RubyEdit" id="Right3ED">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="Right3ED-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Ruby text</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -197,6 +217,11 @@
<object class="svxlo-RubyEdit" id="Right4ED">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="Right4ED-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Ruby text</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -207,6 +232,11 @@
<object class="svxlo-RubyEdit" id="Left4ED">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="Left4ED-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Base text</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -235,10 +265,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">adjustlb</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -249,10 +279,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label"
translatable="yes">Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">positionlb</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -263,10 +293,10 @@
<object class="GtkLabel" id="styleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Character style
for ruby text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">stylelb</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -343,10 +373,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Preview:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">preview</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 0964602..9a96a3b 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -151,9 +151,6 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell
&rShell)
m_pColEdt1->SetAccessibleName(m_pColLbl->GetText());
m_pColEdt2->SetAccessibleName(m_pColLbl->GetText());
m_pColEdt3->SetAccessibleName(m_pColLbl->GetText());
- m_pTypDLB1->SetAccessibleName(m_pTypLbl->GetText());
- m_pTypDLB2->SetAccessibleName(m_pTypLbl->GetText());
- m_pTypDLB3->SetAccessibleName(m_pTypLbl->GetText());
m_pDelimEdt->SetMaxTextLen( 1 );
if(rSh.GetSelectionType() &
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui
b/sw/uiconfig/swriter/ui/sortdialog.ui
index c3eb3aa..d7091b9 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -403,6 +403,11 @@
<relation type="labelled-by" target="keytype"/>
<relation type="member-of" target="key1"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="typelb1-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Key type</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -421,6 +426,11 @@
<relation type="labelled-by" target="keytype"/>
<relation type="member-of" target="key2"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="typelb2-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Key type</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -437,6 +447,11 @@
<relation type="labelled-by" target="keytype"/>
<relation type="member-of" target="key3"/>
</accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="typelb3-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Key type</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
