diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 18:50:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 18:50:04 +0100 |
| commit | d6c29a6c27745e2526f5e83c3018fc8a47450a61 (patch) | |
| tree | 670df02c0e4bc0307fad81b4b73541e12dc18ee5 /sw/source/core/fields/cellfml.cxx | |
| parent | e84f5d6f20585567ca70752ce5188cb10b518acf (diff) | |
| parent | df07d391d83966cf2369ac7fec8d0b88cbe49bcf (diff) | |
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
Diffstat (limited to 'sw/source/core/fields/cellfml.cxx')
| -rw-r--r-- | sw/source/core/fields/cellfml.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index e8302c39ce..d41e0296a3 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -389,7 +389,7 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr, { // relativen Namen zu Box-Namen (externe Darstellung) SwNode* pNd = (SwNode*)pPara; - ASSERT( pNd, "Feld steht in keinem TextNode" ); + OSL_ENSURE( pNd, "Feld steht in keinem TextNode" ); const SwTableBox *pRelBox, *pBox = (SwTableBox *)rTbl.GetTblBox( pNd->FindTableBoxStartNode()->GetIndex() ); @@ -419,7 +419,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr, { // relativen Namen zu Box-Pointern (interne Darstellung) SwNode* pNd = (SwNode*)pPara; - ASSERT( pNd, "Feld steht in keinem Node" ); + OSL_ENSURE( pNd, "Feld steht in keinem Node" ); const SwTableBox *pRelBox, *pBox = (SwTableBox*)rTbl.GetTblBox( pNd->FindTableBoxStartNode()->GetIndex() ); @@ -450,7 +450,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr, { // Box-Namen (externe Darstellung) zu relativen Namen SwNode* pNd = (SwNode*)pPara; - ASSERT( pNd, "Feld steht in keinem Node" ); + OSL_ENSURE( pNd, "Feld steht in keinem Node" ); const SwTableNode* pTblNd = pNd->FindTableNode(); String sRefBoxNm; @@ -458,7 +458,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr, { const SwTableBox *pBox = rTbl.GetTblBox( pNd->FindTableBoxStartNode()->GetIndex() ); - ASSERT( pBox, "Feld steht in keiner Tabelle" ); + OSL_ENSURE( pBox, "Feld steht in keiner Tabelle" ); sRefBoxNm = pBox->GetName(); } @@ -673,7 +673,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl, if( pFnd ) pTbl = pFnd; // ?? - ASSERT( pFnd, "Tabelle nicht gefunden, was nun?" ); + OSL_ENSURE( pFnd, "Tabelle nicht gefunden, was nun?" ); } } } @@ -727,7 +727,7 @@ const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox ) { SwNodeIndex aIdx( *rBox.GetSttNd() ); SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx ); - ASSERT( pCNd, "Box hat keinen TextNode" ); + OSL_ENSURE( pCNd, "Box hat keinen TextNode" ); Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !! return pCNd->GetFrm( &aPt, NULL, FALSE ); } |