svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 +-
sw/source/ui/index/swuiidxmrk.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6c1dec39d95dcaaf30b96a5068762da3d522a63b
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Aug 21 16:04:27 2013 +0100
WaE: enumeral and non-enumeral type in conditional expression
Change-Id: I0b35ce3559acae739e810780832f6e275b493382
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 07cedc3..93c743b 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -103,7 +103,7 @@ void impl_executeSearch( const css::uno::Reference<
css::uno::XComponentContext
lArgs[3].Name = OUString(SEARCHITEM_TRANSLITERATEFLAGS);
SvtCTLOptions aCTLOptions;
sal_Int32 nFlags = 0;
- nFlags |= (!aMatchCase ?
com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0);
+ nFlags |= (!aMatchCase ?
static_cast<int>(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0);
nFlags |= (aCTLOptions.IsCTLFontEnabled() ?
com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 );
lArgs[3].Value <<= nFlags;
lArgs[4].Name = OUString(SEARCHITEM_COMMAND);
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index 1421e2f..dffe955 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -442,7 +442,7 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, sal_Bool
bWordOnly, sal_Bool
0, 0, 0,
(bCaseSensitive
? 0
- : TransliterationModules_IGNORE_CASE) );
+ :
static_cast<int>(TransliterationModules_IGNORE_CASE)) );
rSh.ClearMark();
sal_Bool bCancel;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
