[Libreoffice-commits] core.git: svl/source
Eike Rathke
erack at redhat.com
Thu Feb 5 05:39:59 PST 2015
svl/source/items/srchitem.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 839805a5133668027f7a9bd0ff3a38d6e7637d8e
Author: Eike Rathke <erack at redhat.com>
Date: Thu Feb 5 14:35:47 2015 +0100
fix Windows build
hopefully..
C:/cygwin/home/tinderbox/master/svl/source/items/srchitem.cxx(111) : error C2872: 'Locale' : ambiguous symbol
could be 'C:\cygwin\home\tinderbox\master\workdir\UnoApiHeadersTarget\udkapi\normal\com/sun/star/lang/Locale.hdl(17) : com::sun::star::lang::Locale'
or 'C:\cygwin\home\tinderbox\master\workdir\UnpackedTarball\icu\source\common\unicode/unistr.h(79) : icu_54::Locale'
Change-Id: I9d9650cd058fb4328fcaa2ae8f5adbb903001817
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 35fa3b8..0c69751 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -33,9 +33,9 @@
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
using namespace utl;
+using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::i18n;
-using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace com::sun::star::util;
@@ -108,7 +108,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SearchFlags::LEV_RELAXED,
OUString(),
OUString(),
- Locale(),
+ lang::Locale(),
2, 2, 2,
TransliterationModules_IGNORE_CASE ),
eFamily ( SFX_STYLE_FAMILY_PARA ),
More information about the Libreoffice-commits
mailing list