include/svx/chinese_translation_unodialog.hxx | 3 +-- sc/source/ui/view/cellsh1.cxx | 5 +---- sd/source/ui/func/fuhhconv.cxx | 5 +---- sw/source/uibase/shells/annotsh.cxx | 5 +---- sw/source/uibase/shells/drwtxtsh.cxx | 5 +---- sw/source/uibase/uiview/viewling.cxx | 5 +---- 6 files changed, 6 insertions(+), 22 deletions(-)
New commits: commit eb1a1e43b11ed5c36f2d51530ec060041b4c6161 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Jun 22 19:58:49 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jun 22 22:41:56 2025 +0200 cid#1655085 'Constant' variable guards dead code and cid#1655083 'Constant' variable guards dead code cid#1655082 'Constant' variable guards dead code cid#1655078 'Constant' variable guards dead code cid#1655077 'Constant' variable guards dead code noticable since: commit f9a01110b56775a3798efddf080773145a7723bb no need to use UNO to get to ChineseTranslation_UnoDialog but see also: commit 9eef4168ac57c153f5f265ac3a547e796d062a72 remove always false and disabled m_aCB_Use_Variants checkbox Change-Id: Ie5925bb47b20a1ef9d966fb762f89708b155042b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186800 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/svx/chinese_translation_unodialog.hxx b/include/svx/chinese_translation_unodialog.hxx index 199896022cb6..209d5e1c62cc 100644 --- a/include/svx/chinese_translation_unodialog.hxx +++ b/include/svx/chinese_translation_unodialog.hxx @@ -48,8 +48,7 @@ It can be executed via the ui::dialogs::XExecutableDialog interface. Made settings can be retrieved via beans::XPropertySet interface. Following properties are available (read only and not bound): 1) Name="IsDirectionToSimplified" Type="sal_Bool" -2) Name="IsUseCharacterVariants" Type="sal_Bool" -3) Name="IsTranslateCommonTerms" Type="sal_Bool" +2) Name="IsTranslateCommonTerms" Type="sal_Bool" The dialog gets this information from the registry on execute and writes it back to the registry if ended with OK. */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 6d75b512a797..f75deaa4f91c 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2019,15 +2019,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { //get some parameters from the dialog bool bToSimplified = xDialog->getIsDirectionToSimplified(); - bool bUseVariants = false; bool bCommonTerms = xDialog->getIsTranslateCommonTerms(); //execute translation LanguageType eSourceLang = bToSimplified ? LANGUAGE_CHINESE_TRADITIONAL : LANGUAGE_CHINESE_SIMPLIFIED; LanguageType eTargetLang = bToSimplified ? LANGUAGE_CHINESE_SIMPLIFIED : LANGUAGE_CHINESE_TRADITIONAL; - sal_Int32 nOptions = bUseVariants ? i18n::TextConversionOption::USE_CHARACTER_VARIANTS : 0; - if( !bCommonTerms ) - nOptions |= i18n::TextConversionOption::CHARACTER_BY_CHARACTER; + sal_Int32 nOptions = !bCommonTerms ? i18n::TextConversionOption::CHARACTER_BY_CHARACTER : 0; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_SPREADSHEET, diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 3a0df5ea426f..822317cc16c7 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -192,15 +192,12 @@ void FuHangulHanjaConversion::StartChineseConversion() { //get some parameters from the dialog bool bToSimplified = xDialog->getIsDirectionToSimplified(); - bool bUseVariants = false; bool bCommonTerms = xDialog->getIsTranslateCommonTerms(); //execute translation LanguageType nSourceLang = bToSimplified ? LANGUAGE_CHINESE_TRADITIONAL : LANGUAGE_CHINESE_SIMPLIFIED; LanguageType nTargetLang = bToSimplified ? LANGUAGE_CHINESE_SIMPLIFIED : LANGUAGE_CHINESE_TRADITIONAL; - sal_Int32 nOptions = bUseVariants ? i18n::TextConversionOption::USE_CHARACTER_VARIANTS : 0; - if( !bCommonTerms ) - nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; + sal_Int32 nOptions = !bCommonTerms ? i18n::TextConversionOption::CHARACTER_BY_CHARACTER : 0; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 5614736ca010..eb2190c0f519 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1367,15 +1367,12 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) { //get some parameters from the dialog bool bToSimplified = xDialog->getIsDirectionToSimplified(); - bool bUseVariants = false; bool bCommonTerms = xDialog->getIsTranslateCommonTerms(); //execute translation LanguageType nSourceLang = bToSimplified ? LANGUAGE_CHINESE_TRADITIONAL : LANGUAGE_CHINESE_SIMPLIFIED; LanguageType nTargetLang = bToSimplified ? LANGUAGE_CHINESE_SIMPLIFIED : LANGUAGE_CHINESE_TRADITIONAL; - sal_Int32 nOptions = bUseVariants ? i18n::TextConversionOption::USE_CHARACTER_VARIANTS : 0; - if( !bCommonTerms ) - nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; + sal_Int32 nOptions = !bCommonTerms ? i18n::TextConversionOption::CHARACTER_BY_CHARACTER : 0; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, nTargetLang, GetDefaultFontFlags::OnlyOne ); diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 8535ecd63411..8bb470f515b9 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -293,15 +293,12 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest const &rReq) { //get some parameters from the dialog bool bToSimplified = xDialog->getIsDirectionToSimplified(); - bool bUseVariants = false; bool bCommonTerms = xDialog->getIsTranslateCommonTerms(); //execute translation LanguageType nSourceLang = bToSimplified ? LANGUAGE_CHINESE_TRADITIONAL : LANGUAGE_CHINESE_SIMPLIFIED; LanguageType nTargetLang = bToSimplified ? LANGUAGE_CHINESE_SIMPLIFIED : LANGUAGE_CHINESE_TRADITIONAL; - sal_Int32 nOptions = bUseVariants ? i18n::TextConversionOption::USE_CHARACTER_VARIANTS : 0; - if(!bCommonTerms) - nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; + sal_Int32 nOptions = !bCommonTerms ? i18n::TextConversionOption::CHARACTER_BY_CHARACTER : 0; vcl::Font aTargetFont = OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nTargetLang, GetDefaultFontFlags::OnlyOne); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 02b9c38d55b7..644026b93631 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -118,15 +118,12 @@ void SwView::ExecLingu(SfxRequest &rReq) { //get some parameters from the dialog bool bToSimplified = xDialog->getIsDirectionToSimplified(); - bool bUseVariants = false; bool bCommonTerms = xDialog->getIsTranslateCommonTerms(); //execute translation LanguageType nSourceLang = bToSimplified ? LANGUAGE_CHINESE_TRADITIONAL : LANGUAGE_CHINESE_SIMPLIFIED; LanguageType nTargetLang = bToSimplified ? LANGUAGE_CHINESE_SIMPLIFIED : LANGUAGE_CHINESE_TRADITIONAL; - sal_Int32 nOptions = bUseVariants ? i18n::TextConversionOption::USE_CHARACTER_VARIANTS : 0; - if( !bCommonTerms ) - nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; + sal_Int32 nOptions = !bCommonTerms ? i18n::TextConversionOption::CHARACTER_BY_CHARACTER : 0; vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_TEXT, nTargetLang, GetDefaultFontFlags::OnlyOne );
