summaryrefslogtreecommitdiff
path: root/embeddedobj/source/msole
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-20 17:16:42 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-20 17:25:40 +0200
commitbc9047540a9c6c961bd686c61bed13ce18a28edb (patch)
tree99a6cadc2fc2273d368e3f4dde86f00afa2b2359 /embeddedobj/source/msole
parent9ad66e5ae924b22c589601085c0a7355073a1daf (diff)
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I8542bfaf9e27792369617c44258ddcc393e490a2
Diffstat (limited to 'embeddedobj/source/msole')
-rw-r--r--embeddedobj/source/msole/oleembed.cxx16
-rw-r--r--embeddedobj/source/msole/olepersist.cxx6
-rw-r--r--embeddedobj/source/msole/ownview.cxx10
3 files changed, 16 insertions, 16 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 6d42cabcebdd..ee78fae1c858 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -299,7 +299,7 @@ bool OleEmbeddedObject::TryToConvertToOOo()
uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
uno::Sequence< beans::PropertyValue > aSeq( 1 );
aSeq[0].Name = "SetEmbedded";
- aSeq[0].Value <<= sal_True;
+ aSeq[0].Value <<= true;
xModel->attachResource( OUString(), aSeq );
// load the model from the stream
@@ -307,7 +307,7 @@ bool OleEmbeddedObject::TryToConvertToOOo()
aArgs[0].Name = "HierarchicalDocumentName";
aArgs[0].Value <<= m_aEntryName;
aArgs[1].Name = "ReadOnly";
- aArgs[1].Value <<= sal_True;
+ aArgs[1].Value <<= true;
aArgs[2].Name = "FilterName";
aArgs[2].Value <<= m_aFilterName;
aArgs[3].Name = "URL";
@@ -321,7 +321,7 @@ bool OleEmbeddedObject::TryToConvertToOOo()
// the model is successfully loaded, create a new storage and store the model to the storage
uno::Reference< embed::XStorage > xTmpStorage = CreateTemporarySubstorage( aStorageName );
xStorDoc->storeToStorage( xTmpStorage, uno::Sequence< beans::PropertyValue >() );
- xDocument->close( sal_True );
+ xDocument->close( true );
uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW );
OUString aMediaType;
xStorProps->getPropertyValue("MediaType") >>= aMediaType;
@@ -385,7 +385,7 @@ bool OleEmbeddedObject::TryToConvertToOOo()
catch ( const uno::Exception& )
{
try {
- close( sal_True );
+ close( true );
} catch( const uno::Exception& ) {}
m_xParentStorage->dispose(); // ??? the storage has information loss, it should be closed without committing!
@@ -400,7 +400,7 @@ bool OleEmbeddedObject::TryToConvertToOOo()
catch( const uno::Exception& )
{
try {
- close( sal_True );
+ close( true );
} catch( const uno::Exception& ) {}
throw uno::RuntimeException(); // the repairing is not possible
@@ -725,7 +725,7 @@ namespace
if (bCopied)
{
xNativeTempFile->setPropertyValue("RemoveFile",
- uno::makeAny(sal_False));
+ uno::makeAny(false));
uno::Any aUrl = xNativeTempFile->getPropertyValue("Uri");
aUrl >>= sUrl;
@@ -734,12 +734,12 @@ namespace
uno::Reference < ucb::XSimpleFileAccess3 > xSimpleFileAccess(
ucb::SimpleFileAccess::create( comphelper::getComponentContext(xFactory) ) );
- xSimpleFileAccess->setReadOnly(sUrl, sal_True);
+ xSimpleFileAccess->setReadOnly(sUrl, true);
}
else
{
xNativeTempFile->setPropertyValue("RemoveFile",
- uno::makeAny(sal_True));
+ uno::makeAny(true));
}
#else
(void) xFactory;
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index fd705ae028fa..f713f97ea54a 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -89,7 +89,7 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor
uno::UNO_QUERY_THROW );
try {
- xTempFile->setPropertyValue("RemoveFile", uno::makeAny( sal_False ) );
+ xTempFile->setPropertyValue("RemoveFile", uno::makeAny( false ) );
uno::Any aUrl = xTempFile->getPropertyValue("Uri");
aUrl >>= aResult;
}
@@ -1672,9 +1672,9 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
static_cast< ::cppu::OWeakObject* >(this) );
if ( m_xObjectStream.is() )
- return sal_True;
+ return true;
- return sal_False;
+ return false;
}
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 53e2d0b20225..b81627ff224a 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -116,14 +116,14 @@ bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
aArgs[0].Value <<= aFileURL;
aArgs[1].Name = "ReadOnly";
- aArgs[1].Value <<= sal_True;
+ aArgs[1].Value <<= true;
aArgs[2].Name = "InteractionHandler";
aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >(
static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY );
aArgs[3].Name = "DontEdit";
- aArgs[3].Value <<= sal_True;
+ aArgs[3].Value <<= true;
if ( !m_aFilterName.isEmpty() )
{
@@ -216,7 +216,7 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
aArgs[2].Value <<= aTypeName;
}
- aTypeName = xTypeDetection->queryTypeByDescriptor( aArgs, sal_True );
+ aTypeName = xTypeDetection->queryTypeByDescriptor( aArgs, true );
OUString aFilterName;
for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
@@ -264,7 +264,7 @@ bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io::XI
throw uno::RuntimeException();
try {
- xNativeTempFile->setPropertyValue("RemoveFile", uno::makeAny( sal_False ) );
+ xNativeTempFile->setPropertyValue("RemoveFile", uno::makeAny( false ) );
uno::Any aUrl = xNativeTempFile->getPropertyValue("Uri");
aUrl >>= aNativeTempURL;
}
@@ -562,7 +562,7 @@ void OwnView_Impl::Close()
xCloseable->removeCloseListener( uno::Reference< util::XCloseListener >(
static_cast< ::cppu::OWeakObject* >( this ),
uno::UNO_QUERY ) );
- xCloseable->close( sal_True );
+ xCloseable->close( true );
}
}
catch( uno::Exception& )