editeng/source/editeng/textconv.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 61540cf986cd25c40f12d86ae4760fa671cf35f0
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Nov 24 09:33:16 2014 +0100
error C2872: 'Locale' : ambiguous symbol
Change-Id: I88482566c26218a4b71b8e5652af9fbbad6a8143
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index b7ac644..8a057cc 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,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
