diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-06-06 11:13:57 +0300 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-07 08:12:01 +0000 |
commit | 71bdc1d936f7930a176f760d7148a152dd9cb3e4 (patch) | |
tree | 35e171d328f6f65ed6795e922161c2ad715f5553 /svx/source | |
parent | ca1d1c41f1dd4702bdffb1936b85bb6ac617219a (diff) |
Remove unnecessary strings in bmpmask dialog tdf#87026
By moving accessibility relations to the related .ui file,
and deleting calls to SetAccessibleName where possible.
Change-Id: Ic2b309d54d3579158bdf33468f0895ca2b2a393e
Reviewed-on: https://gerrit.libreoffice.org/25956
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 'svx/source')
-rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 48 | ||||
-rw-r--r-- | svx/source/dialog/bmpmask.hrc | 3 | ||||
-rw-r--r-- | svx/source/dialog/bmpmask.src | 17 |
3 files changed, 0 insertions, 68 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index f947e7aeb7e7..73f082133edd 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -1123,24 +1123,6 @@ bool SvxBmpMask::IsEyedropping() const */ void SvxBmpMask::SetAccessibleNames() { - OUString sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString()); - OUString sSourceColorN; - - sSourceColorN = sSourceColor; - sSourceColorN += " 1"; - m_pCbx1->SetAccessibleName (sSourceColorN); - - sSourceColorN = sSourceColor; - sSourceColorN += " 2"; - m_pCbx2->SetAccessibleName (sSourceColorN); - - sSourceColorN = sSourceColor; - sSourceColorN += " 3"; - m_pCbx3->SetAccessibleName (sSourceColorN); - - sSourceColorN = sSourceColor; - sSourceColorN += " 4"; - m_pCbx4->SetAccessibleName (sSourceColorN); // set the accessible name for valueset OUString sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE)); OUString sColorPaletteN; @@ -1156,36 +1138,6 @@ void SvxBmpMask::SetAccessibleNames() sColorPaletteN = sColorPalette; sColorPaletteN += " 4"; m_pQSet4->SetText (sColorPaletteN); - // set the accessible for replace with spin boxes. - OUString sTolerance(BMP_RESID( RID_SVXDLG_BMPMASK_STR_TOLERANCE)); - OUString sToleranceN; - sToleranceN = sTolerance; - sToleranceN += " 1"; - m_pSp1->SetAccessibleName (sToleranceN); - sToleranceN = sTolerance; - sToleranceN += " 2"; - m_pSp2->SetAccessibleName (sToleranceN); - sToleranceN = sTolerance; - sToleranceN += " 3"; - m_pSp3->SetAccessibleName (sToleranceN); - sToleranceN = sTolerance; - sToleranceN += " 4"; - m_pSp4->SetAccessibleName (sToleranceN); - // set the accessible for replace with combo boxes. - OUString sReplaceWith(BMP_RESID( RID_SVXDLG_BMPMASK_STR_REPLACEWITH)); - OUString sReplaceWithN; - sReplaceWithN = sReplaceWith; - sReplaceWithN += " 1"; - m_pLbColor1->SetAccessibleName (sReplaceWithN); - sReplaceWithN = sReplaceWith; - sReplaceWithN += " 2"; - m_pLbColor2->SetAccessibleName (sReplaceWithN); - sReplaceWithN = sReplaceWith; - sReplaceWithN += " 3"; - m_pLbColor3->SetAccessibleName (sReplaceWithN); - sReplaceWithN = sReplaceWith; - sReplaceWithN += " 4"; - m_pLbColor4->SetAccessibleName (sReplaceWithN); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc index 3fa3f8332e78..1e446c418145 100644 --- a/svx/source/dialog/bmpmask.hrc +++ b/svx/source/dialog/bmpmask.hrc @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1) -#define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2) #define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3) -#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4) -#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index a6c6a405cf4a..d154d7ed0db9 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -27,26 +27,9 @@ String RID_SVXDLG_BMPMASK_STR_TRANSP Text [ en-US ] = "Transparent"; }; -String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR -{ - // This string is used by the eyedropper dialog to denote a color in an image - // that will be replaced by another color. - Text [ en-US ] = "Source Color"; -}; - String RID_SVXDLG_BMPMASK_STR_PALETTE { Text [ en-US ] = "Color Palette"; }; -String RID_SVXDLG_BMPMASK_STR_TOLERANCE -{ - Text [ en-US ] = "Tolerance"; -}; - -String RID_SVXDLG_BMPMASK_STR_REPLACEWITH -{ - Text [ en-US ] = "Replace with"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |