remove always false and disabled m_aCB_Use_Variants checkbox

Change-Id: I770c867a2cb014fd34c5289d47ff030aa774579d

4 files changed, 1 insertions, 59 deletions

diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
index fae7ef0cde4d..288208f7d4ec 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
@@ -239,15 +239,6 @@ ModalDialog DLG_CHINESETRANSLATION
 
     DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) )
 
-    CheckBox CB_USE_VARIANTS
-    {
-        HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS";
-        Pos = MAP_APPFONT( T_COL_3, T_ROW_4 );
-        Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ;
-
-        Text [ en-US ] = "~Use Taiwan, Hong Kong SAR, and Macao SAR character variants";
-    };
-
     FixedLine FL_COMMONTERMS
     {
         Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 75776b7a8b3c..b766059962cc 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -230,7 +230,7 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::O
         SolarMutexGuard aSolarGuard;
         if( m_bDisposed || m_bInDispose || !m_pDialog )
             return aRet;
-        m_pDialog->getSettings( bDirectionToSimplified, bUseCharacterVariants, bTranslateCommonTerms );
+        m_pDialog->getSettings( bDirectionToSimplified, bTranslateCommonTerms );
     }
 
     if( rPropertyName.equals( C2U("IsDirectionToSimplified") ) )
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index f04fd6d949e6..f50679caa4e8 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -48,7 +48,6 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
     , m_aFL_Direction( this, TextConversionDlgs_ResId( FL_DIRECTION ) )
     , m_aRB_To_Simplified( this, TextConversionDlgs_ResId( RB_TO_SIMPLIFIED ) )
     , m_aRB_To_Traditional( this, TextConversionDlgs_ResId( RB_TO_TRADITIONAL ) )
-    , m_aCB_Use_Variants( this, TextConversionDlgs_ResId( CB_USE_VARIANTS ) )
     , m_aFL_Commonterms( this, TextConversionDlgs_ResId( FL_COMMONTERMS ) )
     , m_aCB_Translate_Commonterms( this, TextConversionDlgs_ResId( CB_TRANSLATE_COMMONTERMS ) )
     , m_aPB_Editterms( this, TextConversionDlgs_ResId( PB_EDITTERMS ) )
@@ -62,7 +61,6 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
 
     m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED );
     m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL );
-    m_aCB_Use_Variants.SetHelpId( HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS );
 
     SvtLinguConfig  aLngCfg;
     sal_Bool bValue = sal_Bool();
@@ -73,29 +71,12 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
     else
         m_aRB_To_Traditional.Check();
 
-    aAny = aLngCfg.GetProperty( rtl::OUString( UPN_IS_USE_CHARACTER_VARIANTS ) );
-    if( aAny >>= bValue )
-        m_aCB_Use_Variants.Check( bValue );
-
-    // #117820# (search for other occurrences!)
-    // disable and hide that checkbox until it is decided if it is needed or not.
-    // If it is to be removed later the respective code needs to be removed as
-    // well, otherwise we just have to remove the next lines again.
-    m_aCB_Use_Variants.Check( sal_False );
-    m_aCB_Use_Variants.Enable( sal_False );
-    m_aCB_Use_Variants.Show( sal_False );
-
     aAny = aLngCfg.GetProperty( rtl::OUString( UPN_IS_TRANSLATE_COMMON_TERMS ) );
     if( aAny >>= bValue )
         m_aCB_Translate_Commonterms.Check( bValue );
 
     m_aPB_Editterms.SetClickHdl( LINK( this, ChineseTranslationDialog, DictionaryHdl ) );
-    m_aRB_To_Simplified.SetClickHdl( LINK( this, ChineseTranslationDialog, DirectionHdl ) );
-    m_aRB_To_Traditional.SetClickHdl( LINK( this, ChineseTranslationDialog, DirectionHdl ) );
-    m_aCB_Translate_Commonterms.SetClickHdl( LINK( this, ChineseTranslationDialog, CommonTermsHdl ) );
     m_aBP_OK.SetClickHdl( LINK( this, ChineseTranslationDialog, OkHdl ) );
