mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfx2: sal_Bool->bool

Browse Source 
Change-Id: I128430fe446eb517b42a109a868b88d49bbc4eaa
This commit is contained in:
Noel Grandin
2014-03-14 14:43:53 +02:00
parent 96ef76c1b7
commit 399724aba4
17 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sfx2/mailmodelapi.hxx
View File

@@ -77,7 +77,7 @@ private:
OUString maSubject; OUString maSubject;
MailPriority mePriority; MailPriority mePriority;
sal_Bool mbLoadDone; bool mbLoadDone;
SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, 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, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel,
@@ -124,10 +124,10 @@ public:
const OUString& rType ); const OUString& rType );
SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); 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 #endif // INCLUDED_SFX2_MAILMODELAPI_HXX

2
include/sfx2/mgetempl.hxx
View File

@@ -56,7 +56,7 @@ class SfxManageStyleSheetPage : public SfxTabPage
SfxStyleFamilies *pFamilies; SfxStyleFamilies *pFamilies;
const SfxStyleFamilyItem *pItem; const SfxStyleFamilyItem *pItem;
OUString aBuf; OUString aBuf;
sal_Bool bModified; bool bModified;
// initial data for the style // initial data for the style
OUString aName; OUString aName;

4
include/sfx2/mieclip.hxx
View File

@@ -39,8 +39,8 @@ public:
~MSE40HTMLClipFormatObj(); ~MSE40HTMLClipFormatObj();
//JP 31.01.2001: old interfaces //JP 31.01.2001: old interfaces
SAL_DLLPRIVATE sal_Bool GetData( SotDataObject& ); SAL_DLLPRIVATE bool GetData( SotDataObject& );
SAL_DLLPRIVATE sal_Bool GetData( SvData& ); SAL_DLLPRIVATE bool GetData( SvData& );
//JP 31.01.2001: the new one //JP 31.01.2001: the new one
SvStream* IsValid( SvStream& ); SvStream* IsValid( SvStream& );

6
include/sfx2/mnuitem.hxx
View File

