[Libreoffice-commits] core.git: sw/source

[Matúš Kukan]

 sw/source/core/access/acctable.cxx |    4 ++--
 sw/source/core/crsr/crstrvl.cxx    |    2 +-
 sw/source/filter/html/htmltab.cxx  |    3 ++-
 sw/source/uibase/inc/num.hxx       |    4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 3da32e1fd23aec2f6b7629a318468ecf0179f8cd
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Tue Jun 24 08:46:47 2014 +0200

    Fix some warnings
    
    Change-Id: Ib661af2ab2ad2e95890edb1edf979a82e67a9443

diff --git a/sw/source/core/access/acctable.cxx 
b/sw/source/core/access/acctable.cxx
index 14eeb46..08877d3 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 80febe1..9925e1e 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 4aa9650..ddba2af 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 57ea8f1..6b5b251 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);

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits