[Libreoffice-commits] .: 2 commits - sw/inc sw/qa sw/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon May 9 06:07:32 PDT 2011
sw/inc/PostItMgr.hxx | 2
sw/inc/authfld.hxx | 4 -
sw/inc/bparr.hxx | 4 -
sw/inc/switerator.hxx | 4 -
sw/inc/tox.hxx | 6 -
sw/qa/core/bigpointerarray-new.cxx | 12 +--
sw/source/core/access/acccell.cxx | 10 +-
sw/source/core/access/accdoc.cxx | 4 -
sw/source/core/access/accframebase.cxx | 6 -
sw/source/core/access/accmap.cxx | 18 ++---
sw/source/core/access/accpage.cxx | 6 -
sw/source/core/access/accpara.cxx | 54 +++++++--------
sw/source/core/access/accportions.cxx | 96 +++++++++++++--------------
sw/source/core/access/accselectionhelper.cxx | 6 -
sw/source/core/access/acctable.cxx | 12 +--
sw/source/core/access/acctextframe.cxx | 4 -
sw/source/core/attr/calbck.cxx | 2
sw/source/core/bastyp/bparr.cxx | 12 +--
sw/source/core/bastyp/breakit.cxx | 2
sw/source/core/doc/acmplwrd.cxx | 2
sw/source/core/doc/doc.cxx | 30 ++++----
sw/source/core/doc/doccomp.cxx | 4 -
sw/source/core/doc/docftn.cxx | 4 -
sw/source/core/doc/docglbl.cxx | 4 -
sw/source/core/doc/docglos.cxx | 8 +-
sw/source/core/doc/doclay.cxx | 4 -
sw/source/core/doc/docredln.cxx | 22 +++---
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/docxforms.cxx | 14 +--
sw/source/core/docnode/ndcopy.cxx | 2
sw/source/core/docnode/nodes.cxx | 4 -
sw/source/core/edit/edlingu.cxx | 10 +-
sw/source/core/edit/edsect.cxx | 8 +-
sw/source/core/fields/authfld.cxx | 6 -
sw/source/core/fields/docufld.cxx | 8 +-
sw/source/core/fields/expfld.cxx | 2
sw/source/core/fields/macrofld.cxx | 4 -
sw/source/core/graphic/grfatr.cxx | 8 +-
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/inc/dbgloop.hxx | 77 ---------------------
sw/source/core/layout/atrfrm.cxx | 8 +-
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/ole/ndole.cxx | 10 +-
sw/source/core/swg/SwXMLTextBlocks.cxx | 6 -
sw/source/core/swg/SwXMLTextBlocks1.cxx | 12 +--
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/wrong.cxx | 4 -
sw/source/core/tox/toxhlp.cxx | 12 +--
sw/source/core/txtnode/txtedt.cxx | 10 +-
sw/source/core/unocore/SwXTextDefaults.cxx | 8 +-
sw/source/core/unocore/swunohelper.cxx | 6 -
sw/source/core/unocore/unochart.cxx | 84 +++++++++++------------
sw/source/core/unocore/unocrsrhelper.cxx | 6 -
sw/source/core/unocore/unodraw.cxx | 28 +++----
sw/source/core/unocore/unofield.cxx | 20 ++---
sw/source/core/unocore/unoframe.cxx | 22 +++---
sw/source/core/unocore/unoftn.cxx | 6 -
sw/source/core/unocore/unoidx.cxx | 2
sw/source/core/unocore/unomap.cxx | 4 -
sw/source/core/unocore/unoobj.cxx | 10 +-
sw/source/core/unocore/unoobj2.cxx | 6 -
sw/source/core/unocore/unoparagraph.cxx | 6 -
sw/source/core/unocore/unoport.cxx | 10 +-
sw/source/core/unocore/unoportenum.cxx | 4 -
sw/source/core/unocore/unoprnms.cxx | 2
sw/source/core/unocore/unoredline.cxx | 10 +-
sw/source/core/unocore/unosett.cxx | 28 +++----
sw/source/core/unocore/unosrch.cxx | 8 +-
sw/source/core/unocore/unostyle.cxx | 38 +++++-----
sw/source/core/unocore/unotbl.cxx | 62 ++++++++---------
sw/source/core/unocore/unotext.cxx | 8 +-
sw/source/core/view/printdata.cxx | 16 ++--
sw/source/core/view/viewpg.cxx | 10 +-
sw/source/core/view/viewsh.cxx | 6 -
sw/source/core/view/vprint.cxx | 10 +-
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 2
sw/source/filter/html/htmlfld.cxx | 4 -
sw/source/filter/html/htmlform.cxx | 8 +-
sw/source/filter/html/htmlnum.cxx | 4 -
sw/source/filter/html/parcss1.cxx | 16 ++--
sw/source/filter/html/svxcss1.cxx | 60 ++++++++--------
sw/source/filter/html/swhtml.cxx | 14 +--
sw/source/filter/rtf/swparrtf.cxx | 2
sw/source/filter/ww1/w1class.cxx | 82 +++++++++++------------
sw/source/filter/ww1/w1class.hxx | 20 ++---
sw/source/filter/ww1/w1filter.cxx | 72 ++++++++++----------
sw/source/filter/ww8/needed_cast.hxx | 2
sw/source/filter/ww8/styles.cxx | 2
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 8 +-
sw/source/filter/ww8/wrtww8gr.cxx | 4 -
sw/source/filter/ww8/ww8par.cxx | 8 +-
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 8 +-
sw/source/filter/xml/swxml.cxx | 18 ++---
sw/source/filter/xml/wrtxml.cxx | 10 +-
sw/source/filter/xml/xmlexpit.cxx | 30 ++++----
sw/source/filter/xml/xmlfmte.cxx | 6 -
sw/source/filter/xml/xmlimp.cxx | 10 +-
sw/source/filter/xml/xmlimpit.cxx | 28 +++----
sw/source/filter/xml/xmlithlp.cxx | 4 -
sw/source/filter/xml/xmltble.cxx | 4 -
sw/source/filter/xml/xmltbli.cxx | 4 -
sw/source/filter/xml/xmltexte.cxx | 2
sw/source/filter/xml/xmltexti.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 4 -
108 files changed, 672 insertions(+), 749 deletions(-)
New commits:
commit eb51fa1442f332251b61d026bd984363be9bd2fa
Author: Jacek Wolszczak <shutdownrunner at gmail.com>
Date: Sun May 8 22:54:55 2011 +0200
Remove unused dbgloop.hxx from repository
diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx
deleted file mode 100644
index c399c59..0000000
--- a/sw/source/core/inc/dbgloop.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DBGLOOP_HXX
-#define _DBGLOOP_HXX
-
-#ifdef DBG_UTIL
-
-#include <tools/solar.h>
-
-class SvStream;
-
-#define DBG_MAX_STACK 20 // Verschachtelungstiefe
-#define DBG_MAX_LOOP 1000 // das Abbruchkriterium
-
-class DbgLoopStack
-{
- sal_uInt16 aCount[DBG_MAX_STACK];
- sal_uInt16 nPtr;
- const void *pDbg;
- void Reset();
-public:
- DbgLoopStack();
- void Push( const void *pThis );
- void Pop();
- void Print( SvStream &rOS ) const; //$ ostream
-};
-
-class DbgLoop
-{
- friend inline void PrintLoopStack( SvStream &rOS ); //$ ostream
- static DbgLoopStack aDbgLoopStack;
-public:
- inline DbgLoop( const void *pThis ) { aDbgLoopStack.Push( pThis ); }
- inline ~DbgLoop() { aDbgLoopStack.Pop(); }
-};
-
-inline void PrintLoopStack( SvStream &rOS ) //$ ostream
-{
- DbgLoop::aDbgLoopStack.Print( rOS );
-}
-
-#define DBG_LOOP DbgLoop aDbgLoop( (const void*)this );
-#define DBG_LOOP_RESET DbgLoop aDbgLoop( 0 );
-
-#else
-
-#define DBG_LOOP
-#define DBG_LOOP_RESET
-
-#endif
-
-#endif
commit 08cd2337d97585c190818399cc3f0187c9936b45
Author: Jacek Wolszczak <shutdownrunner at gmail.com>
Date: Sun May 8 22:14:45 2011 +0200
REPLACE DBG_stuff with OSL_ASSERT and OSL_FAIL
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index f3e20bc..905dc4f 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -118,7 +118,7 @@ class SwNoteProps: public utl::ConfigItem
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames();
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues = GetProperties(rNames);
const ::com::sun::star::uno::Any* pValues = aValues.getConstArray();
- DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed");
+ OSL_ENSURE(aValues.getLength() == rNames.getLength(), "GetProperties failed");
if (aValues.getLength())
pValues[0]>>=bIsShowAnchor;
}
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index ac1b50a..1a1830f 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -183,12 +183,12 @@ public:
// --- inlines -----------------------------------------------------------
inline const String& SwAuthEntry::GetAuthorField(ToxAuthorityField ePos)const
{
- DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index");
+ OSL_ENSURE(AUTH_FIELD_END > ePos, "wrong index");
return aAuthFields[ePos];
}
inline void SwAuthEntry::SetAuthorField(ToxAuthorityField ePos, const String& rField)
{
- DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index");
+ OSL_ENSURE(AUTH_FIELD_END > ePos, "wrong index");
if(AUTH_FIELD_END > ePos)
aAuthFields[ePos] = rField;
}
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index a9550ae..9cd9f1e 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -30,7 +30,7 @@
#define _BPARR_HXX
#include <tools/solar.h>
-#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <swdllapi.h>
struct BlockInfo;
@@ -113,7 +113,7 @@ public:
inline sal_uLong BigPtrEntry::GetPos() const
{
- DBG_ASSERT( this == pBlock->pData[ nOffset ], "element not in the block" );
+ OSL_ENSURE( this == pBlock->pData[ nOffset ], "element not in the block" );
return pBlock->nStart + nOffset;
}
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx
index cbdc0b5..963a13c 100644
--- a/sw/inc/switerator.hxx
+++ b/sw/inc/switerator.hxx
@@ -28,14 +28,14 @@
#define _SWITERATOR_HXX
#include <calbck.hxx>
-#include <tools/debug.hxx>
+#include <osl/diagnose.h>
template< class TElementType, class TSource > class SwIterator
{
SwClientIter aClientIter;
public:
- SwIterator( const TSource& rSrc ) : aClientIter(rSrc) { DBG_ASSERT( TElementType::IsOf( TYPE(SwClient) ), "Incompatible types!" ); }
+ SwIterator( const TSource& rSrc ) : aClientIter(rSrc) { OSL_ENSURE( TElementType::IsOf( TYPE(SwClient) ), "Incompatible types!" ); }
TElementType* First() { SwClient* p = aClientIter.First(TYPE(TElementType)); return PTR_CAST(TElementType,p); }
TElementType* Last() { SwClient* p = aClientIter.Last( TYPE(TElementType)); return PTR_CAST(TElementType,p); }
TElementType* Next() { SwClient* p = aClientIter.Next(); return PTR_CAST(TElementType,p); }
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 3dc80c8..246c085 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -543,12 +543,12 @@ public:
const String& GetStyleNames(sal_uInt16 nLevel) const
{
- DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
+ OSL_ENSURE( nLevel < MAXLEVEL, "Which level?");
return aStyleNames[nLevel];
}
void SetStyleNames(const String& rSet, sal_uInt16 nLevel)
{
- DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
+ OSL_ENSURE( nLevel < MAXLEVEL, "Which level?");
aStyleNames[nLevel] = rSet;
}
sal_Bool IsFromChapter() const { return bFromChapter;}
@@ -760,7 +760,7 @@ inline sal_uInt16 SwTOXBase::GetLevel() const
inline void SwTOXBase::SetTemplateName(const String& rName)
{
- DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
+ OSL_FAIL("SwTOXBase::SetTemplateName obsolete");
aStyleNames[0] = rName;
}
diff --git a/sw/qa/core/bigpointerarray-new.cxx b/sw/qa/core/bigpointerarray-new.cxx
index c86c059..b642e7f 100644
--- a/sw/qa/core/bigpointerarray-new.cxx
+++ b/sw/qa/core/bigpointerarray-new.cxx
@@ -44,14 +44,14 @@ sal_uLong BigPtrArray::Count() const
void BigPtrArray::Move(sal_uLong fromPos, sal_uLong toPos)
{
- DBG_ASSERT(fromPos < container_.size() && toPos < container_.size(), "BigPtrArray.Move precondition violation");
+ OSL_ENSURE(fromPos < container_.size() && toPos < container_.size(), "BigPtrArray.Move precondition violation");
Insert(container_[fromPos], toPos);
Remove(toPos < fromPos ? fromPos + 1 : fromPos, 1);
}
void BigPtrArray::ForEach(sal_uLong fromPos, sal_uLong toPos, FnForEach fn, void* pArgs)
{
- DBG_ASSERT(fromPos < toPos && fromPos < container_.size() && toPos < container_.size(), "BigPtrArray::ForEach precondition violation");
+ OSL_ENSURE(fromPos < toPos && fromPos < container_.size() && toPos < container_.size(), "BigPtrArray::ForEach precondition violation");
Container_t::const_iterator iter = container_.begin() + fromPos;
Container_t::const_iterator iter_end = container_.begin() + toPos;
for (/*no init*/; iter != iter_end; ++iter)
@@ -68,13 +68,13 @@ void BigPtrArray::ForEach(FnForEach fn, void* pArgs)
ElementPtr BigPtrArray::operator[](sal_uLong pos) const
{
- DBG_ASSERT(pos < container_.size(), "BigPtrArray::operator[] precondition violation");
+ OSL_ENSURE(pos < container_.size(), "BigPtrArray::operator[] precondition violation");
return container_[pos];
}
void BigPtrArray::Insert(const ElementPtr& rElem, sal_uLong pos)
{
- DBG_ASSERT(pos <= container_.size(), "BigPtrArray::Insert precondition violation");
+ OSL_ENSURE(pos <= container_.size(), "BigPtrArray::Insert precondition violation");
rElem->pBigPtrArray_ = this;
rElem->pos_ = pos;
@@ -90,14 +90,14 @@ void BigPtrArray::Insert(const ElementPtr& rElem, sal_uLong pos)
void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
{
- DBG_ASSERT((pos < container_.size()) && ((container_.begin() + pos + n) < container_.end()), "BigPtrArray.Remove precondition violation")
+ OSL_ENSURE((pos < container_.size()) && ((container_.begin() + pos + n) < container_.end()), "BigPtrArray.Remove precondition violation")
container_.erase(container_.begin() + pos, container_.begin() + pos + n);
FixElementIndizes(container_.begin(), container_.end());
}
void BigPtrArray::Replace(sal_uLong pos, const ElementPtr& rElem)
{
- DBG_ASSERT(pos < container_.size(), "BigPtrArray::Replace precondition violation");
+ OSL_ENSURE(pos < container_.size(), "BigPtrArray::Replace precondition violation");
rElem->pBigPtrArray_ = this;
rElem->pos_ = pos;
container_[pos] = rElem;
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index dbd1b51..18e8d4a 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -67,9 +67,9 @@ sal_Bool SwAccessibleCell::IsSelected()
{
sal_Bool bRet = sal_False;
- DBG_ASSERT( GetMap(), "no map?" );
+ OSL_ENSURE( GetMap(), "no map?" );
const ViewShell *pVSh = GetMap()->GetShell();
- DBG_ASSERT( pVSh, "no shell?" );
+ OSL_ENSURE( pVSh, "no shell?" );
if( pVSh->ISA( SwCrsrShell ) )
{
const SwCrsrShell *pCSh = static_cast< const SwCrsrShell * >( pVSh );
@@ -92,7 +92,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
// SELECTABLE
const ViewShell *pVSh = GetMap()->GetShell();
- DBG_ASSERT( pVSh, "no shell?" );
+ OSL_ENSURE( pVSh, "no shell?" );
if( pVSh->ISA( SwCrsrShell ) )
rStateSet.AddState( AccessibleStateType::SELECTABLE );
@@ -324,8 +324,8 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const
{
- DBG_ASSERT( GetFrm() != NULL, "no frame?" );
- DBG_ASSERT( GetFrm()->IsCellFrm(), "no cell frame?" );
+ OSL_ENSURE( GetFrm() != NULL, "no frame?" );
+ OSL_ENSURE( GetFrm()->IsCellFrm(), "no cell frame?" );
const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() );
return pCellFrm->GetTabBox()->GetFrmFmt();
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index d60c8ae..40bc84d 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -346,11 +346,11 @@ void SwAccessibleDocument::Dispose( sal_Bool bRecursive )
IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEvent )
{
- DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
+ OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) )
{
VclWindowEvent *pVclEvent = static_cast< VclWindowEvent * >( pEvent );
- DBG_ASSERT( pVclEvent->GetWindow(), "Window???" );
+ OSL_ENSURE( pVclEvent->GetWindow(), "Window???" );
switch ( pVclEvent->GetId() )
{
case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index bd88adb..060af1e 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -55,9 +55,9 @@ sal_Bool SwAccessibleFrameBase::IsSelected()
{
sal_Bool bRet = sal_False;
- DBG_ASSERT( GetMap(), "no map?" );
+ OSL_ENSURE( GetMap(), "no map?" );
const ViewShell *pVSh = GetMap()->GetShell();
- DBG_ASSERT( pVSh, "no shell?" );
+ OSL_ENSURE( pVSh, "no shell?" );
if( pVSh->ISA( SwFEShell ) )
{
const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
@@ -75,7 +75,7 @@ void SwAccessibleFrameBase::GetStates(
SwAccessibleContext::GetStates( rStateSet );
const ViewShell *pVSh = GetMap()->GetShell();
- DBG_ASSERT( pVSh, "no shell?" );
+ OSL_ENSURE( pVSh, "no shell?" );
sal_Bool bSelectable = pVSh->ISA( SwFEShell );
// SELECTABLE
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index dd16efc..c552e67 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1412,7 +1412,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
static_cast< const SwTabFrm *>( pFrm ) );
break;
case FRM_PAGE:
- DBG_ASSERT( GetShell()->IsPreView(),
+ OSL_ENSURE( GetShell()->IsPreView(),
"accessible page frames only in PagePreview" );
pAcc = new SwAccessiblePage( this, pFrm );
break;
@@ -2210,8 +2210,8 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages
const SwPageFrm* _pSelectedPageFrm,
const Size& _rPrevwWinSize )
{
- DBG_ASSERT( GetShell()->IsPreView(), "no preview?" );
- DBG_ASSERT( mpPreview != NULL, "no preview data?" );
+ OSL_ENSURE( GetShell()->IsPreView(), "no preview?" );
+ OSL_ENSURE( mpPreview != NULL, "no preview data?" );
mpPreview->Update( *this, _rPrevwPages, _rScale, _pSelectedPageFrm, _rPrevwWinSize );
@@ -2247,8 +2247,8 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages
void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage )
{
- DBG_ASSERT( GetShell()->IsPreView(), "no preview?" );
- DBG_ASSERT( mpPreview != NULL, "no preview data?" );
+ OSL_ENSURE( GetShell()->IsPreView(), "no preview?" );
+ OSL_ENSURE( mpPreview != NULL, "no preview data?" );
mpPreview->InvalidateSelection( GetShell()->GetLayout()->GetPageByPageNum( nSelPage ) );
@@ -2550,7 +2550,7 @@ void SwAccessibleMap::GetMapMode( const Point& _rPoint,
MapMode aMapMode = GetShell()->GetWin()->GetMapMode();
if( GetShell()->IsPreView() )
{
- DBG_ASSERT( mpPreview != NULL, "need preview data" );
+ OSL_ENSURE( mpPreview != NULL, "need preview data" );
mpPreview->AdjustMapMode( aMapMode, _rPoint );
}
@@ -2559,8 +2559,8 @@ void SwAccessibleMap::GetMapMode( const Point& _rPoint,
Size SwAccessibleMap::GetPreViewPageSize( sal_uInt16 _nPrevwPageNum ) const
{
- DBG_ASSERT( mpVSh->IsPreView(), "no page preview accessible." );
- DBG_ASSERT( mpVSh->IsPreView() && ( mpPreview != NULL ),
+ OSL_ENSURE( mpVSh->IsPreView(), "no page preview accessible." );
+ OSL_ENSURE( mpVSh->IsPreView() && ( mpPreview != NULL ),
"missing accessible preview data at page preview" );
if ( mpVSh->IsPreView() && ( mpPreview != NULL ) )
{
@@ -2770,7 +2770,7 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
const SwRect& SwAccessibleMap::GetVisArea() const
{
- DBG_ASSERT( !GetShell()->IsPreView() || (mpPreview != NULL),
+ OSL_ENSURE( !GetShell()->IsPreView() || (mpPreview != NULL),
"preview without preview data?" );
return GetShell()->IsPreView()
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index cd1dc8a..76896e6 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -129,9 +129,9 @@ SwAccessiblePage::SwAccessiblePage( SwAccessibleMap* pInitMap,
: SwAccessibleContext( pInitMap, AccessibleRole::PANEL, pFrame )
, bIsSelected( sal_False )
{
- DBG_ASSERT( pFrame != NULL, "need frame" );
- DBG_ASSERT( pInitMap != NULL, "need map" );
- DBG_ASSERT( pFrame->IsPageFrm(), "need page frame" );
+ OSL_ENSURE( pFrame != NULL, "need frame" );
+ OSL_ENSURE( pInitMap != NULL, "need map" );
+ OSL_ENSURE( pFrame->IsPageFrm(), "need page frame" );
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index c84fc47..a9db42e 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -110,10 +110,10 @@ const xub_StrLen MAX_DESC_TEXT_LEN = 40;
const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const
{
const SwFrm* pFrm = GetFrm();
- DBG_ASSERT( pFrm->IsTxtFrm(), "The text frame has mutated!" );
+ OSL_ENSURE( pFrm->IsTxtFrm(), "The text frame has mutated!" );
const SwTxtNode* pNode = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
- DBG_ASSERT( pNode != NULL, "A text frame without a text node." );
+ OSL_ENSURE( pNode != NULL, "A text frame without a text node." );
return pNode;
}
@@ -160,8 +160,8 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
nRet = GetPortionData().GetAccessiblePosition( nIndex );
}
- DBG_ASSERT( nRet >= 0, "invalid cursor?" );
- DBG_ASSERT( nRet <= GetPortionData().GetAccessibleString().
+ OSL_ENSURE( nRet >= 0, "invalid cursor?" );
+ OSL_ENSURE( nRet <= GetPortionData().GetAccessibleString().
getLength(), "invalid cursor?" );
}
// else: in this paragraph, but in different frame
@@ -215,7 +215,7 @@ sal_Bool SwAccessibleParagraph::GetSelection(
}
else
{
- DBG_ASSERT( nHere == nStartIndex,
+ OSL_ENSURE( nHere == nStartIndex,
"miscalculated index" );
// selection starts in this node:
@@ -230,7 +230,7 @@ sal_Bool SwAccessibleParagraph::GetSelection(
else if( nCoreStart <=
GetPortionData().GetLastValidCorePosition() )
{
- DBG_ASSERT(
+ OSL_ENSURE(
GetPortionData().IsValidCorePosition(
nCoreStart ),
"problem determining valid core position" );
@@ -252,7 +252,7 @@ sal_Bool SwAccessibleParagraph::GetSelection(
}
else
{
- DBG_ASSERT( nHere == nEndIndex,
+ OSL_ENSURE( nHere == nEndIndex,
"miscalculated index" );
// selection ends in this node: then select everything
@@ -269,7 +269,7 @@ sal_Bool SwAccessibleParagraph::GetSelection(
GetPortionData().GetFirstValidCorePosition() )
{
// selection is inside our part of this para
- DBG_ASSERT(
+ OSL_ENSURE(
GetPortionData().IsValidCorePosition(
nCoreEnd ),
"problem determining valid core position" );
@@ -519,8 +519,8 @@ void SwAccessibleParagraph::UpdatePortionData()
throw( uno::RuntimeException )
{
// obtain the text frame
- DBG_ASSERT( GetFrm() != NULL, "The text frame has vanished!" );
- DBG_ASSERT( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
+ OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
+ OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
// build new portion data
@@ -529,7 +529,7 @@ void SwAccessibleParagraph::UpdatePortionData()
pFrm->GetTxtNode(), GetMap()->GetShell()->GetViewOptions() );
pFrm->VisitPortions( *pPortionData );
- DBG_ASSERT( pPortionData != NULL, "UpdatePortionData() failed" );
+ OSL_ENSURE( pPortionData != NULL, "UpdatePortionData() failed" );
}
void SwAccessibleParagraph::ClearPortionData()
@@ -544,23 +544,23 @@ void SwAccessibleParagraph::ClearPortionData()
void SwAccessibleParagraph::ExecuteAtViewShell( sal_uInt16 nSlot )
{
- DBG_ASSERT( GetMap() != NULL, "no map?" );
+ OSL_ENSURE( GetMap() != NULL, "no map?" );
ViewShell* pViewShell = GetMap()->GetShell();
- DBG_ASSERT( pViewShell != NULL, "View shell exptected!" );
+ OSL_ENSURE( pViewShell != NULL, "View shell exptected!" );
SfxViewShell* pSfxShell = pViewShell->GetSfxViewShell();
- DBG_ASSERT( pSfxShell != NULL, "SfxViewShell shell exptected!" );
+ OSL_ENSURE( pSfxShell != NULL, "SfxViewShell shell exptected!" );
if( !pSfxShell )
return;
SfxViewFrame *pFrame = pSfxShell->GetViewFrame();
- DBG_ASSERT( pFrame != NULL, "View frame exptected!" );
+ OSL_ENSURE( pFrame != NULL, "View frame exptected!" );
if( !pFrame )
return;
SfxDispatcher *pDispatcher = pFrame->GetDispatcher();
- DBG_ASSERT( pDispatcher != NULL, "Dispatcher exptected!" );
+ OSL_ENSURE( pDispatcher != NULL, "Dispatcher exptected!" );
if( !pDispatcher )
return;
@@ -571,7 +571,7 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion(
sal_Int32 nStartIndex,
sal_Int32 nEndIndex )
{
- DBG_ASSERT( (IsValidChar(nStartIndex, GetString().getLength()) &&
+ OSL_ENSURE( (IsValidChar(nStartIndex, GetString().getLength()) &&
(nEndIndex == -1)) ||
IsValidRange(nStartIndex, nEndIndex, GetString().getLength()),
"please check parameters before calling this method" );
@@ -644,8 +644,8 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary(
sal_Bool bRet = sal_False;
// now ask the Break-Iterator for the word
- DBG_ASSERT( pBreakIt != NULL, "We always need a break." );
- DBG_ASSERT( pBreakIt->GetBreakIter().is(), "No break-iterator." );
+ OSL_ENSURE( pBreakIt != NULL, "We always need a break." );
+ OSL_ENSURE( pBreakIt->GetBreakIter().is(), "No break-iterator." );
if( pBreakIt->GetBreakIter().is() )
{
// get locale for this position
@@ -724,8 +724,8 @@ sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
// ask the Break-Iterator for the glyph by moving one cell
// forward, and then one cell back
- DBG_ASSERT( pBreakIt != NULL, "We always need a break." );
- DBG_ASSERT( pBreakIt->GetBreakIter().is(), "No break-iterator." );
+ OSL_ENSURE( pBreakIt != NULL, "We always need a break." );
+ OSL_ENSURE( pBreakIt->GetBreakIter().is(), "No break-iterator." );
if( pBreakIt->GetBreakIter().is() )
{
// get locale for this position
@@ -741,8 +741,8 @@ sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
rBound.startPos = pBreakIt->GetBreakIter()->previousCharacters(
rText, rBound.endPos, aLocale, nIterMode, 1, nDone );
- DBG_ASSERT( rBound.startPos <= nPos, "start pos too high" );
- DBG_ASSERT( rBound.endPos >= nPos, "end pos too low" );
+ OSL_ENSURE( rBound.startPos <= nPos, "start pos too high" );
+ OSL_ENSURE( rBound.endPos >= nPos, "end pos too low" );
}
else
{
@@ -1713,8 +1713,8 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
}
// ask core for position
- DBG_ASSERT( GetFrm() != NULL, "The text frame has vanished!" );
- DBG_ASSERT( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
+ OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
+ OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
SwCrsrMoveState aMoveState;
aMoveState.bPosMatchesBounds = sal_True;
@@ -1874,8 +1874,8 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
i18n::Boundary aBound;
sal_Bool bWord = GetTextBoundary( aBound, rText, nIndex, nTextType );
- DBG_ASSERT( aBound.startPos >= 0, "illegal boundary" );
- DBG_ASSERT( aBound.startPos <= aBound.endPos, "illegal boundary" );
+ OSL_ENSURE( aBound.startPos >= 0, "illegal boundary" );
+ OSL_ENSURE( aBound.startPos <= aBound.endPos, "illegal boundary" );
// return word (if present)
if ( bWord )
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 36cf5a4..efd6c67 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -99,7 +99,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
nBeforePortions( 0 ),
bLastIsSpecial( sal_False )
{
- DBG_ASSERT( pTxtNode != NULL, "Text node is needed!" );
+ OSL_ENSURE( pTxtNode != NULL, "Text node is needed!" );
// reserve some space to reduce memory allocations
aLineBreaks.reserve( 5 );
@@ -117,10 +117,10 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType)
{
- DBG_ASSERT( (nModelPosition + nLength) <= pTxtNode->GetTxt().Len(),
+ OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().Len(),
"portion exceeds model string!" );
- DBG_ASSERT( !bFinished, "We are already done!" );
+ OSL_ENSURE( !bFinished, "We are already done!" );
// ignore zero-length portions
if( nLength == 0 )
@@ -147,11 +147,11 @@ void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType)
void SwAccessiblePortionData::Special(
sal_uInt16 nLength, const String& rText, sal_uInt16 nType)
{
- DBG_ASSERT( nModelPosition >= 0, "illegal position" );
- DBG_ASSERT( (nModelPosition + nLength) <= pTxtNode->GetTxt().Len(),
+ OSL_ENSURE( nModelPosition >= 0, "illegal position" );
+ OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().Len(),
"portion exceeds model string!" );
- DBG_ASSERT( !bFinished, "We are already done!" );
+ OSL_ENSURE( !bFinished, "We are already done!" );
// construct string with representation; either directly from
// rText, or use resources for special case portions
@@ -219,23 +219,23 @@ void SwAccessiblePortionData::Special(
void SwAccessiblePortionData::LineBreak()
{
- DBG_ASSERT( !bFinished, "We are already done!" );
+ OSL_ENSURE( !bFinished, "We are already done!" );
aLineBreaks.push_back( aBuffer.getLength() );
}
void SwAccessiblePortionData::Skip(sal_uInt16 nLength)
{
- DBG_ASSERT( !bFinished, "We are already done!" );
- DBG_ASSERT( aModelPositions.empty(), "Never Skip() after portions" );
- DBG_ASSERT( nLength <= pTxtNode->GetTxt().Len(), "skip exceeds model string!" );
+ OSL_ENSURE( !bFinished, "We are already done!" );
+ OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" );
+ OSL_ENSURE( nLength <= pTxtNode->GetTxt().Len(), "skip exceeds model string!" );
nModelPosition += nLength;
}
void SwAccessiblePortionData::Finish()
{
- DBG_ASSERT( !bFinished, "We are already done!" );
+ OSL_ENSURE( !bFinished, "We are already done!" );
// include terminator values: always include two 'last character'
// markers in the position arrays to make sure we always find one
@@ -253,7 +253,7 @@ void SwAccessiblePortionData::Finish()
sal_Bool SwAccessiblePortionData::IsPortionAttrSet(
size_t nPortionNo, sal_uInt8 nAttr ) const
{
- DBG_ASSERT( nPortionNo < aPortionAttrs.size(),
+ OSL_ENSURE( nPortionNo < aPortionAttrs.size(),
"Illegal portion number" );
return (aPortionAttrs[nPortionNo] & nAttr) != 0;
}
@@ -300,7 +300,7 @@ sal_Bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
const OUString& SwAccessiblePortionData::GetAccessibleString() const
{
- DBG_ASSERT( bFinished, "Shouldn't call this before we are done!" );
+ OSL_ENSURE( bFinished, "Shouldn't call this before we are done!" );
return sAccessibleString;
}
@@ -351,7 +351,7 @@ void SwAccessiblePortionData::GetBoundaryOfLine( const sal_Int32 nLineNo,
void SwAccessiblePortionData::GetLastLineBoundary(
Boundary& rBound ) const
{
- DBG_ASSERT( aLineBreaks.size() >= 2, "need min + max value" );
+ OSL_ENSURE( aLineBreaks.size() >= 2, "need min + max value" );
// The last two positions except the two deleimiters are the ones
// we are looking for, except for empty paragraphs (nBreaks==3)
@@ -361,8 +361,8 @@ void SwAccessiblePortionData::GetLastLineBoundary(
sal_uInt16 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
{
- DBG_ASSERT( nPos >= 0, "illegal position" );
- DBG_ASSERT( nPos <= sAccessibleString.getLength(), "illegal position" );
+ OSL_ENSURE( nPos >= 0, "illegal position" );
+ OSL_ENSURE( nPos <= sAccessibleString.getLength(), "illegal position" );
// find the portion number
size_t nPortionNo = FindBreak( aAccessiblePositions, nPos );
@@ -375,7 +375,7 @@ sal_uInt16 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
if( ! IsSpecialPortion( nPortionNo ) )
{
// 'wide' portions have to be of the same width
- DBG_ASSERT( ( aModelPositions[nPortionNo+1] - nStartPos ) ==
+ OSL_ENSURE( ( aModelPositions[nPortionNo+1] - nStartPos ) ==
( aAccessiblePositions[nPortionNo+1] -
aAccessiblePositions[nPortionNo] ),
"accesability portion disagrees with text model" );
@@ -385,7 +385,7 @@ sal_uInt16 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
}
// else: return nStartPos unmodified
- DBG_ASSERT( (nStartPos >= 0) && (nStartPos < USHRT_MAX),
+ OSL_ENSURE( (nStartPos >= 0) && (nStartPos < USHRT_MAX),
"How can the SwTxtNode have so many characters?" );
return static_cast<sal_uInt16>(nStartPos);
}
@@ -404,11 +404,11 @@ size_t SwAccessiblePortionData::FindBreak(
const Positions_t& rPositions,
sal_Int32 nValue ) const
{
- DBG_ASSERT( rPositions.size() >= 2, "need min + max value" );
- DBG_ASSERT( rPositions[0] <= nValue, "need min value" );
- DBG_ASSERT( rPositions[rPositions.size()-1] >= nValue,
+ OSL_ENSURE( rPositions.size() >= 2, "need min + max value" );
+ OSL_ENSURE( rPositions[0] <= nValue, "need min value" );
+ OSL_ENSURE( rPositions[rPositions.size()-1] >= nValue,
"need first terminator value" );
- DBG_ASSERT( rPositions[rPositions.size()-2] >= nValue,
+ OSL_ENSURE( rPositions[rPositions.size()-2] >= nValue,
"need second terminator value" );
size_t nMin = 0;
@@ -418,20 +418,20 @@ size_t SwAccessiblePortionData::FindBreak(
while( nMin+1 < nMax )
{
// check loop invariants
- DBG_ASSERT( ( (nMin == 0) && (rPositions[nMin] <= nValue) ) ||
+ OSL_ENSURE( ( (nMin == 0) && (rPositions[nMin] <= nValue) ) ||
( (nMin != 0) && (rPositions[nMin] < nValue) ),
"minvalue not minimal" );
- DBG_ASSERT( nValue <= rPositions[nMax], "max value not maximal" );
+ OSL_ENSURE( nValue <= rPositions[nMax], "max value not maximal" );
// get middle (and ensure progress)
size_t nMiddle = (nMin + nMax)/2;
- DBG_ASSERT( nMin < nMiddle, "progress?" );
- DBG_ASSERT( nMiddle < nMax, "progress?" );
+ OSL_ENSURE( nMin < nMiddle, "progress?" );
+ OSL_ENSURE( nMiddle < nMax, "progress?" );
// check array
- DBG_ASSERT( rPositions[nMin] <= rPositions[nMiddle],
+ OSL_ENSURE( rPositions[nMin] <= rPositions[nMiddle],
"garbled positions array" );
- DBG_ASSERT( rPositions[nMiddle] <= rPositions[nMax],
+ OSL_ENSURE( rPositions[nMiddle] <= rPositions[nMax],
"garbled positions array" );
if( nValue > rPositions[nMiddle] )
@@ -441,17 +441,17 @@ size_t SwAccessiblePortionData::FindBreak(
}
// only two are left; we only need to check which one is the winner
- DBG_ASSERT( (nMax == nMin) || (nMax == nMin+1), "only two left" );
+ OSL_ENSURE( (nMax == nMin) || (nMax == nMin+1), "only two left" );
if( (rPositions[nMin] < nValue) && (rPositions[nMin+1] <= nValue) )
nMin = nMin+1;
// finally, check to see whether the returned value is the 'right' position
- DBG_ASSERT( rPositions[nMin] <= nValue, "not smaller or equal" );
- DBG_ASSERT( nValue <= rPositions[nMin+1], "not equal or larger" );
- DBG_ASSERT( (nMin == 0) || (rPositions[nMin-1] <= nValue),
+ OSL_ENSURE( rPositions[nMin] <= nValue, "not smaller or equal" );
+ OSL_ENSURE( nValue <= rPositions[nMin+1], "not equal or larger" );
+ OSL_ENSURE( (nMin == 0) || (rPositions[nMin-1] <= nValue),
"earlier value should have been returned" );
- DBG_ASSERT( nMin < rPositions.size()-1,
+ OSL_ENSURE( nMin < rPositions.size()-1,
"shouldn't return last position (due to termintator values)" );
return nMin;
@@ -479,13 +479,13 @@ void SwAccessiblePortionData::GetSentenceBoundary(
Boundary& rBound,
sal_Int32 nPos )
{
- DBG_ASSERT( nPos >= 0, "illegal position; check before" );
- DBG_ASSERT( nPos < sAccessibleString.getLength(), "illegal position" );
+ OSL_ENSURE( nPos >= 0, "illegal position; check before" );
+ OSL_ENSURE( nPos < sAccessibleString.getLength(), "illegal position" );
if( pSentences == NULL )
{
- DBG_ASSERT( pBreakIt != NULL, "We always need a break." );
- DBG_ASSERT( pBreakIt->GetBreakIter().is(), "No break-iterator." );
+ OSL_ENSURE( pBreakIt != NULL, "We always need a break." );
+ OSL_ENSURE( pBreakIt->GetBreakIter().is(), "No break-iterator." );
if( pBreakIt->GetBreakIter().is() )
{
pSentences = new Positions_t();
@@ -534,7 +534,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
Boundary& rBound,
sal_Int32 nPos) const
{
- DBG_ASSERT( pTxtNode != NULL, "Need SwTxtNode!" );
+ OSL_ENSURE( pTxtNode != NULL, "Need SwTxtNode!" );
// attribute boundaries can only occur on portion boundaries
FillBoundary( rBound, aAccessiblePositions,
@@ -544,7 +544,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= pTxtNode->GetTxt().Len(), "illegal position" );
+ OSL_ENSURE( nPos <= pTxtNode->GetTxt().Len(), "illegal position" );
// find the portion number
// #i70538# - consider "empty" model portions - e.g. number portion
@@ -560,7 +560,7 @@ sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_uInt16 nPos ) cons
if( (nEndPos - nStartPos) > 1 )
{
// 'wide' portions have to be of the same width
- DBG_ASSERT( ( nEndPos - nStartPos ) ==
+ OSL_ENSURE( ( nEndPos - nStartPos ) ==
( aAccessiblePositions[nPortionNo+1] -
aAccessiblePositions[nPortionNo] ),
"accesability portion disagrees with text model" );
@@ -570,7 +570,7 @@ sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_uInt16 nPos ) cons
}
// else: return nRet unmodified
- DBG_ASSERT( (nRet >= 0) && (nRet <= sAccessibleString.getLength()),
+ OSL_ENSURE( (nRet >= 0) && (nRet <= sAccessibleString.getLength()),
"too long!" );
return nRet;
}
@@ -606,10 +606,10 @@ sal_uInt16 SwAccessiblePortionData::FillSpecialPos(
nModelEndPos = nModelPos;
nModelPos = aModelPositions[nCorePortionNo];
- DBG_ASSERT( nModelPos >= 0, "Can't happen." );
- DBG_ASSERT( nCorePortionNo >= nBeforePortions, "Can't happen." );
+ OSL_ENSURE( nModelPos >= 0, "Can't happen." );
+ OSL_ENSURE( nCorePortionNo >= nBeforePortions, "Can't happen." );
}
- DBG_ASSERT( nModelPos != nModelEndPos,
+ OSL_ENSURE( nModelPos != nModelEndPos,
"portion with core-representation expected" );
// if we have anything except plain text, compute nExtend + nRefPos
@@ -637,7 +637,7 @@ sal_uInt16 SwAccessiblePortionData::FillSpecialPos(
else
{
// case 3: regular text portion
- DBG_ASSERT( ( nModelEndPos - nModelPos ) ==
+ OSL_ENSURE( ( nModelEndPos - nModelPos ) ==
( aAccessiblePositions[nPortionNo+1] -
aAccessiblePositions[nPortionNo] ),
"text portion expected" );
@@ -648,9 +648,9 @@ sal_uInt16 SwAccessiblePortionData::FillSpecialPos(
}
if( rpPos != NULL )
{
- DBG_ASSERT( rpPos == &rPos, "Yes!" );
- DBG_ASSERT( nRefPos <= nPos, "wrong reference" );
- DBG_ASSERT( (nExtend == SP_EXTEND_RANGE_NONE) ||
+ OSL_ENSURE( rpPos == &rPos, "Yes!" );
+ OSL_ENSURE( nRefPos <= nPos, "wrong reference" );
+ OSL_ENSURE( (nExtend == SP_EXTEND_RANGE_NONE) ||
(nExtend == SP_EXTEND_RANGE_BEFORE) ||
(nExtend == SP_EXTEND_RANGE_BEHIND), "need extend" );
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 26b1995..85cfd2c 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -64,9 +64,9 @@ SwAccessibleSelectionHelper::~SwAccessibleSelectionHelper()
SwFEShell* SwAccessibleSelectionHelper::GetFEShell()
{
- DBG_ASSERT( rContext.GetMap() != NULL, "no map?" );
+ OSL_ENSURE( rContext.GetMap() != NULL, "no map?" );
ViewShell* pViewShell = rContext.GetMap()->GetShell();
- DBG_ASSERT( pViewShell != NULL,
+ OSL_ENSURE( pViewShell != NULL,
"No view shell? Then what are you looking at?" );
SwFEShell* pFEShell = NULL;
@@ -293,7 +293,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
if( !aChild.IsValid() )
throwIndexOutOfBoundsException();
- DBG_ASSERT( rContext.GetMap() != NULL, "We need the map." );
+ OSL_ENSURE( rContext.GetMap() != NULL, "We need the map." );
Reference< XAccessible > xChild;
if( aChild.GetSwFrm() )
{
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index ed9fbad..be54ecd 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -626,8 +626,8 @@ void SwAccessibleTable::FireTableChangeEvent(
const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const
{
- DBG_ASSERT( nChildIndex >= 0, "Illegal child index." );
- DBG_ASSERT( nChildIndex < const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(), "Illegal child index." ); // #i77106#
+ OSL_ENSURE( nChildIndex >= 0, "Illegal child index." );
+ OSL_ENSURE( nChildIndex < const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(), "Illegal child index." ); // #i77106#
const SwTableBox* pBox = NULL;
@@ -644,7 +644,7 @@ const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const
}
}
- DBG_ASSERT( pBox != NULL, "We need the table box." );
+ OSL_ENSURE( pBox != NULL, "We need the table box." );
return pBox;
}
@@ -655,7 +655,7 @@ sal_Bool SwAccessibleTable::IsChildSelected( sal_Int32 nChildIndex ) const
if( pSelBoxes )
{
const SwTableBox* pBox = GetTableBox( nChildIndex );
- DBG_ASSERT( pBox != NULL, "We need the table box." );
+ OSL_ENSURE( pBox != NULL, "We need the table box." );
bRet = pSelBoxes->Seek_Entry( const_cast<SwTableBox*>( pBox ) );
}
@@ -1417,7 +1417,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
// preliminaries: get 'our' table box, and get the cursor shell
const SwTableBox* pBox = GetTableBox( nChildIndex );
- DBG_ASSERT( pBox != NULL, "We need the table box." );
+ OSL_ENSURE( pBox != NULL, "We need the table box." );
SwCrsrShell* pCrsrShell = GetCrsrShell();
if( pCrsrShell == NULL )
@@ -1592,7 +1592,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
return;
const SwTableBox* pBox = GetTableBox( nChildIndex );
- DBG_ASSERT( pBox != NULL, "We need the table box." );
+ OSL_ENSURE( pBox != NULL, "We need the table box." );
// If we unselect point, then set cursor to mark. If we clear another
// selected box, then set cursor to point.
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 003045a..c4800b3 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -230,7 +230,7 @@ SwFlyFrm* SwAccessibleTextFrame::getFlyFrm() const
SwFlyFrm* pFlyFrm = NULL;
const SwFrm* pFrm = GetFrm();
- DBG_ASSERT( pFrm != NULL, "frame expected" );
+ OSL_ENSURE( pFrm != NULL, "frame expected" );
if( pFrm->IsFlyFrm() )
{
pFlyFrm = static_cast<SwFlyFrm*>( const_cast<SwFrm*>( pFrm ) );
@@ -258,7 +258,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccess
AccessibleRelationSetHelper* pHelper = new AccessibleRelationSetHelper();
SwFlyFrm* pFlyFrm = getFlyFrm();
- DBG_ASSERT( pFlyFrm != NULL, "fly frame expected" );
+ OSL_ENSURE( pFlyFrm != NULL, "fly frame expected" );
const SwFlyFrm* pPrevFrm = pFlyFrm->GetPrevLink();
if( pPrevFrm != NULL )
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index f9e88f5..348b92c 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -86,7 +86,7 @@ void SwClient::SwClientNotify( const SwModify&, const SfxHint& )
//*************************************************************************
SwClient::~SwClient()
{
- DBG_ASSERT( !pRegisteredIn || pRegisteredIn->GetDepends(),"SwModify still known, but Client already disconnected!" );
+ OSL_ENSURE( !pRegisteredIn || pRegisteredIn->GetDepends(),"SwModify still known, but Client already disconnected!" );
if( pRegisteredIn && pRegisteredIn->GetDepends() )
// still connected
pRegisteredIn->Remove( this );
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 243a397..97ba70b 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -45,18 +45,18 @@ const sal_uInt16 nBlockGrowSize = 20;
void CheckIdx( BlockInfo** ppInf, sal_uInt16 nBlock, sal_uLong nSize, sal_uInt16 nCur )
{
- DBG_ASSERT( !nSize || nCur < nBlock, "BigPtrArray: CurIndex steht falsch" );
+ OSL_ENSURE( !nSize || nCur < nBlock, "BigPtrArray: CurIndex steht falsch" );
sal_uLong nIdx = 0;
for( sal_uInt16 nCnt = 0; nCnt < nBlock; ++nCnt, ++ppInf )
{
nIdx += (*ppInf)->nElem;
// Array mit Luecken darf es nicht geben
- DBG_ASSERT( !nCnt || (*(ppInf-1))->nEnd + 1 == (*ppInf)->nStart,
+ OSL_ENSURE( !nCnt || (*(ppInf-1))->nEnd + 1 == (*ppInf)->nStart,
"BigPtrArray: Luecke in der Verwaltung!" );
}
- DBG_ASSERT( nIdx == nSize, "BigPtrArray: Anzahl ungueltig" );
+ OSL_ENSURE( nIdx == nSize, "BigPtrArray: Anzahl ungueltig" );
}
#else
@@ -140,7 +140,7 @@ void BigPtrArray::ForEach( sal_uLong nStart, sal_uLong nEnd,
ElementPtr BigPtrArray::operator[]( sal_uLong idx ) const
{
// weil die Funktion eben doch nicht const ist:
- DBG_ASSERT( idx < nSize, "operator[]: Index aussserhalb" );
+ OSL_ENSURE( idx < nSize, "operator[]: Index aussserhalb" );
BigPtrArray* pThis = (BigPtrArray*) this;
sal_uInt16 cur = Index2Block( idx );
BlockInfo* p = ppInf[ cur ];
@@ -351,7 +351,7 @@ void BigPtrArray::Insert( const ElementPtr& rElem, sal_uLong pos )
}
// Nun haben wir einen freien Block am Wickel: eintragen
pos -= p->nStart;
- DBG_ASSERT( pos < MAXENTRY, "falsche Pos" );
+ OSL_ENSURE( pos < MAXENTRY, "falsche Pos" );
if( pos != p->nElem )
{
int nCount = p->nElem - sal_uInt16(pos);
@@ -461,7 +461,7 @@ void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
void BigPtrArray::Replace( sal_uLong idx, const ElementPtr& rElem)
{
// weil die Funktion eben doch nicht const ist:
- DBG_ASSERT( idx < nSize, "Set: Index aussserhalb" );
+ OSL_ENSURE( idx < nSize, "Set: Index aussserhalb" );
BigPtrArray* pThis = (BigPtrArray*) this;
sal_uInt16 cur = Index2Block( idx );
BlockInfo* p = ppInf[ cur ];
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 1f0a5aa..f3c964f 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -67,7 +67,7 @@ SwBreakIt::SwBreakIt(
aLast( LANGUAGE_DONTKNOW ),
aForbiddenLang( LANGUAGE_DONTKNOW)
{
- DBG_ASSERT( m_xMSF.is(), "SwBreakIt: no MultiServiceFactory" );
+ OSL_ENSURE( m_xMSF.is(), "SwBreakIt: no MultiServiceFactory" );
}
SwBreakIt::~SwBreakIt()
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index f9e2503..2d55c66 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -433,7 +433,7 @@ void SwAutoCompleteWord::DocumentDying(const SwDoc& rDoc)
{
aWordLst.Remove( nPos - 1 );
sal_uInt16 nLRUPos = aLRULst.GetPos( (void*)pCurrent );
- DBG_ASSERT(nLRUPos < USHRT_MAX, "word not found in LRU list" );
+ OSL_ENSURE(nLRUPos < USHRT_MAX, "word not found in LRU list" );
aLRULst.Remove( nLRUPos );
delete pCurrent;
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6bd08fd..aecba23 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -662,7 +662,7 @@ const SwPrintData & SwDoc::getPrintData() const
// the respective config item is implememted by SwPrintOptions which
// is also derived from SwPrintData
const SwDocShell *pDocSh = GetDocShell();
- DBG_ASSERT( pDocSh, "pDocSh is 0, can't determine if this is a WebDoc or not" );
+ OSL_ENSURE( pDocSh, "pDocSh is 0, can't determine if this is a WebDoc or not" );
bool bWeb = 0 != dynamic_cast< const SwWebDocShell * >(pDocSh);
SwPrintOptions aPrintOptions( bWeb );
*pThis->pPrtData = aPrintOptions;
@@ -1121,7 +1121,7 @@ bool lcl_GetPostIts(
bool bHasPostIts = false;
SwFieldType* pFldType = pIDFA->GetSysFldType( RES_POSTITFLD );
- DBG_ASSERT( pFldType, "kein PostItType ? ");
+ OSL_ENSURE( pFldType, "kein PostItType ? ");
if( pFldType->GetDepends() )
{
@@ -1158,7 +1158,7 @@ static void lcl_FormatPostIt(
{
static char const sTmp[] = " : ";
- DBG_ASSERT( ViewShell::GetShellRes(), "missing ShellRes" );
+ OSL_ENSURE( ViewShell::GetShellRes(), "missing ShellRes" );
if (bNewPage)
{
@@ -1272,7 +1272,7 @@ void SwDoc::CalculatePagesForPrinting(
}
}
- DBG_ASSERT( nFirstPageNo, "first page not found! Should not happen!" );
+ OSL_ENSURE( nFirstPageNo, "first page not found! Should not happen!" );
if (nFirstPageNo)
{
// HACK: Hier muss von der MultiSelection noch eine akzeptable Moeglichkeit
@@ -1380,7 +1380,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
{
sal_Int16 nPostItMode = (sal_Int16) rOptions.getIntValue( "PrintAnnotationMode", 0 );
- DBG_ASSERT(nPostItMode == POSTITS_NONE || rData.HasPostItData(),
+ OSL_ENSURE(nPostItMode == POSTITS_NONE || rData.HasPostItData(),
"print post-its without post-it data?" );
const sal_uInt16 nPostItCount = rData.HasPostItData() ? rData.m_pPostItFields->Count() : 0;
if (nPostItMode != POSTITS_NONE && nPostItCount > 0)
@@ -1466,14 +1466,14 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
const SwPageFrm * pPageFrm = (SwPageFrm*)rData.m_pPostItShell->GetLayout()->Lower();
while( pPageFrm && nPageNum < nPostItDocPageCount )
{
- DBG_ASSERT( pPageFrm, "Empty page frame. How are we going to print this?" );
+ OSL_ENSURE( pPageFrm, "Empty page frame. How are we going to print this?" );
++nPageNum;
rData.GetPagesToPrint().push_back( 0 ); // a page number of 0 indicates this page is from the post-it doc
- DBG_ASSERT( pPageFrm, "pPageFrm is NULL!" );
+ OSL_ENSURE( pPageFrm, "pPageFrm is NULL!" );
rData.GetPostItStartFrames().push_back( pPageFrm );
pPageFrm = (SwPageFrm*)pPageFrm->GetNext();
}
- DBG_ASSERT( nPageNum == nPostItDocPageCount, "unexpected number of pages" );
+ OSL_ENSURE( nPageNum == nPostItDocPageCount, "unexpected number of pages" );
}
else if (nPostItMode == POSTITS_ENDPAGE)
{
@@ -1487,12 +1487,12 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
const SwPageFrm * pPageFrm = (SwPageFrm*)rData.m_pPostItShell->GetLayout()->Lower();
while( pPageFrm && sal_Int32(aAllPostItStartFrames.size()) < nPostItDocPageCount )
{
- DBG_ASSERT( pPageFrm, "Empty page frame. How are we going to print this?" );
+ OSL_ENSURE( pPageFrm, "Empty page frame. How are we going to print this?" );
++nPostItPageNum;
aAllPostItStartFrames.push_back( pPageFrm );
pPageFrm = (SwPageFrm*)pPageFrm->GetNext();
}
- DBG_ASSERT( sal_Int32(aAllPostItStartFrames.size()) == nPostItDocPageCount,
+ OSL_ENSURE( sal_Int32(aAllPostItStartFrames.size()) == nPostItDocPageCount,
"unexpected number of frames; does not match number of pages" );
// get a map that holds all post-it frames to be printed for a
@@ -1504,13 +1504,13 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
const sal_Int32 nFrames = aIt->second - nLastStartPageNum;
const sal_Int32 nFirstStartPageNum = aIt == aPostItLastStartPageNum.begin() ?
1 : aIt->second - nFrames + 1;
- DBG_ASSERT( 1 <= nFirstStartPageNum && nFirstStartPageNum <= nPostItDocPageCount,
+ OSL_ENSURE( 1 <= nFirstStartPageNum && nFirstStartPageNum <= nPostItDocPageCount,
"page number for first frame out of range" );
std::vector< const SwPageFrm * > aStartFrames;
for (sal_Int32 i = 0; i < nFrames; ++i)
{
const sal_Int32 nIdx = nFirstStartPageNum - 1 + i; // -1 because lowest page num is 1
- DBG_ASSERT( 0 <= nIdx && nIdx < sal_Int32(aAllPostItStartFrames.size()),
+ OSL_ENSURE( 0 <= nIdx && nIdx < sal_Int32(aAllPostItStartFrames.size()),
"index out of range" );
aStartFrames.push_back( aAllPostItStartFrames[ nIdx ] );
}
@@ -1601,7 +1601,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
const SwPageFrm *pPageFrm = dynamic_cast<const SwPageFrm*>( rLayout.Lower() );
while( pPageFrm && nPageNum < nDocPageCount )
{
- DBG_ASSERT( pPageFrm, "Empty page frame. How are we going to print this?" );
+ OSL_ENSURE( pPageFrm, "Empty page frame. How are we going to print this?" );
++nPageNum;
rValidPagesSet.insert( nPageNum );
rValidStartFrms[ nPageNum ] = pPageFrm;
@@ -1609,7 +1609,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
rPrinterPaperTrays[ nPageNum ] = lcl_GetPaperBin( pStPage );
}
- DBG_ASSERT( nPageNum == nDocPageCount, "unexpected number of pages" );
+ OSL_ENSURE( nPageNum == nDocPageCount, "unexpected number of pages" );
// properties to take into account when calcualting the set of pages
// Note: here bPrintLeftPages and bPrintRightPages refer to the (virtual) resulting pages
@@ -1695,7 +1695,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
nSPg = nSPg + nStep;
nEPg = nEPg - nStep;
}
- DBG_ASSERT( size_t(nCntPage) == rPagePairs.size(), "size mismatch for number of page pairs" );
+ OSL_ENSURE( size_t(nCntPage) == rPagePairs.size(), "size mismatch for number of page pairs" );
// luckily prospect printing does not make use of post-its so far,
// thus we are done here.
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 37a0b2c..841e053 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1409,13 +1409,13 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
sal_uInt16 nAuthor = rDoc.GetRedlineAuthor();
DateTime aTimeStamp;
SwDocShell *pDocShell(rDoc.GetDocShell());
- DBG_ASSERT(pDocShell, "no SwDocShell");
+ OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
- DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
+ OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
if( bUseDocInfo && xDocProps.is() ) {
String aTmp( 1 == xDocProps->getEditingCycles()
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index f9ec5c2..ea0eada 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -176,7 +176,7 @@ SwCharFmt* SwEndNoteInfo::GetCharFmt(SwDoc &rDoc) const
void SwEndNoteInfo::SetCharFmt( SwCharFmt* pChFmt )
{
- DBG_ASSERT(pChFmt, "kein CharFmt?");
+ OSL_ENSURE(pChFmt, "kein CharFmt?");
pChFmt->Add( &((SwClient&)aCharFmtDep) );
}
@@ -193,7 +193,7 @@ SwCharFmt* SwEndNoteInfo::GetAnchorCharFmt(SwDoc &rDoc) const
void SwEndNoteInfo::SetAnchorCharFmt( SwCharFmt* pChFmt )
{
- DBG_ASSERT(pChFmt, "kein CharFmt?");
+ OSL_ENSURE(pChFmt, "kein CharFmt?");
pChFmt->Add( &((SwClient&)aAnchorCharFmtDep) );
}
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index a0fadbc..2d6dee0 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -239,7 +239,7 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath,
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
- DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
+ OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
// the GlobalDoc is the template
xDocProps->setTemplateName(aEmptyStr);
::util::DateTime uDT(aTmplDate.Get100Sec(),
@@ -587,7 +587,7 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutline
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
- DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
+ OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
// the GlobalDoc is the template
xDocProps->setTemplateName(aEmptyStr);
::util::DateTime uDT(aTmplDate.Get100Sec(),
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 84f5a48..60bdf00 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -52,8 +52,8 @@ using namespace ::com::sun::star;
static void lcl_copyDocumentProperties(
uno::Reference<document::XDocumentProperties> i_xSource,
uno::Reference<document::XDocumentProperties> i_xTarget) {
- DBG_ASSERT(i_xSource.is(), "null reference");
- DBG_ASSERT(i_xTarget.is(), "null reference");
+ OSL_ENSURE(i_xSource.is(), "null reference");
+ OSL_ENSURE(i_xTarget.is(), "null reference");
i_xTarget->setAuthor(i_xSource->getAuthor());
i_xTarget->setGenerator(i_xSource->getGenerator());
@@ -130,8 +130,8 @@ sal_Bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
// entry document.
// To be able to do this, we copy the document properties of the
// target document to the glossary document
-// DBG_ASSERT(GetDocShell(), "no SwDocShell"); // may be clipboard!
- DBG_ASSERT(pGDoc->GetDocShell(), "no SwDocShell at glossary");
+// OSL_ENSURE(GetDocShell(), "no SwDocShell"); // may be clipboard!
+ OSL_ENSURE(pGDoc->GetDocShell(), "no SwDocShell at glossary");
if (GetDocShell() && pGDoc->GetDocShell()) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetDocShell()->GetModel(), uno::UNO_QUERY_THROW);
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 322eca0..15cd1b3 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1189,7 +1189,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
break;
}
}
- DBG_ASSERT( pColl, "no text collection found" );
+ OSL_ENSURE( pColl, "no text collection found" );
}
if( !pColl )
@@ -1551,7 +1551,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
break;
}
}
- DBG_ASSERT( pColl, "no text collection found" );
+ OSL_ENSURE( pColl, "no text collection found" );
}
if( !pColl )
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index d722fbb..5d5ffd1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -71,19 +71,19 @@ TYPEINIT1(SwRedlineHint, SfxHint);
SwPosition aComparePos( *pPos );
aComparePos.nContent.Assign(
aComparePos.nNode.GetNode().GetCntntNode(), 0 );
- DBG_ASSERT( pPos->nContent.GetIdxReg() ==
+ OSL_ENSURE( pPos->nContent.GetIdxReg() ==
aComparePos.nContent.GetIdxReg(),
_ERROR_PREFIX "illegal position" );
SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
if( pTxtNode == NULL )
{
- DBG_ASSERT( pPos->nContent == 0,
+ OSL_ENSURE( pPos->nContent == 0,
_ERROR_PREFIX "non-text-node with content" );
}
else
{
- DBG_ASSERT( pPos->nContent >= 0 &&
+ OSL_ENSURE( pPos->nContent >= 0 &&
pPos->nContent <= pTxtNode->Len(),
_ERROR_PREFIX "index behind text" );
}
@@ -91,7 +91,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
void lcl_CheckPam( const SwPaM* pPam )
{
- DBG_ASSERT( pPam != NULL, _ERROR_PREFIX "illegal argument" );
+ OSL_ENSURE( pPam != NULL, _ERROR_PREFIX "illegal argument" );
lcl_CheckPosition( pPam->GetPoint() );
lcl_CheckPosition( pPam->GetMark() );
}
@@ -109,7 +109,7 @@ TYPEINIT1(SwRedlineHint, SfxHint);
for( sal_uInt16 j = 0; j < rTbl.Count(); ++j )
{
// check for empty redlines
- DBG_ASSERT( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
+ OSL_ENSURE( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
( rTbl[j]->GetContentIdx() != NULL ),
_ERROR_PREFIX "empty redline" );
}
@@ -121,11 +121,11 @@ TYPEINIT1(SwRedlineHint, SfxHint);
const SwRedline* pCurrent = rTbl[ n ];
// check redline sorting
- DBG_ASSERT( *pPrev->Start() <= *pCurrent->Start(),
+ OSL_ENSURE( *pPrev->Start() <= *pCurrent->Start(),
_ERROR_PREFIX "not sorted correctly" );
// check for overlapping redlines
- DBG_ASSERT( *pPrev->End() <= *pCurrent->Start(),
+ OSL_ENSURE( *pPrev->End() <= *pCurrent->Start(),
_ERROR_PREFIX "overlapping redlines" );
}
}
@@ -336,7 +336,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
if( pStt->nContent > 0 )
{
- DBG_ASSERT( false, "Redline start: non-text-node with content" );
+ OSL_ENSURE( false, "Redline start: non-text-node with content" );
pStt->nContent = 0;
}
}
@@ -344,7 +344,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
if( pStt->nContent > pTxtNode->Len() )
{
- DBG_ASSERT( false, "Redline start: index behind text" );
+ OSL_ENSURE( false, "Redline start: index behind text" );
pStt->nContent = pTxtNode->Len();
}
}
@@ -353,7 +353,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
if( pEnd->nContent > 0 )
{
- DBG_ASSERT( false, "Redline end: non-text-node with content" );
+ OSL_ENSURE( false, "Redline end: non-text-node with content" );
pEnd->nContent = 0;
}
}
@@ -361,7 +361,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
if( pEnd->nContent > pTxtNode->Len() )
{
- DBG_ASSERT( false, "Redline end: index behind text" );
+ OSL_ENSURE( false, "Redline end: index behind text" );
pEnd->nContent = pTxtNode->Len();
}
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 81b586b..1b6013a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -788,7 +788,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
SwDoc* pDoc = (SwDoc*)pSectNd->GetDoc();
- DBG_ASSERT(pDoc != NULL, "Where is the document?");
+ OSL_ENSURE(pDoc != NULL, "Where is the document?");
if(pAttr && pDoc && GetFmt())
pDoc->ChgFmt(*GetFmt(), *pAttr);
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index 322d286..682c8c9 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -70,28 +70,28 @@ bool SwDoc::isXForms() const
Reference<XInterface> lcl_createInstance( const sal_Char* pServiceName )
{
- DBG_ASSERT( pServiceName != NULL, "no service name" );
+ OSL_ENSURE( pServiceName != NULL, "no service name" );
return utl::getProcessServiceFactory()->createInstance(
OUString::createFromAscii( pServiceName ) );
}
void SwDoc::initXForms( bool bCreateDefaultModel )
{
- DBG_ASSERT( ! isXForms(), "please initialize only once" );
+ OSL_ENSURE( ! isXForms(), "please initialize only once" );
try
{
// create XForms components
xXForms.set( lcl_createInstance( "com.sun.star.xforms.XForms" ),
UNO_QUERY );
- DBG_ASSERT( xXForms.is(), "can't create XForms container" );
+ OSL_ENSURE( xXForms.is(), "can't create XForms container" );
// change our module identifier, to be able to have a dedicated UI
Reference< XModule > xModule;
SwDocShell* pShell( GetDocShell() );
if ( pShell )
xModule = xModule.query( pShell->GetModel() );
- DBG_ASSERT( xModule.is(), "SwDoc::initXForms: no XModule at the document!" );
+ OSL_ENSURE( xModule.is(), "SwDoc::initXForms: no XModule at the document!" );
if ( xModule.is() )
xModule->setIdentifier( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xforms.XMLFormDocument" ) ) );
@@ -102,7 +102,7 @@ void SwDoc::initXForms( bool bCreateDefaultModel )
Reference<XModel> xModel(
lcl_createInstance( "com.sun.star.xforms.Model" ),
UNO_QUERY );
- DBG_ASSERT( xModel.is(), "no model?" );
+ OSL_ENSURE( xModel.is(), "no model?" );
if( xModel.is() )
{
xModel->setID( sName );
@@ -112,10 +112,10 @@ void SwDoc::initXForms( bool bCreateDefaultModel )
xModel->initialize();
xXForms->insertByName( sName, makeAny( xModel ) );
}
- DBG_ASSERT( xXForms->hasElements(), "can't create XForms model" );
+ OSL_ENSURE( xXForms->hasElements(), "can't create XForms model" );
}
- DBG_ASSERT( isXForms(), "initialization failed" );
+ OSL_ENSURE( isXForms(), "initialization failed" );
}
catch( const Exception& )
{
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 7826c44..57b5b18 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1141,7 +1141,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// (text) node, and thus we set bStartisTxtNode to true. This
// will ensure that this node will be deleted during Undo
// using JoinNext.
- DBG_ASSERT( !bStartIsTxtNode, "Oops, undo may be instable now." );
+ OSL_ENSURE( !bStartIsTxtNode, "Oops, undo may be instable now." );
bStartIsTxtNode = sal_True;
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 05597e6..28eb833 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1898,9 +1898,9 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
return;
// when inserting into the source range, nothing need to be done
- DBG_ASSERT( &aRg.aStart.GetNodes() == this,
+ OSL_ENSURE( &aRg.aStart.GetNodes() == this,
"aRg should use thisnodes array" );
- DBG_ASSERT( &aRg.aStart.GetNodes() == &aRg.aEnd.GetNodes(),
+ OSL_ENSURE( &aRg.aStart.GetNodes() == &aRg.aEnd.GetNodes(),
"Range across different nodes arrays? You deserve punishment!");
if( &rIndex.GetNodes() == &aRg.aStart.GetNodes() &&
rIndex.GetIndex() >= aRg.aStart.GetIndex() &&
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index fece09b..dcdc438 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1305,9 +1305,9 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
sal_uInt32 nRedlinePortions = lcl_CountRedlines(rLastPortions);
if((rLastPortions.size() - nRedlinePortions) == rNewPortions.size())
{
- DBG_ASSERT( rNewPortions.size() > 0, "rNewPortions should not be empty here" );
- DBG_ASSERT( rLastPortions.size() > 0, "rLastPortions should not be empty here" );
- DBG_ASSERT( rLastPositions.size() > 0, "rLastPositions should not be empty here" );
+ OSL_ENSURE( rNewPortions.size() > 0, "rNewPortions should not be empty here" );
+ OSL_ENSURE( rLastPortions.size() > 0, "rLastPortions should not be empty here" );
+ OSL_ENSURE( rLastPositions.size() > 0, "rLastPositions should not be empty here" );
//the simple case: the same number of elements on both sides
//each changed element has to be applied to the corresponding source element
@@ -1330,7 +1330,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
}
else
{
- DBG_ASSERT( 0, "ApplyChangedSentence: iterator positions broken" );
+ OSL_ENSURE( 0, "ApplyChangedSentence: iterator positions broken" );
break;
}
}
@@ -1372,7 +1372,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
}
else
{
- DBG_ASSERT( rLastPositions.size() > 0, "rLastPositions should not be empty here" );
+ OSL_ENSURE( rLastPositions.size() > 0, "rLastPositions should not be empty here" );
//select the complete sentence
SpellContentPositions::const_iterator aCurrentEndPosition = rLastPositions.end();
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 04d2bdb..036b20e 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -328,7 +328,7 @@ const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
// the current position
// const SwPosition* pCurrentPos = GetCrsr()->GetPoint();
- DBG_ASSERT( pCurrentPos != NULL, "Strange, we have no position!" );
+ OSL_ENSURE( pCurrentPos != NULL, "Strange, we have no position!" );
const SwNode& rCurrentNode = pCurrentPos->nNode.GetNode();
@@ -361,9 +361,9 @@ const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
// Now, pInnermostNode is NULL or the innermost section or table node.
if( (pInnermostNode != NULL) && !pInnermostNode->IsProtect() )
{
- DBG_ASSERT( pInnermostNode->IsTableNode() ||
+ OSL_ENSURE( pInnermostNode->IsTableNode() ||
pInnermostNode->IsSectionNode(), "wrong node found" );
- DBG_ASSERT( ( pInnermostNode->GetIndex() <= rCurrentNode.GetIndex() )&&
+ OSL_ENSURE( ( pInnermostNode->GetIndex() <= rCurrentNode.GetIndex() )&&
( pInnermostNode->EndOfSectionNode()->GetIndex() >=
rCurrentNode.GetIndex() ), "wrong node found" );
@@ -403,7 +403,7 @@ const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
}
- DBG_ASSERT( ( pReturn == NULL ) || pReturn->IsStartNode() ||
+ OSL_ENSURE( ( pReturn == NULL ) || pReturn->IsStartNode() ||
pReturn->IsEndNode(),
"SpecialInsertNode failed" );
return pReturn;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 92763af..359d010 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -153,7 +153,7 @@ void SwAuthorityFieldType::RemoveField(long nHandle)
}
}
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT(bRemoved, "Field unknown" );
+ OSL_ENSURE(bRemoved, "Field unknown" );
#endif
}
@@ -203,7 +203,7 @@ sal_Bool SwAuthorityFieldType::AddField(long nHandle)
break;
}
}
- DBG_ASSERT(bRet, "::AddField(long) failed");
+ OSL_ENSURE(bRet, "::AddField(long) failed");
return bRet;
}
@@ -547,7 +547,7 @@ const SwTOXSortKey* SwAuthorityFieldType::GetSortKey(sal_uInt16 nIdx) const
SwTOXSortKey* pRet = 0;
if(m_pSortKeyArr->Count() > nIdx)
pRet = (*m_pSortKeyArr)[nIdx];
- DBG_ASSERT(pRet, "Sort key not found");
+ OSL_ENSURE(pRet, "Sort key not found");
return pRet;
}
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 0f86411..ea83304 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -618,13 +618,13 @@ String SwTemplNameFieldType::Expand(sal_uLong nFmt) const
String aRet;
SwDocShell *pDocShell(pDoc->GetDocShell());
- DBG_ASSERT(pDocShell, "no SwDocShell");
+ OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
- DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
+ OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
if( FF_UI_NAME == nFmt )
aRet = xDocProps->getTemplateName();
@@ -908,14 +908,14 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
String aStr;
const LocaleDataWrapper *pAppLocalData = 0, *pLocalData = 0;
SwDocShell *pDocShell(GetDoc()->GetDocShell());
- DBG_ASSERT(pDocShell, "no SwDocShell");
+ OSL_ENSURE(pDocShell, "no SwDocShell");
if (!pDocShell) { return aStr; }
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps(
xDPS->getDocumentProperties());
- DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
+ OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
sal_uInt16 nExtSub = nSub & 0xff00;
nSub &= 0xff; // ExtendedSubTypes nicht beachten
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 077b66d..07e9bdd 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -870,7 +870,7 @@ void SwSetExpField::SetSubType(sal_uInt16 nSub)
((SwSetExpFieldType*)GetTyp())->SetType(nSub & 0xff);
nSubType = nSub & 0xff00;
- DBG_ASSERT( (nSub & 0xff) != 3, "SubType ist illegal!" );
+ OSL_ENSURE( (nSub & 0xff) != 3, "SubType ist illegal!" );
}
sal_uInt16 SwSetExpField::GetSubType() const
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index d41d345..c00ba76 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -105,7 +105,7 @@ String SwMacroField::GetLibName() const
return aMacro.Copy(0, nPos );
}
- DBG_ASSERT(0, "Kein Macroname vorhanden");
+ OSL_FAIL("Kein Macroname vorhanden");
return aEmptyStr;
}
@@ -128,7 +128,7 @@ String SwMacroField::GetMacroName() const
}
}
- DBG_ASSERT(0, "Kein Macroname vorhanden");
+ OSL_FAIL("Kein Macroname vorhanden");
return aEmptyStr;
}
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 0a5310f..df65a56 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -295,9 +295,9 @@ SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool * ) const
bool SwTransparencyGrf::QueryValue( uno::Any& rVal,
sal_uInt8 ) const
{
- DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!");
+ OSL_ENSURE(ISA(SfxByteItem),"Put/QueryValue should be removed!");
sal_Int16 nRet = GetValue();
- DBG_ASSERT( 0 <= nRet && nRet <= 100, "value out of range" );
+ OSL_ENSURE( 0 <= nRet && nRet <= 100, "value out of range" );
rVal <<= nRet;
return true;
}
@@ -306,7 +306,7 @@ bool SwTransparencyGrf::PutValue( const uno::Any& rVal,
sal_uInt8 )
{
//temporary conversion until this is a SfxInt16Item!
- DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!");
+ OSL_ENSURE(ISA(SfxByteItem),"Put/QueryValue should be removed!");
sal_Int16 nVal = 0;
if(!(rVal >>= nVal) || nVal < -100 || nVal > 100)
return false;
@@ -317,7 +317,7 @@ bool SwTransparencyGrf::PutValue( const uno::Any& rVal,
nVal = ( ( nVal * 128 ) - (99/2) ) / 100;
nVal += 128;
}
- DBG_ASSERT( 0 <= nVal && nVal <= 100, "value out of range" );
+ OSL_ENSURE( 0 <= nVal && nVal <= 100, "value out of range" );
SetValue(static_cast<sal_uInt8>(nVal));
return true;
}
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 2fcffc1..aece9b7 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -475,7 +475,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
}
else
nRet = 1;
- DBG_ASSERTWARNING( nRet, "Grafik kann nicht eingeswapt werden" );
+ OSL_ENSURE( nRet, "Grafik kann nicht eingeswapt werden" );
if( nRet )
{
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 791459a..f5bd2ae 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2252,17 +2252,17 @@ bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal.setValue( &bDisplayGrid, ::getBooleanCppuType() );
break;
case MID_GRID_BASEHEIGHT:
- DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
+ OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0,
"This value needs TWIPS-MM100 conversion" );
rVal <<= (sal_Int32) TWIP_TO_MM100_UNSIGNED(nBaseHeight);
break;
case MID_GRID_BASEWIDTH:
- DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
+ OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0,
"This value needs TWIPS-MM100 conversion" );
rVal <<= (sal_Int32) TWIP_TO_MM100_UNSIGNED(nBaseWidth);
break;
case MID_GRID_RUBYHEIGHT:
- DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
+ OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0,
"This value needs TWIPS-MM100 conversion" );
rVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(nRubyHeight);
break;
@@ -2338,7 +2338,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_GRID_BASEWIDTH:
case MID_GRID_RUBYHEIGHT:
{
- DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
+ OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0,
"This value needs TWIPS-MM100 conversion" );
sal_Int32 nTmp = 0;
bRet = (rVal >>= nTmp);
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 04edc6c..e5c5e13 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1902,7 +1902,7 @@ void SwRootFrm::UnoRemoveAllActions()
// Recursives calls to <::EndAction()> are not allowed.
if ( !pSh->IsInEndAction() )
{
- DBG_ASSERT(!pSh->GetRestoreActions(), "Restore action count is already set!");
+ OSL_ENSURE(!pSh->GetRestoreActions(), "Restore action count is already set!");
sal_Bool bCrsr = pSh->ISA( SwCrsrShell );
sal_Bool bFE = pSh->ISA( SwFEShell );
sal_uInt16 nRestore = 0;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 7a8e977..394c691 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -288,7 +288,7 @@ SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )
sal_Bool SwOLENode::RestorePersistentData()
{
- DBG_ASSERT( aOLEObj.GetOleRef().is(), "No object to restore!" );
+ OSL_ENSURE( aOLEObj.GetOleRef().is(), "No object to restore!" );
if ( aOLEObj.xOLERef.is() )
{
// Falls bereits eine SvPersist-Instanz existiert, nehmen wir diese
@@ -306,7 +306,7 @@ sal_Bool SwOLENode::RestorePersistentData()
if ( xChild.is() )
xChild->setParent( p->GetModel() );
- DBG_ASSERT( aOLEObj.aName.Len(), "No object name!" );
+ OSL_ENSURE( aOLEObj.aName.Len(), "No object name!" );
::rtl::OUString aObjName;
if ( !p->GetEmbeddedObjectContainer().InsertEmbeddedObject( aOLEObj.xOLERef.GetObject(), aObjName ) )
{
@@ -334,7 +334,7 @@ sal_Bool SwOLENode::SavePersistentData()
#if OSL_DEBUG_LEVEL > 0
SfxObjectShell* p = GetDoc()->GetPersist();
- DBG_ASSERT( p, "No document!" );
+ OSL_ENSURE( p, "No document!" );
if( p )
{
comphelper::EmbeddedObjectContainer& rCnt = p->GetEmbeddedObjectContainer();
@@ -679,7 +679,7 @@ SwOLEObj::~SwOLEObj()
#if OSL_DEBUG_LEVEL > 0
SfxObjectShell* p = pOLENd->GetDoc()->GetPersist();
- DBG_ASSERT( p, "No document!" );
+ OSL_ENSURE( p, "No document!" );
if( p )
{
comphelper::EmbeddedObjectContainer& rCnt = p->GetEmbeddedObjectContainer();
@@ -931,7 +931,7 @@ void SwOLELRUCache::Load()
Sequence< OUString > aNames( GetPropertyNames() );
Sequence< Any > aValues = GetProperties( aNames );
const Any* pValues = aValues.getConstArray();
- DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties failed" );
+ OSL_ENSURE( aValues.getLength() == aNames.getLength(), "GetProperties failed" );
if( aValues.getLength() == aNames.getLength() && pValues->hasValue() )
{
sal_Int32 nVal = 0;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index bc8f4fc..744b389 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -204,7 +204,7 @@ sal_uLong SwXMLTextBlocks::Delete( sal_uInt16 n )
sal_uLong SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const String& rNewShort, const String& )
{
- DBG_ASSERT( xBlkRoot.is(), "No storage set" );
+ OSL_ENSURE( xBlkRoot.is(), "No storage set" );
if(!xBlkRoot.is())
return 0;
String aOldName (aNames[ nIdx ]->aPackageName);
@@ -255,7 +255,7 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, String& rShort,
String sDestShortName( GetPackageName (nIndex) );
sal_uInt16 nIdx = 0;
- DBG_ASSERT( xBlkRoot.is(), "No storage set" );
+ OSL_ENSURE( xBlkRoot.is(), "No storage set" );
if(!xBlkRoot.is())
return ERR_SWG_WRITE_ERROR;
@@ -298,7 +298,7 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, String& rShort,
sal_uLong SwXMLTextBlocks::StartPutBlock( const String& rShort, const String& rPackageName )
{
- DBG_ASSERT( xBlkRoot.is(), "No storage set" );
+ OSL_ENSURE( xBlkRoot.is(), "No storage set" );
if(!xBlkRoot.is())
return 0;
GetIndex ( rShort );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 0b16cbd..004b984 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -207,7 +207,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
OUString sStreamName(RTL_CONSTASCII_USTRINGPARAM("atevent.xml"));
uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement(
sStreamName, embed::ElementModes::READ );
- DBG_ASSERT(xDocStream.is(), "Can't create stream");
+ OSL_ENSURE(xDocStream.is(), "Can't create stream");
if ( xDocStream.is() )
{
uno::Reference<io::XInputStream> xInputStream = xDocStream->getInputStream();
@@ -229,7 +229,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
uno::Reference< xml::sax::XParser > xParser(
xServiceFactory->createInstance(sParserService),
UNO_QUERY );
- DBG_ASSERT( xParser.is(), "Can't create parser" );
+ OSL_ENSURE( xParser.is(), "Can't create parser" );
if( xParser.is() )
{
// create descriptor and reference to it. Either
@@ -249,7 +249,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
xServiceFactory->createInstanceWithArguments(
sFilterComponent, aFilterArguments),
UNO_QUERY );
- DBG_ASSERT( xFilter.is(),
+ OSL_ENSURE( xFilter.is(),
"can't instantiate atevents filter");
if ( xFilter.is() )
{
@@ -416,7 +416,7 @@ sal_uLong SwXMLTextBlocks::PutBlockText( const String& rShort, const String& ,
uno::Reference < XInterface > xWriter (xServiceFactory->createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))));
- DBG_ASSERT(xWriter.is(),"com.sun.star.xml.sax.Writer service missing");
+ OSL_ENSURE(xWriter.is(),"com.sun.star.xml.sax.Writer service missing");
sal_uLong nRes = 0;
try
@@ -548,7 +548,7 @@ void SwXMLTextBlocks::WriteInfo( void )
{
uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
comphelper::getProcessServiceFactory();
- DBG_ASSERT( xServiceFactory.is(),
+ OSL_ENSURE( xServiceFactory.is(),
"XMLReader::Read: got no service manager" );
if( !xServiceFactory.is() )
{
@@ -557,7 +557,7 @@ void SwXMLTextBlocks::WriteInfo( void )
uno::Reference < XInterface > xWriter (xServiceFactory->createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))));
- DBG_ASSERT(xWriter.is(),"com.sun.star.xml.sax.Writer service missing");
+ OSL_ENSURE(xWriter.is(),"com.sun.star.xml.sax.Writer service missing");
OUString sDocName( RTL_CONSTASCII_USTRINGPARAM( XMLN_BLOCKLIST ) );
/*
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index fba4566..ba19cec 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1343,7 +1343,7 @@ static void lcl_InitHyphValues( PropertyValues &rVals,
const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
{
- DBG_ASSERT( 2 == aHyphVals.getLength(),
+ OSL_ENSURE( 2 == aHyphVals.getLength(),
"hyphenation values not yet initialized" );
return aHyphVals;
}
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index dd50932..9bc25b2 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -467,7 +467,7 @@ void SwWrongList::JoinList( SwWrongList* pNext, xub_StrLen nInsertPos )
{
if (pNext)
{
- DBG_ASSERT( GetWrongListType() == pNext->GetWrongListType(), "type mismatch with next list" );
+ OSL_ENSURE( GetWrongListType() == pNext->GetWrongListType(), "type mismatch with next list" );
}
if( pNext )
{
@@ -503,7 +503,7 @@ void SwWrongList::InsertSubList( xub_StrLen nNewPos, xub_StrLen nNewLen, sal_uIn
{
if (pSubList)
{
- DBG_ASSERT( GetWrongListType() == pSubList->GetWrongListType(), "type mismatch with sub list" );
+ OSL_ENSURE( GetWrongListType() == pSubList->GetWrongListType(), "type mismatch with sub list" );
}
std::vector<SwWrongArea>::iterator i = maList.begin();
if ( nWhere >= maList.size() )
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 6192fe8..0dd7661 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -66,7 +66,7 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
#if OSL_DEBUG_LEVEL > 1
ByteString aMsg( "IndexEntrySupplierWrapper: Exception caught\n" );
aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
}
@@ -92,7 +92,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
#if OSL_DEBUG_LEVEL > 1
ByteString aMsg( "getIndexKey: Exception caught\n" );
aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
return sRet;
@@ -113,7 +113,7 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
#if OSL_DEBUG_LEVEL > 1
ByteString aMsg( "getIndexFollowPageWord: Exception caught\n" );
aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
return sRet;
@@ -136,7 +136,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
#if OSL_DEBUG_LEVEL > 1
ByteString aMsg( "getAlgorithmList: Exception caught\n" );
aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
return sRet;
@@ -159,7 +159,7 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
#if OSL_DEBUG_LEVEL > 1
ByteString aMsg( "loadAlgorithm: Exception caught\n" );
aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
return bRet;
@@ -185,7 +185,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
#if OSL_DEBUG_LEVEL > 1
ByteString aMsg( "compareIndexEntry: Exception caught\n" );
aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
+ OSL_FAIL( aMsg.GetBuffer() );
#endif
}
return nRet;
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index af88482..29c6260 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -947,7 +947,7 @@ void SwTxtNode::SetLanguageAndFont( const SwPaM &rPaM,
SfxItemSet aSet( pEditShell->GetAttrPool(), aRanges );
aSet.Put( SvxLanguageItem( nLang, nLangWhichId ) );
- DBG_ASSERT( pFont, "target font missing?" );
+ OSL_ENSURE( pFont, "target font missing?" );
if (pFont)
{
SvxFontItem aFontItem = (SvxFontItem&) aSet.Get( nFontWhichId );
@@ -1071,7 +1071,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
if (bFound && bInSelection) // convertible text found within selection/range?
{
const XubString aTxtPortion = m_Text.Copy( nBegin, nLen );
- DBG_ASSERT( m_Text.Len() > 0, "convertible text portion missing!" );
+ OSL_ENSURE( m_Text.Len() > 0, "convertible text portion missing!" );
rArgs.aConvText = m_Text.Copy( nBegin, nLen );
rArgs.nConvTextLang = nLangFound;
@@ -1198,7 +1198,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
if( bSpell && rWord.Len() > 0 )
{
// check for: bAlter => xHyphWord.is()
- DBG_ASSERT(!bSpell || xSpell.is(), "NULL pointer");
+ OSL_ENSURE(!bSpell || xSpell.is(), "NULL pointer");
if( !xSpell->isValid( rWord, eActLang, Sequence< PropertyValue >() ) )
{
@@ -1574,7 +1574,7 @@ void SwTxtNode::TransliterateText(
nStt = (xub_StrLen)aCurWordBndry.startPos;
nEnd = (xub_StrLen)aCurWordBndry.endPos;
sal_Int32 nLen = nEnd - nStt;
- DBG_ASSERT( nLen > 0, "invalid word length of 0" );
+ OSL_ENSURE( nLen > 0, "invalid word length of 0" );
#if OSL_DEBUG_LEVEL > 1
String aText( GetTxt().Copy( nStt, nLen ) );
#endif
@@ -1657,7 +1657,7 @@ void SwTxtNode::TransliterateText(
while (nCurrentStart < nLastEnd)
{
sal_Int32 nLen = nCurrentEnd - nCurrentStart;
- DBG_ASSERT( nLen > 0, "invalid word length of 0" );
+ OSL_ENSURE( nLen > 0, "invalid word length of 0" );
#if OSL_DEBUG_LEVEL > 1
String aText( GetTxt().Copy( nCurrentStart, nLen ) );
#endif
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index c74f072..2c9e3ca 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -161,28 +161,28 @@ Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName )
void SAL_CALL SwXTextDefaults::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- DBG_WARNING ( "not implemented" );
+ OSL_FAIL ( "not implemented" );
}
void SAL_CALL SwXTextDefaults::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- DBG_WARNING ( "not implemented" );
+ OSL_FAIL ( "not implemented" );
}
void SAL_CALL SwXTextDefaults::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- DBG_WARNING ( "not implemented" );
+ OSL_FAIL ( "not implemented" );
}
void SAL_CALL SwXTextDefaults::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- DBG_WARNING ( "not implemented" );
+ OSL_FAIL ( "not implemented" );
}
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index cc0386a..162716d 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -230,7 +230,7 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList,
}
catch( UNO_NMSPC::Exception& )
{
- DBG_ERRORFILE( "create cursor failed!" );
+ OSL_FAIL( "create cursor failed!" );
}
if( xResultSet.is() )
@@ -274,13 +274,13 @@ sal_Bool UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList,
}
catch( UNO_NMSPC::Exception& )
{
- DBG_ERRORFILE( "Exception caught!" );
+ OSL_FAIL( "Exception caught!" );
}
}
}
catch( UNO_NMSPC::Exception& )
{
- DBG_ERRORFILE( "Exception caught!" );
+ OSL_FAIL( "Exception caught!" );
bOk = sal_False;
}
return bOk;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 7e5a3dd..fd9a2b6 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -240,12 +240,12 @@ sal_Bool FillRangeDescriptor(
lcl_GetCellPosition( aTLName, rDesc.nLeft, rDesc.nTop );
lcl_GetCellPosition( aBRName, rDesc.nRight, rDesc.nBottom );
rDesc.Normalize();
- DBG_ASSERT( rDesc.nTop != -1 &&
+ OSL_ENSURE( rDesc.nTop != -1 &&
rDesc.nLeft != -1 &&
rDesc.nBottom != -1 &&
rDesc.nRight != -1,
"failed to get range descriptor" );
- DBG_ASSERT( rDesc.nTop <= rDesc.nBottom && rDesc.nLeft <= rDesc.nRight,
+ OSL_ENSURE( rDesc.nTop <= rDesc.nBottom && rDesc.nLeft <= rDesc.nRight,
"invalid range descriptor");
return sal_True;
}
@@ -277,8 +277,8 @@ static String GetCellRangeName( SwFrmFmt &rTblFmt, SwUnoCrsr &rTblCrsr )
pStart = pUnoTblCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
pStartBox = pTable->GetTblBox( pStart->GetIndex());
}
- DBG_ASSERT( pStartBox, "start box not found" );
- DBG_ASSERT( pEndBox, "end box not found" );
+ OSL_ENSURE( pStartBox, "start box not found" );
+ OSL_ENSURE( pEndBox, "end box not found" );
// need to switch start and end?
if (*pUnoTblCrsr->GetPoint() < *pUnoTblCrsr->GetMark())
{
@@ -302,8 +302,8 @@ static String GetRangeRepFromTableAndCells( const String &rTableName,
const String &rStartCell, const String &rEndCell,
sal_Bool bForceEndCellName )
{
- DBG_ASSERT( rTableName.Len(), "table name missing" );
- DBG_ASSERT( rStartCell.Len(), "cell name missing" );
+ OSL_ENSURE( rTableName.Len(), "table name missing" );
+ OSL_ENSURE( rStartCell.Len(), "cell name missing" );
String aRes( rTableName );
aRes += (sal_Unicode) '.';
aRes += rStartCell;
@@ -597,7 +597,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
// false: DataSource will be sequence of rows
OUString aChartOleObjectName;//work around wrong writer ranges ( see Issue 58464 )
sal_Int32 nArgs = rArguments.getLength();
- DBG_ASSERT( nArgs != 0, "no properties provided" );
+ OSL_ENSURE( nArgs != 0, "no properties provided" );
if (nArgs == 0)
return xRes;
const beans::PropertyValue *pArg = rArguments.getConstArray();
@@ -739,12 +739,12 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
sal_Bool bOk2 = GetTableAndCellsFromRangeRep(
pSubRanges[i], aTblName, aStartCell, aEndCell );
(void) bOk2;
- DBG_ASSERT( bOk2, "failed to get table and start/end cells" );
+ OSL_ENSURE( bOk2, "failed to get table and start/end cells" );
sal_Int32 nStartRow, nStartCol, nEndRow, nEndCol;
lcl_GetCellPosition( aStartCell, nStartCol, nStartRow );
lcl_GetCellPosition( aEndCell, nEndCol, nEndRow );
- DBG_ASSERT( nStartRow <= nEndRow && nStartCol <= nEndCol,
+ OSL_ENSURE( nStartRow <= nEndRow && nStartCol <= nEndCol,
"cell range not normalized");
// test if the ranges span more than the available cells
@@ -932,13 +932,13 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
// create XDataSequence's from cursors
if (pLabelUnoCrsr)
pLabelSeqs[ nSeqsIdx ] = new SwChartDataSequence( *this, *pTblFmt, pLabelUnoCrsr );
- DBG_ASSERT( pDataUnoCrsr, "pointer to data sequence missing" );
+ OSL_ENSURE( pDataUnoCrsr, "pointer to data sequence missing" );
if (pDataUnoCrsr)
pDataSeqs [ nSeqsIdx ] = new SwChartDataSequence( *this, *pTblFmt, pDataUnoCrsr );
if (pLabelUnoCrsr || pDataUnoCrsr)
++nSeqsIdx;
}
- DBG_ASSERT( nSeqsIdx == nNumLDS,
+ OSL_ENSURE( nSeqsIdx == nNumLDS,
"mismatch between sequence size and num,ber of entries" );
// build data source from data and label sequences
@@ -984,7 +984,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list