diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-21 16:04:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-21 16:09:38 +0100 |
| commit | 6c1dec39d95dcaaf30b96a5068762da3d522a63b (patch) | |
| tree | 85b80f7067056a4cd3c75d9c0d40f27471fc0d6b | |
| parent | 9bc83f1b56385c832f15b93d35bb738d0c68ec56 (diff) | |
WaE: enumeral and non-enumeral type in conditional expression
Change-Id: I0b35ce3559acae739e810780832f6e275b493382
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 07cedc30b064..93c743b53b40 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 1421e2ff8fc1..dffe955d8fad 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; |