framework: sal_Bool->bool

Change-Id: If3276f184c63e85762fe54ce19655c30e00aeb15

12 files changed, 130 insertions, 130 deletions

diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index a165a29824b5..0f4c16be95a5 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -69,7 +69,7 @@ AddonMenu::~AddonMenu()
 
 
 // Check if command URL string has the unique prefix to identify addon popup menus
-sal_Bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL )
+bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL )
 {
     const char aPrefixCharBuf[] = ADDONSPOPUPMENU_URL_PREFIX_STR;
 
@@ -103,7 +103,7 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame
 
 
 
-sal_Bool AddonMenuManager::HasAddonMenuElements()
+bool AddonMenuManager::HasAddonMenuElements()
 {
     return AddonsOptions().HasAddonsMenu();
 }
@@ -279,10 +279,10 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
                                   const Reference< XModel >&            rModel )
 {
     Sequence< Sequence< PropertyValue > >   aAddonSubMenu;
-    sal_Bool                                    bInsertSeparator    = sal_False;
-    sal_uInt32                                  i                   = 0;
-    sal_uInt32                                  nElements           = 0;
-    sal_uInt32                                  nCount              = aAddonMenuDefinition.getLength();
+    bool                                    bInsertSeparator    = false;
+    sal_uInt32                              i                   = 0;
+    sal_uInt32                              nElements           = 0;
+    sal_uInt32                              nCount              = aAddonMenuDefinition.getLength();
     AddonsOptions                           aAddonsOptions;
 
     OUString aTitle;
@@ -299,7 +299,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
             continue;
 
         if ( aURL == "private:separator" )
-            bInsertSeparator = sal_True;
+            bInsertSeparator = true;
         else
         {
             PopupMenu* pSubMenu = NULL;
@@ -322,7 +322,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
                 // Insert a separator only when we insert a new element afterwards and we
                 // have already one before us
                 nElements = 0;
-                bInsertSeparator = sal_False;
+                bInsertSeparator = false;
                 pCurrentMenu->InsertSeparator(OString(), nInsPos);
                 nInsPos = AddonMenuManager::GetNextPos( nInsPos );
             }
@@ -375,7 +375,7 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu
 }
 
 // Check if the context string matches the provided xModel context
-sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, const OUString& aContext )
+bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, const OUString& aContext )
 {
     if ( rModel.is() )
     {
@@ -388,7 +388,7 @@ sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel,
                 OUString aToken = aContext.getToken( 0, ',', nIndex );
 
                 if ( xServiceInfo->supportsService( aToken ))
-                    return sal_True;
+                    return true;
             }
             while ( nIndex >= 0 );
         }
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 224f53a24aba..97784d0a8858 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -269,14 +269,14 @@ class AddonsOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        sal_Bool                                        HasAddonsMenu        () const ;
+        bool                                            HasAddonsMenu        () const ;
         sal_Int32                                       GetAddonsToolBarCount() const ;
         const Sequence< Sequence< PropertyValue > >&    GetAddonsMenu        () const ;
         const Sequence< Sequence< PropertyValue > >&    GetAddonsMenuBarPart () const ;
         const Sequence< Sequence< PropertyValue > >&    GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
         const OUString                           GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
         const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const ;
-        Image                                           GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale );
+        Image                                           GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale );
         const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const;
         bool                                            GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
         const MergeStatusbarInstructionContainer&       GetMergeStatusbarInstructions() const;
@@ -325,32 +325,32 @@ class AddonsOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        sal_Bool             ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
-        sal_Bool             ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
-        sal_Bool             ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames );
-        sal_Bool             ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq );
-        sal_Bool             ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq );
+        bool                 ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
+        bool                 ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
+        bool                 ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames );
+        bool                 ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq );
+        bool                 ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq );
         void                 ReadImages( ImageManager& aImageManager );
