summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appuno.cxx4
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx8
-rw-r--r--sfx2/source/dialog/taskpane.cxx2
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx2
-rw-r--r--sfx2/source/doc/Metadatable.cxx22
-rw-r--r--sfx2/source/doc/docfac.cxx2
-rw-r--r--sfx2/source/doc/doctemplates.cxx6
-rw-r--r--sfx2/source/doc/objxtor.cxx4
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx4
-rw-r--r--sfx2/source/view/userinputinterception.cxx2
-rw-r--r--sfx2/source/view/viewfrm2.cxx2
-rw-r--r--sfx2/workben/custompanel/ctp_factory.cxx2
12 files changed, 30 insertions, 30 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7438353c2822..9ecd8764fdad 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1392,13 +1392,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sFrame));
if ( pItem->ISA( SfxUsrAnyItem ) )
{
- OSL_ENSURE( false, "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
+ OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
pValue[nActProp++].Value = static_cast< const SfxUsrAnyItem* >( pItem )->GetValue();
}
else if ( pItem->ISA( SfxUnoFrameItem ) )
pValue[nActProp++].Value <<= static_cast< const SfxUnoFrameItem* >( pItem )->GetFrame();
else
- OSL_ENSURE( false, "TransformItems: invalid item type for SID_FILLFRAME!" );
+ OSL_FAIL( "TransformItems: invalid item type for SID_FILLFRAME!" );
}
if ( rSet.GetItemState( SID_TEMPLATE, sal_False, &pItem ) == SFX_ITEM_SET )
{
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index b5126744aa50..092ace28428b 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -78,7 +78,7 @@ void ImeStatusWindow::init()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
// Degrade gracefully and use the VCL-supplied default if no
// configuration is available.
}
@@ -96,7 +96,7 @@ bool ImeStatusWindow::isShowing()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
// Degrade gracefully and use the VCL-supplied default if no
// configuration is available.
}
@@ -122,7 +122,7 @@ void ImeStatusWindow::show(bool bShow)
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
}
}
@@ -143,7 +143,7 @@ ImeStatusWindow::~ImeStatusWindow()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.RuntimeException");
+ OSL_FAIL("com.sun.star.uno.RuntimeException");
}
}
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d1de5e0aec68..50f168cfd3ea 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -1119,7 +1119,7 @@ namespace sfx2
// ---------------------------------------------------------------------------------------------------------------------
void TaskPaneController_Impl::Dying()
{
- OSL_ENSURE( false, "TaskPaneController_Impl::Dying: unexpected call!" );
+ OSL_FAIL( "TaskPaneController_Impl::Dying: unexpected call!" );
// We are expected to live longer than the ToolPanelDeck we work with. Since we remove ourself, in our dtor,
// as listener from the panel deck, this method here should never be called.
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 8ad9d8b537cb..3e54717ca6d2 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -1341,7 +1341,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
try {
xBaseURI = createBaseURI(m_pImpl->m_xContext, xStorage, URL);
} catch (uno::Exception &) {
- OSL_ENSURE(false, "cannot create base URI");
+ OSL_FAIL("cannot create base URI");
}
}
uno::Reference<task::XInteractionHandler> xIH;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 302e181fe438..e00f5e67fec5 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -285,7 +285,7 @@ public:
virtual bool IsInContent() const { return m_isInContent; }
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > MakeUnoObject()
- { OSL_ENSURE(false, "MetadatableUndo::MakeUnoObject"); throw; }
+ { OSL_FAIL("MetadatableUndo::MakeUnoObject"); throw; }
};
// MetadatableClipboard ----------------------------------------------
@@ -310,7 +310,7 @@ public:
virtual bool IsInContent() const { return m_isInContent; }
virtual ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable > MakeUnoObject()
- { OSL_ENSURE(false, "MetadatableClipboard::MakeUnoObject"); throw; }
+ { OSL_FAIL("MetadatableClipboard::MakeUnoObject"); throw; }
void OriginNoLongerInBusinessAnymore() { m_pReg = 0; }
};
@@ -777,7 +777,7 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
::rtl::OUString idref;
if (!m_pImpl->LookupXmlId(i_rObject, path, idref))
{
- OSL_ENSURE(false, "unregister: no xml id?");
+ OSL_FAIL("unregister: no xml id?");
return;
}
const XmlIdMap_t::iterator iter( m_pImpl->m_XmlIdMap.find(idref) );
@@ -820,7 +820,7 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
::rtl::OUString idref;
if (!m_pImpl->LookupXmlId( i_rSource, path, idref ))
{
- OSL_ENSURE(false, "no xml id?");
+ OSL_FAIL("no xml id?");
return;
}
XmlIdList_t * pList ( m_pImpl->LookupElementList(path, idref) );
@@ -887,7 +887,7 @@ XmlIdRegistryDocument::JoinMetadatables(
}
else
{
- OSL_ENSURE(false, "JoinMetadatables: no xmlid?");
+ OSL_FAIL("JoinMetadatables: no xmlid?");
return;
}
if (!mergedOwnsRef)
@@ -1202,7 +1202,7 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
const MetadatableClipboard * pLink;
if (!m_pImpl->LookupXmlId(i_rObject, path, idref, pLink))
{
- OSL_ENSURE(false, "unregister: no xml id?");
+ OSL_FAIL("unregister: no xml id?");
return;
}
const ClipboardXmlIdMap_t::iterator iter( m_pImpl->m_XmlIdMap.find(idref) );
@@ -1309,7 +1309,7 @@ void Metadatable::RemoveMetadataReference()
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::RemoveMetadataReference: exception");
+ OSL_FAIL("Metadatable::RemoveMetadataReference: exception");
}
}
@@ -1465,13 +1465,13 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource,
}
else
{
- OSL_ENSURE(false, "neither RegDoc nor RegClp cannot happen");
+ OSL_FAIL("neither RegDoc nor RegClp cannot happen");
}
}
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::RegisterAsCopyOf: exception");
+ OSL_FAIL("Metadatable::RegisterAsCopyOf: exception");
}
}
@@ -1494,7 +1494,7 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource,
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::CreateUndo: exception");
+ OSL_FAIL("Metadatable::CreateUndo: exception");
}
return ::boost::shared_ptr<MetadatableUndo>();
}
@@ -1564,7 +1564,7 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
}
catch (uno::Exception &)
{
- OSL_ENSURE(false, "Metadatable::JoinMetadatable: exception");
+ OSL_FAIL("Metadatable::JoinMetadatable: exception");
}
}
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 2ff73c35cb36..e02e560f47e9 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -168,7 +168,7 @@ void SfxObjectFactory::RegisterViewFactory
ByteString sMessage( "SfxObjectFactory::RegisterViewFactory: duplicate view name '" );
sMessage += ByteString( sViewName, RTL_TEXTENCODING_ASCII_US );
sMessage += "'!";
- OSL_ENSURE( false, sMessage.GetBuffer() );
+ OSL_FAIL( sMessage.GetBuffer() );
break;
}
}
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 6ab877dfc6a9..8815bad96cbf 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -455,7 +455,7 @@ void SfxDocTplService_Impl::init_Impl()
mxInfo = uno::Reference< XStandaloneDocumentInfo > (
mxFactory->createInstance( aService ), UNO_QUERY );
} catch (uno::RuntimeException &) {
- OSL_ENSURE(false, "SfxDocTplService_Impl::init_Impl: "
+ OSL_FAIL("SfxDocTplService_Impl::init_Impl: "
"cannot create DocumentProperties service");
}
@@ -1037,7 +1037,7 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
}
else
{
- OSL_ENSURE( false, "Unsupported property value type" );
+ OSL_FAIL( "Unsupported property value type" );
}
}
}
@@ -1098,7 +1098,7 @@ sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent,
}
else
{
- OSL_ENSURE( false, "Unsupported property value type" );
+ OSL_FAIL( "Unsupported property value type" );
}
}
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 3061682a39c5..d09bad7feea3 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -774,7 +774,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer()
if ( pBasMgr )
return pBasMgr->GetDialogLibraryContainer().get();
- OSL_ENSURE( false, "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?" );
+ OSL_FAIL( "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?" );
return SFX_APP()->GetDialogContainer();
}
@@ -789,7 +789,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
if ( pBasMgr )
return pBasMgr->GetScriptLibraryContainer().get();
- OSL_ENSURE( false, "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?" );
+ OSL_FAIL( "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?" );
return SFX_APP()->GetBasicContainer();
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7d36263c5c45..b88e14004731 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2583,7 +2583,7 @@ sal_Bool SfxBaseModel::IsInitialized() const
{
if ( !m_pData || !m_pData->m_pObjectShell )
{
- OSL_ENSURE( false, "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
+ OSL_FAIL( "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
return sal_False;
}
@@ -3874,7 +3874,7 @@ SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame
// destroyed later, and the new one, which we're going to create
continue;
- OSL_ENSURE( false, "SfxBaseModel::FindOrCreateViewFrame_Impl: there already is an SfxFrame for the given XFrame, but no view in it!" );
+ OSL_FAIL( "SfxBaseModel::FindOrCreateViewFrame_Impl: there already is an SfxFrame for the given XFrame, but no view in it!" );
// nowadays, we're the only instance allowed to create an SfxFrame for an XFrame, so this case here should not happen
break;
}
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index a61e32197cd5..fdd9f97fb4e0 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -267,7 +267,7 @@ namespace sfx2
break;
default:
- OSL_ENSURE( false, "UserInputInterception::handleNotifyEvent: illegal event type!" );
+ OSL_FAIL( "UserInputInterception::handleNotifyEvent: illegal event type!" );
break;
}
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 86d634cfd531..d32c31ff15ac 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -460,7 +460,7 @@ void SfxViewFrame::INetExecute_Impl( SfxRequest &rRequest )
{
case SID_BROWSE_FORWARD:
case SID_BROWSE_BACKWARD:
- OSL_ENSURE( false, "SfxViewFrame::INetExecute_Impl: SID_BROWSE_FORWARD/BACKWARD are dead!" );
+ OSL_FAIL( "SfxViewFrame::INetExecute_Impl: SID_BROWSE_FORWARD/BACKWARD are dead!" );
break;
case SID_CREATELINK:
{
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx
index 40525347ac58..c49e5279ebbd 100644
--- a/sfx2/workben/custompanel/ctp_factory.cxx
+++ b/sfx2/workben/custompanel/ctp_factory.cxx
@@ -103,7 +103,7 @@ namespace sd { namespace colortoolpanel
}
if ( !xParentWindow.is() )
{
- OSL_ENSURE( false, "ToolPanelFactory::createUIElement: no parent window in the args!" );
+ OSL_FAIL( "ToolPanelFactory::createUIElement: no parent window in the args!" );
throw IllegalArgumentException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No parent window provided in the creation arguments. Cannot create tool panel." ) ),
*this,
generated by cgit (git 2.34.1) at 2024-08-12 21:28:24 +0000