[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_so3 binfilter/bf_sw binfilter/bf_xmloff

Caolán McNamara caolan at kemper.freedesktop.org
Tue Jan 25 13:11:32 PST 2011


 binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx           |    3 ++-
 binfilter/bf_so3/source/inplace/ipobj.cxx                  |    2 --
 binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx           |    2 +-
 binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx |    3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 362cb337921071159814c18d22e84bee19cf0bce
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 25 21:11:22 2011 +0000

    fix build break in dbgutil mode

diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index b37d977..94ca1fa 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -6903,7 +6903,7 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo
     return FALSE;
 }
 
-sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& /*aPosition*/ )
+sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition )
                                             throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -6912,6 +6912,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& /*a
     {
         USHORT nTab = GetTab_Impl();
         DBG_ASSERT( aPosition.Sheet == nTab, "falsche Tabelle in CellAddress" );
+        (void)aPosition;
         (void)nTab;
         return false;
     }
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index f34309c..4daac44 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -109,8 +109,6 @@ SvInPlaceObject::SvInPlaceObject()
 
 SvInPlaceObject::~SvInPlaceObject()
 {
-    DBG_ASSERT( LIST_ENTRY_NOTFOUND == GetIPActiveObjectList().GetPos( this ),
-                "ip-object in ip-object-list" );
 }
 
 
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
index 507a58a..3623432 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
@@ -959,7 +959,7 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
                                     SwXMLTableInfo_Impl& rTblInfo,
                                     sal_Bool bHeadline )
 {
-    ASSERT( pTableLines && pTableLines->Count(),
+    ASSERT( pTableLines && !pTableLines->empty(),
             "SwXMLExport::ExportTableLines: table columns infos missing" );
     if( !pTableLines || pTableLines->empty() )
         return;
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
index a26e5f6..723765c 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
@@ -114,10 +114,11 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OPropertyImport::Characters(const ::rtl::OUString& /*_rChars*/)
+    void OPropertyImport::Characters(const ::rtl::OUString& _rChars)
     {
         // ignore them (should be whitespaces only)
         OSL_ENSURE(0 == _rChars.trim().getLength(), "OPropertyImport::Characters: non-whitespace characters!");
+        (void)_rChars;
     }
 
     //---------------------------------------------------------------------


More information about the Libreoffice-commits mailing list