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

Stephan Bergmann sbergman at redhat.com
Wed Feb 19 14:06:11 CET 2014


 sot/source/sdstor/ucbstorage.cxx               |    4 ++--
 sot/source/unoolestorage/xolesimplestorage.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 81a2fc786728205b0a869b38a95fc889662b08a6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 19 14:05:37 2014 +0100

    sot: sal_Bool -> bool fixup
    
    Change-Id: I53777b6f72f5ff60228e40e9ec2a0e909e059fcf

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 9d3e66a..47158af 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2156,7 +2156,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                         // first remove all open stream handles
                         if( !pElement->m_xStream.Is() || pElement->m_xStream->Clear() )
                         {
-                            pContent->executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
+                            pContent->executeCommand( OUString("delete"), makeAny( true ) );
                             nRet = COMMIT_RESULT_SUCCESS;
                         }
                         else
@@ -2189,7 +2189,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                             // OLE storage should be stored encrytped, if the storage uses encryption
                             pElement->m_xStream->m_aContentType = "application/vnd.sun.star.oleobject";
                             Any aValue;
-                            aValue <<= (sal_Bool)sal_True;
+                            aValue <<= true;
                             pElement->m_xStream->m_pContent->setPropertyValue("Encrypted", aValue );
                         }
 
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 3fe6aa5..1de814e 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -476,7 +476,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName )
 
         uno::Sequence< uno::Any > aArgs( 2 );
         aArgs[0] <<= xInputStream; // allow readonly access only
-        aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+        aArgs[1] <<= true; // do not create copy
 
         uno::Reference< container::XNameContainer > xResultNameContainer(
             m_xFactory->createInstanceWithArguments(


More information about the Libreoffice-commits mailing list