-        sal_Bool             ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer );
-        sal_Bool             ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap );
-        sal_Bool             ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& rContainer );
-
-        sal_Bool             ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu );
-        sal_Bool             ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems );
-        sal_Bool             ReadMergeStatusbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar );
-        sal_Bool             ReadMenuItem( const OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False );
-        sal_Bool             ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu );
-        sal_Bool             AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
-        sal_Bool             ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
-        sal_Bool             ReadStatusBarItem( const OUString& aStatusbarItemNodeName, Sequence< PropertyValue >& aStatusbarItem );
-        sal_Bool             ReadImagesItem( const OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem );
+        bool                 ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer );
+        bool                 ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap );
+        bool                 ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& rContainer );
+
+        bool                 ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu );
+        bool                 ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems );
+        bool                 ReadMergeStatusbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbar );
+        bool                 ReadMenuItem( const OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu = false );
+        bool                 ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu );
+        bool                 AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
+        bool                 ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
+        bool                 ReadStatusBarItem( const OUString& aStatusbarItemNodeName, Sequence< PropertyValue >& aStatusbarItem );
+        bool                 ReadImagesItem( const OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem );
         ImageEntry*          ReadImageData( const OUString& aImagesNodeName );
         void                 ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId );
         Image                ReadImageFromURL( const OUString& aURL );
-        sal_Bool             HasAssociatedImages( const OUString& aURL );
+        bool                 HasAssociatedImages( const OUString& aURL );
         void                 SubstituteVariables( OUString& aURL );
 
-        sal_Bool             ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
+        bool                 ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
         void                 InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq );
         OUString          GeneratePrefixURL();
 
@@ -359,7 +359,7 @@ class AddonsOptions_Impl : public ConfigItem
         Sequence< OUString > GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const;
         Sequence< OUString > GetPropertyNamesStatusbarItem( const ::rtl::OUString& aPropertyRootNode ) const;
         Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const;
-        sal_Bool             CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const;
+        bool                 CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const;
 
 
     //  private member
@@ -528,7 +528,7 @@ void AddonsOptions_Impl::Commit()
 
 //  public method
 
-sal_Bool AddonsOptions_Impl::HasAddonsMenu() const
+bool AddonsOptions_Impl::HasAddonsMenu() const
 {
     return ( m_aCachedMenuProperties.getLength() > 0 );
 }
@@ -630,7 +630,7 @@ static Image ScaleImage( const Image &rImage, bool bBig )
     return Image(aScaleBmp);
 }
 
-Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale )
+Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale )
 {
     Image aImage;
     ImageSize eSize = bBig ? IMGSIZE_BIG : IMGSIZE_SMALL;
@@ -682,7 +682,7 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig,
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
+bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
 {
     // Read the AddonMenu set and fill property sequences
     OUString             aAddonMenuNodeName( "AddonUI/AddonMenu" );
@@ -721,7 +721,7 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
+bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
 {
     // Read the AddonMenu set and fill property sequences
     OUString             aAddonHelpMenuNodeName( "AddonUI/OfficeHelp" );
@@ -745,7 +745,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu
         OUString aRootMenuItemNode( aAddonHelpMenuItemNode + aAddonHelpMenuNodeSeq[n] );
 
         // Read the MenuItem
-        if ( ReadMenuItem( aRootMenuItemNode, aMenuItem, sal_True ) )
+        if ( ReadMenuItem( aRootMenuItemNode, aMenuItem, true ) )
         {
             // Successfully read a menu item, append to our list
             sal_uInt32 nMenuItemCount = rAddonOfficeHelpMenuSeq.getLength() + 1;
@@ -760,7 +760,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
+bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
 {
     // Read the OfficeMenuBar set and fill property sequences
     OUString             aAddonMenuBarNodeName( "AddonUI/OfficeMenuBar" );
@@ -816,7 +816,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
+bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
 {
     // Read the OfficeToolBar set and fill property sequences
     OUString             aAddonToolBarNodeName( "AddonUI/OfficeToolBar" );
@@ -840,10 +840,10 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
+bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
 {
-    sal_Bool                    bInsertSeparator        = sal_False;
-    sal_uInt32                  nToolBarItemCount       = rAddonOfficeToolBarSeq.getLength();
+    bool                     bInsertSeparator        = false;
+    sal_uInt32               nToolBarItemCount       = rAddonOfficeToolBarSeq.getLength();
     OUString                 aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter );
     Sequence< OUString >     aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName );
     Sequence< PropertyValue >   aToolBarItem( PROPERTYCOUNT_TOOLBARITEM );
@@ -867,7 +867,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSet
         {
             if ( bInsertSeparator )
             {
-                bInsertSeparator = sal_False;
+                bInsertSeparator = false;
                 InsertToolBarSeparator( rAddonOfficeToolBarSeq );
             }
 
@@ -978,7 +978,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
 //  private method
 
 
-sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
+bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
 {
     const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" );
 
@@ -1041,13 +1041,13 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
+bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
 {
     OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] );
 
@@ -1064,7 +1064,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
+bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
 {
     const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" );
 
@@ -1133,13 +1133,13 @@ sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruc
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
+bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
 {
     OUStringBuffer aBuffer( aMergeAddonInstructionBase );
     aBuffer.append( m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ] );
@@ -1150,7 +1150,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonIn
 }
 
 
-sal_Bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
+bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
 {
     const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
 
@@ -1211,10 +1211,10 @@ sal_Bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstr
         }
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool AddonsOptions_Impl::ReadMergeStatusbarData(
+bool AddonsOptions_Impl::ReadMergeStatusbarData(
     const ::rtl::OUString& aMergeAddonInstructionBase,
     Sequence< Sequence< PropertyValue > >& rMergeStatusbarItems )
 {
@@ -1252,11 +1252,11 @@ sal_Bool AddonsOptions_Impl::ReadMergeStatusbarData(
     return ( (sal_uInt32)rMergeStatusbarItems.getLength() > nStatusbarItemCount );
 }
 
-sal_Bool AddonsOptions_Impl::ReadStatusBarItem(
+bool AddonsOptions_Impl::ReadStatusBarItem(
     const ::rtl::OUString& aStatusarItemNodeName,
     Sequence< PropertyValue >& aStatusbarItem )
 {
-    sal_Bool bResult( sal_False );
+    bool bResult( false );
     ::rtl::OUString aURL;
     ::rtl::OUString aAddonStatusbarItemTreeNode( aStatusarItemNodeName + m_aPathDelimiter );
     Sequence< Any > aStatusbarItemNodePropValues;
@@ -1278,7 +1278,7 @@ sal_Bool AddonsOptions_Impl::ReadStatusBarItem(
         aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_WIDTH ] >>= nValue;
         aStatusbarItem[ OFFSET_STATUSBARITEM_WIDTH ].Value <<= sal_Int32( nValue );
 
-        bResult = sal_True;
+        bResult = true;
     }
 
     return bResult;
@@ -1287,9 +1287,9 @@ sal_Bool AddonsOptions_Impl::ReadStatusBarItem(
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu )
+bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu )
 {
-    sal_Bool            bResult = sal_False;
+    bool             bResult = false;
     OUString         aStrValue;
     OUString         aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter );
     Sequence< Any >     aMenuItemNodePropValues;
@@ -1324,7 +1324,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
                 aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n];
             ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
             aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= aSubMenuSeq;
-            bResult = sal_True;
+            bResult = true;
         }
         else if (( aMenuItemNodePropValues[ OFFSET_MENUITEM_URL ] >>= aStrValue ) && !aStrValue.isEmpty() )
         {
@@ -1340,7 +1340,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
             aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT        ];
             aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set!
 
-            bResult = sal_True;
+            bResult = true;
         }
     }
     else if (( aMenuItemNodePropValues[ OFFSET_MENUITEM_URL ] >>= aStrValue ) &&
@@ -1352,7 +1352,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
         aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER  ].Value <<= m_aEmpty;
         aMenuItem[ OFFSET_MENUITEM_CONTEXT          ].Value <<= m_aEmpty;
         aMenuItem[ OFFSET_MENUITEM_SUBMENU          ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set!
-        bResult = sal_True;
+        bResult = true;
     }
 
     return bResult;
@@ -1361,9 +1361,9 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
+bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
 {
-    sal_Bool            bResult = sal_False;
+    bool             bResult = false;
     OUString         aStrValue;
     OUString         aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter );
     Sequence< Any >     aPopupMenuNodePropValues;
@@ -1392,7 +1392,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName,
                 aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n];
             ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
             aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aSubMenuSeq;
-            bResult = sal_True;
+            bResult = true;
         }
     }
 
@@ -1402,7 +1402,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName,
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
+bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
 {
     Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq;
     Sequence< Sequence< PropertyValue > > aSourceSubMenuSeq;
@@ -1417,15 +1417,15 @@ sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTarget
         rTargetPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aTargetSubMenuSeq;
     }
 
-    return sal_True;
+    return true;
 }
 
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
+bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
 {
-    sal_Bool            bResult = sal_False;
+    bool             bResult = false;
     OUString         aTitle;
     OUString         aURL;
     OUString         aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter );
@@ -1447,7 +1447,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeNa
             aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE        ].Value <<= m_aEmpty;
             aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH              ].Value <<= sal_Int32( 0 );
 
-            bResult = sal_True;
+            bResult = true;
         }
         else if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TITLE ] >>= aTitle ) && !aTitle.isEmpty() )
         {
@@ -1470,7 +1470,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeNa
             aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_WIDTH ] >>= nValue;
             aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH              ].Value <<= sal_Int32( nValue );
 
-            bResult = sal_True;
+            bResult = true;
         }
     }
 
@@ -1480,7 +1480,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeNa
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
+bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
 {
     Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM );
 
@@ -1504,13 +1504,13 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSu
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
+bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
 {
     // FIXME: potentially this is not so useful in a world of delayed image loading
     ImageManager::const_iterator pIter = m_aImageManager.find( aURL );
@@ -1648,9 +1648,9 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin
 
 //  private method
 
-sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const
+bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if ( rBitmapDataSeq.getLength() > 0 )
     {
@@ -1666,7 +1666,7 @@ sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< s
         }
 
         rImage = Image( aBitmapEx );
-        bResult = sal_True;
+        bResult = true;
     }
 
     return bResult;
@@ -1803,7 +1803,7 @@ AddonsOptions::~AddonsOptions()
 
 //  public method
 
-sal_Bool AddonsOptions::HasAddonsMenu() const
+bool AddonsOptions::HasAddonsMenu() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->HasAddonsMenu();
@@ -1894,7 +1894,7 @@ const MergeStatusbarInstructionContainer& AddonsOptions::GetMergeStatusbarInstru
 
 //  public method
 
-Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
+Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale );
@@ -1903,9 +1903,9 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_B
 
 //  public method
 
-Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const
+Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const
 {
-    return GetImageFromURL( aURL, bBig, sal_False );
+    return GetImageFromURL( aURL, bBig, false );
 }
 
 
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index a3fdea31db7e..616ca9040bf6 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -70,9 +70,9 @@ FrameListAnalyzer::~FrameListAnalyzer()
 void FrameListAnalyzer::impl_analyze()
 {
     // reset all members to get a consistent state
-    m_bReferenceIsHidden  = sal_False;
-    m_bReferenceIsHelp    = sal_False;
-    m_bReferenceIsBacking = sal_False;
+    m_bReferenceIsHidden  = false;
+    m_bReferenceIsHelp    = false;
+    m_bReferenceIsBacking = false;
     m_xHelp               = css::uno::Reference< css::frame::XFrame >();
     m_xBackingComponent   = css::uno::Reference< css::frame::XFrame >();
 
@@ -143,7 +143,7 @@ void FrameListAnalyzer::impl_analyze()
         (m_xReferenceFrame->getName() == SPECIALTARGET_HELPTASK)
        )
     {
-        m_bReferenceIsHelp = sal_True;
+        m_bReferenceIsHelp = true;
     }
 
     try
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 9447d6b5b69f..ba76e8dc440b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -91,7 +91,7 @@ class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::sta
 {
 public:
     RequestFilterSelect_Impl( const OUString& sURL );
-    sal_Bool        isAbort  () const;
+    bool     isAbort  () const;
     OUString getFilter() const;
 
 public:
@@ -130,7 +130,7 @@ RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL )
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 
-sal_Bool RequestFilterSelect_Impl::isAbort() const
+bool RequestFilterSelect_Impl::isAbort() const
 {
     return m_pAbort->wasSelected();
 }
@@ -181,7 +181,7 @@ RequestFilterSelect::~RequestFilterSelect()
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 
-sal_Bool RequestFilterSelect::isAbort() const
+bool RequestFilterSelect::isAbort() const
 {
     return pImp->isAbort();
 }
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 70108d6cec9c..0ea11f910f3c 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -204,7 +204,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
                             else
                             {
                                 // Support add-on images for context menu interceptors
-                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, sal_True );
+                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, false, true );
                                 if ( !!aImage )
                                     pSubMenu->SetItemImage( nNewItemId, aImage );
                             }
diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index d51650755916..9b32e23fe192 100644
--- a/framework/source/fwe/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 namespace framework
 {
 
-sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
+bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
     const uno::Reference< ui::XUIConfigurationManager2 >& rContainerFactory,
     uno::Sequence< uno::Reference< container::XIndexContainer > >& rSeqContainer,
     const uno::Reference< uno::XComponentContext >& rxContext,
@@ -37,7 +37,7 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
 {
     const char USERDEFTOOLBOX[] = "userdeftoolbox0.xml";
 
-    sal_Bool bResult ( sal_False );
+    bool bResult ( false );
     if ( rToolbarStorage.is() && rContainerFactory.is() )
     {
         try
@@ -61,7 +61,7 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
                             sal_uInt32 nIndex = rSeqContainer.getLength();
                             rSeqContainer.realloc( nIndex+1 );
                             rSeqContainer[nIndex] = xContainer;
-                            bResult = sal_True;
+                            bResult = true;
                         }
                     }
                 }
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 1676fce67b27..aa04ecd4d723 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -45,7 +45,7 @@ TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext
     , m_xOwner          ()
     , m_xUntitledNumbers()
     , m_xSubTitle       ()
-    , m_bExternalTitle  (sal_False)
+    , m_bExternalTitle  (false)
     , m_sTitle          ()
     , m_nLeasedNumber   (css::frame::UntitledNumbersConst::INVALID_NUMBER)
     , m_aListener       (m_aMutex)
@@ -133,7 +133,7 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
-        m_bExternalTitle = sal_True;
+        m_bExternalTitle = true;
         m_sTitle         = sTitle;
 
     aLock.clear ();
@@ -383,7 +383,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram
 
     // WORKAROUND: the notification is currently sent always,
     //             can be changed after shared mode is supported per UNO API
-    sal_Bool bChanged        = !init; // && m_sTitle != sTitle
+    bool     bChanged        = !init; // && m_sTitle != sTitle
 
              m_sTitle        = sTitle;
              m_nLeasedNumber = nLeasedNumber;
@@ -450,9 +450,9 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css:
     aLock.reset ();
 
         OUString sNewTitle       = sTitle.makeStringAndClear ();
-        sal_Bool        bChanged        = !init && m_sTitle != sNewTitle;
-                        m_sTitle        = sNewTitle;
-                        m_nLeasedNumber = nLeasedNumber;
+        bool     bChanged        = !init && m_sTitle != sNewTitle;
+                 m_sTitle        = sNewTitle;
+                 m_nLeasedNumber = nLeasedNumber;
 
     aLock.clear ();
     // <- SYNCHRONIZED
@@ -497,8 +497,8 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
     aLock.reset ();
 
         OUString sNewTitle = sTitle.makeStringAndClear ();
-        sal_Bool        bChanged  = !init && m_sTitle != sNewTitle;
-                        m_sTitle  = sNewTitle;
+        bool     bChanged  = !init && m_sTitle != sNewTitle;
+                 m_sTitle  = sNewTitle;
 
     aLock.clear ();
     // <- SYNCHRONIZED
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index c6a9f47efbc3..21f664589bef 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -1006,25 +1006,25 @@ namespace framework
     }
 
 
-    ::sal_Bool UndoManagerHelper::isUndoPossible() const
+    bool UndoManagerHelper::isUndoPossible() const
     {
         // SYNCHRONIZED --->
         ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
         IUndoManager& rUndoManager = m_pImpl->getUndoManager();
         if ( rUndoManager.IsInListAction() )
-            return sal_False;
+            return false;
         return rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) > 0;
         // <--- SYNCHRONIZED
     }
 
 
-    ::sal_Bool UndoManagerHelper::isRedoPossible() const
+    bool UndoManagerHelper::isRedoPossible() const
     {
         // SYNCHRONIZED --->
         ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
         const IUndoManager& rUndoManager = m_pImpl->getUndoManager();
         if ( rUndoManager.IsInListAction() )
-            return sal_False;
+            return false;
         return rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0;
         // <--- SYNCHRONIZED
     }
@@ -1132,7 +1132,7 @@ namespace framework
     }
 
 
-    ::sal_Bool UndoManagerHelper::isLocked()
+    bool UndoManagerHelper::isLocked()
     {
         // SYNCHRONIZED --->
         ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index cdf58098c5bb..02901e7e6f34 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -86,7 +86,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
     throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aRequest  = xRequest->getRequest();
-    sal_Bool      bHandleIt = sal_True;
+    bool          bHandleIt = true;
 
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -224,8 +224,8 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter
 
 
 
-sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&                               aInteraction,
-                                                               PreventDuplicateInteraction::InteractionInfo* pReturn     ) const
+bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&                               aInteraction,
+                                                           PreventDuplicateInteraction::InteractionInfo* pReturn     ) const
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -239,14 +239,14 @@ sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&
         if (rInfo.m_aInteraction == aInteraction)
         {
             *pReturn = rInfo;
-            return sal_True;
+            return true;
         }
     }
 
     aLock.clear();
     // <- SAFE
 
