Actually, I am running into lots of small errors, missing semicolons mostly.
Attached is a patch that lets the "sw" module build.
From e7b195830bfddf4477d4a6a26fde5712b644e761 Mon Sep 17 00:00:00 2001
From: Luke Symes <[email protected]>
Date: Mon, 25 Oct 2010 12:28:14 +1300
Subject: [PATCH] Fix build errors
---
sw/source/ui/dochdl/swdtflvr.cxx | 2 +-
sw/source/ui/index/swuiidxmrk.cxx | 2 +-
sw/source/ui/shells/listsh.cxx | 2 +-
sw/source/ui/shells/tabsh.cxx | 2 +-
sw/source/ui/uiview/pview.cxx | 4 ++--
sw/source/ui/uiview/view2.cxx | 2 +-
sw/source/ui/uiview/viewmdi.cxx | 2 +-
sw/source/ui/wrtsh/delete.cxx | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 6b73704..63fc77f 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1257,7 +1257,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
break;
case EXCHG_OUT_ACTION_MOVE_PRIVATE:
- OSL_ENSURE( pPt, "EXCHG_OUT_ACTION_MOVE_PRIVATE: what should happen here?" )
+ OSL_ENSURE( pPt, "EXCHG_OUT_ACTION_MOVE_PRIVATE: what should happen here?" );
break;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index e6ec8db..1ec95e7 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -368,7 +368,7 @@ void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
//get the current language
if(!bNewMark) //if dialog is opened to iterate existing marks
{
- OSL_ENSURE(pTOXMgr, "need TOXMgr")
+ OSL_ENSURE(pTOXMgr, "need TOXMgr");
if(!pTOXMgr)
return;
SwTOXMark* pMark = pTOXMgr->GetCurTOXMark();
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 6f8980b..a17ed8a 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -155,7 +155,7 @@ void SwListShell::Execute(SfxRequest &rReq)
// --> FME 2005-01-04 #i35572#
const SwNumRule* pCurRule = rSh.GetCurNumRule();
- OSL_ENSURE( pCurRule, "SwListShell::Execute without NumRule" )
+ OSL_ENSURE( pCurRule, "SwListShell::Execute without NumRule" );
bool bOutline = pCurRule && pCurRule->IsOutlineRule();
// <--
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 7af7f77..41672f1 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -534,7 +534,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
aBox.SetDistance( Max(rCoreBox.GetDistance(),(USHORT)MIN_BORDER_DIST) );
}
else
- {OSL_ENSURE( !this, "where is BoxItem?" )}
+ OSL_ENSURE( !this, "where is BoxItem?" );
//since the drawing layer also supports borders the which id might be a different one
SvxBoxInfoItem aInfo( SID_ATTR_BORDER_INNER );
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 0fc0e8c..520eeea 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1333,7 +1333,7 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori )
Window *pMDI = &GetViewFrame()->GetWindow();
SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar;
- OSL_ENSURE( !*ppScrollbar, "vorher abpruefen!" )
+ OSL_ENSURE( !*ppScrollbar, "vorher abpruefen!" );
if( !bHori )
{
@@ -1809,7 +1809,7 @@ PrintDialog* SwPagePreView::CreatePrintDialog( Window *pParent )
// OD 18.12.2002 #103492# - no longer needed ??
Size SwPagePreView::GetOptimalSizePixel() const
{
- OSL_ENSURE( false, "overloaded virtual method <SwPagePreView::GetOptimalSizePixel()> needed ??" )
+ OSL_ENSURE( false, "overloaded virtual method <SwPagePreView::GetOptimalSizePixel()> needed ??" );
return Size( -1, -1 );
/*
//JP 09.06.99: was wird hier errechnet ?????
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index c8cf03b..70c5412 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1372,7 +1372,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
sStr = pTOX->GetTOXName();
else
{
- OEL_ENSURE( !this,
+ OSL_ENSURE( !this,
"was ist das fuer ein Verzeichnis?" );
sStr = pCurrSect->GetSectionName();
}
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 9ce55ac..158fc59 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -324,7 +324,7 @@ int SwView::_CreateScrollbar( BOOL bHori )
Window *pMDI = &GetViewFrame()->GetWindow();
SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar;
- OSL_ENSURE( !*ppScrollbar, "vorher abpruefen!" )
+ OSL_ENSURE( !*ppScrollbar, "vorher abpruefen!" );
if( !bHori )
CreatePageButtons( !bShowAtResize );
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 2e404d3..600fb86 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -389,7 +389,7 @@ long SwWrtShell::DelRight()
UnSelectFrm();
// --> OD 2006-07-06 #134369#
OSL_ENSURE( !IsFrmSelected(),
- "<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all objects" )
+ "<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all objects" );
// <--
// --> OD 2006-07-10 #134369#
// leave draw mode, if necessary.
--
1.7.0.4
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
