summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-14 14:43:53 +0200
committerNoel Grandin <noel@peralex.com>2014-03-18 11:26:05 +0200
commit399724aba4b7297a262a775d000ddf4534e38b6c (patch)
tree6d45b2e8e0f597e36f89454db6948740462b4520 /include
parent96ef76c1b75332e4b8379276e396ea623153644d (diff)
sfx2: sal_Bool->bool
Change-Id: I128430fe446eb517b42a109a868b88d49bbc4eaa
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/mailmodelapi.hxx6
-rw-r--r--include/sfx2/mgetempl.hxx2
-rw-r--r--include/sfx2/mieclip.hxx4
-rw-r--r--include/sfx2/mnuitem.hxx6
-rw-r--r--include/sfx2/mnumgr.hxx6
-rw-r--r--include/sfx2/module.hxx6
-rw-r--r--include/sfx2/msg.hxx4
-rw-r--r--include/sfx2/new.hxx6
8 files changed, 20 insertions, 20 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