Skip to content

C
core
Kaydet (Commit) 0f297e20 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

OSL_ENSURE->assert where unconditionally deref follows 

Change-Id: I0cb2400e7ebb28cad2c98f9e69d68d312efb03ca
üst 37e4920a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
sw/source/filter/xml/xmltexti.cxx
Dosyayı görüntüle @ 0f297e20
......@@ -185,7 +185,7 @@ bool SwXMLTextImportHelper::IsInHeaderFooter() const
{
uno::Reference<XUnoTunnel> xCrsrTunnel(
((SwXMLTextImportHelper *)this)->GetCursor(), UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
......@@ -229,7 +229,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
return xPropSet;
uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
......@@ -539,7 +539,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
uno::Reference < XPropertySet > xPropSet;
uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
......@@ -627,7 +627,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
uno::Reference < XPropertySet > xPropSet;
uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
......@@ -674,7 +674,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
{
uno::Reference < XPropertySet > xPropSet;
uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
......@@ -757,7 +757,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
uno::Reference < XPropertySet > xPropSet;
uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for Cursor");
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
......@@ -909,7 +909,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
SolarMutexGuard aGuard;
uno::Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY );
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for embedded" );
assert(xCrsrTunnel.is() && "missing XUnoTunnel for embedded");
SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
OSL_ENSURE( pFrame, "SwXFrame missing" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment