[Libreoffice-commits] core.git: framework/inc framework/source

Stephan Bergmann sbergman at redhat.com
Fri Sep 12 02:49:03 PDT 2014


 framework/inc/xml/toolboxdocumenthandler.hxx        |    2 +-
 framework/source/fwe/xml/toolboxdocumenthandler.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b53b5081a85d7773cee8a718f84f31ecf7b70c0d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 12 11:48:34 2014 +0200

    framework: sal_Bool -> bool
    
    Change-Id: Ie56d3fe674af048d7aea32f141c5825e4c2aa98b

diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index f1bb2c3..9e643fc 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -163,7 +163,7 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
 
     protected:
         virtual void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle,
-                                       sal_Int16 nWidth, sal_Bool bVisible ) throw
+                                       sal_Int16 nWidth, bool bVisible ) throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
 
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 639d339..265581e 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -762,7 +762,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
     const OUString& rTooltip,
     sal_Int16       nStyle,
     sal_Int16       nWidth,
-    sal_Bool        bVisible )
+    bool        bVisible )
 throw ( SAXException, RuntimeException )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
@@ -784,7 +784,7 @@ throw ( SAXException, RuntimeException )
                              rLabel );
     }
 
-    if ( bVisible == sal_False )
+    if ( !bVisible )
     {
         pList->AddAttribute( m_aXMLToolbarNS + OUString( ATTRIBUTE_VISIBLE ),
                              m_aAttributeType,


More information about the Libreoffice-commits mailing list