summaryrefslogtreecommitdiffstats
path: root/editeng/source/misc/hangulhanja.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-01-28 21:14:35 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-01-28 23:00:32 -0600
commit097e67c758a5bef7ed430776c985819ab5993158 (patch)
treee4636915b85d04e3a9195d61ca8d32c443e8f6c8 /editeng/source/misc/hangulhanja.cxx
parentcoverity#1019410 : Uninitialized scalar field (diff)
downloadcore-097e67c758a5bef7ed430776c985819ab5993158.tar.gz
core-097e67c758a5bef7ed430776c985819ab5993158.zip
coverity#1019409 : Uninitialized scalar field
Change-Id: I54c360fbdb2d7eed786ff7e7566d6ebe12ed833c
Diffstat (limited to 'editeng/source/misc/hangulhanja.cxx')
-rw-r--r--editeng/source/misc/hangulhanja.cxx59
1 files changed, 29 insertions, 30 deletions
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index aa952b82ea2a..2455257bf0b4 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -230,29 +230,34 @@ namespace editeng
HangulHanjaConversion_Impl::StringMap HangulHanjaConversion_Impl::m_aRecentlyUsedList = HangulHanjaConversion_Impl::StringMap();
HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( Window* _pUIParent,
- const Reference< XComponentContext >& rxContext,
- const Locale& _rSourceLocale,
- const Locale& _rTargetLocale,
- const Font* _pTargetFont,
- sal_Int32 _nOptions,
- bool _bIsInteractive,
- HangulHanjaConversion* _pAntiImpl )
-: m_pConversionDialog( NULL )
-, m_pUIParent( _pUIParent )
-, m_xContext( rxContext )
-, m_aSourceLocale( _rSourceLocale )
-, m_nSourceLang( LanguageTag::convertToLanguageType( _rSourceLocale ) )
-, m_nTargetLang( LanguageTag::convertToLanguageType( _rTargetLocale ) )
-, m_pTargetFont( _pTargetFont )
-, m_bIsInteractive( _bIsInteractive )
-, m_pAntiImpl( _pAntiImpl )
-, m_nCurrentPortionLang( LANGUAGE_NONE )
-, m_nCurrentStartIndex( 0 )
-, m_nCurrentEndIndex( 0 )
-, m_nReplacementBaseIndex( 0 )
-, m_nCurrentConversionOption( TextConversionOption::NONE )
-, m_nCurrentConversionType( -1 ) // not yet known
-, m_bTryBothDirections( true )
+ const Reference< XComponentContext >& rxContext,
+ const Locale& _rSourceLocale,
+ const Locale& _rTargetLocale,
+ const Font* _pTargetFont,
+ sal_Int32 _nOptions,
+ bool _bIsInteractive,
+ HangulHanjaConversion* _pAntiImpl )
+ : m_pConversionDialog( NULL )
+ , m_pUIParent( _pUIParent )
+ , m_xContext( rxContext )
+ , m_aSourceLocale( _rSourceLocale )
+ , m_nSourceLang( LanguageTag::convertToLanguageType( _rSourceLocale ) )
+ , m_nTargetLang( LanguageTag::convertToLanguageType( _rTargetLocale ) )
+ , m_pTargetFont( _pTargetFont )
+ , m_nConvOptions(_nOptions)
+ , m_bIsInteractive( _bIsInteractive )
+ , m_pAntiImpl( _pAntiImpl )
+ , m_bByCharacter((_nOptions & CHARACTER_BY_CHARACTER) ? true : false)
+ , m_eConversionFormat( HHC::eSimpleConversion)
+ , m_ePrimaryConversionDirection( HHC::eHangulToHanja) // used for eConvHangulHanja
+ , m_eCurrentConversionDirection( HHC::eHangulToHanja) // used for eConvHangulHanja
+ , m_nCurrentPortionLang( LANGUAGE_NONE )
+ , m_nCurrentStartIndex( 0 )
+ , m_nCurrentEndIndex( 0 )
+ , m_nReplacementBaseIndex( 0 )
+ , m_nCurrentConversionOption( TextConversionOption::NONE )
+ , m_nCurrentConversionType( -1 ) // not yet known
+ , m_bTryBothDirections( true )
{
implReadOptionsFromConfiguration();
@@ -266,16 +271,10 @@ namespace editeng
m_eConvType = HHC::eConvSimplifiedTraditional;
else
{
+ m_eConvType = HHC::eConvHangulHanja;
OSL_FAIL( "failed to determine conversion type from languages" );
}
- // set remaining conversion parameters to their default values
- m_nConvOptions = _nOptions;
- m_bByCharacter = 0 != (_nOptions & CHARACTER_BY_CHARACTER);
- m_eConversionFormat = HHC::eSimpleConversion;
- m_ePrimaryConversionDirection = HHC::eHangulToHanja; // used for eConvHangulHanja
- m_eCurrentConversionDirection = HHC::eHangulToHanja; // used for eConvHangulHanja
-
m_xConverter = TextConversion::create( m_xContext );
}