-
-    impl_UpdateVariantsCheckBox();
 }
 
 ChineseTranslationDialog::~ChineseTranslationDialog()
@@ -109,34 +90,12 @@ ChineseTranslationDialog::~ChineseTranslationDialog()
 }
 
 void ChineseTranslationDialog::getSettings( sal_Bool& rbDirectionToSimplified
-                                          , sal_Bool& rbUseCharacterVariants
                                           , sal_Bool& rbTranslateCommonTerms ) const
 {
     rbDirectionToSimplified = m_aRB_To_Simplified.IsChecked();
-    rbUseCharacterVariants = m_aCB_Use_Variants.IsChecked();
     rbTranslateCommonTerms = m_aCB_Translate_Commonterms.IsChecked();
 }
 
-void ChineseTranslationDialog::impl_UpdateVariantsCheckBox()
-{
-// #117820# (search for other occurrences!)
-//    m_aCB_Use_Variants.Enable( m_aRB_To_Traditional.IsChecked() );
-}
-
-IMPL_LINK_NOARG(ChineseTranslationDialog, DirectionHdl)
-{
-    impl_UpdateVariantsCheckBox();
-    return 0;
-}
-
-IMPL_LINK_NOARG(ChineseTranslationDialog, CommonTermsHdl)
-{
-// #117820# (search for other occurrences!)
-//    if( m_aCB_Translate_Commonterms.IsChecked() && m_aRB_To_Traditional.IsChecked() )
-//        m_aCB_Use_Variants.Check( true );
-    return 0;
-}
-
 IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl)
 {
     //save settings to configuration
@@ -144,8 +103,6 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl)
     Any aAny;
     aAny <<= sal_Bool( !!m_aRB_To_Simplified.IsChecked() );
     aLngCfg.SetProperty( rtl::OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny );
-    aAny <<= sal_Bool( !!m_aCB_Use_Variants.IsChecked() );
-    aLngCfg.SetProperty( rtl::OUString( UPN_IS_USE_CHARACTER_VARIANTS ), aAny );
     aAny <<= sal_Bool( !!m_aCB_Translate_Commonterms.IsChecked() );
     aLngCfg.SetProperty( rtl::OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny );
 
@@ -174,9 +131,6 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl)
             sal_Int32 nTextConversionOptions = i18n::TextConversionOption::NONE;
             if( !m_aCB_Translate_Commonterms.IsChecked() )
                 nTextConversionOptions = nTextConversionOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
-            if( m_aCB_Use_Variants.IsChecked() )
-                nTextConversionOptions = nTextConversionOptions | i18n::TextConversionOption::USE_CHARACTER_VARIANTS;
-
             m_pDictionaryDialog->setDirectionAndTextConversionOptions( m_aRB_To_Simplified.IsChecked(), nTextConversionOptions );
             m_pDictionaryDialog->Execute();
         }
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 1dc0d25c99a8..a1b321737f36 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -43,12 +43,10 @@ public:
     virtual ~ChineseTranslationDialog();
 
     void getSettings( sal_Bool& rbDirectionToSimplified
-                    , sal_Bool& rbUseCharacterVariants
                     , sal_Bool& rbTranslateCommonTerms ) const;
 
 private:
     DECL_LINK( DictionaryHdl, void* );
-    DECL_LINK( DirectionHdl, void* );
     DECL_LINK( CommonTermsHdl, void* );
     DECL_LINK( OkHdl, void* );
     void impl_UpdateVariantsCheckBox();
@@ -58,7 +56,6 @@ private:
 
     RadioButton m_aRB_To_Simplified;
     RadioButton m_aRB_To_Traditional;
-    CheckBox    m_aCB_Use_Variants;
 
     FixedLine   m_aFL_Commonterms;