-    return sal_False;
+    return false;
 }
 
 } // namespace framework
diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index 22f2b8ba918e..0a9c3d8843b5 100644
--- a/framework/source/fwe/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::container;
 namespace framework
 {
 
-sal_Bool StatusBarConfiguration::LoadStatusBar(
+bool StatusBarConfiguration::LoadStatusBar(
     const Reference< XComponentContext >& rxContext,
     const Reference< XInputStream >& xInputStream,
     const Reference< XIndexContainer >& rStatusbarConfiguration )
@@ -63,23 +63,23 @@ sal_Bool StatusBarConfiguration::LoadStatusBar(
     try
     {
         xParser->parseStream( aInputSource );
-        return sal_True;
+        return true;
     }
     catch ( const RuntimeException& )
     {
-        return sal_False;
+        return false;
     }
     catch( const SAXException& )
     {
-        return sal_False;
+        return false;
     }
     catch( const ::com::sun::star::io::IOException& )
     {
-        return sal_False;
+        return false;
     }
 }
 
-sal_Bool StatusBarConfiguration::StoreStatusBar(
+bool StatusBarConfiguration::StoreStatusBar(
     const Reference< XComponentContext >& rxContext,
     const Reference< XOutputStream >& xOutputStream,
     const Reference< XIndexAccess >& rStatusbarConfiguration )
@@ -91,19 +91,19 @@ sal_Bool StatusBarConfiguration::StoreStatusBar(
     {
         OWriteStatusBarDocumentHandler aWriteStatusBarDocumentHandler( rStatusbarConfiguration, xWriter );
         aWriteStatusBarDocumentHandler.WriteStatusBarDocument();
-        return sal_True;
+        return true;
     }
     catch ( const RuntimeException& )
     {
-        return sal_False;
+        return false;
     }
     catch ( const SAXException& )
     {
-        return sal_False;
+        return false;
     }
     catch ( const ::com::sun::star::io::IOException& )
     {
-        return sal_False;
+        return false;
     }
 }
 }
diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 7e08b3bbfdfb..26bd8d66f6bc 100644
--- a/framework/source/fwe/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::container;
 namespace framework
 {
 
-sal_Bool ToolBoxConfiguration::LoadToolBox(
+bool ToolBoxConfiguration::LoadToolBox(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
     const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration )
@@ -64,24 +64,24 @@ sal_Bool ToolBoxConfiguration::LoadToolBox(
     try
     {
         xParser->parseStream( aInputSource );
-        return sal_True;
+        return true;
     }
     catch ( const RuntimeException& )
     {
-        return sal_False;
+        return false;
     }
     catch( const SAXException& )
     {
-        return sal_False;
+        return false;
     }
     catch( const ::com::sun::star::io::IOException& )
     {
-        return sal_False;
+        return false;
     }
 }
 
 
-sal_Bool ToolBoxConfiguration::StoreToolBox(
+bool ToolBoxConfiguration::StoreToolBox(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
     const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration )
@@ -94,19 +94,19 @@ sal_Bool ToolBoxConfiguration::StoreToolBox(
         Reference< XDocumentHandler > xHandler( xWriter, UNO_QUERY_THROW );
         OWriteToolBoxDocumentHandler aWriteToolBoxDocumentHandler( rToolbarConfiguration, xHandler );
         aWriteToolBoxDocumentHandler.WriteToolBoxDocument();
-        return sal_True;
+        return true;
     }
     catch ( const RuntimeException& )
     {
-        return sal_False;
+        return false;
     }
     catch ( const SAXException& )
     {
-        return sal_False;
+        return false;
     }
     catch ( const ::com::sun::star::io::IOException& )
     {
-        return sal_False;
+        return false;
     }
 }
 
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index f86f59fcf697..85d503893f55 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -108,7 +108,7 @@ ImageButtonToolbarController::ImageButtonToolbarController(
 {
     sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
 
-    Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, sal_True );
+    Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, true );
 
     // Height will be controlled by scaling according to button height
     m_pToolbar->SetItemImage( m_nID, aImage );