diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 15:45:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 15:45:06 +0100 |
commit | b6f77d2702721d25ae7be5a749b65a53f55f5ee2 (patch) | |
tree | 2d7828399e3267eb7098c231560b16c992ca09e0 /sc/source | |
parent | b10be2e0294567cf79863e3e54111d4ff95397fd (diff) |
Remove remaining DBG_CTOR etc. remnants from sc
Change-Id: Ica865166d6f187bbe610ed537208eab809a77e5f
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleContextBase.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 29 | ||||
-rw-r--r-- | sc/source/ui/unoobj/celllistsource.cxx | 21 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.cxx | 25 |
4 files changed, 0 insertions, 82 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 490861e27f4c..9a19e1344536 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -39,10 +39,6 @@ using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -//===== internal ============================================================ - -DBG_NAME(ScAccessibleContextBase) - ScAccessibleContextBase::ScAccessibleContextBase( const uno::Reference<XAccessible>& rxParent, const sal_Int16 aRole) @@ -52,14 +48,11 @@ ScAccessibleContextBase::ScAccessibleContextBase( mnClientId(0), maRole(aRole) { - DBG_CTOR(ScAccessibleContextBase, NULL); } ScAccessibleContextBase::~ScAccessibleContextBase(void) { - DBG_DTOR(ScAccessibleContextBase, NULL); - if (!IsDefunc() && !rBHelper.bInDispose) { // increment refcount to prevent double call off dtor diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 149580927a89..728f8709e5d6 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -80,11 +80,6 @@ const sal_Unicode cRulerLine = '|'; const sal_Int32 CSV_LINE_HEADER = CSV_POS_INVALID; const sal_uInt32 CSV_COLUMN_HEADER = CSV_COLUMN_INVALID; - -// CSV base control =========================================================== - -DBG_NAME( ScAccessibleCsvControl ) - ScAccessibleCsvControl::ScAccessibleCsvControl( const Reference< XAccessible >& rxParent, ScCsvControl& rControl, @@ -92,12 +87,10 @@ ScAccessibleCsvControl::ScAccessibleCsvControl( ScAccessibleContextBase( rxParent, nRole ), mpControl( &rControl ) { - DBG_CTOR( ScAccessibleCsvControl, NULL ); } ScAccessibleCsvControl::~ScAccessibleCsvControl() { - DBG_DTOR( ScAccessibleCsvControl, NULL ); implDispose(); } @@ -339,22 +332,14 @@ static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font& lcl_FillProperty( rSeq[ nIndex++ ], "CharLocale", aLangItem, MID_LANG_LOCALE ); } - - - - -DBG_NAME( ScAccessibleCsvRuler ) - ScAccessibleCsvRuler::ScAccessibleCsvRuler( ScCsvRuler& rRuler ) : ScAccessibleCsvControl( rRuler.GetAccessibleParentWindow()->GetAccessible(), rRuler, nRulerRole ) { - DBG_CTOR( ScAccessibleCsvRuler, NULL ); constructStringBuffer(); } ScAccessibleCsvRuler::~ScAccessibleCsvRuler() { - DBG_DTOR( ScAccessibleCsvRuler, NULL ); implDispose(); } @@ -881,20 +866,13 @@ static inline sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn ) return (nApiColumn > 0) ? static_cast< sal_uInt32 >( nApiColumn - 1 ) : CSV_COLUMN_HEADER; } - - - -DBG_NAME( ScAccessibleCsvGrid ) - ScAccessibleCsvGrid::ScAccessibleCsvGrid( ScCsvGrid& rGrid ) : ScAccessibleCsvControl( rGrid.GetAccessibleParentWindow()->GetAccessible(), rGrid, nGridRole ) { - DBG_CTOR( ScAccessibleCsvGrid, NULL ); } ScAccessibleCsvGrid::~ScAccessibleCsvGrid() { - DBG_DTOR( ScAccessibleCsvGrid, NULL ); implDispose(); } @@ -1424,11 +1402,6 @@ ScAccessibleCsvControl* ScAccessibleCsvGrid::implCreateCellObj( sal_Int32 nRow, return new ScAccessibleCsvCell( implGetGrid(), implGetCellText( nRow, nColumn ), nRow, nColumn ); } - - - -DBG_NAME( ScAccessibleCsvCell ) - ScAccessibleCsvCell::ScAccessibleCsvCell( ScCsvGrid& rGrid, const OUString& rCellText, @@ -1440,13 +1413,11 @@ ScAccessibleCsvCell::ScAccessibleCsvCell( mnColumn( lcl_GetGridColumn( nColumn ) ), mnIndex( nRow * (rGrid.GetColumnCount() + 1) + nColumn ) { - DBG_CTOR( ScAccessibleCsvCell, NULL ); SetEditSource( implCreateEditSource() ); } ScAccessibleCsvCell::~ScAccessibleCsvCell() { - DBG_DTOR( ScAccessibleCsvCell, NULL ); } void SAL_CALL ScAccessibleCsvCell::disposing() diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index d921aa596d47..51aa0a826742 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -44,11 +44,6 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - - //= OCellListSource - - DBG_NAME( OCellListSource ) - #ifdef DBG_UTIL const char* OCellListSource::checkConsistency_static( const void* _pThis ) { @@ -73,8 +68,6 @@ namespace calc ,m_aListEntryListeners( m_aMutex ) ,m_bInitialized( false ) { - DBG_CTOR( OCellListSource, checkConsistency_static ); - OSL_PRECOND( m_xDocument.is(), "OCellListSource::OCellListSource: invalid document!" ); // register our property at the base class @@ -96,8 +89,6 @@ namespace calc acquire(); // prevent duplicate dtor dispose(); } - - DBG_DTOR( OCellListSource, checkConsistency_static ); } @@ -110,7 +101,6 @@ namespace calc void SAL_CALL OCellListSource::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); Reference<XModifyBroadcaster> xBroadcaster( m_xRange, UNO_QUERY ); if ( xBroadcaster.is() ) @@ -129,7 +119,6 @@ namespace calc Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) throw(RuntimeException, std::exception) { - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); return createPropertySetInfo( getInfoHelper() ) ; } @@ -150,7 +139,6 @@ namespace calc void SAL_CALL OCellListSource::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); OSL_ENSURE( _nHandle == PROP_HANDLE_RANGE_ADDRESS, "OCellListSource::getFastPropertyValue: invalid handle!" ); // we only have this one property .... (void)_nHandle; // avoid warning in product version @@ -220,7 +208,6 @@ namespace calc sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); @@ -232,7 +219,6 @@ namespace calc OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); @@ -246,7 +232,6 @@ namespace calc Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); @@ -264,7 +249,6 @@ namespace calc void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); @@ -278,7 +262,6 @@ namespace calc void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); @@ -291,8 +274,6 @@ namespace calc void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); - notifyModified(); } @@ -324,8 +305,6 @@ namespace calc void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellListSource, checkConsistency_static ); - Reference<XInterface> xRangeInt( m_xRange, UNO_QUERY ); if ( xRangeInt == aEvent.Source ) { diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 9d4a9bb7a9ca..953b2a3a0544 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -48,11 +48,6 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - - //= OCellValueBinding - - DBG_NAME( OCellValueBinding ) - #ifdef DBG_UTIL const char* OCellValueBinding::checkConsistency_static( const void* _pThis ) { @@ -81,8 +76,6 @@ namespace calc ,m_bInitialized( false ) ,m_bListPos( _bListPos ) { - DBG_CTOR( OCellValueBinding, checkConsistency_static ); - // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( @@ -105,8 +98,6 @@ namespace calc acquire(); // prevent duplicate dtor dispose(); } - - DBG_DTOR( OCellValueBinding, checkConsistency_static ); } @@ -118,8 +109,6 @@ namespace calc void SAL_CALL OCellValueBinding::disposing() { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Reference<XModifyBroadcaster> xBroadcaster( m_xCell, UNO_QUERY ); if ( xBroadcaster.is() ) { @@ -135,7 +124,6 @@ namespace calc Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) throw(RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); return createPropertySetInfo( getInfoHelper() ) ; } @@ -156,7 +144,6 @@ namespace calc void SAL_CALL OCellValueBinding::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); OSL_ENSURE( _nHandle == PROP_HANDLE_BOUND_CELL, "OCellValueBinding::getFastPropertyValue: invalid handle!" ); // we only have this one property .... (void)_nHandle; // avoid warning in product version @@ -170,7 +157,6 @@ namespace calc Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); checkDisposed( ); checkInitialized( ); @@ -202,7 +188,6 @@ namespace calc sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); checkDisposed( ); checkInitialized( ); @@ -220,7 +205,6 @@ namespace calc Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); checkDisposed( ); checkInitialized( ); checkValueType( aType ); @@ -307,7 +291,6 @@ namespace calc void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); checkDisposed( ); checkInitialized( ); if ( aValue.hasValue() ) @@ -469,8 +452,6 @@ namespace calc OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - return OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } @@ -481,8 +462,6 @@ namespace calc Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); aServices[ 0 ] = "com.sun.star.table.CellValueBinding"; aServices[ 1 ] = "com.sun.star.form.binding.ValueBinding"; @@ -531,16 +510,12 @@ namespace calc void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - notifyModified(); } void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) { - DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Reference<XInterface> xCellInt( m_xCell, UNO_QUERY ); if ( xCellInt == aEvent.Source ) { |