From 399724aba4b7297a262a775d000ddf4534e38b6c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 14 Mar 2014 14:43:53 +0200 Subject: [PATCH] sfx2: sal_Bool->bool Change-Id: I128430fe446eb517b42a109a868b88d49bbc4eaa --- include/sfx2/mailmodelapi.hxx | 6 +++--- include/sfx2/mgetempl.hxx | 2 +- include/sfx2/mieclip.hxx | 4 ++-- include/sfx2/mnuitem.hxx | 6 +++--- include/sfx2/mnumgr.hxx | 6 +++--- include/sfx2/module.hxx | 6 +++--- include/sfx2/msg.hxx | 4 ++-- include/sfx2/new.hxx | 6 +++--- sd/source/ui/app/sdmod.cxx | 2 +- sfx2/source/appl/module.cxx | 4 ++-- sfx2/source/dialog/mailmodel.cxx | 6 +++--- sfx2/source/dialog/mgetempl.cxx | 10 +++++----- sfx2/source/doc/new.cxx | 6 +++--- sfx2/source/menu/mnuitem.cxx | 14 +++++++------- sfx2/source/menu/mnumgr.cxx | 2 +- starmath/source/smmod.cxx | 2 +- sw/source/core/uibase/app/swmodule.cxx | 2 +- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx index c688cf051897..44b2ef9addd2 100644 --- a/include/sfx2/mailmodelapi.hxx +++ b/include/sfx2/mailmodelapi.hxx @@ -77,7 +77,7 @@ private: OUString maSubject; MailPriority mePriority; - sal_Bool mbLoadDone; + bool mbLoadDone; SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, @@ -124,10 +124,10 @@ public: const OUString& rType ); SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); - sal_Bool IsEmpty() const; + bool IsEmpty() const; }; -sal_Bool CreateFromAddress_Impl( OUString& rFrom ); +bool CreateFromAddress_Impl( OUString& rFrom ); #endif // INCLUDED_SFX2_MAILMODELAPI_HXX diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 35b573f0f4d0..e2893429a60a 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -56,7 +56,7 @@ class SfxManageStyleSheetPage : public SfxTabPage SfxStyleFamilies *pFamilies; const SfxStyleFamilyItem *pItem; OUString aBuf; - sal_Bool bModified; + bool bModified; // initial data for the style OUString aName; diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index 0fad2119e903..ca32932f7340 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -39,8 +39,8 @@ public: ~MSE40HTMLClipFormatObj(); //JP 31.01.2001: old interfaces - SAL_DLLPRIVATE sal_Bool GetData( SotDataObject& ); - SAL_DLLPRIVATE sal_Bool GetData( SvData& ); + SAL_DLLPRIVATE bool GetData( SotDataObject& ); + SAL_DLLPRIVATE bool GetData( SvData& ); //JP 31.01.2001: the new one SvStream* IsValid( SvStream& ); diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 72f5c2f21b07..0ac440e245ca 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -40,11 +40,11 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem OUString aTitle; SfxVirtualMenu* pOwnMenu; SfxVirtualMenu* pSubMenu; - sal_Bool b_ShowStrings; + bool b_ShowStrings; public: SfxMenuControl(); - SfxMenuControl( sal_Bool bShowStrings ); + SfxMenuControl( bool bShowStrings ); SfxMenuControl( sal_uInt16, SfxBindings&); static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); @@ -123,7 +123,7 @@ class SfxAppMenuControl_Impl : public SfxMenuControl { PopupMenu* pMenu; OUString m_sIconTheme; - sal_Bool m_bShowMenuImages; + bool m_bShowMenuImages; protected: DECL_LINK( Activate, Menu * ); // Needed to support high contrast images diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 1a5c91168db7..1b6a630e56cd 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -46,13 +46,13 @@ class SfxMenuManager { friend class SfxPopupMenuManager; - SfxVirtualMenu* pMenu; // the actual Menu + SfxVirtualMenu* pMenu; // the actual Menu SfxVirtualMenu* pOldMenu; // only while reconfiguring - sal_Bool bMenuBar; // Popup or MenuBar + bool bMenuBar; // Popup or MenuBar SfxBindings* pBindings; ResMgr* pResMgr; sal_uInt32 nType; - sal_Bool bAddClipboardFuncs : 1; + bool bAddClipboardFuncs : 1; void Construct( SfxVirtualMenu& rMenu ); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index ab52672dee23..52ccefb7f968 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell { private: ResMgr* pResMgr; - sal_Bool bDummy : 1; + bool bDummy : 1; SfxModule_Impl* pImpl; SAL_DLLPRIVATE void Construct_Impl(); @@ -69,7 +69,7 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE) - SfxModule( ResMgr* pMgrP, sal_Bool bDummy, + SfxModule( ResMgr* pMgrP, bool bDummy, SfxObjectFactory* pFactoryP, ... ); ~SfxModule(); @@ -107,7 +107,7 @@ public: SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const; - SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig ); + SAL_DLLPRIVATE ImageList* GetImageList_Impl( bool bBig ); }; #endif diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 8bd6d0baaf38..4c85ab3b276c 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -265,7 +265,7 @@ public: sal_uInt16 GetSlotId() const; sal_uIntPtr GetHelpId() const; sal_uIntPtr GetMode() const; - sal_Bool IsMode( sal_uIntPtr nMode ) const; + bool IsMode( sal_uIntPtr nMode ) const; sal_uInt16 GetGroupId() const; sal_uInt16 GetMasterSlotId() const { return nMasterSlotId; } sal_uInt16 GetWhich( const SfxItemPool &rPool ) const; @@ -314,7 +314,7 @@ inline sal_uIntPtr SfxSlot::GetMode() const // determines if the specified mode is assigned -inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const +inline bool SfxSlot::IsMode( sal_uIntPtr nMode ) const { return (nFlags & nMode) != 0; } diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index e567a2d75736..c457562f3431 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -59,9 +59,9 @@ public: SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); ~SfxNewFileDialog(); - // Returns sal_False, when '- No -' is set as Template - // Template names can only be obtained when IsTemplate() returns sal_True. - sal_Bool IsTemplate() const; + // Returns false, when '- No -' is set as Template + // Template names can only be obtained when IsTemplate() returns true. + bool IsTemplate() const; OUString GetTemplateFileName() const; // load template methods diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 27271bf5833e..8af20c4fcde3 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -67,7 +67,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR)) // Ctor SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) -: SfxModule( SfxApplication::CreateResManager("sd"), sal_False, +: SfxModule( SfxApplication::CreateResManager("sd"), false, pFact1, pFact2, NULL ), pTransferClip(NULL), pTransferDrag(NULL), diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 5a96e8777590..0590b0addc73 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -114,7 +114,7 @@ ResMgr* SfxModule::GetResMgr() -SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP, +SfxModule::SfxModule( ResMgr* pMgrP, bool bDummyP, SfxObjectFactory* pFactoryP, ... ) : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L) { @@ -299,7 +299,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const return pImpl->pFactArr; } -ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig ) +ImageList* SfxModule::GetImageList_Impl( bool bBig ) { return pImpl->GetImageList( pResMgr, bBig ); } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 982b4eb8ffbe..bdc1f7d68956 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -276,7 +276,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( return eRet; } -sal_Bool SfxMailModel::IsEmpty() const +bool SfxMailModel::IsEmpty() const { return maAttachedDocuments.empty(); } @@ -684,7 +684,7 @@ SfxMailModel::SfxMailModel() : mpCcList ( NULL ), mpBccList ( NULL ), mePriority ( PRIO_NORMAL ), - mbLoadDone ( sal_True ) + mbLoadDone ( true ) { } @@ -920,7 +920,7 @@ SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Referenc // functions ------------------------------------------------------------- -sal_Bool CreateFromAddress_Impl( OUString& rFrom ) +bool CreateFromAddress_Impl( OUString& rFrom ) /* [Description] diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 3cf107a48bdf..33c60e30be73 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -382,7 +382,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) nFilterIdx != m_pFilterLb->GetSavedValue() && m_pFilterLb->IsEnabled() ) { - bModified = sal_True; + bModified = true; OSL_ENSURE( pItem, "No Item" ); // is only possibly for user templates sal_uInt16 nMask = pItem->GetFilterList()[ (size_t)m_pFilterLb->GetEntryData( nFilterIdx ) ]->nFlags | SFXSTYLEBIT_USERDEF; @@ -415,7 +415,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) */ { - bModified = sal_False; + bModified = false; OUString sCmp( pStyle->GetName() ); if ( sCmp != aName ) @@ -550,7 +550,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); return SfxTabPage::KEEP_PAGE; } - bModified = sal_True; + bModified = true; } if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() ) @@ -566,7 +566,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) m_pFollowLb->GrabFocus(); return SfxTabPage::KEEP_PAGE; } - bModified = sal_True; + bModified = true; } } @@ -586,7 +586,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) m_pBaseLb->GrabFocus(); return SfxTabPage::KEEP_PAGE; } - bModified = sal_True; + bModified = true; nRet |= (int)SfxTabPage::REFRESH_SET; } } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index c97caebc8087..d8bbd51a09e9 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -162,7 +162,7 @@ public: // Returns sal_False if '- No -' is set as a template // Template name can only be obtained if IsTemplate() is TRUE // erfragt werden - sal_Bool IsTemplate() const; + bool IsTemplate() const; OUString GetTemplateFileName() const; sal_uInt16 GetTemplateFlags()const; @@ -326,7 +326,7 @@ sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const -sal_Bool SfxNewFileDialog_Impl::IsTemplate() const +bool SfxNewFileDialog_Impl::IsTemplate() const { return GetSelectedTemplatePos()!=0; @@ -457,7 +457,7 @@ SfxNewFileDialog::~SfxNewFileDialog() delete pImpl; } -sal_Bool SfxNewFileDialog::IsTemplate() const +bool SfxNewFileDialog::IsTemplate() const { return pImpl->IsTemplate(); } diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 56901f794d4d..b40e8924d40a 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -110,7 +110,7 @@ void SfxMenuControl::Bind( // Constructor for explicit registration -SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings ) +SfxMenuControl::SfxMenuControl( bool bShowStrings ) : pOwnMenu(0), pSubMenu(0), b_ShowStrings(bShowStrings) @@ -123,7 +123,7 @@ SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings ) SfxMenuControl::SfxMenuControl(): pOwnMenu(0), pSubMenu(0), - b_ShowStrings(sal_False) + b_ShowStrings(false) { } @@ -133,7 +133,7 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): SfxControllerItem(nSlotId, rBindings), pOwnMenu(0), pSubMenu(0), - b_ShowStrings(sal_False) + b_ShowStrings(false) { // This constructor should make it possible already during the design // to fall back to the bindings, but can as always be bound later. @@ -240,7 +240,7 @@ void SfxMenuControl::StateChanged SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ ) { - return new SfxMenuControl( sal_True ); + return new SfxMenuControl( true ); } void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod ) @@ -333,7 +333,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); OUString sIconTheme = rSettings.DetermineIconTheme(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + bool bShowMenuImages = rSettings.GetUseImagesInMenus(); if (( sIconTheme != m_sIconTheme ) || ( bShowMenuImages != m_bShowMenuImages )) @@ -349,7 +349,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) { if ( bShowMenuImages ) { - sal_Bool bImageSet = sal_False; + bool bImageSet = false; OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); @@ -363,7 +363,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) Image aImage = GetImage( xFrame, aImageId, false ); if ( !!aImage ) { - bImageSet = sal_True; + bImageSet = true; pActMenu->SetItemImage( nItemId, aImage ); } } diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 122d9335fef4..500af4453999 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -263,7 +263,7 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) pResMgr(NULL), nType(0) { - bAddClipboardFuncs = sal_False; + bAddClipboardFuncs = false; SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True ); Construct(*pVMenu); } diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 11c9bc8eb1a3..8db6486a4fe0 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -165,7 +165,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION)) SmModule::SmModule(SfxObjectFactory* pObjFact) : - SfxModule(SfxApplication::CreateResManager("sm"), sal_False, pObjFact, NULL), + SfxModule(SfxApplication::CreateResManager("sm"), false, pObjFact, NULL), pColorConfig( 0 ), pConfig( 0 ), pLocSymbolData( 0 ), diff --git a/sw/source/core/uibase/app/swmodule.cxx b/sw/source/core/uibase/app/swmodule.cxx index 115ab46da5cf..7d4c1cd68b27 100644 --- a/sw/source/core/uibase/app/swmodule.cxx +++ b/sw/source/core/uibase/app/swmodule.cxx @@ -151,7 +151,7 @@ using namespace ::com::sun::star::uno; SwModule::SwModule( SfxObjectFactory* pWebFact, SfxObjectFactory* pFact, SfxObjectFactory* pGlobalFact ) - : SfxModule( SfxApplication::CreateResManager( "sw" ), sal_False, pWebFact, + : SfxModule( SfxApplication::CreateResManager( "sw" ), false, pWebFact, pFact, pGlobalFact, NULL ), pModuleConfig(0), pUsrPref(0),