diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-06-24 08:46:47 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-06-24 08:54:18 +0200 |
| commit | 3da32e1fd23aec2f6b7629a318468ecf0179f8cd (patch) | |
| tree | 12af8c17341c961b266284d3f65cde800f2770f6 /sw | |
| parent | 45f18e2ff2a54c412f296818fd73111cb62c7f3d (diff) | |
Fix some warnings
Change-Id: Ib661af2ab2ad2e95890edb1edf979a82e67a9443
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/access/acctable.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/inc/num.hxx | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 14eeb464b517..08877d32a796 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1438,8 +1438,8 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil if( HasTableData() ) { - OSL_ENSURE( !HasTableData() || - GetFrm()->Frm().Pos() == GetTableData().GetTablePos(), + SAL_WARN_IF( HasTableData() && + GetFrm()->Frm().Pos() != GetTableData().GetTablePos(), "sw.core", "table has invalid position" ); if( HasTableData() ) { diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 80febe13fdb1..9925e1e0f282 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1447,7 +1447,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt, RES_BOXATR_VALUE, false, &pItem )) #else SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState( - RES_BOXATR_FORMULA, sal_False, &pItem ) + RES_BOXATR_FORMULA, false, &pItem ) #endif ) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 4aa965088ecb..ddba2af44821 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2999,8 +2999,9 @@ public: _SectionSaveStruct( SwHTMLParser& rParser ); virtual ~_SectionSaveStruct(); +#if OSL_DEBUG_LEVEL > 0 sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMinSave; } - +#endif void Restore( SwHTMLParser& rParser ); }; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 57ea8f1d945f..6b5b251a4068 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -132,8 +132,8 @@ public: #ifdef DBG_UTIL void SetModified(bool bRepaint = true); #else - void SetModified(sal_Bool bRepaint = sal_True) - { bModified = sal_True; + void SetModified(bool bRepaint = true) + { bModified = true; if(bRepaint) { m_pPreviewWIN->SetLevel(nActNumLvl); |