vbahelper: sal_Bool->bool

Change-Id: I9fd549bd4ad8f67f83db6a864aa86d0c7310d43e

9 files changed, 67 insertions, 39 deletions

diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 82b4ec4a719c..8cc8d99a571c 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -301,7 +301,7 @@ ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException
         if ( xDlgProps.is() )
         {
             uno::Reference< container::XNameContainer > xAllChildren( xDlgProps->getPropertyValue( "AllDialogChildren" ), uno::UNO_QUERY_THROW );
-            sal_Bool bRes =  xAllChildren->hasByName( aName );
+            bool bRes =  xAllChildren->hasByName( aName );
             SAL_INFO("vbahelper", "ScVbaUserForm::hasProperty(" << aName << ") " << xAllChildren.is() << " ---> " << bRes );
             return bRes;
         }
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index 47fedfabdb69..a491c36c9734 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -29,7 +29,12 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Bool bIsMenu ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu )
+ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent,
+                                  const uno::Reference< uno::XComponentContext > xContext,
+                                  VbaCommandBarHelperRef pHelper,
+                                  const uno::Reference< container::XIndexAccess >& xBarSettings,
+                                  const OUString& sResourceUrl, bool bIsMenu ) throw( uno::RuntimeException )
+   : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu )
 {
 }
 
@@ -80,7 +85,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception)
     if( m_bIsMenu )
         return sal_True;
 
-    sal_Bool bVisible = sal_False;
+    bool bVisible = false;
     try
     {
         uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState();
diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx
index bb7dce3bb4c8..b2906163d71f 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.hxx
@@ -37,13 +37,13 @@ class ScVbaCommandBar : public CommandBar_BASE
 private:
     VbaCommandBarHelperRef pCBarHelper;
     css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
-    OUString   m_sResourceUrl;
-    sal_Bool        m_bIsMenu;
+    OUString    m_sResourceUrl;
+    bool        m_bIsMenu;
 
 public:
-    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Bool bIsMenu ) throw( css::uno::RuntimeException );
+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, bool bIsMenu ) throw( css::uno::RuntimeException );
 
-    sal_Bool IsMenu() const { return m_bIsMenu; }
+    bool IsMenu() const { return m_bIsMenu; }
 
     // Attributes
     virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index af58dc43b897..78fd8e7d0cc1 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -24,7 +24,7 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( sal_True )
+ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( true )
 {
 }
 
@@ -78,7 +78,7 @@ ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::Run
 sal_Bool SAL_CALL
 ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bVisible = sal_True;
+    bool bVisible = true;
     uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE );
     if( aValue.hasValue() )
         aValue >>= bVisible;
@@ -98,7 +98,7 @@ ScVbaCommandBarControl::setVisible( sal_Bool _visible ) throw (uno::RuntimeExcep
 sal_Bool SAL_CALL
 ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bEnabled = sal_True;
+    bool bEnabled = true;
 
     uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ENABLED );
     if( aValue.hasValue() )
@@ -194,7 +194,15 @@ ScVbaCommandBarControl::getServiceNames()
 }
 
 // ScVbaCommandBarPopup
-ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
+ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent,
+                                            const css::uno::Reference< css::uno::XComponentContext >& xContext,
+                                            const css::uno::Reference< css::container::XIndexAccess >& xSettings,
+                                            VbaCommandBarHelperRef pHelper,
+                                            const css::uno::Reference< css::container::XIndexAccess >& xBarSettings,
+                                            const OUString& sResourceUrl,
+                                            sal_Int32 nPosition,
+                                            bool bTemporary ) throw (css::uno::RuntimeException)
+    : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
 {
     m_nPosition = nPosition;
     m_bTemporary = bTemporary;
@@ -220,7 +228,15 @@ ScVbaCommandBarPopup::getServiceNames()
 }
 
 // ScVbaCommandBarButton
-ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
+ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent,
+                                              const css::uno::Reference< css::uno::XComponentContext >& xContext,
+                                              const css::uno::Reference< css::container::XIndexAccess >& xSettings,
+                                              VbaCommandBarHelperRef pHelper,
+                                              const css::uno::Reference< css::container::XIndexAccess >& xBarSettings,
+                                              const OUString& sResourceUrl,
+                                              sal_Int32 nPosition,
+                                              bool bTemporary ) throw (css::uno::RuntimeException)
+    : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
 {
     m_nPosition = nPosition;
     m_bTemporary = bTemporary;
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
index bde9de7e458e..72c21f8d046b 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
@@ -40,7 +40,7 @@ protected:
     css::uno::Sequence< css::beans::PropertyValue >     m_aPropertyValues;
 
     sal_Int32           m_nPosition;
-    sal_Bool            m_bTemporary;
+    bool                m_bTemporary;
 
 private:
     void ApplyChange() throw (css::uno::RuntimeException);
@@ -77,7 +77,7 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPop
 class ScVbaCommandBarPopup : public CommandBarPopup_BASE
 {
 public:
-    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary ) throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
@@ -92,7 +92,7 @@ typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarBut
 class ScVbaCommandBarButton : public CommandBarButton_BASE
 {
 public:
-    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary ) throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index a12250489e6a..8696075b241f 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -57,8 +57,8 @@ uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateMenuItemDat
                                                                                    const OUString& sLabel,
                                                                                    sal_uInt16 nType,
                                                                                    const uno::Any& aSubMenu,
-                                                                                   sal_Bool isVisible,
-                                                                                   sal_Bool isEnabled )
+                                                                                   bool isVisible,
+                                                                                   bool isEnabled )
 {
     uno::Sequence< beans::PropertyValue > aProps(7);
 
@@ -80,7 +80,13 @@ uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateMenuItemDat
     return aProps;
 }
 
-uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItemData( const OUString& sCommandURL, const OUString& sHelpURL, const OUString& sLabel, sal_uInt16 nType, const uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle )
+uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItemData( const OUString& sCommandURL,
+                                                                                      const OUString& sHelpURL,
+                                                                                      const OUString& sLabel,
+                                                                                      sal_uInt16 nType,
+                                                                                      const uno::Any& aSubMenu,
+                                                                                      bool isVisible,
+                                                                                      sal_Int32 nStyle )
 {
     uno::Sequence< beans::PropertyValue > aProps(7);
 
@@ -126,9 +132,9 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
     getPropertyValue( aProps, ITEM_DESCRIPTOR_CONTAINER ) >>= xSubMenu;
     ScVbaCommandBarControl* pNewCommandBarControl = NULL;
     if( xSubMenu.is() )
-        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True );
+        pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, true );
     else
-        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True );
+        pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, true );
 
     return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
 }
@@ -166,7 +172,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
     OUString sCommandUrl( CUSTOM_MENU_STR + sLabel);
     sal_Int32 nType = office::MsoControlType::msoControlButton;
     sal_Int32 nPosition = 0;
-    sal_Bool bTemporary = sal_True;
+    bool bTemporary = true;
 
     if( Type.hasValue() )
     {
@@ -208,7 +214,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
     }
     else
     {
-        sal_Bool isVisible = sal_True;
+        bool isVisible = true;
         sal_Int32 nStyle = 0;
         aProps = CreateToolbarItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu, isVisible, nStyle );
     }
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
index 33ab759fe59f..0cce2bdfbc41 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
@@ -33,20 +33,20 @@ private:
     VbaCommandBarHelperRef                              pCBarHelper;
     css::uno::Reference< css::container::XIndexAccess > m_xBarSettings;
     OUString                                            m_sResourceUrl;
-    sal_Bool                                            m_bIsMenu;
+    bool                                                m_bIsMenu;
 
     css::uno::Sequence< css::beans::PropertyValue > CreateMenuItemData( const OUString& sCommandURL,
                                                                         const OUString& sHelpURL,
                                                                         const OUString& sLabel,
                                                                         sal_uInt16 nType,
                                                                         const css::uno::Any& aSubMenu,
-                                                                        sal_Bool isVisible,
-                                                                        sal_Bool isEnabled );
-    css::uno::Sequence< css::beans::PropertyValue > CreateToolbarItemData( const OUString& sCommandURL, const OUString& sHelpURL, const OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu, sal_Bool isVisible, sal_Int32 nStyle );
+                                                                        bool isVisible,
+                                                                        bool isEnabled );
+    css::uno::Sequence< css::beans::PropertyValue > CreateToolbarItemData( const OUString& sCommandURL, const OUString& sHelpURL, const OUString& sLabel, sal_uInt16 nType, const css::uno::Any& aSubMenu, bool isVisible, sal_Int32 nStyle );
 
 public:
     ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw( css::uno::RuntimeException );
