mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced diagnore ENSURE_OR_CONTINUE with regular code.

Browse Source
This commit is contained in:
Marcel Metz
2012-01-15 11:48:11 +01:00
committed by Stephan Bergmann
parent f9e6d195db
commit 89f0655eba
10 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sfx2/source/dialog/taskpane.cxx
View File

@@ -671,7 +671,12 @@ namespace sfx2
{
const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i ) );
const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() );
ENSURE_OR_CONTINUE( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!" );
if ( !pCustomPanel )
{
SAL_WARN( "sfx2.dialog", "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!" );
continue;
}
if ( pCustomPanel->GetResourceURL() == i_rResourceURL )
{
aPanelPos = i;

6
svtools/source/uno/svtxgridcontrol.cxx
View File

@@ -781,7 +781,11 @@ void SVTXGridControl::impl_updateColumnsFromModel_nothrow()
++colRef
)
{
ENSURE_OR_CONTINUE( colRef->is(), "illegal column!" );
if ( !colRef->is() )
{
SAL_WARN( "svtools.uno", "illegal column!" );
continue;
}
m_pTableModel->appendColumn( *colRef );
}

7
svtools/source/uno/unocontroltablemodel.cxx
View File

@@ -323,7 +323,12 @@ namespace svt { namespace table
)
{
UnoGridColumnFacade* pColumn = dynamic_cast< UnoGridColumnFacade* >( col->get() );
ENSURE_OR_CONTINUE( pColumn != NULL, "UnoControlTableModel::removeAllColumns: illegal column implementation!" );
if ( !pColumn )
{
SAL_WARN( "svtools.uno", "UnoControlTableModel::removeAllColumns: illegal column implementation!" );
continue;
}
pColumn->dispose();
}
m_pImpl->aColumns.clear();

12
svx/source/form/fmpgeimp.cxx
View File

@@ -216,15 +216,23 @@ void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl )
continue;
Reference< XControlModel > xForeignModel( pForeignObj->GetUnoControlModel() );
ENSURE_OR_CONTINUE( xForeignModel.is(), "FmFormPageImpl::FmFormPageImpl: control shape without control!" );
if ( !xForeignModel.is() )
{
// if this fires, the SdrObject does not have a UNO Control Model. This is pathological, but well ...
// So the cloned SdrObject will also not have a UNO Control Model.
SAL_WARN( "svx.form", "FmFormPageImpl::FmFormPageImpl: control shape without control!" );
continue;
}
MapControlModels::const_iterator assignment = aModelAssignment.find( xForeignModel );
ENSURE_OR_CONTINUE( assignment != aModelAssignment.end(), "FmFormPageImpl::FmFormPageImpl: no clone found for this model!" );
if ( assignment == aModelAssignment.end() )
{
// if this fires, the source SdrObject has a model, but it is not part of the model hierarchy in
// i_foreignImpl.getForms().
// Pathological, too ...
SAL_WARN( "svx.form", "FmFormPageImpl::FmFormPageImpl: no clone found for this model!" );
continue;
}
pOwnObj->SetUnoControlModel( assignment->second );
}

13
svx/source/form/fmvwimp.cxx
View File

@@ -733,7 +733,11 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
continue;
Reference< XPropertySet > xFormSet( xForm, UNO_QUERY );
ENSURE_OR_CONTINUE( xFormSet.is(), "FmXFormView::OnActivate: a form which does not have properties?" );
if ( !xFormSet.is() )
{
SAL_WARN( "svx.form", "FmXFormView::OnActivate: a form which does not have properties?" );
continue;
}
const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) );
if ( !aSource.isEmpty() )
@@ -908,7 +912,12 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF
)
{
const PFormViewPageWindowAdapter pAdapter( *pos );
ENSURE_OR_CONTINUE( pAdapter.get(), "FmXFormView::getFormController: invalid page window adapter!" );
if ( !pAdapter.get() )
{
SAL_WARN( "svx.form", "FmXFormView::getFormController: invalid page window adapter!" );
continue;
}
if ( pAdapter->getWindow() != &_rDevice )
// wrong device
continue;

7
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
View File

@@ -178,7 +178,12 @@ namespace toolkit
)
{
GridColumn* pColumnImpl = GridColumn::getImplementation( *updatePos );
ENSURE_OR_CONTINUE( pColumnImpl, "DefaultGridColumnModel::removeColumn: invalid column implementation!" );
if ( !pColumnImpl )
{
SAL_WARN( "toolkit.controls", "DefaultGridColumnModel::removeColumn: invalid column implementation!" );
continue;
}
pColumnImpl->setIndex( columnIndex );
}

6
ucb/source/ucp/ext/ucpext_datasupplier.cxx
View File

@@ -163,7 +163,11 @@ namespace ucb { namespace ucp { namespace ext
++pExtInfo
)
{
ENSURE_OR_CONTINUE( pExtInfo->getLength() > 0, "illegal extension info" );
if ( pExtInfo->getLength() <= 0 )
{
SAL_WARN( "ucb.ucp", "illegal extension info" );
continue;
}
const ::rtl::OUString& rLocalId = (*pExtInfo)[0];
ResultListEntry aEntry;

7
vcl/source/control/throbber.cxx
View File

@@ -190,7 +190,12 @@ void Throbber::initImages()
++check
)
{
ENSURE_OR_CONTINUE( !check->empty(), "Throbber::initImages: illegal image!" );
if ( check->empty() )
{
SAL_WARN( "vcl.control", "Throbber::initImages: illegal image!" );
continue;
}
const Size aImageSize = (*check)[0].GetSizePixel();
if ( ( aImageSize.Width() > aWindowSizePixel.Width() )

7
xmloff/source/forms/elementexport.cxx
View File

@@ -500,8 +500,11 @@ namespace xmloff
// let the factory provide the concrete handler. Note that caching, if desired, is the task
// of the factory
PPropertyHandler handler = (*propDescription->factory)( propDescription->propertyId );
ENSURE_OR_CONTINUE( handler.get() != NULL,
"OControlExport::exportGenericHandlerAttributes: invalid property handler provided by the factory!" );
if ( !handler.get() )
{
SAL_WARN( "xmloff.forms", "OControlExport::exportGenericHandlerAttributes: invalid property handler provided by the factory!" );
continue;
}
::rtl::OUString attributeValue;
if ( propDescription->propertyGroup == NO_GROUP )

7
xmloff/source/forms/property_meta_data.cxx
View File

@@ -245,7 +245,12 @@ namespace xmloff { namespace metadata
{
const PropertyGroup propGroup = group->second;
const IndexedPropertyGroups::const_iterator groupPos = rPropertyGroups.find( propGroup );
ENSURE_OR_CONTINUE( groupPos != rPropertyGroups.end(), "getPropertyGroupList: inconsistency!" );
if( groupPos == rPropertyGroups.end() )
{
SAL_WARN( "xmloff.forms", "getPropertyGroupList: inconsistency!" );
continue;
}
o_propertyGroups.push_back( groupPos->second );
}
}