@@ -40,11 +40,11 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
OUString aTitle; OUString aTitle;
SfxVirtualMenu* pOwnMenu; SfxVirtualMenu* pOwnMenu;
SfxVirtualMenu* pSubMenu; SfxVirtualMenu* pSubMenu;
sal_Bool b_ShowStrings; bool b_ShowStrings;
public: public:
SfxMenuControl(); SfxMenuControl();
SfxMenuControl( sal_Bool bShowStrings ); SfxMenuControl( bool bShowStrings );
SfxMenuControl( sal_uInt16, SfxBindings&); SfxMenuControl( sal_uInt16, SfxBindings&);
static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
@@ -123,7 +123,7 @@ class SfxAppMenuControl_Impl : public SfxMenuControl
{ {
PopupMenu* pMenu; PopupMenu* pMenu;
OUString m_sIconTheme; OUString m_sIconTheme;
sal_Bool m_bShowMenuImages; bool m_bShowMenuImages;
protected: protected:
DECL_LINK( Activate, Menu * ); // Needed to support high contrast images DECL_LINK( Activate, Menu * ); // Needed to support high contrast images

6
include/sfx2/mnumgr.hxx
View File

@@ -46,13 +46,13 @@ class SfxMenuManager
{ {
friend class SfxPopupMenuManager; friend class SfxPopupMenuManager;
SfxVirtualMenu* pMenu; // the actual Menu SfxVirtualMenu* pMenu; // the actual Menu
SfxVirtualMenu* pOldMenu; // only while reconfiguring SfxVirtualMenu* pOldMenu; // only while reconfiguring
sal_Bool bMenuBar; // Popup or MenuBar bool bMenuBar; // Popup or MenuBar
SfxBindings* pBindings; SfxBindings* pBindings;
ResMgr* pResMgr; ResMgr* pResMgr;
sal_uInt32 nType; sal_uInt32 nType;
sal_Bool bAddClipboardFuncs : 1; bool bAddClipboardFuncs : 1;
void Construct( SfxVirtualMenu& rMenu ); void Construct( SfxVirtualMenu& rMenu );

6
include/sfx2/module.hxx
View File

@@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell
{ {
private: private:
ResMgr* pResMgr; ResMgr* pResMgr;
sal_Bool bDummy : 1; bool bDummy : 1;
SfxModule_Impl* pImpl; SfxModule_Impl* pImpl;
SAL_DLLPRIVATE void Construct_Impl(); SAL_DLLPRIVATE void Construct_Impl();
@@ -69,7 +69,7 @@ public:
TYPEINFO(); TYPEINFO();
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE) SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE)
SfxModule( ResMgr* pMgrP, sal_Bool bDummy, SfxModule( ResMgr* pMgrP, bool bDummy,
SfxObjectFactory* pFactoryP, ... ); SfxObjectFactory* pFactoryP, ... );
~SfxModule(); ~SfxModule();
@@ -107,7 +107,7 @@ public:
SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_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 #endif

4
include/sfx2/msg.hxx
View File

@@ -265,7 +265,7 @@ public:
sal_uInt16 GetSlotId() const; sal_uInt16 GetSlotId() const;
sal_uIntPtr GetHelpId() const; sal_uIntPtr GetHelpId() const;
sal_uIntPtr GetMode() const; sal_uIntPtr GetMode() const;
sal_Bool IsMode( sal_uIntPtr nMode ) const; bool IsMode( sal_uIntPtr nMode ) const;
sal_uInt16 GetGroupId() const; sal_uInt16 GetGroupId() const;
sal_uInt16 GetMasterSlotId() const { return nMasterSlotId; } sal_uInt16 GetMasterSlotId() const { return nMasterSlotId; }
sal_uInt16 GetWhich( const SfxItemPool &rPool ) const; sal_uInt16 GetWhich( const SfxItemPool &rPool ) const;
@@ -314,7 +314,7 @@ inline sal_uIntPtr SfxSlot::GetMode() const
// determines if the specified mode is assigned // 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; return (nFlags & nMode) != 0;
} }

6
include/sfx2/new.hxx
View File

@@ -59,9 +59,9 @@ public:
SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0);
~SfxNewFileDialog(); ~SfxNewFileDialog();
// Returns sal_False, when '- No -' is set as Template // Returns false, when '- No -' is set as Template
// Template names can only be obtained when IsTemplate() returns sal_True. // Template names can only be obtained when IsTemplate() returns true.
sal_Bool IsTemplate() const; bool IsTemplate() const;
OUString GetTemplateFileName() const; OUString GetTemplateFileName() const;
// load template methods // load template methods

2
sd/source/ui/app/sdmod.cxx
View File

@@ -67,7 +67,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR))
// Ctor // Ctor
SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
: SfxModule( SfxApplication::CreateResManager("sd"), sal_False, : SfxModule( SfxApplication::CreateResManager("sd"), false,
pFact1, pFact2, NULL ), pFact1, pFact2, NULL ),
pTransferClip(NULL), pTransferClip(NULL),
pTransferDrag(NULL), pTransferDrag(NULL),

4
sfx2/source/appl/module.cxx
View File

@@ -114,7 +114,7 @@ ResMgr* SfxModule::GetResMgr()
SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP, SfxModule::SfxModule( ResMgr* pMgrP, bool bDummyP,
SfxObjectFactory* pFactoryP, ... ) SfxObjectFactory* pFactoryP, ... )
: pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L) : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
{ {
@@ -299,7 +299,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
return pImpl->pFactArr; return pImpl->pFactArr;
} }
ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig ) ImageList* SfxModule::GetImageList_Impl( bool bBig )
{ {
return pImpl->GetImageList( pResMgr, bBig ); return pImpl->GetImageList( pResMgr, bBig );
} }

6
sfx2/source/dialog/mailmodel.cxx
View File

@@ -276,7 +276,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
return eRet; return eRet;
} }
sal_Bool SfxMailModel::IsEmpty() const bool SfxMailModel::IsEmpty() const
{ {
return maAttachedDocuments.empty(); return maAttachedDocuments.empty();
} }
@@ -684,7 +684,7 @@ SfxMailModel::SfxMailModel() :
mpCcList ( NULL ), mpCcList ( NULL ),
mpBccList ( NULL ), mpBccList ( NULL ),
mePriority ( PRIO_NORMAL ), mePriority ( PRIO_NORMAL ),
mbLoadDone ( sal_True ) mbLoadDone ( true )
{ {
} }
@@ -920,7 +920,7 @@ SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Referenc
// functions ------------------------------------------------------------- // functions -------------------------------------------------------------
sal_Bool CreateFromAddress_Impl( OUString& rFrom ) bool CreateFromAddress_Impl( OUString& rFrom )
/* [Description] /* [Description]

10
sfx2/source/dialog/mgetempl.cxx
View File

@@ -382,7 +382,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
nFilterIdx != m_pFilterLb->GetSavedValue() && nFilterIdx != m_pFilterLb->GetSavedValue() &&
m_pFilterLb->IsEnabled() ) m_pFilterLb->IsEnabled() )
{ {
bModified = sal_True; bModified = true;
OSL_ENSURE( pItem, "No Item" ); OSL_ENSURE( pItem, "No Item" );
// is only possibly for user templates // is only possibly for user templates
sal_uInt16 nMask = pItem->GetFilterList()[ (size_t)m_pFilterLb->GetEntryData( nFilterIdx ) ]->nFlags | SFXSTYLEBIT_USERDEF; 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() ); OUString sCmp( pStyle->GetName() );
if ( sCmp != aName ) if ( sCmp != aName )
@@ -550,7 +550,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
return SfxTabPage::KEEP_PAGE; return SfxTabPage::KEEP_PAGE;
} }
bModified = sal_True; bModified = true;
} }
if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() ) if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() )
@@ -566,7 +566,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
m_pFollowLb->GrabFocus(); m_pFollowLb->GrabFocus();
return SfxTabPage::KEEP_PAGE; return SfxTabPage::KEEP_PAGE;
} }
bModified = sal_True; bModified = true;
} }
} }
@@ -586,7 +586,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
m_pBaseLb->GrabFocus(); m_pBaseLb->GrabFocus();
return SfxTabPage::KEEP_PAGE; return SfxTabPage::KEEP_PAGE;
} }
bModified = sal_True; bModified = true;
nRet |= (int)SfxTabPage::REFRESH_SET; nRet |= (int)SfxTabPage::REFRESH_SET;
} }
} }

6
sfx2/source/doc/new.cxx
View File

@@ -162,7 +162,7 @@ public:
// Returns sal_False if '- No -' is set as a template // Returns sal_False if '- No -' is set as a template
// Template name can only be obtained if IsTemplate() is TRUE // Template name can only be obtained if IsTemplate() is TRUE
// erfragt werden // erfragt werden
sal_Bool IsTemplate() const; bool IsTemplate() const;
OUString GetTemplateFileName() const; OUString GetTemplateFileName() const;
sal_uInt16 GetTemplateFlags()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; return GetSelectedTemplatePos()!=0;
@@ -457,7 +457,7 @@ SfxNewFileDialog::~SfxNewFileDialog()
delete pImpl; delete pImpl;
} }
sal_Bool SfxNewFileDialog::IsTemplate() const bool SfxNewFileDialog::IsTemplate() const
{ {
return pImpl->IsTemplate(); return pImpl->IsTemplate();
} }

14
sfx2/source/menu/mnuitem.cxx
View File

@@ -110,7 +110,7 @@ void SfxMenuControl::Bind(
// Constructor for explicit registration // Constructor for explicit registration
SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings ) SfxMenuControl::SfxMenuControl( bool bShowStrings )
: pOwnMenu(0), : pOwnMenu(0),
pSubMenu(0), pSubMenu(0),
b_ShowStrings(bShowStrings) b_ShowStrings(bShowStrings)
@@ -123,7 +123,7 @@ SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings )
SfxMenuControl::SfxMenuControl(): SfxMenuControl::SfxMenuControl():
pOwnMenu(0), pOwnMenu(0),
pSubMenu(0), pSubMenu(0),
b_ShowStrings(sal_False) b_ShowStrings(false)
{ {
} }
@@ -133,7 +133,7 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
SfxControllerItem(nSlotId, rBindings), SfxControllerItem(nSlotId, rBindings),
pOwnMenu(0), pOwnMenu(0),
pSubMenu(0), pSubMenu(0),
b_ShowStrings(sal_False) b_ShowStrings(false)
{ {
// This constructor should make it possible already during the design // This constructor should make it possible already during the design
// to fall back to the bindings, but can as always be bound later. // 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*/ ) 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 ) 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(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
OUString sIconTheme = rSettings.DetermineIconTheme(); OUString sIconTheme = rSettings.DetermineIconTheme();
sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); bool bShowMenuImages = rSettings.GetUseImagesInMenus();
if (( sIconTheme != m_sIconTheme ) || if (( sIconTheme != m_sIconTheme ) ||
( bShowMenuImages != m_bShowMenuImages )) ( bShowMenuImages != m_bShowMenuImages ))
@@ -349,7 +349,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
{ {
if ( bShowMenuImages ) if ( bShowMenuImages )
{ {
sal_Bool bImageSet = sal_False; bool bImageSet = false;
OUString aImageId; OUString aImageId;
::framework::MenuConfiguration::Attributes* pMenuAttributes = ::framework::MenuConfiguration::Attributes* pMenuAttributes =
(::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId );
@@ -363,7 +363,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
Image aImage = GetImage( xFrame, aImageId, false ); Image aImage = GetImage( xFrame, aImageId, false );
if ( !!aImage ) if ( !!aImage )
{ {
bImageSet = sal_True; bImageSet = true;
pActMenu->SetItemImage( nItemId, aImage ); pActMenu->SetItemImage( nItemId, aImage );
} }
} }

2
sfx2/source/menu/mnumgr.cxx
View File

@@ -263,7 +263,7 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
pResMgr(NULL), pResMgr(NULL),
nType(0) nType(0)
{ {
bAddClipboardFuncs = sal_False; bAddClipboardFuncs = false;
SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True ); SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True );
Construct(*pVMenu); Construct(*pVMenu);
} }

2
starmath/source/smmod.cxx
View File

@@ -165,7 +165,7 @@ SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION))
SmModule::SmModule(SfxObjectFactory* pObjFact) : SmModule::SmModule(SfxObjectFactory* pObjFact) :
SfxModule(SfxApplication::CreateResManager("sm"), sal_False, pObjFact, NULL), SfxModule(SfxApplication::CreateResManager("sm"), false, pObjFact, NULL),
pColorConfig( 0 ), pColorConfig( 0 ),
pConfig( 0 ), pConfig( 0 ),
pLocSymbolData( 0 ), pLocSymbolData( 0 ),

2
sw/source/core/uibase/app/swmodule.cxx
View File

@@ -151,7 +151,7 @@ using namespace ::com::sun::star::uno;
SwModule::SwModule( SfxObjectFactory* pWebFact, SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pFact, SfxObjectFactory* pFact,
SfxObjectFactory* pGlobalFact ) SfxObjectFactory* pGlobalFact )
: SfxModule( SfxApplication::CreateResManager( "sw" ), sal_False, pWebFact, : SfxModule( SfxApplication::CreateResManager( "sw" ), false, pWebFact,
pFact, pGlobalFact, NULL ), pFact, pGlobalFact, NULL ),
pModuleConfig(0), pModuleConfig(0),
pUsrPref(0), pUsrPref(0),