diff options
Diffstat (limited to 'cui/source/dialogs/hangulhanjadlg.cxx')
| -rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index ec46262284c5..537918ecb779 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> -#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weldutils.hxx> #include <unotools/lingucfg.hxx> @@ -452,8 +451,8 @@ namespace svx m_xSuggestions->set_size_request(m_xOriginalWord->get_approximate_digit_width() * 42, m_xOriginalWord->get_text_height() * 5); - const OUString sHangul(CuiResId(RID_SVXSTR_HANGUL)); - const OUString sHanja(CuiResId(RID_SVXSTR_HANJA)); + const OUString sHangul(CuiResId(RID_CUISTR_HANGUL)); + const OUString sHanja(CuiResId(RID_CUISTR_HANJA)); m_xHanjaAbove->init( sHangul, sHanja, PseudoRubyText::eAbove ); m_xHanjaBelow->init( sHangul, sHanja, PseudoRubyText::eBelow ); m_xHangulAbove->init( sHanja, sHangul, PseudoRubyText::eAbove ); @@ -623,8 +622,7 @@ namespace svx pNewDefButton = m_xFind.get(); } - pOldDefButton->set_has_default(false); - pNewDefButton->set_has_default(true); + m_xDialog->change_default_widget(pOldDefButton, pNewDefButton); } OUString HangulHanjaConversionDialog::GetCurrentSuggestion( ) const @@ -731,15 +729,9 @@ namespace svx Reference< XNameContainer > xNameCont = m_xConversionDictionaryList->getDictionaryContainer(); if( xNameCont.is() ) { - Sequence< OUString > aDictNames( xNameCont->getElementNames() ); - - const OUString* pDic = aDictNames.getConstArray(); - sal_Int32 nCount = aDictNames.getLength(); - - sal_Int32 i; - for( i = 0 ; i < nCount ; ++i ) + for (auto& name : xNameCont->getElementNames()) { - Any aAny( xNameCont->getByName( pDic[ i ] ) ); + Any aAny(xNameCont->getByName(name)); Reference< XConversionDictionary > xDic; if( ( aAny >>= xDic ) && xDic.is() ) { @@ -1374,20 +1366,13 @@ namespace svx m_xSuggestions->Clear(); //fill found entries into boxes - sal_uInt32 nCnt = aEntries.getLength(); - if( nCnt ) + if (aEntries.hasElements()) { if( !m_xSuggestions ) m_xSuggestions.reset(new SuggestionList); - const OUString* pSugg = aEntries.getConstArray(); - sal_uInt32 n = 0; - while( nCnt ) - { - m_xSuggestions->Set( pSugg[ n ], sal_uInt16( n ) ); - ++n; - --nCnt; - } + for (sal_Int32 n = 0; n < aEntries.getLength(); ++n) + m_xSuggestions->Set(aEntries[n], n); } m_bModifiedSuggestions = false; } @@ -1432,7 +1417,7 @@ namespace svx HangulHanjaEditDictDialog::HangulHanjaEditDictDialog(weld::Window* pParent, HHDictList& _rDictList, sal_uInt32 nSelDict) : GenericDialogController(pParent, "cui/ui/hangulhanjaeditdictdialog.ui", "HangulHanjaEditDictDialog") - , m_aEditHintText ( CuiResId(RID_SVXSTR_EDITHINT) ) + , m_aEditHintText ( CuiResId(RID_CUISTR_EDITHINT) ) , m_rDictList ( _rDictList ) , m_nCurrentDict ( 0xFFFFFFFF ) , m_nTopPos ( 0 ) |