diff options
| author | Eike Rathke <erack@redhat.com> | 2015-02-05 17:43:09 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-02-05 17:43:54 +0100 |
| commit | 231678b9816aeded19f372dfa8794a998dbc09f1 (patch) | |
| tree | 3606336f8609760e8a37cb5a898b39e47d122cd0 | |
| parent | ff26f022b36002c4f3ad426d8f37313e2651ae75 (diff) | |
yet yet yet another Windows build 'Locale' ambiguous symbol
Change-Id: I2540e78f13d856a9ada59b6ed416974b361b6a14
| -rw-r--r-- | editeng/source/misc/hangulhanja.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 0d2e6d7ab4cd..a041de86d146 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -49,11 +49,11 @@ namespace editeng { + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::i18n::TextConversionOption; using namespace ::com::sun::star::i18n::TextConversionType; - using namespace ::com::sun::star::lang; class HangulHanjaConversion_Impl { @@ -74,7 +74,7 @@ namespace editeng m_xContext; // the service factory to use Reference< XExtendedTextConversion > m_xConverter; // the text conversion service - Locale m_aSourceLocale; // the locale we're working with + lang::Locale m_aSourceLocale; // the locale we're working with // additions for Chinese simplified / traditional conversion HHC::ConversionType m_eConvType; // conversion type (Hangul/Hanja, simplified/traditional Chinese,...) @@ -121,8 +121,8 @@ namespace editeng HangulHanjaConversion_Impl( vcl::Window* _pUIParent, const Reference< XComponentContext >& rxContext, - const Locale& _rSourceLocale, - const Locale& _rTargetLocale, + const lang::Locale& _rSourceLocale, + const lang::Locale& _rTargetLocale, const vcl::Font* _pTargetFont, sal_Int32 _nConvOptions, bool _bIsInteractive, @@ -231,8 +231,8 @@ namespace editeng HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( vcl::Window* _pUIParent, const Reference< XComponentContext >& rxContext, - const Locale& _rSourceLocale, - const Locale& _rTargetLocale, + const lang::Locale& _rSourceLocale, + const lang::Locale& _rTargetLocale, const vcl::Font* _pTargetFont, sal_Int32 _nOptions, bool _bIsInteractive, @@ -967,7 +967,7 @@ namespace editeng HangulHanjaConversion::HangulHanjaConversion( vcl::Window* _pUIParent, const Reference< XComponentContext >& rxContext, - const Locale& _rSourceLocale, const Locale& _rTargetLocale, + const lang::Locale& _rSourceLocale, const lang::Locale& _rTargetLocale, const vcl::Font* _pTargetFont, sal_Int32 _nOptions, bool _bIsInteractive) :m_pImpl( new HangulHanjaConversion_Impl( _pUIParent, rxContext, _rSourceLocale, _rTargetLocale, _pTargetFont, _nOptions, _bIsInteractive, this ) ) |