Kaydet (Commit) be8bbd29 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:flatten (clang-cl, embeddedobj)

Change-Id: Ic870347b3dc0ce6b7ad223c47a36b54843a26613
üst 3d1b53a0
...@@ -1563,8 +1563,9 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& ...@@ -1563,8 +1563,9 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
uno::Reference< io::XOutputStream > xTempOutStream = xTempFileStream->getOutputStream(); uno::Reference< io::XOutputStream > xTempOutStream = xTempFileStream->getOutputStream();
uno::Reference< io::XInputStream > xTempInStream = xTempFileStream->getInputStream(); uno::Reference< io::XInputStream > xTempInStream = xTempFileStream->getInputStream();
if ( xTempOutStream.is() && xTempInStream.is() ) if ( !(xTempOutStream.is() && xTempInStream.is()) )
{ throw io::IOException(); // TODO:
OSL_ENSURE( m_pUnoOleObject, "Unexpected object absence!" ); OSL_ENSURE( m_pUnoOleObject, "Unexpected object absence!" );
if ( !m_pUnoOleObject ) if ( !m_pUnoOleObject )
throw uno::RuntimeException(); throw uno::RuntimeException();
...@@ -1573,9 +1574,6 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& ...@@ -1573,9 +1574,6 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
xTempOutStream->closeOutput(); xTempOutStream->closeOutput();
xTempOutStream.clear(); xTempOutStream.clear();
}
else
throw io::IOException(); // TODO:
aResult <<= xTempInStream; aResult <<= xTempInStream;
} }
......
...@@ -176,8 +176,9 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia ...@@ -176,8 +176,9 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
uTemp=pInsertFct(&io); uTemp=pInsertFct(&io);
if ( OLEUI_OK == uTemp ) if ( OLEUI_OK != uTemp )
{ throw ucb::CommandAbortedException();
if (io.dwFlags & IOF_SELECTCREATENEW) if (io.dwFlags & IOF_SELECTCREATENEW)
{ {
uno::Reference< embed::XEmbeddedObjectCreator > xEmbCreator = embed::EmbeddedObjectCreator::create( comphelper::getComponentContext(m_xFactory) ); uno::Reference< embed::XEmbeddedObjectCreator > xEmbCreator = embed::EmbeddedObjectCreator::create( comphelper::getComponentContext(m_xFactory) );
...@@ -259,9 +260,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia ...@@ -259,9 +260,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
GlobalUnlock( io.hMetaPict ); GlobalUnlock( io.hMetaPict );
} }
} }
}
else
throw ucb::CommandAbortedException();
OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!" ); OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!" );
if ( !aObjectInfo.Object.is() ) if ( !aObjectInfo.Object.is() )
......
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