diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-06-08 14:43:53 +0300 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-15 20:26:35 +0000 |
commit | a00757e75b7d55239f97c1ca9e50c68252ff227f (patch) | |
tree | e146a209905b532ded1521a9c52d766a0b03329e /sw | |
parent | bdfccfde308f0267965933a8273e6e9201a2c67c (diff) |
Move accessibility relations to .ui files, Part 9: tdf#87026
By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.
Change-Id: I52e3f2a16519aee13b06f0efc6beb3385bcb0f1c
Reviewed-on: https://gerrit.libreoffice.org/26066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 6 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/tabletextflowpage.ui | 76 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/tocdialog.ui | 7 |
4 files changed, 25 insertions, 65 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d8383ce90a3c..18945f4fb230 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -314,7 +314,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& m_pShowExampleCB->Check( SW_MOD()->GetModuleConfig()->IsShowIndexPreview()); - m_pExampleContainerWIN->SetAccessibleName(m_pShowExampleCB->GetText()); SetViewAlign( WindowAlign::Left ); // SetViewWindow does not work if the dialog is visible! diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 139712ad4946..c5fe6f82cd23 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1301,12 +1301,6 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pTextDirectionLB, "textdirection"); get(m_pVertOrientLB, "vertorient"); - m_pPgBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pColBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPgBrkBeforeRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPgBrkAfterRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPageCollLB->SetAccessibleName(m_pPageCollCB->GetText()); - m_pPgBrkCB->SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl)); m_pPgBrkBeforeRB->SetClickHdl( LINK( this, SwTextFlowPage, PageBreakPosHdl_Impl ) ); diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui index 9af0800155cd..76b2f3c6172b 100644 --- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui +++ b/sw/uiconfig/swriter/ui/tabletextflowpage.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="upper">9999</property> <property name="step_increment">1</property> @@ -103,8 +104,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> @@ -118,12 +117,13 @@ <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">column</property> + <accessibility> + <relation type="member-of" target="break"/> + </accessibility> </object> <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> @@ -136,12 +136,13 @@ <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">page</property> + <accessibility> + <relation type="member-of" target="break"/> + </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> @@ -155,12 +156,13 @@ <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">after</property> + <accessibility> + <relation type="member-of" target="break"/> + </accessibility> </object> <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> @@ -172,12 +174,13 @@ <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <accessibility> + <relation type="member-of" target="break"/> + </accessibility> </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> @@ -187,8 +190,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> @@ -212,8 +213,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> @@ -227,8 +226,6 @@ <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> @@ -236,14 +233,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustment1</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -255,20 +249,21 @@ <accessibility> <relation type="labelled-by" target="pagestyle"/> </accessibility> + <child internal-child="accessible"> + <object class="AtkObject" id="pagestylelb-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">With Page Style</property> + </object> + </child> </object> <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> @@ -284,8 +279,6 @@ <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> @@ -303,8 +296,6 @@ <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> @@ -320,8 +311,6 @@ <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> @@ -340,8 +329,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> @@ -353,16 +340,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">6</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -383,8 +366,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> @@ -403,8 +384,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> @@ -416,8 +395,6 @@ <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> @@ -425,30 +402,23 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustment2</property> </object> <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">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">5</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -469,8 +439,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> @@ -501,8 +469,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> @@ -514,8 +480,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> @@ -536,8 +500,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> </object> diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui index 3857a2f0364b..d90952818a15 100644 --- a/sw/uiconfig/swriter/ui/tocdialog.ui +++ b/sw/uiconfig/swriter/ui/tocdialog.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="GtkDialog" id="TocDialog"> @@ -114,6 +114,11 @@ <object class="GtkDrawingArea" id="example"> <property name="visible">True</property> <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="example-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Preview</property> + </object> + </child> </object> <packing> <property name="expand">False</property> |