diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-05-09 20:59:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-05-09 22:28:44 +0200 |
| commit | 261b1ad80aae0dd9aba50190a4cf99011cc18fb9 (patch) | |
| tree | f37e5e85296e64957d743671a2675b1909f1b173 /svx | |
| parent | dd484af7cfb472a39c9afebc6dad9ea28d1224c4 (diff) | |
'!= false' is redundant, and confusing - kill it.
Change-Id: I1a52b9ce7b590e8cf274a2daaa1c55cfc1efe48b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 2 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 2 | ||||
| -rw-r--r-- | svx/source/table/cell.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 2f4903db5c01..fd872b4e5c61 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -315,7 +315,7 @@ namespace { bool bInputRequired = true; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_INPUT_REQUIRED ) >>= bInputRequired ); - return ( bInputRequired != false ); + return bInputRequired; } void lcl_resetColumnControlInfo( ColumnInfo& _rColInfo ) diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 738593ad0cc3..498c6f5d2629 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -630,7 +630,7 @@ namespace svxform OUString GetURL() const { return m_pURLED->GetText(); } void SetURL( const OUString& _rURL ) { m_pURLED->SetText( _rURL );} bool IsLinkInstance() const { return m_pLinkInstanceCB->IsChecked(); } - void SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check( _bLink != false ); } + void SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check(_bLink); } }; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 8e904c20f64c..ad69f65cb16d 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -433,7 +433,7 @@ void Cell::SetModel(SdrModel* pNewModel) void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) { - if( (mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || (mbMerged != false) ) + if ((mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || mbMerged) { mnColSpan = nColumnSpan; mnRowSpan = nRowSpan; |