summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@pardus.org.tr>2016-06-20 15:36:23 +0300
committerCaolán McNamara <caolanm@redhat.com>2016-06-27 20:24:28 +0000
commit0ea96b1a2f5cf523af451b41915bbafd81a95a2c (patch)
tree59236a77c50d41ff6499456269581a9e82801008 /sw
parent2d6a88135ef107e5927c7a6cd2542ad1bc8bbe09 (diff)
Move accessibility relations to .ui files, Part 11: tdf#87026
By removing unnecessary variables/strings/function calls, and making proper changes in the related .ui files. As of this commit, all accessible relations of type "SetAccessibleName" have been moved to .ui files other than a few exceptions. Change-Id: I5972211f58de70889066dec3c74341b405f82c85 Reviewed-on: https://gerrit.libreoffice.org/26520 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/table/tabledlg.cxx5
-rw-r--r--sw/uiconfig/swriter/ui/tablecolumnpage.ui36
2 files changed, 33 insertions, 8 deletions
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index c5fe6f82cd23..c3cdf8d985ed 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -892,11 +892,6 @@ IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void )
OUString sIndex = OUString::number( aValueTable[i] + 1 );
sEntry += sIndex;
m_pTextArr[i]->SetText( sEntry );
-
- //added by menghu for SODC_5143,12/12/2006
- OUString sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
- sColumnWidth = sColumnWidth.replaceFirst( "%1", sIndex );
- m_aFieldArr[i].SetAccessibleName( sColumnWidth );
}
m_pDownBtn->Enable(aValueTable[0] > 0);
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
index 44c87cc05d23..457074e4b3ad 100644
--- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.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"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -17,13 +17,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
- <property name="icon-size">1</property>
+ <property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
- <property name="icon-size">1</property>
+ <property name="icon_size">1</property>
</object>
<object class="GtkGrid" id="TableColumnPage">
<property name="visible">True</property>
@@ -129,6 +129,11 @@
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="width2:0.0cm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Column 2 Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -145,6 +150,11 @@
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="width3:0.00cm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Column 3 Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">3</property>
@@ -161,6 +171,11 @@
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="width4:0.00cm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Column 4 Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">4</property>
@@ -177,6 +192,11 @@
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="width5:0.00cm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Column 5 Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">5</property>
@@ -193,6 +213,11 @@
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="width6:0.00cm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Column 6 Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">6</property>
@@ -294,6 +319,11 @@
<property name="invisible_char">•</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="width1:0.00cm-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Column 1 Width</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>