Merge remote branch 'origin/libreoffice-3-3'

Conflicts:
sw/inc/SwNumberTree.hxx
sw/inc/calbck.hxx
sw/inc/tox.hxx
sw/inc/viscrs.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/finalthreadmanager.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/text/makefile.mk
sw/source/core/txtnode/txtedt.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/srcedtw.cxx

2 files changed, 7 insertions, 7 deletions

diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 5e34a3827a47..b3085bba254e 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -77,7 +77,7 @@ void DbgTColumn(TColumn* pTColumn, USHORT nCount)
         String sMsg(i);
         sMsg += pTColumn[i].bVisible ? " v " : " h ";
         sMsg += pTColumn[i].nWidth;
-        OSL_ENSURE(false, sMsg)
+        OSL_ENSURE(false, sMsg);
     }
 }
 #endif
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 6c3dc96d7eff..6efd11c68d79 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -81,8 +81,8 @@ using namespace ::com::sun::star;
 #ifdef DEBUG_TBLDLG
 void DbgTblRep(SwTableRep* pRep)
 {
-    OSL_ENSURE(false, String(pRep->GetColCount()))
-    OSL_ENSURE(false, String(pRep->GetAllColCount()))
+    OSL_ENSURE(false, String(pRep->GetColCount()));
+    OSL_ENSURE(false, String(pRep->GetAllColCount()));
     SwTwips nSum = 0;
     for(USHORT i = 0; i < pRep->GetAllColCount(); i++)
     {
@@ -90,23 +90,23 @@ void DbgTblRep(SwTableRep* pRep)
         sMsg += pRep->GetColumns()[i].bVisible ? " v " : " h ";
         sMsg += pRep->GetColumns()[i].nWidth;
         nSum +=pRep->GetColumns()[i].nWidth;
-        OSL_ENSURE(false, sMsg)
+        OSL_ENSURE(false, sMsg);
     }
     String sMsg("Column sum: ");
     sMsg += nSum;
     sMsg += " table width: ";
     sMsg += pRep->GetWidth();
-    OSL_ENSURE(false, sMsg)
+    OSL_ENSURE(false, sMsg);
     sMsg = "Gesamt/Links/Rechts: ";
     sMsg += pRep->GetSpace();
     sMsg += '/';
     sMsg += pRep->GetLeftSpace();
     sMsg += '/';
     sMsg += pRep->GetRightSpace();
-    OSL_ENSURE(false, sMsg)
+    OSL_ENSURE(false, sMsg);
     sMsg = "Align: ";
     sMsg += pRep->GetAlign();
-    OSL_ENSURE(false, sMsg)
+    OSL_ENSURE(false, sMsg);
 
 };