diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 16:08:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:01 +0200 |
| commit | e19cd844be171097dddf6319a037b7503ad2c922 (patch) | |
| tree | 64ed67787f118d2b97036cc687242002e7bda5ce /svx/source | |
| parent | d0e9aa6a2b07cb183dd7f8b06399b28f67588a83 (diff) | |
Rephrase comparisons between bool and sal_Bool
...to cater for forthcoming loplugin:implicitboolconversion improvements
Change-Id: I801b6b73648715448198d582a087cc834f6e20c8
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/form/fmsrcimp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index f5ef9eb7d34b..f5f86da6cb94 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -423,7 +423,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(bool _bSearchForNull // der aktuell zu vergleichende Inhalt iterFieldLoop->xContents->getString(); // needed for wasNull - bFound = (_bSearchForNull ? 1 : 0) == iterFieldLoop->xContents->wasNull(); + bFound = _bSearchForNull == bool(iterFieldLoop->xContents->wasNull()); if (bFound) break; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 1a480441d48e..5efd2607b49d 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -2179,7 +2179,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl) // a.) wenn der ganze Datensatz gesperrt ist // b.) wenn das zugehoerige Feld gespeert ist Reference< XBoundControl > xBound(xControl, UNO_QUERY); - if (xBound.is() && (( (bLocked && (bLocked ? 1 : 0) != xBound->getLock()) || + if (xBound.is() && (( (bLocked && bLocked != bool(xBound->getLock())) || !bLocked))) // beim entlocken immer einzelne Felder ueberprüfen { // gibt es eine Datenquelle |