diff options
Diffstat (limited to 'editeng/source/misc/hangulhanja.cxx')
| -rw-r--r-- | editeng/source/misc/hangulhanja.cxx | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 1eac907e55b6..5a9a8c1034fe 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -36,7 +36,7 @@ #include <sal/log.hxx> #include <osl/diagnose.h> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <editeng/edtdlg.hxx> @@ -67,7 +67,7 @@ namespace editeng // general VclPtr<AbstractHangulHanjaConversionDialog> m_pConversionDialog; // the dialog to display for user interaction - weld::Window* m_pUIParent; // the parent window for any UI we raise + weld::Widget* m_pUIParent; // the parent window for any UI we raise Reference< XComponentContext > m_xContext; // the service factory to use Reference< XExtendedTextConversion > @@ -117,7 +117,7 @@ namespace editeng public: HangulHanjaConversion_Impl( - weld::Window* pUIParent, + weld::Widget* pUIParent, const Reference< XComponentContext >& rxContext, const lang::Locale& _rSourceLocale, const lang::Locale& _rTargetLocale, @@ -131,6 +131,7 @@ namespace editeng bool IsValid() const { return m_xConverter.is(); } + weld::Widget* GetUIParent() const { return m_pUIParent; } LanguageType GetSourceLang() const { return m_nSourceLang; } LanguageType GetTargetLang() const { return m_nTargetLang; } const vcl::Font * GetTargetFont() const { return m_pTargetFont; } @@ -153,8 +154,8 @@ namespace editeng DECL_LINK( OnIgnoreAll, weld::Button&, void ); DECL_LINK( OnChange, weld::Button&, void ); DECL_LINK( OnChangeAll, weld::Button&, void ); - DECL_LINK( OnByCharClicked, weld::ToggleButton&, void ); - DECL_LINK( OnConversionTypeChanged, weld::Button&, void ); + DECL_LINK( OnByCharClicked, weld::Toggleable&, void ); + DECL_LINK( OnConversionTypeChanged, weld::Toggleable&, void ); DECL_LINK( OnFind, weld::Button&, void ); /** proceed, after the current convertible has been handled @@ -225,7 +226,7 @@ namespace editeng HangulHanjaConversion_Impl::StringMap HangulHanjaConversion_Impl::m_aRecentlyUsedList = HangulHanjaConversion_Impl::StringMap(); - HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( weld::Window* pUIParent, + HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( weld::Widget* pUIParent, const Reference< XComponentContext >& rxContext, const lang::Locale& _rSourceLocale, const lang::Locale& _rTargetLocale, @@ -233,8 +234,7 @@ namespace editeng sal_Int32 _nOptions, bool _bIsInteractive, HangulHanjaConversion* _pAntiImpl ) - : m_pConversionDialog() - , m_pUIParent( pUIParent ) + : m_pUIParent( pUIParent ) , m_xContext( rxContext ) , m_aSourceLocale( _rSourceLocale ) , m_nSourceLang( LanguageTag::convertToLanguageType( _rSourceLocale ) ) @@ -407,13 +407,14 @@ namespace editeng { sal_Int32 nCount = m_aCurrentSuggestions.getLength(); Sequence< OUString > aTmp(nCount); - aTmp[0]=aRecentlyUsed->second; + auto pTmp = aTmp.getArray(); + pTmp[0]=aRecentlyUsed->second; sal_Int32 nDiff = 1; for( sal_Int32 n=1; n<nCount; n++)//we had 0 already { if( nDiff && m_aCurrentSuggestions[n-nDiff]==aRecentlyUsed->second ) nDiff=0; - aTmp[n]=m_aCurrentSuggestions[n-nDiff]; + pTmp[n]=m_aCurrentSuggestions[n-nDiff]; } m_aCurrentSuggestions = aTmp; } @@ -860,7 +861,7 @@ namespace editeng implProceed( false ); } - IMPL_LINK(HangulHanjaConversion_Impl, OnByCharClicked, weld::ToggleButton&, rBox, void) + IMPL_LINK(HangulHanjaConversion_Impl, OnByCharClicked, weld::Toggleable&, rBox, void) { m_bByCharacter = rBox.get_active(); @@ -868,7 +869,7 @@ namespace editeng implProceed( true ); } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged, weld::Button&, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged, weld::Toggleable&, void) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); if( m_pConversionDialog ) @@ -937,7 +938,7 @@ namespace editeng bool HangulHanjaConversion::m_bTryBothDirectionsSave = false; HHC::ConversionDirection HangulHanjaConversion::m_ePrimaryConversionDirectionSave = HHC::eHangulToHanja; - HangulHanjaConversion::HangulHanjaConversion( weld::Window* pUIParent, + HangulHanjaConversion::HangulHanjaConversion( weld::Widget* pUIParent, const Reference< XComponentContext >& rxContext, const lang::Locale& _rSourceLocale, const lang::Locale& _rTargetLocale, const vcl::Font* _pTargetFont, @@ -946,7 +947,7 @@ namespace editeng { } - HangulHanjaConversion::~HangulHanjaConversion( ) + HangulHanjaConversion::~HangulHanjaConversion() COVERITY_NOEXCEPT_FALSE { } @@ -960,6 +961,11 @@ namespace editeng return m_bUseSavedValues; } + weld::Widget* HangulHanjaConversion::GetUIParent() const + { + return m_pImpl->GetUIParent(); + } + LanguageType HangulHanjaConversion::GetSourceLanguage( ) const { return m_pImpl->GetSourceLang(); |