-    sal_Bool IsMenu(){ return m_bIsMenu; }
+    bool IsMenu(){ return m_bIsMenu; }
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index d2177ae40290..d55b79792ff8 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -62,7 +62,7 @@ public:
             if( sResourceUrl.indexOf( "private:resource/toolbar/" ) != -1 )
             {
                 uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl );
-                uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False ) );
+                uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, false ) );
                 // Strange, shouldn't the Enumeration support match/share the
                 // iteration code? ( e.g. ScVbaCommandBars::Item(...) )
                 // and we at least should return here ( something ) it seems
@@ -106,7 +106,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
     OUString sResourceUrl;
     uno::Reference< container::XIndexAccess > xBarSettings;
     OUString sBarName;
-    sal_Bool bMenu = sal_False;
+    bool bMenu = false;
     uno::Any aRet;
 
     if( aSource >>= sBarName )
@@ -118,7 +118,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
             {
                 // spreadsheet menu bar
                 sResourceUrl = ITEM_MENUBAR_URL;
-                bMenu = sal_True;
+                bMenu = true;
             }
             else if( sBarName.equalsIgnoreAsciiCase( "Cell" ) )
             {
@@ -132,7 +132,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
             {
                 // text processor menu bar
                 sResourceUrl = ITEM_MENUBAR_URL;
-                bMenu = sal_True;
+                bMenu = true;
             }
         }
 
@@ -140,7 +140,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
         if( !aRet.hasValue() && sResourceUrl.isEmpty() )
         {
             sResourceUrl = m_pCBarHelper->findToolbarByName( m_xNameAccess, sBarName );
-            bMenu = sal_False;
+            bMenu = false;
         }
     }
 
@@ -181,7 +181,7 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio
 
     sResourceUrl = VbaCommandBarHelper::generateCustomURL();
     uno::Reference< container::XIndexAccess > xBarSettings( m_pCBarHelper->getSettings( sResourceUrl ), uno::UNO_QUERY_THROW );
-    uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, sal_False ) );
+    uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, false ) );
     xCBar->setName( sName );
     return xCBar;
 }
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 5d0efd42a75a..591144d61301 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -210,7 +210,7 @@ VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xP
 
 namespace {
 
-void lclSetupComponent( const uno::Reference< lang::XComponent >& rxComponent, sal_Bool bScreenUpdating, sal_Bool bInteractive )
+void lclSetupComponent( const uno::Reference< lang::XComponent >& rxComponent, bool bScreenUpdating, bool bInteractive )
 {
     if( !bScreenUpdating ) try
     {
@@ -238,8 +238,8 @@ uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException)
 {
     // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
     uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
-    sal_Bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating();
-    sal_Bool bInteractive = !xApplication.is() || xApplication->getInteractive();
+    bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating();
+    bool bInteractive = !xApplication.is() || xApplication->getInteractive();
 
     uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create(mxContext);
     OUString sURL;
@@ -284,8 +284,8 @@ uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::A
 {
     // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
     uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
-    sal_Bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating();
-    sal_Bool bInteractive = !xApplication.is() || xApplication->getInteractive();
+    bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating();
+    bool bInteractive = !xApplication.is() || xApplication->getInteractive();
 
     // we need to detect if this is a URL, if not then assume it's a file path
         OUString aURL;
@@ -305,7 +305,8 @@ uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::A
 
     if ( ReadOnly.hasValue()  )
     {
-        sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly;
+        bool bIsReadOnly = false;
+        ReadOnly >>= bIsReadOnly;
         if ( bIsReadOnly )
         {
             sProps.realloc( sProps.getLength() + 1 );