[Libreoffice-commits] core.git: editeng/source include/editeng
Arnaud Versini
arnaud.versini at gmail.com
Tue Jan 21 08:07:43 PST 2014
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 170 -----------
editeng/source/accessibility/AccessibleImageBullet.cxx | 46 ---
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 18 -
editeng/source/editeng/editattr.cxx | 3
editeng/source/editeng/editdoc.cxx | 15 -
editeng/source/editeng/editdoc.hxx | 5
editeng/source/editeng/editeng.cxx | 179 ------------
editeng/source/editeng/editobj.cxx | 4
editeng/source/editeng/editundo.cxx | 2
editeng/source/editeng/editview.cxx | 142 ---------
editeng/source/editeng/impedit.hxx | 2
editeng/source/editeng/impedit2.cxx | 4
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit4.cxx | 1
editeng/source/editeng/impedit5.cxx | 3
editeng/source/outliner/outlin2.cxx | 95 ------
editeng/source/outliner/outliner.cxx | 61 ----
editeng/source/outliner/outlundo.cxx | 7
editeng/source/outliner/outlvw.cxx | 106 -------
editeng/source/outliner/paralist.cxx | 7
include/editeng/editobj.hxx | 2
21 files changed, 874 deletions(-)
New commits:
commit 5e10e6937a8d5117555a4dcc9520aca173d75c95
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sat Jan 18 10:15:10 2014 +0100
EDITENG : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Change-Id: Ifc04e2ec9d27c706868569a3bcb8fbfae0e84c69
Reviewed-on: https://gerrit.libreoffice.org/7524
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 3b44e94..75dce25 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::accessibility;
-
//------------------------------------------------------------------------
//
// AccessibleEditableTextPara implementation
@@ -102,9 +101,6 @@ namespace accessibility
return &aPropSet;
}
-
- DBG_NAME( AccessibleEditableTextPara )
-
// #i27138# - add parameter <_pParaManager>
AccessibleEditableTextPara::AccessibleEditableTextPara(
const uno::Reference< XAccessible >& rParent,
@@ -125,7 +121,6 @@ namespace accessibility
mpParaManager( _pParaManager )
{
#ifdef DBG_UTIL
- DBG_CTOR( AccessibleEditableTextPara, NULL );
OSL_TRACE( "AccessibleEditableTextPara received ID: %d", mnNotifierClientId );
#endif
@@ -150,8 +145,6 @@ namespace accessibility
AccessibleEditableTextPara::~AccessibleEditableTextPara()
{
- DBG_DTOR( AccessibleEditableTextPara, NULL );
-
// sign off from event notifier
if( getNotifierClientId() != -1 )
{
@@ -170,15 +163,11 @@ namespace accessibility
OUString AccessibleEditableTextPara::implGetText()
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return GetTextRange( 0, GetTextLen() );
}
::com::sun::star::lang::Locale AccessibleEditableTextPara::implGetLocale()
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
"AccessibleEditableTextPara::getLocale: paragraph index value overflow");
@@ -188,8 +177,6 @@ namespace accessibility
void AccessibleEditableTextPara::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
sal_uInt16 nStart, nEnd;
if( GetSelection( nStart, nEnd ) )
@@ -207,7 +194,6 @@ namespace accessibility
void AccessibleEditableTextPara::implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 /*nIndex*/ )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" );
rBoundary.startPos = 0;
@@ -219,8 +205,6 @@ namespace accessibility
void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SvxTextForwarder& rCacheTF = GetTextForwarder();
const sal_Int32 nParaIndex = GetParagraphIndex();
@@ -267,29 +251,21 @@ namespace accessibility
int AccessibleEditableTextPara::getNotifierClientId() const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return mnNotifierClientId;
}
void AccessibleEditableTextPara::SetIndexInParent( sal_Int32 nIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
mnIndexInParent = nIndex;
}
sal_Int32 AccessibleEditableTextPara::GetIndexInParent() const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return mnIndexInParent;
}
void AccessibleEditableTextPara::SetParagraphIndex( sal_Int32 nIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
sal_Int32 nOldIndex = mnParagraphIndex;
mnParagraphIndex = nIndex;
@@ -325,15 +301,11 @@ namespace accessibility
sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return mnParagraphIndex;
}
void AccessibleEditableTextPara::Dispose()
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
int nClientId( getNotifierClientId() );
// #108212# drop all references before notifying dispose
@@ -362,8 +334,6 @@ namespace accessibility
void AccessibleEditableTextPara::SetEditSource( SvxEditSourceAdapter* pEditSource )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
WeakBullet::HardRefType aChild( maImageBullet.get() );
if( aChild.is() )
aChild->SetEditSource(pEditSource);
@@ -391,8 +361,6 @@ namespace accessibility
ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nStartEEIndex, sal_Int32 nEndEEIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
// check overflow
DBG_ASSERT(nStartEEIndex >= 0 && nStartEEIndex <= USHRT_MAX &&
nEndEEIndex >= 0 && nEndEEIndex <= USHRT_MAX &&
@@ -406,22 +374,16 @@ namespace accessibility
ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nEEIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return MakeSelection( nEEIndex, nEEIndex+1 );
}
ESelection AccessibleEditableTextPara::MakeCursor( sal_Int32 nEEIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return MakeSelection( nEEIndex, nEEIndex );
}
void AccessibleEditableTextPara::CheckIndex( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
if( nIndex < 0 || nIndex >= getCharacterCount() )
throw lang::IndexOutOfBoundsException("AccessibleEditableTextPara: character index out of bounds",
uno::Reference< uno::XInterface >
@@ -430,8 +392,6 @@ namespace accessibility
void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
if( nIndex < 0 || nIndex > getCharacterCount() )
throw lang::IndexOutOfBoundsException("AccessibleEditableTextPara: character position out of bounds",
uno::Reference< uno::XInterface >
@@ -440,16 +400,12 @@ namespace accessibility
void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
CheckPosition( nStart );
CheckPosition( nEnd );
}
sal_Bool AccessibleEditableTextPara::GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
ESelection aSelection;
sal_Int32 nPara = GetParagraphIndex();
if( !GetEditViewForwarder().GetSelection( aSelection ) )
@@ -493,22 +449,16 @@ namespace accessibility
OUString AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) );
}
sal_uInt16 AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
}
SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
if( mpEditSource )
return *mpEditSource;
else
@@ -520,8 +470,6 @@ namespace accessibility
SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SvxEditSourceAdapter& rEditSource = GetEditSource();
SvxAccessibleTextAdapter* pTextForwarder = rEditSource.GetTextForwarderAdapter();
@@ -542,8 +490,6 @@ namespace accessibility
SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SvxEditSource& rEditSource = GetEditSource();
SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
@@ -566,8 +512,6 @@ namespace accessibility
SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SvxEditSourceAdapter& rEditSource = GetEditSource();
SvxAccessibleTextEditViewAdapter* pTextEditViewForwarder = rEditSource.GetEditViewForwarderAdapter( bCreate );
@@ -604,8 +548,6 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::HaveEditView() const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SvxEditSource& rEditSource = GetEditSource();
SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
@@ -620,8 +562,6 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::HaveChildren()
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
"AccessibleEditableTextPara::HaveChildren: paragraph index value overflow");
@@ -637,15 +577,11 @@ namespace accessibility
const Point& AccessibleEditableTextPara::GetEEOffset() const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return maEEOffset;
}
void AccessibleEditableTextPara::SetEEOffset( const Point& rOffset )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
WeakBullet::HardRefType aChild( maImageBullet.get() );
if( aChild.is() )
aChild->SetEEOffset(rOffset);
@@ -655,8 +591,6 @@ namespace accessibility
void AccessibleEditableTextPara::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue) const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleEditableTextPara* > (this)->getAccessibleContext() );
AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
@@ -673,22 +607,16 @@ namespace accessibility
void AccessibleEditableTextPara::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
FireEvent( nEventId, rNewValue );
}
void AccessibleEditableTextPara::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
FireEvent( nEventId, uno::Any(), rOldValue );
}
void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
!pStateSet->contains(nStateId) )
@@ -700,8 +628,6 @@ namespace accessibility
void AccessibleEditableTextPara::UnSetState( const sal_Int16 nStateId )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
pStateSet->contains(nStateId) )
@@ -726,8 +652,6 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex )
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
"AccessibleEditableTextPara::GetAttributeRun: index value overflow");
@@ -742,8 +666,6 @@ namespace accessibility
uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
uno::Any aRet;
// must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
@@ -773,8 +695,6 @@ namespace accessibility
// XAccessible
uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
// We implement the XAccessibleContext interface in the same object
return uno::Reference< XAccessibleContext > ( this );
}
@@ -782,8 +702,6 @@ namespace accessibility
// XAccessibleContext
sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
return HaveChildren() ? 1 : 0;
@@ -791,8 +709,6 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
if( !HaveChildren() )
@@ -832,7 +748,6 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
#ifdef DBG_UTIL
if( !mxParent.is() )
@@ -844,21 +759,16 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return mnIndexInParent;
}
sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return AccessibleRole::PARAGRAPH;
}
OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
// append first 40 characters from text, or first line, if shorter
@@ -903,8 +813,6 @@ namespace accessibility
OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
// throws if defunc
@@ -918,8 +826,6 @@ namespace accessibility
uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
// #i27138# - provide relations CONTENT_FLOWS_FROM
// and CONTENT_FLOWS_TO
if ( mpParaManager )
@@ -1096,8 +1002,6 @@ namespace accessibility
uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
// Create a copy of the state set and return it.
@@ -1120,8 +1024,6 @@ namespace accessibility
lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
return implGetLocale();
@@ -1129,16 +1031,12 @@ namespace accessibility
void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
}
void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
}
@@ -1146,8 +1044,6 @@ namespace accessibility
// XAccessibleComponent
sal_Bool SAL_CALL AccessibleEditableTextPara::containsPoint( const awt::Point& aTmpPoint ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
@@ -1162,8 +1058,6 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
if( HaveChildren() )
@@ -1197,8 +1091,6 @@ namespace accessibility
awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32,
@@ -1223,8 +1115,6 @@ namespace accessibility
awt::Point SAL_CALL AccessibleEditableTextPara::getLocation( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
awt::Rectangle aRect = getBounds();
@@ -1234,8 +1124,6 @@ namespace accessibility
awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
// relate us to parent
@@ -1280,8 +1168,6 @@ namespace accessibility
awt::Size SAL_CALL AccessibleEditableTextPara::getSize( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
awt::Rectangle aRect = getBounds();
@@ -1291,16 +1177,12 @@ namespace accessibility
void SAL_CALL AccessibleEditableTextPara::grabFocus( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
// set cursor to this paragraph
setSelection(0,0);
}
sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground( ) throw (::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
// #104444# Added to XAccessibleComponent interface
svtools::ColorConfig aColorConfig;
sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
@@ -1309,8 +1191,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground( ) throw (::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
// #104444# Added to XAccessibleComponent interface
Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
@@ -1323,8 +1203,6 @@ namespace accessibility
// XAccessibleText
sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
if( !HaveEditView() )
@@ -1353,15 +1231,11 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
return setSelection(nIndex, nIndex);
}
sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1372,7 +1246,6 @@ namespace accessibility
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
//Skip the bullet range to ingnore the bullet text
@@ -1478,8 +1351,6 @@ namespace accessibility
awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1513,8 +1384,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1525,8 +1394,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
sal_Int32 nPara;
@@ -1573,8 +1440,6 @@ namespace accessibility
OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1588,8 +1453,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1603,8 +1466,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1618,8 +1479,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1640,8 +1499,6 @@ namespace accessibility
OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1652,8 +1509,6 @@ namespace accessibility
OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1934,8 +1789,6 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -2051,8 +1904,6 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -2218,8 +2069,6 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -2346,8 +2195,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
SolarMutexGuard aGuard;
try
@@ -2392,7 +2239,6 @@ namespace accessibility
// XAccessibleEditableText
sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2430,7 +2276,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2466,7 +2311,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2508,7 +2352,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const OUString& sText, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2549,7 +2392,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2593,7 +2435,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2653,7 +2494,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const OUString& sText ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2665,7 +2505,6 @@ namespace accessibility
const uno::Sequence< OUString >& rRequestedAttributes )
throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
#if OSL_DEBUG_LEVEL > 0
@@ -2763,7 +2602,6 @@ namespace accessibility
const uno::Sequence< OUString >& rRequestedAttributes )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
SolarMutexGuard aGuard;
@@ -2930,7 +2768,6 @@ namespace accessibility
// XAccessibleMultiLineText
sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
sal_Int32 nRes = -1;
sal_Int32 nPara = GetParagraphIndex();
@@ -2952,7 +2789,6 @@ namespace accessibility
// XAccessibleMultiLineText
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
::com::sun::star::accessibility::TextSegment aResult;
sal_Int32 nPara = GetParagraphIndex();
@@ -2989,7 +2825,6 @@ namespace accessibility
// XAccessibleMultiLineText
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
::com::sun::star::accessibility::TextSegment aResult;
try
@@ -3006,7 +2841,6 @@ namespace accessibility
// XAccessibleMultiLineText
sal_Int32 SAL_CALL AccessibleEditableTextPara::getNumberOfLineWithCaret( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
sal_Int32 nRes = -1;
try
@@ -3024,21 +2858,18 @@ namespace accessibility
// XServiceInfo
OUString SAL_CALL AccessibleEditableTextPara::getImplementationName (void) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
return OUString("AccessibleEditableTextPara");
}
sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const OUString& sServiceName) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
return cppu::supportsService(this, sServiceName);
}
uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames (void) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
const OUString sServiceName( getServiceName() );
return uno::Sequence< OUString > (&sServiceName, 1);
@@ -3047,7 +2878,6 @@ namespace accessibility
// XServiceName
OUString SAL_CALL AccessibleEditableTextPara::getServiceName (void) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
// #105185# Using correct service now
return OUString("com.sun.star.text.AccessibleParagraphView");
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 51b4644..40f3ed8 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::accessibility;
namespace accessibility
{
- DBG_NAME( AccessibleImageBullet )
AccessibleImageBullet::AccessibleImageBullet ( const uno::Reference< XAccessible >& rParent ) :
mnParagraphIndex( 0 ),
@@ -64,7 +63,6 @@ namespace accessibility
mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
{
#ifdef DBG_UTIL
- DBG_CTOR( AccessibleImageBullet, NULL );
OSL_TRACE( "Received ID: %d", mnNotifierClientId );
#endif
@@ -85,7 +83,6 @@ namespace accessibility
AccessibleImageBullet::~AccessibleImageBullet()
{
- DBG_DTOR( AccessibleImageBullet, NULL );
// sign off from event notifier
if( getNotifierClientId() != -1 )
@@ -103,14 +100,12 @@ namespace accessibility
uno::Any SAL_CALL AccessibleImageBullet::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return AccessibleImageBulletInterfaceBase::queryInterface(rType);
}
uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
// We implement the XAccessibleContext interface in the same object
return uno::Reference< XAccessibleContext > ( this );
@@ -118,14 +113,12 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleChildCount() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return 0;
}
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
(void)i;
throw lang::IndexOutOfBoundsException("No children available",
@@ -135,28 +128,24 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return mxParent;
}
sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleIndexInParent() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return mnIndexInParent;
}
sal_Int16 SAL_CALL AccessibleImageBullet::getAccessibleRole() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return AccessibleRole::GRAPHIC;
}
OUString SAL_CALL AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -166,7 +155,6 @@ namespace accessibility
OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -176,7 +164,6 @@ namespace accessibility
uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
// no relations, therefore empty
return uno::Reference< XAccessibleRelationSet >();
@@ -184,7 +171,6 @@ namespace accessibility
uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -199,7 +185,6 @@ namespace accessibility
lang::Locale SAL_CALL AccessibleImageBullet::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -212,7 +197,6 @@ namespace accessibility
void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
@@ -220,7 +204,6 @@ namespace accessibility
void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
@@ -228,7 +211,6 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleImageBullet::containsPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -244,7 +226,6 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
// as we have no children, empty reference
return uno::Reference< XAccessible >();
@@ -252,7 +233,6 @@ namespace accessibility
awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -291,7 +271,6 @@ namespace accessibility
awt::Point SAL_CALL AccessibleImageBullet::getLocation( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -302,7 +281,6 @@ namespace accessibility
awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -329,7 +307,6 @@ namespace accessibility
awt::Size SAL_CALL AccessibleImageBullet::getSize( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SolarMutexGuard aGuard;
@@ -340,7 +317,6 @@ namespace accessibility
void SAL_CALL AccessibleImageBullet::grabFocus( ) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
throw uno::RuntimeException("Not focusable",
uno::Reference< uno::XInterface >
@@ -349,7 +325,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) throw (::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
// #104444# Added to XAccessibleComponent interface
svtools::ColorConfig aColorConfig;
@@ -359,7 +334,6 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleImageBullet::getBackground( ) throw (::com::sun::star::uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
// #104444# Added to XAccessibleComponent interface
Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
@@ -372,21 +346,18 @@ namespace accessibility
OUString SAL_CALL AccessibleImageBullet::getImplementationName (void) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return OUString("AccessibleImageBullet");
}
sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return cppu::supportsService(this, sServiceName);
}
uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames (void) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext");
return uno::Sequence< OUString > (&sServiceName, 1);
@@ -394,28 +365,24 @@ namespace accessibility
OUString SAL_CALL AccessibleImageBullet::getServiceName (void) throw (uno::RuntimeException)
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return OUString("com.sun.star.accessibility.AccessibleContext");
}
void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex )
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
mnIndexInParent = nIndex;
}
void AccessibleImageBullet::SetEEOffset( const Point& rOffset )
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
maEEOffset = rOffset;
}
void AccessibleImageBullet::Dispose()
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
int nClientId( getNotifierClientId() );
@@ -443,7 +410,6 @@ namespace accessibility
void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource )
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
mpEditSource = pEditSource;
@@ -461,7 +427,6 @@ namespace accessibility
void AccessibleImageBullet::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleImageBullet* > (this)->getAccessibleContext() );
@@ -474,21 +439,18 @@ namespace accessibility
void AccessibleImageBullet::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
FireEvent( nEventId, rNewValue );
}
void AccessibleImageBullet::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
FireEvent( nEventId, uno::Any(), rOldValue );
}
void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
@@ -501,7 +463,6 @@ namespace accessibility
void AccessibleImageBullet::UnSetState( const sal_Int16 nStateId )
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
@@ -514,14 +475,12 @@ namespace accessibility
int AccessibleImageBullet::getNotifierClientId() const
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return mnNotifierClientId;
}
void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex )
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
uno::Any aOldDesc;
uno::Any aOldName;
@@ -551,14 +510,12 @@ namespace accessibility
sal_Int32 AccessibleImageBullet::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return mnParagraphIndex;
}
SvxEditSource& AccessibleImageBullet::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
if( mpEditSource )
return *mpEditSource;
@@ -571,7 +528,6 @@ namespace accessibility
SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SvxEditSource& rEditSource = GetEditSource();
SvxTextForwarder* pTextForwarder = rEditSource.GetTextForwarder();
@@ -593,7 +549,6 @@ namespace accessibility
SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
SvxEditSource& rEditSource = GetEditSource();
SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
@@ -617,7 +572,6 @@ namespace accessibility
const Point& AccessibleImageBullet::GetEEOffset() const
{
- DBG_CHKTHIS( AccessibleImageBullet, NULL );
return maEEOffset;
}
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 890bc54..d7fa158 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -102,7 +102,6 @@ namespace accessibility
//
//------------------------------------------------------------------------
- DBG_NAME( AccessibleStaticTextBase_Impl );
/** AccessibleStaticTextBase_Impl
@@ -123,7 +122,6 @@ namespace accessibility
SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
return maEditSource;
}
@@ -133,13 +131,11 @@ namespace accessibility
void SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
mxThis = rInterface;
}
uno::Reference< XAccessible > GetEventSource() const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
return mxThis;
}
@@ -147,7 +143,6 @@ namespace accessibility
void SetOffset( const Point& );
Point GetOffset() const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
return aPoint;
@@ -165,14 +160,12 @@ namespace accessibility
EPosition Index2Internal( sal_Int32 nFlatIndex ) const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
return ImpCalcInternal( nFlatIndex, false );
}
EPosition Range2Internal( sal_Int32 nFlatIndex ) const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
return ImpCalcInternal( nFlatIndex, true );
}
@@ -229,7 +222,6 @@ namespace accessibility
maMutex(),
maOffset(0,0)
{
- DBG_CTOR( AccessibleStaticTextBase_Impl, NULL );
// TODO: this is still somewhat of a hack, all the more since
// now the maTextParagraph has an empty parent reference set
@@ -237,13 +229,11 @@ namespace accessibility
AccessibleStaticTextBase_Impl::~AccessibleStaticTextBase_Impl()
{
- DBG_DTOR( AccessibleStaticTextBase_Impl, NULL );
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
maEditSource.SetEditSource( pEditSource );
if( mpTextParagraph )
@@ -253,7 +243,6 @@ namespace accessibility
void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
// guard against non-atomic access to maOffset data structure
{
@@ -270,14 +259,12 @@ namespace accessibility
void AccessibleStaticTextBase_Impl::UpdateChildren()
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
// currently no children
}
void AccessibleStaticTextBase_Impl::Dispose()
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
// we're the owner of the paragraph, so destroy it, too
if( mpTextParagraph )
@@ -298,7 +285,6 @@ namespace accessibility
AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( !mpTextParagraph )
throw lang::DisposedException ("object has been already disposed", mxThis );
@@ -312,7 +298,6 @@ namespace accessibility
sal_Int32 AccessibleStaticTextBase_Impl::GetParagraphCount() const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( !mpTextParagraph )
return 0;
@@ -357,7 +342,6 @@ namespace accessibility
EPosition AccessibleStaticTextBase_Impl::ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( nFlatIndex < 0 )
throw lang::IndexOutOfBoundsException("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds",
@@ -399,7 +383,6 @@ namespace accessibility
sal_Bool AccessibleStaticTextBase_Impl::SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
sal_Int32 nEndPara, sal_Int32 nEndIndex )
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( !mpTextParagraph )
return sal_False;
@@ -418,7 +401,6 @@ namespace accessibility
sal_Bool AccessibleStaticTextBase_Impl::CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex,
sal_Int32 nEndPara, sal_Int32 nEndIndex )
{
- DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( !mpTextParagraph )
return sal_False;
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index de847d6..1014424 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -46,7 +46,6 @@
#include "editattr.hxx"
-DBG_NAME( EE_EditAttrib )
// -------------------------------------------------------------------------
// class EditCharAttrib
@@ -54,7 +53,6 @@ DBG_NAME( EE_EditAttrib )
EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE ) :
nStart(nS), nEnd(nE), bFeature(false), bEdge(false)
{
- DBG_CTOR( EE_EditAttrib, 0 );
pItem = &rAttr;
DBG_ASSERT( ( rAttr.Which() >= EE_ITEMS_START ) && ( rAttr.Which() <= EE_ITEMS_END ), "EditCharAttrib CTOR: Invalid id!" );
@@ -63,7 +61,6 @@ EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uIn
EditCharAttrib::~EditCharAttrib()
{
- DBG_DTOR( EE_EditAttrib, 0 );
}
void EditCharAttrib::SetFont( SvxFont&, OutputDevice* )
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 2b0e40f..7e02703 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -161,11 +161,6 @@ sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType )
// Should later be moved to TOOLS/STRING (Current: 303)
// for Grep: WS_TARGET
-DBG_NAME( EE_TextPortion );
-DBG_NAME( EE_EditLine );
-DBG_NAME( EE_ContentNode );
-DBG_NAME( EE_CharAttribList );
-DBG_NAME( EE_ParaPortion )
const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
{ SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // EE_PARA_WRITINGDIR
@@ -532,7 +527,6 @@ void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLe
ParaPortion::ParaPortion( ContentNode* pN )
{
- DBG_CTOR( EE_ParaPortion, 0 );
pNode = pN;
bInvalid = sal_True;
@@ -548,7 +542,6 @@ ParaPortion::ParaPortion( ContentNode* pN )
ParaPortion::~ParaPortion()
{
- DBG_DTOR( EE_ParaPortion, 0 );
}
void ParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff )
@@ -948,7 +941,6 @@ EditLine::EditLine() :
bHangingPunctuation(false),
bInvalid(true)
{
- DBG_CTOR( EE_EditLine, 0 );
nStart = nEnd = 0;
nStartPortion = 0; // to be able to tell the difference between a line
@@ -966,7 +958,6 @@ EditLine::EditLine( const EditLine& r ) :
bHangingPunctuation(r.bHangingPunctuation),
bInvalid(true)
{
- DBG_CTOR( EE_EditLine, 0 );
nEnd = r.nEnd;
nStart = r.nStart;
@@ -983,7 +974,6 @@ EditLine::EditLine( const EditLine& r ) :
EditLine::~EditLine()
{
- DBG_DTOR( EE_EditLine, 0 );
}
EditLine::CharPosArrayType& EditLine::GetCharPosArray()
@@ -1298,18 +1288,15 @@ sal_Bool operator != ( const EditPaM& r1, const EditPaM& r2 )
ContentNode::ContentNode( SfxItemPool& rPool ) : aContentAttribs( rPool )
{
- DBG_CTOR( EE_ContentNode, 0 );
}
ContentNode::ContentNode( const OUString& rStr, const ContentAttribs& rContentAttribs ) :
maString(rStr), aContentAttribs(rContentAttribs)
{
- DBG_CTOR( EE_ContentNode, 0 );
}
ContentNode::~ContentNode()
{
- DBG_DTOR( EE_ContentNode, 0 );
}
void ContentNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew, SfxItemPool& rItemPool )
@@ -2694,12 +2681,10 @@ CharAttribList::CharAttribList()
, aDefFont()
, bHasEmptyAttribs(false)
{
- DBG_CTOR( EE_CharAttribList, 0 );
}
CharAttribList::~CharAttribList()
{
- DBG_DTOR( EE_CharAttribList, 0 );
}
void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index aebbd04..f7100ef 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -40,7 +40,6 @@
class ImpEditEngine;
class SvxTabStop;
-DBG_NAMEEX( EE_TextPortion )
#define CHARPOSGROW 16
#define DEFTAB 720
@@ -399,7 +398,6 @@ private:
, nRightToLeft( sal_False )
, nExtraValue( 0 )
{
- DBG_CTOR( EE_TextPortion, 0 );
}
public:
@@ -411,7 +409,6 @@ public:
, nRightToLeft( sal_False )
, nExtraValue( 0 )
{
- DBG_CTOR( EE_TextPortion, 0 );
}
TextPortion( const TextPortion& r )
@@ -422,10 +419,8 @@ public:
, nRightToLeft( r.nRightToLeft )
, nExtraValue( r.nExtraValue )
{
- DBG_CTOR( EE_TextPortion, 0 );
}
- ~TextPortion() { DBG_DTOR( EE_TextPortion, 0 ); delete pExtraInfos; }
sal_uInt16 GetLen() const { return nLen; }
void SetLen( sal_uInt16 nL ) { nLen = nL; }
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index c9b7970..649a725 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -86,8 +86,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::linguistic2;
-DBG_NAME( EditEngine )
-DBG_NAMEEX( EditView )
#if (OSL_DEBUG_LEVEL > 1) || defined ( DBG_UTIL )
static sal_Bool bDebugPaint = sal_False;
@@ -100,49 +98,41 @@ static SfxItemPool* pGlobalPool=0;
// ----------------------------------------------------------------------
EditEngine::EditEngine( SfxItemPool* pItemPool )
{
- DBG_CTOR( EditEngine, 0 );
pImpEditEngine = new ImpEditEngine( this, pItemPool );
}
EditEngine::~EditEngine()
{
- DBG_DTOR( EditEngine, 0 );
delete pImpEditEngine;
}
void EditEngine::EnableUndo( sal_Bool bEnable )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->EnableUndo( bEnable );
}
sal_Bool EditEngine::IsUndoEnabled()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsUndoEnabled();
}
sal_Bool EditEngine::IsInUndo()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsInUndo();
}
::svl::IUndoManager& EditEngine::GetUndoManager()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetUndoManager();
}
::svl::IUndoManager* EditEngine::SetUndoManager(::svl::IUndoManager* pNew)
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->SetUndoManager(pNew);
}
void EditEngine::UndoActionStart( sal_uInt16 nId )
{
- DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( !pImpEditEngine->IsInUndo(), "Calling UndoActionStart in Undomode!" );
if ( !pImpEditEngine->IsInUndo() )
pImpEditEngine->UndoActionStart( nId );
@@ -155,7 +145,6 @@ void EditEngine::UndoActionStart(sal_uInt16 nId, const ESelection& rSel)
void EditEngine::UndoActionEnd( sal_uInt16 nId )
{
- DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( !pImpEditEngine->IsInUndo(), "Calling UndoActionEnd in Undomode!" );
if ( !pImpEditEngine->IsInUndo() )
pImpEditEngine->UndoActionEnd( nId );
@@ -168,79 +157,66 @@ bool EditEngine::HasTriedMergeOnLastAddUndo() const
void EditEngine::SetRefDevice( OutputDevice* pRefDev )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetRefDevice( pRefDev );
}
OutputDevice* EditEngine::GetRefDevice() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetRefDevice();
}
void EditEngine::SetRefMapMode( const MapMode& rMapMode )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetRefMapMode( rMapMode );
}
MapMode EditEngine::GetRefMapMode()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetRefMapMode();
}
void EditEngine::SetBackgroundColor( const Color& rColor )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetBackgroundColor( rColor );
}
Color EditEngine::GetBackgroundColor() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetBackgroundColor();
}
Color EditEngine::GetAutoColor() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetAutoColor();
}
void EditEngine::EnableAutoColor( sal_Bool b )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->EnableAutoColor( b );
}
void EditEngine::ForceAutoColor( sal_Bool b )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->ForceAutoColor( b );
}
sal_Bool EditEngine::IsForceAutoColor() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsForceAutoColor();
}
const SfxItemSet& EditEngine::GetEmptyItemSet()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetEmptyItemSet();
}
void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect )
{
- DBG_CHKTHIS( EditEngine, 0 );
Draw( pOutDev, rOutRect, Point( 0, 0 ) );
}
void EditEngine::Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation )
{
- DBG_CHKTHIS( EditEngine, 0 );
// Create with 2 points, as with positive points it will end up with
// LONGMAX as Size, Bottom and Right in the range > LONGMAX.
Rectangle aBigRect( -0x3FFFFFFF, -0x3FFFFFFF, 0x3FFFFFFF, 0x3FFFFFFF );
@@ -264,7 +240,6 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, sal_Bool bClip )
{
- DBG_CHKTHIS( EditEngine, 0 );
#if defined( DBG_UTIL ) || (OSL_DEBUG_LEVEL > 1)
if ( bDebugPaint )
@@ -335,8 +310,6 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
void EditEngine::InsertView(EditView* pEditView, size_t nIndex)
{
- DBG_CHKTHIS( EditEngine, 0 );
- DBG_CHKOBJ( pEditView, EditView, 0 );
if ( nIndex > pImpEditEngine->GetEditViews().size() )
nIndex = pImpEditEngine->GetEditViews().size();
@@ -355,8 +328,6 @@ void EditEngine::InsertView(EditView* pEditView, size_t nIndex)
EditView* EditEngine::RemoveView( EditView* pView )
{
- DBG_CHKTHIS( EditEngine, 0 );
- DBG_CHKOBJ( pView, EditView, 0 );
pView->HideCursor();
EditView* pRemoved = NULL;
@@ -381,7 +352,6 @@ EditView* EditEngine::RemoveView( EditView* pView )
EditView* EditEngine::RemoveView(size_t nIndex)
{
- DBG_CHKTHIS( EditEngine, 0 );
ImpEditEngine::ViewsType& rViews = pImpEditEngine->GetEditViews();
if (nIndex >= rViews.size())
return NULL;
@@ -394,13 +364,11 @@ EditView* EditEngine::RemoveView(size_t nIndex)
EditView* EditEngine::GetView(size_t nIndex) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetEditViews()[nIndex];
}
size_t EditEngine::GetViewCount() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetEditViews().size();
}
@@ -412,7 +380,6 @@ sal_Bool EditEngine::HasView( EditView* pView ) const
EditView* EditEngine::GetActiveView() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetActiveView();
}
@@ -423,7 +390,6 @@ void EditEngine::SetActiveView(EditView* pView)
void EditEngine::SetDefTab( sal_uInt16 nDefTab )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->GetEditDoc().SetDefTab( nDefTab );
if ( pImpEditEngine->IsFormatted() )
{
@@ -434,7 +400,6 @@ void EditEngine::SetDefTab( sal_uInt16 nDefTab )
void EditEngine::SetPaperSize( const Size& rNewSize )
{
- DBG_CHKTHIS( EditEngine, 0 );
Size aOldSize( pImpEditEngine->GetPaperSize() );
pImpEditEngine->SetValidPaperSize( rNewSize );
@@ -446,7 +411,6 @@ void EditEngine::SetPaperSize( const Size& rNewSize )
for (size_t nView = 0; nView < pImpEditEngine->aEditViews.size(); ++nView)
{
EditView* pView = pImpEditEngine->aEditViews[nView];
- DBG_CHKOBJ( pView, EditView, 0 );
if ( bAutoPageSize )
pView->pImpEditView->RecalcOutputArea();
else if ( pView->pImpEditView->DoAutoSize() )
@@ -473,43 +437,36 @@ void EditEngine::SetPaperSize( const Size& rNewSize )
const Size& EditEngine::GetPaperSize() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetPaperSize();
}
void EditEngine::SetVertical( bool bVertical )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetVertical( bVertical );
}
bool EditEngine::IsVertical() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsVertical();
}
void EditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
}
void EditEngine::SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetDefaultHorizontalTextDirection( eHTextDir );
}
EEHorizontalTextDirection EditEngine::GetDefaultHorizontalTextDirection() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetDefaultHorizontalTextDirection();
}
sal_uInt16 EditEngine::GetScriptType( const ESelection& rSelection ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) );
return pImpEditEngine->GetItemScriptType( aSel );
}
@@ -521,7 +478,6 @@ LanguageType EditEngine::GetLanguage(const EditPaM& rPaM) const
LanguageType EditEngine::GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
DBG_ASSERT( pNode, "GetLanguage - nPara is invalid!" );
return pNode ? pImpEditEngine->GetLanguage( EditPaM( pNode, nPos ) ) : LANGUAGE_DONTKNOW;
@@ -530,7 +486,6 @@ LanguageType EditEngine::GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const
void EditEngine::TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode )
{
- DBG_CHKTHIS( EditView, 0 );
pImpEditEngine->TransliterateText( pImpEditEngine->CreateSel( rSelection ), nTransliterationMode );
}
@@ -541,31 +496,26 @@ EditSelection EditEngine::TransliterateText(const EditSelection& rSelection, sal
void EditEngine::SetAsianCompressionMode( sal_uInt16 n )
{
- DBG_CHKTHIS( EditView, 0 );
pImpEditEngine->SetAsianCompressionMode( n );
}
void EditEngine::SetKernAsianPunctuation( sal_Bool b )
{
- DBG_CHKTHIS( EditView, 0 );
pImpEditEngine->SetKernAsianPunctuation( b );
}
void EditEngine::SetAddExtLeading( sal_Bool b )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetAddExtLeading( b );
}
void EditEngine::SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon )
{
- DBG_CHKTHIS( EditEngine, 0 );
SetPolygon( rPolyPolygon, 0L );
}
void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon)
{
- DBG_CHKTHIS( EditEngine, 0 );
sal_Bool bSimple(sal_False);
if(pLinePolyPolygon && 1L == rPolyPolygon.count())
@@ -584,62 +534,52 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
void EditEngine::ClearPolygon()
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetTextRanger( 0 );
}
const Size& EditEngine::GetMinAutoPaperSize() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetMinAutoPaperSize();
}
void EditEngine::SetMinAutoPaperSize( const Size& rSz )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetMinAutoPaperSize( rSz );
}
const Size& EditEngine::GetMaxAutoPaperSize() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetMaxAutoPaperSize();
}
void EditEngine::SetMaxAutoPaperSize( const Size& rSz )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetMaxAutoPaperSize( rSz );
}
OUString EditEngine::GetText( LineEnd eEnd ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetEditDoc().GetText( eEnd );
}
OUString EditEngine::GetText( const ESelection& rESelection, const LineEnd eEnd ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->CreateSel( rESelection ) );
return pImpEditEngine->GetSelected( aSel, eEnd );
}
sal_uInt32 EditEngine::GetTextLen() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetEditDoc().GetTextLen();
}
sal_Int32 EditEngine::GetParagraphCount() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->aEditDoc.Count();
}
sal_uInt16 EditEngine::GetLineCount( sal_Int32 nParagraph ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
return pImpEditEngine->GetLineCount( nParagraph );
@@ -647,7 +587,6 @@ sal_uInt16 EditEngine::GetLineCount( sal_Int32 nParagraph ) const
sal_uInt16 EditEngine::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
return pImpEditEngine->GetLineLen( nParagraph, nLine );
@@ -655,7 +594,6 @@ sal_uInt16 EditEngine::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) cons
void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
return pImpEditEngine->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
@@ -663,7 +601,6 @@ void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
return pImpEditEngine->GetLineNumberAtIndex( nPara, nIndex );
@@ -671,7 +608,6 @@ sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex
sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
{
- DBG_CHKTHIS( EditEngine, 0 );
// If someone calls GetLineHeight() with an empty Engine.
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
@@ -680,7 +616,6 @@ sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
sal_uInt32 EditEngine::GetTextHeight( sal_Int32 nParagraph ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
@@ -1021,8 +956,6 @@ void EditEngine::SetInSelectionMode(bool b)
sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
{
- DBG_CHKTHIS( EditEngine, 0 );
- DBG_CHKOBJ( pEditView, EditView, 0 );
DBG_ASSERT( pEditView, "no View - no cookie !" );
sal_Bool bDone = sal_True;
@@ -1480,7 +1413,6 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
sal_uInt32 EditEngine::GetTextHeight() const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
@@ -1491,7 +1423,6 @@ sal_uInt32 EditEngine::GetTextHeight() const
sal_uInt32 EditEngine::GetTextHeightNTP() const
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
@@ -1504,7 +1435,6 @@ sal_uInt32 EditEngine::GetTextHeightNTP() const
sal_uInt32 EditEngine::CalcTextWidth()
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
@@ -1515,7 +1445,6 @@ sal_uInt32 EditEngine::CalcTextWidth()
void EditEngine::SetUpdateMode( sal_Bool bUpdate )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetUpdateMode( bUpdate );
if ( pImpEditEngine->pActiveView )
pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False );
@@ -1523,19 +1452,16 @@ void EditEngine::SetUpdateMode( sal_Bool bUpdate )
sal_Bool EditEngine::GetUpdateMode() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetUpdateMode();
}
void EditEngine::Clear()
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->Clear();
}
void EditEngine::SetText( const OUString& rText )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetText( rText );
if ( !rText.isEmpty() )
pImpEditEngine->FormatAndUpdate();
@@ -1543,7 +1469,6 @@ void EditEngine::SetText( const OUString& rText )
sal_uLong EditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
{
- DBG_CHKTHIS( EditEngine, 0 );
sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
pImpEditEngine->EnableUndo( sal_False );
pImpEditEngine->SetText( OUString() );
@@ -1555,7 +1480,6 @@ sal_uLong EditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFo
sal_uLong EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditPaM aStartPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
EditPaM aEndPaM( pImpEditEngine->GetEditDoc().GetEndPaM() );
pImpEditEngine->Write( rOutput, eFormat, EditSelection( aStartPaM, aEndPaM ) );
@@ -1564,20 +1488,17 @@ sal_uLong EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
EditTextObject* EditEngine::CreateTextObject()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->CreateTextObject();
}
EditTextObject* EditEngine::CreateTextObject( const ESelection& rESelection )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->CreateSel( rESelection ) );
return pImpEditEngine->CreateTextObject( aSel );
}
void EditEngine::SetText( const EditTextObject& rTextObject )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->EnterBlockNotifications();
pImpEditEngine->SetText( rTextObject );
pImpEditEngine->FormatAndUpdate();
@@ -1586,74 +1507,62 @@ void EditEngine::SetText( const EditTextObject& rTextObject )
void EditEngine::ShowParagraph( sal_Int32 nParagraph, sal_Bool bShow )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->ShowParagraph( nParagraph, bShow );
}
void EditEngine::SetNotifyHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetNotifyHdl( rLink );
}
Link EditEngine::GetNotifyHdl() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetNotifyHdl();
}
void EditEngine::SetStatusEventHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetStatusEventHdl( rLink );
}
Link EditEngine::GetStatusEventHdl() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetStatusEventHdl();
}
void EditEngine::SetImportHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->aImportHdl = rLink;
}
Link EditEngine::GetImportHdl() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->aImportHdl;
}
void EditEngine::SetBeginMovingParagraphsHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->aBeginMovingParagraphsHdl = rLink;
}
void EditEngine::SetEndMovingParagraphsHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->aEndMovingParagraphsHdl = rLink;
}
void EditEngine::SetBeginPasteOrDropHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->aBeginPasteOrDropHdl = rLink;
}
void EditEngine::SetEndPasteOrDropHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->aEndPasteOrDropHdl = rLink;
}
EditTextObject* EditEngine::CreateTextObject( sal_Int32 nPara, sal_Int32 nParas )
{
- DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( 0 <= nPara && nPara < pImpEditEngine->GetEditDoc().Count(), "CreateTextObject: Startpara out of Range" );
DBG_ASSERT( nParas <= pImpEditEngine->GetEditDoc().Count() - nPara, "CreateTextObject: Endpara out of Range" );
@@ -1674,7 +1583,6 @@ EditTextObject* EditEngine::CreateTextObject( sal_Int32 nPara, sal_Int32 nParas
void EditEngine::RemoveParagraph( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( pImpEditEngine->GetEditDoc().Count() > 1, "The first paragraph should not be deleted!" );
if( pImpEditEngine->GetEditDoc().Count() <= 1 )
return;
@@ -1694,7 +1602,6 @@ void EditEngine::RemoveParagraph( sal_Int32 nPara )
sal_uInt16 EditEngine::GetTextLen( sal_Int32 nPara ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
DBG_ASSERT( pNode, "Paragraph not found: GetTextLen" );
if ( pNode )
@@ -1704,7 +1611,6 @@ sal_uInt16 EditEngine::GetTextLen( sal_Int32 nPara ) const
OUString EditEngine::GetText( sal_Int32 nPara ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
OUString aStr;
if ( 0 <= nPara && nPara < pImpEditEngine->GetEditDoc().Count() )
aStr = pImpEditEngine->GetEditDoc().GetParaAsString( nPara );
@@ -1713,45 +1619,38 @@ OUString EditEngine::GetText( sal_Int32 nPara ) const
void EditEngine::SetModifyHdl( const Link& rLink )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetModifyHdl( rLink );
}
Link EditEngine::GetModifyHdl() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetModifyHdl();
}
void EditEngine::ClearModifyFlag()
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetModifyFlag( sal_False );
}
void EditEngine::SetModified()
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetModifyFlag( sal_True );
}
sal_Bool EditEngine::IsModified() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsModified();
}
sal_Bool EditEngine::IsInSelectionMode() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return ( pImpEditEngine->IsInSelectionMode() ||
pImpEditEngine->GetSelEngine().IsInSelection() );
}
void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( nPara > GetParagraphCount() )
{
DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" );
@@ -1774,7 +1673,6 @@ void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj
void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt)
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( nPara > GetParagraphCount() )
{
DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" );
@@ -1793,7 +1691,6 @@ void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt)
void EditEngine::SetText(sal_Int32 nPara, const OUString& rTxt)
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection* pSel = pImpEditEngine->SelectParagraph( nPara );
if ( pSel )
{
@@ -1807,38 +1704,32 @@ void EditEngine::SetText(sal_Int32 nPara, const OUString& rTxt)
void EditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetParaAttribs( nPara, rSet );
pImpEditEngine->FormatAndUpdate();
}
const SfxItemSet& EditEngine::GetParaAttribs( sal_Int32 nPara ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetParaAttribs( nPara );
}
sal_Bool EditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->HasParaAttrib( nPara, nWhich );
}
const SfxPoolItem& EditEngine::GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich )
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetParaAttrib( nPara, nWhich );
}
void EditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->GetCharAttribs( nPara, rLst );
}
SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
@@ -1846,13 +1737,11 @@ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAtt
SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
}
void EditEngine::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
EditSelection aSel( pImpEditEngine->ConvertSelection( rSelection.nStartPara, rSelection.nStartPos, rSelection.nEndPara, rSelection.nEndPos ) );
@@ -1863,20 +1752,17 @@ void EditEngine::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemovePa
Font EditEngine::GetStandardFont( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
return GetStandardSvxFont( nPara );
}
SvxFont EditEngine::GetStandardSvxFont( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
return pNode->GetCharAttribs().GetDefFont();
}
void EditEngine::StripPortions()
{
- DBG_CHKTHIS( EditEngine, 0 );
VirtualDevice aTmpDev;
Rectangle aBigRect( Point( 0, 0 ), Size( 0x7FFFFFFF, 0x7FFFFFFF ) );
if ( IsVertical() )
@@ -1907,19 +1793,16 @@ void EditEngine::GetPortions( sal_Int32 nPara, std::vector<sal_uInt16>& rList )
void EditEngine::SetFlatMode( sal_Bool bFlat)
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetFlatMode( bFlat );
}
sal_Bool EditEngine::IsFlatMode() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return !( pImpEditEngine->aStatus.UseCharAttribs() );
}
void EditEngine::SetControlWord( sal_uInt32 nWord )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( nWord != pImpEditEngine->aStatus.GetControlWord() )
{
@@ -1997,13 +1880,11 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
sal_uInt32 EditEngine::GetControlWord() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->aStatus.GetControlWord();
}
long EditEngine::GetFirstLineStartX( sal_Int32 nParagraph )
{
- DBG_CHKTHIS( EditEngine, 0 );
long nX = 0;
const ParaPortion* pPPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nParagraph );
@@ -2031,7 +1912,6 @@ Point EditEngine::GetDocPos( const Point& rPaperPos ) const
Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
{
- DBG_CHKTHIS( EditEngine, 0 );
const ParaPortion* pPPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nParagraph );
DBG_ASSERT( pPPortion, "Paragraph not found: GetWindowPosTopLeft" );
Point aPoint;
@@ -2075,13 +1955,11 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
sal_Bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsRightToLeft( nPara );
}
sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
@@ -2113,19 +1991,16 @@ sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
void EditEngine::SetEditTextObjectPool( SfxItemPool* pPool )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetEditTextObjectPool( pPool );
}
SfxItemPool* EditEngine::GetEditTextObjectPool() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetEditTextObjectPool();
}
void EditEngine::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2135,7 +2010,6 @@ void EditEngine::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel
void EditEngine::QuickMarkInvalid( const ESelection& rSel )
{
- DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( rSel.nStartPara < pImpEditEngine->GetEditDoc().Count(), "MarkInvalid: Start out of Range!" );
DBG_ASSERT( rSel.nEndPara < pImpEditEngine->GetEditDoc().Count(), "MarkInvalid: End out of Range!" );
for ( sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
@@ -2148,7 +2022,6 @@ void EditEngine::QuickMarkInvalid( const ESelection& rSel )
void EditEngine::QuickInsertText(const OUString& rText, const ESelection& rSel)
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2158,7 +2031,6 @@ void EditEngine::QuickInsertText(const OUString& rText, const ESelection& rSel)
void EditEngine::QuickDelete( const ESelection& rSel )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2168,7 +2040,6 @@ void EditEngine::QuickDelete( const ESelection& rSel )
void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
ParaPortion* pPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nPara );
if ( pPortion )
pPortion->SetMustRepaint( sal_True );
@@ -2176,7 +2047,6 @@ void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara )
void EditEngine::QuickInsertLineBreak( const ESelection& rSel )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2186,7 +2056,6 @@ void EditEngine::QuickInsertLineBreak( const ESelection& rSel )
void EditEngine::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
@@ -2196,7 +2065,6 @@ void EditEngine::QuickInsertField( const SvxFieldItem& rFld, const ESelection& r
void EditEngine::QuickFormatDoc( sal_Bool bFull )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( bFull )
pImpEditEngine->FormatFullDoc();
else
@@ -2208,7 +2076,6 @@ void EditEngine::QuickFormatDoc( sal_Bool bFull )
void EditEngine::QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->RemoveCharAttribs( nPara, nWhich );
}
@@ -2219,37 +2086,31 @@ void EditEngine::SetStyleSheet(const EditSelection& aSel, SfxStyleSheet* pStyle)
void EditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetStyleSheet( nPara, pStyle );
}
const SfxStyleSheet* EditEngine::GetStyleSheet( sal_Int32 nPara ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetStyleSheet( nPara );
}
SfxStyleSheet* EditEngine::GetStyleSheet( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetStyleSheet( nPara );
}
void EditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetStyleSheetPool( pSPool );
}
SfxStyleSheetPool* EditEngine::GetStyleSheetPool()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetStyleSheetPool();
}
void EditEngine::SetWordDelimiters( const OUString& rDelimiters )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->aWordDelimiters = rDelimiters;
if (pImpEditEngine->aWordDelimiters.indexOf(CH_FEATURE) == -1)
pImpEditEngine->aWordDelimiters += OUString(CH_FEATURE);
@@ -2257,31 +2118,26 @@ void EditEngine::SetWordDelimiters( const OUString& rDelimiters )
OUString EditEngine::GetWordDelimiters() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->aWordDelimiters;
}
void EditEngine::EraseVirtualDevice()
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->EraseVirtualDevice();
}
void EditEngine::SetSpeller( Reference< XSpellChecker1 > &xSpeller )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetSpeller( xSpeller );
}
Reference< XSpellChecker1 > EditEngine::GetSpeller()
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetSpeller();
}
void EditEngine::SetHyphenator( Reference< XHyphenator > & xHyph )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetHyphenator( xHyph );
}
@@ -2297,31 +2153,26 @@ void EditEngine::SetAllMisspellRanges( const std::vector<editeng::MisspellRanges
void EditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetForbiddenCharsTable( xForbiddenChars );
}
void EditEngine::SetDefaultLanguage( LanguageType eLang )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetDefaultLanguage( eLang );
}
LanguageType EditEngine::GetDefaultLanguage() const
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetDefaultLanguage();
}
sal_Bool EditEngine::SpellNextDocument()
{
- DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
}
EESpellState EditEngine::HasSpellErrors()
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->GetSpeller().is() )
return EE_SPELL_NOSPELLER;
@@ -2335,61 +2186,51 @@ void EditEngine::ClearSpellErrors()
void EditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->StartSpelling(rEditView, bMultipleDoc);
}
bool EditEngine::SpellSentence(EditView& rView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking )
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking );
}
void EditEngine::PutSpellingToSentenceStart( EditView& rEditView )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->PutSpellingToSentenceStart( rEditView );
}
void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck );
}
sal_Bool EditEngine::HasConvertibleTextPortion( LanguageType nLang )
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->HasConvertibleTextPortion( nLang );
}
sal_Bool EditEngine::ConvertNextDocument()
{
- DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
}
sal_Bool EditEngine::HasText( const SvxSearchItem& rSearchItem )
{
- DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->HasText( rSearchItem );
}
void EditEngine::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetCharStretching( nX, nY );
}
void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->GetCharStretching( rX, rY );
}
sal_Bool EditEngine::ShouldCreateBigTextObject() const
{
- DBG_CHKTHIS( EditEngine, 0 );
sal_uInt32 nTextPortions = 0;
sal_Int32 nParas = pImpEditEngine->GetEditDoc().Count();
for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ )
@@ -2449,7 +2290,6 @@ EFieldInfo EditEngine::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const
bool EditEngine::UpdateFields()
{
- DBG_CHKTHIS( EditEngine, 0 );
sal_Bool bChanges = pImpEditEngine->UpdateFields();
if ( bChanges )
pImpEditEngine->FormatAndUpdate();
@@ -2463,7 +2303,6 @@ bool EditEngine::UpdateFieldsOnly()
void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( bKeepFieldText )
pImpEditEngine->UpdateFields();
@@ -2493,7 +2332,6 @@ void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
sal_Bool EditEngine::HasOnlineSpellErrors() const
{
- DBG_CHKTHIS( EditEngine, 0 );
sal_Int32 nNodes = pImpEditEngine->GetEditDoc().Count();
for ( sal_Int32 n = 0; n < nNodes; n++ )
{
@@ -2506,7 +2344,6 @@ sal_Bool EditEngine::HasOnlineSpellErrors() const
void EditEngine::CompleteOnlineSpelling()
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( pImpEditEngine->GetStatus().DoOnlineSpelling() )
{
if( !pImpEditEngine->IsFormatted() )
@@ -2553,7 +2390,6 @@ Rectangle EditEngine::GetCharacterBounds( const EPosition& rPos ) const
ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
// This only works if not already in the format ...
if ( !pImpEditEngine->IsFormatted() )
@@ -2584,7 +2420,6 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
EditEngine::CreateTransferable( const ESelection& rSelection ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) );
return pImpEditEngine->CreateTransferable( aSel );
}
@@ -2598,7 +2433,6 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_uInt16, sal_uIn
const ::com::sun::star::lang::Locale*, const Color&, const Color&)
{
- DBG_CHKTHIS( EditEngine, 0 );
}
void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
@@ -2608,17 +2442,14 @@ void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/,
const Color& /*rTextLineColor*/)
{
- DBG_CHKTHIS( EditEngine, 0 );
}
void EditEngine::PaintingFirstLine( sal_Int32, const Point&, long, const Point&, short, OutputDevice* )
{
- DBG_CHKTHIS( EditEngine, 0 );
}
void EditEngine::ParagraphInserted( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( GetNotifyHdl().IsSet() )
{
@@ -2631,7 +2462,6 @@ void EditEngine::ParagraphInserted( sal_Int32 nPara )
void EditEngine::ParagraphDeleted( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( GetNotifyHdl().IsSet() )
{
@@ -2643,29 +2473,24 @@ void EditEngine::ParagraphDeleted( sal_Int32 nPara )
}
void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 /*nRightParagraph*/ )
{
- DBG_CHKTHIS( EditEngine, 0 );
}
sal_Bool EditEngine::FormattingParagraph( sal_Int32 )
{
// return sal_True, if the Attribute was changed ...
- DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
}
void EditEngine::ParaAttribsChanged( sal_Int32 /* nParagraph */ )
{
- DBG_CHKTHIS( EditEngine, 0 );
}
void EditEngine::StyleSheetChanged( SfxStyleSheet* /* pStyle */ )
{
- DBG_CHKTHIS( EditEngine, 0 );
}
void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
{
- DBG_CHKTHIS( EditEngine, 0 );
if ( GetNotifyHdl().IsSet() )
{
@@ -2678,7 +2503,6 @@ void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const
{
- DBG_CHKTHIS( EditEngine, 0 );
OUString aComment;
switch ( nId )
{
@@ -2736,18 +2560,15 @@ Rectangle EditEngine::GetBulletArea( sal_Int32 )
OUString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_uInt16, Color*&, Color*& )
{
- DBG_CHKTHIS( EditEngine, 0 );
return OUString(' ');
}
void EditEngine::FieldClicked( const SvxFieldItem&, sal_Int32, sal_uInt16 )
{
- DBG_CHKTHIS( EditEngine, 0 );
}
void EditEngine::FieldSelected( const SvxFieldItem&, sal_Int32, sal_uInt16 )
{
- DBG_CHKTHIS( EditEngine, 0 );
}
// =====================================================================
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 6b4713b..eee3e24 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -56,8 +56,6 @@ using std::endl;
using namespace com::sun::star;
-DBG_NAME( EE_EditTextObject )
-DBG_NAME( XEditAttribute )
//--------------------------------------------------------------
@@ -72,7 +70,6 @@ XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem
XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
{
- DBG_CTOR( XEditAttribute, 0 );
pItem = &rAttr;
nStart = nS;
nEnd = nE;
@@ -80,7 +77,6 @@ XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uIn
XEditAttribute::~XEditAttribute()
{
- DBG_DTOR( XEditAttribute, 0 );
pItem = 0; // belongs to the Pool.
}
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 48aacd8..3af0090 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -26,7 +26,6 @@
#include <editeng/editview.hxx>
#include <editeng/editeng.hxx>
-DBG_NAME( EditUndo )
static void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
{
@@ -134,7 +133,6 @@ EditEngine* EditUndo::GetEditEngine()
sal_uInt16 EditUndo::GetId() const
{
- DBG_CHKTHIS( EditUndo, 0 );
return nId;
}
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 7895f92..6616e12 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -72,7 +72,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
-DBG_NAME( EditView )
// static
@@ -160,33 +159,26 @@ LanguageType EditView::CheckLanguage(
// ----------------------------------------------------------------------
EditView::EditView( EditEngine* pEng, Window* pWindow )
{
- DBG_CTOR( EditView, 0 );
pImpEditView = new ImpEditView( this, pEng, pWindow );
}
EditView::~EditView()
{
- DBG_DTOR( EditView, 0 );
delete pImpEditView;
}
ImpEditEngine* EditView::GetImpEditEngine() const
{
- DBG_CHKTHIS( EditView, 0 );
return pImpEditView->pEditEngine->pImpEditEngine;
}
EditEngine* EditView::GetEditEngine() const
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
return pImpEditView->pEditEngine;
}
void EditView::Invalidate()
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
if ( !pImpEditView->DoInvalidateMore() )
pImpEditView->GetWindow()->Invalidate( pImpEditView->aOutArea );
else
@@ -203,21 +195,16 @@ void EditView::Invalidate()
void EditView::SetReadOnly( sal_Bool bReadOnly )
{
- DBG_CHKTHIS( EditView, 0 );
pImpEditView->bReadOnly = bReadOnly;
}
sal_Bool EditView::IsReadOnly() const
{
- DBG_CHKTHIS( EditView, 0 );
return pImpEditView->bReadOnly;
}
void EditView::SetSelection( const ESelection& rESel )
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
// If someone has just left an empty attribute, and then the outliner
// manipulates the selection:
if ( !pImpEditView->GetEditSelection().HasRange() )
@@ -255,9 +242,6 @@ void EditView::SetSelection( const ESelection& rESel )
ESelection EditView::GetSelection() const
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
ESelection aSelection;
aSelection.nStartPara = PIMPE->GetEditDoc().GetPos( pImpEditView->GetEditSelection().Min().GetNode() );
@@ -271,35 +255,26 @@ ESelection EditView::GetSelection() const
sal_Bool EditView::HasSelection() const
{
- DBG_CHKTHIS( EditView, 0 );
return pImpEditView->HasSelection();
}
void EditView::DeleteSelected()
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
pImpEditView->DeleteSelected();
}
sal_uInt16 EditView::GetSelectedScriptType() const
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
return PIMPE->GetScriptType( pImpEditView->GetEditSelection() );
}
void EditView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
PIMPEE->Paint( pImpEditView, rRect, pTargetDevice );
}
void EditView::SetEditEngine( EditEngine* pEditEng )
{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
pImpEditView->pEditEngine = pEditEng;
EditSelection aStartSel;
aStartSel = PIMPE->GetEditDoc().GetStartPaM();
@@ -308,26 +283,22 @@ void EditView::SetEditEngine( EditEngine* pEditEng )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list