From 67868423378130c0e88eed99a6921e81fe94352c Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Tue, 7 Jun 2016 10:52:25 +0300 Subject: Move accessibility relations to .ui files, Part 8: tdf#87026 By removing unnecessary variables/strings/function calls, and making proper changes in the related .ui files. Change-Id: I04244b360b4bb32ccbbe5bde4756a9166ae1fcaf Reviewed-on: https://gerrit.libreoffice.org/26018 Tested-by: Jenkins Reviewed-by: Katarina Behrens --- chart2/source/controller/dialogs/Strings.src | 9 --- chart2/source/controller/dialogs/tp_DataSource.cxx | 3 - chart2/source/inc/Strings.hrc | 7 +- chart2/uiconfig/ui/tp_DataSource.ui | 46 +++++------- include/sfx2/sfx.hrc | 2 +- sc/source/ui/dbgui/tpsort.cxx | 4 -- sc/uiconfig/scalc/ui/sortoptionspage.ui | 50 +++++-------- sfx2/source/appl/sfx.src | 5 -- sfx2/source/dialog/passwd.cxx | 2 - sfx2/uiconfig/ui/password.ui | 19 +++-- svx/source/dialog/ctredlin.cxx | 3 - svx/uiconfig/ui/redlinefilterpage.ui | 82 +++++++--------------- sw/source/ui/chrdlg/break.cxx | 2 - sw/uiconfig/swriter/ui/insertbreak.ui | 9 ++- 14 files changed, 84 insertions(+), 159 deletions(-) diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index c9d18eb62391..63455740b5ab 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -94,15 +94,6 @@ String STR_PAGE_POSITION Text [ en-US ] = "Position" ; }; -String STR_BUTTON_UP -{ - Text [ en-US ] = "Up"; -}; -String STR_BUTTON_DOWN -{ - Text [ en-US ] = "Down"; -}; - String STR_PAGE_LAYOUT { Text [ en-US ] = "Layout"; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index c8808e1d41ae..9c8fe5f0074b 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -267,9 +267,6 @@ DataSourceTabPage::DataSourceTabPage( if( m_pLB_SERIES->First()) m_pLB_SERIES->Select( m_pLB_SERIES->First()); m_pLB_SERIES->GrabFocus(); - - m_pBTN_UP->SetAccessibleName(SCH_RESSTR(STR_BUTTON_UP)); - m_pBTN_DOWN->SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN)); } DataSourceTabPage::~DataSourceTabPage() diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index 950050ba228f..9ffe163e620d 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -265,11 +265,8 @@ #define STR_TEXT_DIRECTION_RTL (RID_APP_START + 279) #define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280) -#define STR_BUTTON_UP (RID_APP_START + 500) -#define STR_BUTTON_DOWN (RID_APP_START + 501) - -// ids must not exceed RID_APP_START + 499 -// ids >= RID_APP_START + 500 are defined in glob.hrc +// There is a gap here due to removed strings +// RID_APP_START + 500 and RID_APP_START + 501 are removed // CHART_STRINGS_HRC #endif diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui index 8de0320b0fc5..55918aaab42c 100644 --- a/chart2/uiconfig/ui/tp_DataSource.ui +++ b/chart2/uiconfig/ui/tp_DataSource.ui @@ -1,8 +1,8 @@ - + - + True False @@ -25,8 +25,8 @@ True False - 0 Customize Data Ranges for Individual Data Series + 0 @@ -55,10 +55,10 @@ True False - 0 Data _series: True LB_SERIES:border + 0 False @@ -102,8 +102,6 @@ 0 0 - 1 - 1 @@ -113,12 +111,15 @@ False True True + + + Up + + 1 0 - 1 - 1 @@ -134,8 +135,6 @@ 0 1 - 1 - 1 @@ -144,12 +143,15 @@ True False True + + + Down + + 1 1 - 1 - 1 @@ -178,16 +180,14 @@ True False - 0 _Data ranges: True LB_ROLE:border + 0 0 0 - 1 - 1 @@ -205,24 +205,20 @@ 0 1 - 1 - 1 True False - 0 Ran_ge for %VALUETYPE True EDT_RANGE + 0 0 2 - 1 - 1 @@ -262,8 +258,6 @@ 0 3 - 1 - 1 @@ -275,10 +269,10 @@ True False - 0 _Categories True EDT_CATEGORIES + 0 False @@ -290,9 +284,9 @@ True False - 0 Data _labels True + 0 False @@ -304,8 +298,6 @@ 0 4 - 1 - 1 @@ -345,8 +337,6 @@ 0 5 - 1 - 1 diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 5145f5d1ac1b..82a9e757bc54 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -139,7 +139,7 @@ #define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119) #define STR_SHARED (RID_SFX_START+120) #define RID_XMLSEC_DOCUMENTSIGNED (RID_SFX_START+121) -#define STR_PASSWD (RID_SFX_START+122) +// Here is a gap, STR_PASSWORD was removed RID_SFX_START+122 #define STR_PASSWD_EMPTY (RID_SFX_START+123) #define STR_PASSWD_MIN_LEN (RID_SFX_START+124) #define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125) diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 02dc4a18b759..c095810fb735 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -519,10 +519,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window* pParent, get(m_pLbLanguage, "language"); Init(); SetExchangeSupport(); - - m_pLbOutPos->SetAccessibleName(m_pBtnCopyResult->GetText()); - m_pEdOutPos->SetAccessibleName(m_pBtnCopyResult->GetText()); - m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText()); } ScTabPageSortOptions::~ScTabPageSortOptions() diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 44128d0e6910..88873be8a760 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -1,7 +1,8 @@ + - - + + True False @@ -39,8 +40,6 @@ 0 0 - 1 - 1 @@ -55,8 +54,6 @@ 0 1 - 1 - 1 @@ -71,8 +68,6 @@ 0 2 - 1 - 1 @@ -87,8 +82,6 @@ 0 3 - 1 - 1 @@ -106,8 +99,6 @@ 0 4 - 1 - 1 @@ -119,12 +110,15 @@ + + + Copy sort results to: + + 0 5 - 1 - 1 @@ -133,16 +127,18 @@ True True • - True + + + Copy sort results to: + + 1 5 - 1 - 1 @@ -160,8 +156,6 @@ 0 6 - 1 - 1 @@ -173,12 +167,16 @@ + + + Custom sort order + + 0 7 2 - 1 @@ -193,8 +191,6 @@ 0 8 - 1 - 1 @@ -209,8 +205,6 @@ 1 8 - 1 - 1 @@ -221,8 +215,6 @@ 0 9 - 1 - 1 @@ -233,8 +225,6 @@ 1 9 - 1 - 1 @@ -307,8 +297,6 @@ 0 0 - 1 - 1 @@ -325,8 +313,6 @@ 0 1 - 1 - 1 diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index 11467c866e70..5ece515ab104 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -39,11 +39,6 @@ String STR_PASSWD_EMPTY Text [ en-US ] = "(The password can be empty)" ; }; -String STR_PASSWD -{ - Text [ en-US ] = "Password" ; -}; - String STR_MODULENOTINSTALLED { Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed."; diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 9aff690b72ac..97e0e259a4da 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -109,8 +109,6 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou get(mpOKBtn, "ok"); - mpPassword1ED->SetAccessibleName(SFX2_RESSTR(STR_PASSWD)); - Link aLink = LINK( this, SfxPasswordDialog, EditModifyHdl ); mpPassword1ED->SetModifyHdl( aLink ); mpPassword2ED->SetModifyHdl( aLink ); diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui index ab6d5d2c2071..259b7faa8c79 100644 --- a/sfx2/uiconfig/ui/password.ui +++ b/sfx2/uiconfig/ui/password.ui @@ -1,5 +1,5 @@ - + @@ -97,10 +97,10 @@ True False - 0 User: True usered + 0 0 @@ -111,10 +111,10 @@ True False - 0 Password: True pass1ed + 0 0 @@ -125,10 +125,10 @@ True False - 0 Confirm: True confirm1ed + 0 0 @@ -153,6 +153,11 @@ True False ● + + + Password + + 1 @@ -215,10 +220,10 @@ True False - 0 Password: True pass2ed + 0 0 @@ -229,10 +234,10 @@ True False - 0 Confirm: True confirm2ed + 0 0 @@ -290,8 +295,8 @@ True False - 0 6 + 0 False diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 7003011bad7a..d7538b1a3a67 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -551,9 +551,6 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent) get(m_pCbComment, "comment"); get(m_pEdComment, "commentedit"); - m_pLbAuthor->SetAccessibleName(m_pCbAuthor->GetText()); - m_pEdComment->SetAccessibleName(m_pCbComment->GetText()); - m_pDfDate->SetShowDateCentury( true ); m_pDfDate2->SetShowDateCentury( true ); diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui index a78f49558d17..6f8734a7669d 100644 --- a/svx/uiconfig/ui/redlinefilterpage.ui +++ b/svx/uiconfig/ui/redlinefilterpage.ui @@ -1,6 +1,7 @@ + - + 19851231 20501231 @@ -38,8 +39,6 @@ 0 0 - 1 - 1 @@ -55,8 +54,6 @@ 0 2 - 1 - 1 @@ -75,8 +72,6 @@ 0 8 - 1 - 1 @@ -87,13 +82,15 @@ 24 True • - True + + + Comment + + 0 9 - 1 - 1 @@ -109,8 +106,6 @@ 0 6 - 1 - 1 @@ -120,8 +115,6 @@ False 24 True - 0 - 1 @@ -134,8 +127,6 @@ 0 5 - 1 - 1 @@ -151,8 +142,6 @@ 0 4 - 1 - 1 @@ -162,17 +151,18 @@ False 24 True - 0 - 1 + + + Author + + 0 3 - 1 - 1 @@ -188,10 +178,14 @@ True True • - True + + + Range + + False @@ -220,8 +214,6 @@ 0 7 - 1 - 1 @@ -237,16 +229,6 @@ False False True - 0 - 1 - - - - - - Date Condition - - earlier than since @@ -255,6 +237,14 @@ between since saving + + + + + + Date Condition + + False @@ -274,16 +264,14 @@ True False False - 1 a_nd True end + 1 0 1 - 1 - 1 @@ -294,7 +282,6 @@ True True • - True adjustment1 @@ -305,8 +292,6 @@ 1 0 - 1 - 1 @@ -317,7 +302,6 @@ True True • - True Start Time @@ -327,8 +311,6 @@ 2 0 - 1 - 1 @@ -345,8 +327,6 @@ 3 0 - 1 - 1 @@ -357,7 +337,6 @@ True True • - True adjustment1 @@ -368,8 +347,6 @@ 1 1 - 1 - 1 @@ -380,7 +357,6 @@ True True • - True End Time @@ -390,8 +366,6 @@ 2 1 - 1 - 1 @@ -408,8 +382,6 @@ 3 1 - 1 - 1 @@ -426,8 +398,6 @@ 0 1 - 1 - 1 diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 9107ec55073e..d9c1e16c0eef 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -136,8 +136,6 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) get(m_pPageNumBox, "pagenumcb"); get(m_pPageNumEdit, "pagenumsb"); - m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText()); - Link aLk = LINK(this,SwBreakDlg,ClickHdl); m_pPageBtn->SetClickHdl( aLk ); m_pLineBtn->SetClickHdl( aLk ); diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui index 9d737e6afaef..942ca58b0d1d 100644 --- a/sw/uiconfig/swriter/ui/insertbreak.ui +++ b/sw/uiconfig/swriter/ui/insertbreak.ui @@ -1,5 +1,5 @@ - + @@ -161,10 +161,10 @@ True False 6 - 0 Style: True stylelb + 0 False @@ -210,6 +210,11 @@ + + + Change page number + + False -- cgit