diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-24 09:33:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-24 09:33:27 +0100 |
| commit | 61540cf986cd25c40f12d86ae4760fa671cf35f0 (patch) | |
| tree | 6abab7eb9a1b9278b10d84a3ddf2f5e6f84a1c1c /editeng | |
| parent | 4f7586a61e078ed8944d7f85697c809c4bd0d676 (diff) | |
error C2872: 'Locale' : ambiguous symbol
Change-Id: I88482566c26218a4b71b8e5652af9fbbad6a8143
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/textconv.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index b7ac6448cd11..8a057cca8559 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -37,15 +37,14 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using namespace com::sun::star::lang; using namespace com::sun::star::linguistic2; TextConvWrapper::TextConvWrapper( vcl::Window* pWindow, 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, |