diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-17 11:39:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-22 09:53:13 +0200 |
commit | 584e8c8c3c81c4e475905c687b377676334b393b (patch) | |
tree | 3ac0dee881c06adafa632715d9ea22fb811a425f /embeddedobj/source/msole/oleembed.cxx | |
parent | c7d6d3d241473d43fb8f7486805c0cfda2d66257 (diff) |
embeddedobj: sal_Bool->bool
Change-Id: Ie3465a34963c768945b1ee7f5939ea1f233d3528
Diffstat (limited to 'embeddedobj/source/msole/oleembed.cxx')
-rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index fe2108676620..800166167746 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -247,16 +247,16 @@ OUString OleEmbeddedObject::MoveToTemporarySubstream() } -sal_Bool OleEmbeddedObject::TryToConvertToOOo() +bool OleEmbeddedObject::TryToConvertToOOo() { - sal_Bool bResult = sal_False; + bool bResult = false; OUString aStorageName; OUString aTmpStreamName; sal_Int32 nStep = 0; if ( m_pOleComponent || m_bReadOnly ) - return sal_False; + return false; try { @@ -289,7 +289,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() { // create the model uno::Sequence< uno::Any > aArguments(1); - aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True )); + aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( true )); uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW ); @@ -356,7 +356,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() nStep = 4; m_xWrappedObject.set( xEmbCreator->createInstanceInitFromEntry( m_xParentStorage, m_aEntryName, uno::Sequence< beans::PropertyValue >(), uno::Sequence< beans::PropertyValue >() ), uno::UNO_QUERY_THROW ); - bResult = sal_True; // the change is no more revertable + bResult = true; // the change is no more revertable try { m_xParentStorage->removeElement( aTmpStreamName ); @@ -699,7 +699,7 @@ namespace uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xObjectStream; - aArgs[1] <<= (sal_Bool)sal_True; // do not create copy + aArgs[1] <<= true; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( xFactory->createInstanceWithArguments( OUString("com.sun.star.embed.OLESimpleStorage"), @@ -715,7 +715,7 @@ namespace // ignore } - sal_Bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream()); + bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream()); uno::Reference< io::XSeekable > xSeekableStor(xObjectStream, uno::UNO_QUERY); if (xSeekableStor.is()) @@ -836,7 +836,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) // if it is possible, the object will be converted to OOo format if ( !m_bTriedConversion ) { - m_bTriedConversion = sal_True; + m_bTriedConversion = true; if ( TryToConvertToOOo() ) { changeState( embed::EmbedStates::UI_ACTIVE ); |