[Libreoffice-commits] core.git: comphelper/source

[Stephan Bergmann]

 comphelper/source/container/embeddedobjectcontainer.cxx |    8 ++++----
 comphelper/source/misc/officerestartmanager.cxx         |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d12e4724748752b62b38f15f1223df5b87a00530
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 19 14:31:09 2014 +0100

    comphelper: sal_Bool -> bool sequel
    
    Change-Id: I2b9bd19abf4510fccef0374a539069cb8222ccae

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index eaa9772..ebe4df1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1241,13 +1241,13 @@ bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Re
             throw uno::RuntimeException();
 
         xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
-                                    uno::makeAny( (sal_Bool)sal_True ) );
+                                    uno::makeAny( true ) );
         uno::Any aAny;
         aAny <<= rMediaType;
         xPropSet->setPropertyValue("MediaType", aAny );
 
         xPropSet->setPropertyValue("Compressed",
-                                    uno::makeAny( (sal_Bool)sal_True ) );
+                                    uno::makeAny( true ) );
     }
     catch (const uno::Exception&)
     {
@@ -1271,9 +1271,9 @@ bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star:
         aProps[0].Name = "MediaType";
         aProps[0].Value <<= rMediaType;
         aProps[1].Name = "UseCommonStoragePasswordEncryption";
-        aProps[1].Value <<= (sal_Bool)sal_True;
+        aProps[1].Value <<= true;
         aProps[2].Name = "Compressed";
-        aProps[2].Value <<= (sal_Bool)sal_True;
+        aProps[2].Value <<= true;
 
         if ( xReplacement->hasByName( rObjectName ) )
             xReplacement->removeElement( rObjectName );
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index 3977fd8..aec471e 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -136,7 +136,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
             uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW );
             OUString aVetoPropName( "SuspendQuickstartVeto" );
             uno::Any aValue;
-            aValue <<= (sal_Bool)sal_True;
+            aValue <<= true;
             xPropertySet->setPropertyValue( aVetoPropName, aValue );
 
             try
@@ -147,7 +147,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 
             if ( !bSuccess )
             {
-                aValue <<= (sal_Bool)sal_False;
+                aValue <<= false;
                 xPropertySet->setPropertyValue( aVetoPropName, aValue );
             }
         }