diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-18 11:23:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-18 11:27:39 +0200 |
| commit | c3e3f466571e4993c1b5e42c6d15e37c48f3a069 (patch) | |
| tree | 538fb90ed2c05e725f28ff16d41fd27ca38a7573 | |
| parent | e399c0759812affd4f7f6e1e3aacfbcafc06ad6d (diff) | |
sfx2: sal_Bool->bool
Change-Id: I375a72c34e46778385a9fdc24c9ebd0f0a3f3c9b
56 files changed, 191 insertions, 193 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 59f28873abbb..eb05257bcb71 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -965,7 +965,7 @@ void Shell::GetState(SfxItemSet &rSet) pCurWin->GetState( rSet ); } -sal_Bool Shell::HasUIFeature( sal_uInt32 nFeature ) +bool Shell::HasUIFeature( sal_uInt32 nFeature ) { bool bResult = false; @@ -1230,7 +1230,7 @@ Reference< XModel > Shell::GetCurrentDocument() const return xDocument; } -void Shell::Activate( sal_Bool bMDI ) +void Shell::Activate( bool bMDI ) { SfxViewShell::Activate( bMDI ); @@ -1241,7 +1241,7 @@ void Shell::Activate( sal_Bool bMDI ) } } -void Shell::Deactivate( sal_Bool bMDI ) +void Shell::Deactivate( bool bMDI ) { // bMDI == true means that another MDI has been activated; in case of a // deactivate due to a MessageBox bMDI is false diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index c4c5d72258bb..fdb8ef2893d6 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -130,8 +130,8 @@ private: virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ); - virtual void Activate(sal_Bool bMDI); - virtual void Deactivate(sal_Bool bMDI); + virtual void Activate(bool bMDI); + virtual void Deactivate(bool bMDI); virtual void Move(); virtual void ShowCursor( bool bOn = true ); @@ -185,7 +185,7 @@ public: void ExecuteBasic( SfxRequest& rReq ); void ExecuteDialog( SfxRequest& rReq ); - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual bool HasUIFeature( sal_uInt32 nFeature ); bool CallBasicErrorHdl( StarBASIC* pBasic ); long CallBasicBreakHdl( StarBASIC* pBasic ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 08b2df329eda..c8721cf7373d 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -293,7 +293,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) { SfxItemPool &rPool = pViewFrame->GetPool(); SfxRequest aReq(SID_VIEW_DATA_SOURCE_BROWSER, 0, rPool); - pViewFrame->ExecuteSlot( aReq, sal_True ); + pViewFrame->ExecuteSlot( aReq, true ); } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 90728017a3ee..6cd97101988d 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -380,7 +380,7 @@ Reference < com::sun::star::embed::XEmbeddedObject > AbstractInsertObjectDialog_ return pDlg->GetObject(); } -sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew() +bool AbstractInsertObjectDialog_Impl::IsCreateNew() { return pDlg->IsCreateNew(); } @@ -1182,7 +1182,7 @@ AbstractDialogFactory_Impl::CreateScriptErrorDialog( AbstractScriptSelectorDialog* AbstractDialogFactory_Impl::CreateScriptSelectorDialog( - Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) + Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) { SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog(pParent, bShowSlots, _rxFrame); return new AbstractScriptSelectorDialog_Impl(pDlg); @@ -1792,7 +1792,7 @@ SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* p return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); } -SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p) +SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p) { SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML ); if ( p ) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 03d4ca9cca59..510385c74465 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -443,7 +443,7 @@ class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl) virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); - virtual sal_Bool IsCreateNew(); + virtual bool IsCreateNew(); }; class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog @@ -548,7 +548,7 @@ public: virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 ); + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ); virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); @@ -671,7 +671,7 @@ public: virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - sal_Bool bShowSlots, + bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index ecd0b269dd70..2b5b4493ee81 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -1390,9 +1390,9 @@ public: SfxObjectShell* GetObjectShell() const ; - SAL_DLLPRIVATE sal_Bool impl_isDisposed() const ; - sal_Bool IsInitialized() const; - sal_Bool IsDisposed() const { return impl_isDisposed(); } + SAL_DLLPRIVATE bool impl_isDisposed() const ; + bool IsInitialized() const; + bool IsDisposed() const { return impl_isDisposed(); } void MethodEntryCheck( const bool i_mustBeInitialized ) const; ::osl::Mutex& getMutex() const { return m_aMutex; } @@ -1403,7 +1403,7 @@ public: void notifyEvent( const css::document::EventObject& aEvent ) const; /** returns true if someone added a XEventListener to this XEventBroadcaster */ - sal_Bool hasEventListeners() const; + bool hasEventListeners() const; protected: @@ -1412,7 +1412,7 @@ protected: OUString getRuntimeUID() const; /* returns true if the document signatures are valid, otherwise false */ - sal_Bool hasValidSignatures() const; + bool hasValidSignatures() const; /* GrabBagItem for interim interop purposes */ void getGrabBagItem(com::sun::star::uno::Any& rVal) const; @@ -1445,7 +1445,7 @@ private: SAL_DLLPRIVATE void impl_store( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments , - sal_Bool bSaveTo ) ; + bool bSaveTo ) ; SAL_DLLPRIVATE void postEvent_Impl( const OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() ); diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index b78992022a33..fcfd9bb8140e 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -87,7 +87,7 @@ class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog public: virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType )=0; - virtual sal_Bool IsCreateNew()=0; + virtual bool IsCreateNew()=0; }; class SfxAbstractPasteDialog : virtual public VclAbstractDialog @@ -140,13 +140,13 @@ public: virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const rtl::OUString& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - sal_Bool bShowSlots, + bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index cc7ad04c2845..de0b484660af 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -31,11 +31,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help { OUString aTicket; // for Plugins OUString aUser; - sal_Bool bIsDebug; + bool bIsDebug; SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE sal_Bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); + SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ); SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ); SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 132d98b4a70e..1343ac64000d 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser protected: - SfxHTMLParser( SvStream& rStream, sal_Bool bNewDoc=sal_True, SfxMedium *pMedium=0 ); + SfxHTMLParser( SvStream& rStream, bool bNewDoc=true, SfxMedium *pMedium=0 ); virtual ~SfxHTMLParser(); @@ -60,7 +60,7 @@ public: const HTMLOptions& rOptions, sal_uInt16 nEventMouseOver = 0, sal_uInt16 nEventMouseOut = 0 ); - inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, + inline bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, sal_uInt16 nEventMouseOver = 0, sal_uInt16 nEventMouseOut = 0); @@ -84,11 +84,11 @@ protected: // End of an asynchronous file download. Returns TRUE if the download // was successful. The read file is then passed into String. - sal_Bool FinishFileDownload( OUString& rStr ); + bool FinishFileDownload( OUString& rStr ); // Returns TRUE if a file was downloaded and if FileDownloadFinished // has not yet been called - sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; } + bool ShouldFinishFileDownload() const { return pDLMedium != 0; } SfxMedium *GetMedium() { return pMedium; } const SfxMedium *GetMedium() const { return pMedium; } @@ -98,7 +98,7 @@ protected: const OUString& GetScriptTypeString( SvKeyValueIterator* ) const; }; -inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, +inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, sal_uInt16 nEventMouseOver, sal_uInt16 nEventMouseOut) { diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index e1c27ec5a91f..cfe8d8a30bda 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -42,7 +42,7 @@ #include <rtl/ustring.hxx> -inline sal_Bool operator==( const css::util::URL& aURL1, const css::util::URL& aURL2 ) +inline bool operator==( const css::util::URL& aURL1, const css::util::URL& aURL2 ) { return aURL1.Complete == aURL2.Complete; } diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 8b3664f5067c..b34cda6b58ea 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -187,7 +187,7 @@ public: const SfxPoolItem* GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 ); const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 ); - const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, sal_Bool bAsync ); + const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, bool bAsync ); sal_uIntPtr ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 ); inline SfxItemPool& GetPool() const; @@ -202,16 +202,16 @@ public: virtual void Invalidate(sal_uInt16 nId = 0); - sal_Bool IsActive() const; - virtual void Activate(sal_Bool bMDI); - virtual void Deactivate(sal_Bool bMDI); + bool IsActive() const; + virtual void Activate(bool bMDI); + virtual void Deactivate(bool bMDI); virtual void ParentActivate(); virtual void ParentDeactivate(); SfxDispatcher* GetDispatcher() const; SfxViewFrame* GetFrame() const; ResMgr* GetResMgr() const; - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual bool HasUIFeature( sal_uInt32 nFeature ); void UIFeatureChanged(); // Items @@ -254,8 +254,8 @@ public: bool SetContextBroadcasterEnabled (const bool bIsEnabled); SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot ); - SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); - SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); + SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, bool bMDI); + SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, bool bMDI); }; diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 14e6ac0d6af2..5bbf236c76ac 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -88,7 +88,7 @@ public: @return <TRUE/> if an image list for the requested mode could be found in the given resource. */ - sal_Bool updateImages( const ResId& _rId ); + bool updateImages( const ResId& _rId ); }; #endif diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 2129f55aeecc..7076f2313c68 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -135,8 +135,8 @@ public: void ToTop(); void Enable( sal_Bool bEnable ); virtual sal_Bool Close(); - virtual void Activate( sal_Bool bUI ); - virtual void Deactivate( sal_Bool bUI ); + virtual void Activate( bool bUI ); + virtual void Deactivate( bool bUI ); // DDE-Interface virtual long DdeExecute( const OUString& rCmd ); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index f87ddd3f6c49..8488234d9344 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -141,8 +141,8 @@ friend class SfxPrinterController; sal_Bool bNoNewWindow; protected: - virtual void Activate(sal_Bool IsMDIActivate); - virtual void Deactivate(sal_Bool IsMDIActivate); + virtual void Activate(bool IsMDIActivate); + virtual void Deactivate(bool IsMDIActivate); virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index c36b26d1dfa7..ababcc43444c 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -108,7 +108,7 @@ public: virtual void Execute( SfxRequest& ); virtual void GetState( SfxItemSet& ); - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual bool HasUIFeature( sal_uInt32 nFeature ); void ExecuteTextAttribute( SfxRequest& ); void GetTextAttributeState( SfxItemSet& ); @@ -129,8 +129,8 @@ public: void ForgetActiveControl(); void SetControlActivationHandler( const Link& _rHdl ); - virtual void Activate(sal_Bool bMDI); - virtual void Deactivate(sal_Bool bMDI); + virtual void Activate(bool bMDI); + virtual void Deactivate(bool bMDI); // helper methods for implementing XFormLayerAccess SdrUnoObj* GetFormControl( diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 88a276f3f5f8..dbbc3d22ad57 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -459,7 +459,7 @@ public: virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - sal_Bool bShowSlots, + bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 7ff85f14e5a6..99beae50b91c 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -400,7 +400,7 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) -void ScDrawShell::Activate (const sal_Bool bMDI) +void ScDrawShell::Activate (const bool bMDI) { (void)bMDI; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 34050b1375d7..7e5ede5fce22 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -44,7 +44,7 @@ class ScDrawShell : public SfxShell void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); protected: - virtual void Activate(sal_Bool bMDI); + virtual void Activate(bool bMDI); ScViewData* GetViewData() { return pViewData; } public: diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 524da0bef6f0..e9d352c9c39c 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -64,8 +64,8 @@ private: void ExitPreview(); protected: - virtual void Activate(sal_Bool bMDI); - virtual void Deactivate(sal_Bool bMDI); + virtual void Activate(bool bMDI); + virtual void Deactivate(bool bMDI); virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 5fdc286087f1..c5cdb6e8558c 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -200,8 +200,8 @@ private: DECL_LINK( FormControlActivated, void* ); protected: - virtual void Activate(sal_Bool bMDI); - virtual void Deactivate(sal_Bool bMDI); + virtual void Activate(bool bMDI); + virtual void Deactivate(bool bMDI); virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; virtual void ShowCursor(bool bOn); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index c2eb5b1fd9a2..a43b85d7a0f1 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -234,7 +234,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { // show database beamer: SfxViewFrame call must be synchronous - pViewFrame->ExecuteSlot( rReq, (sal_Bool) false ); // sal_False = synchronous + pViewFrame->ExecuteSlot( rReq, false ); // false = synchronous // select current database in database beamer diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 174520a5a697..bf8311bffd22 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -548,7 +548,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt return 0; } -void ScPreviewShell::Activate(sal_Bool bMDI) +void ScPreviewShell::Activate(bool bMDI) { SfxViewShell::Activate(bMDI); @@ -563,7 +563,7 @@ void ScPreviewShell::Activate(sal_Bool bMDI) } } -void ScPreviewShell::Deactivate(sal_Bool bMDI) +void ScPreviewShell::Deactivate(bool bMDI) { SfxViewShell::Deactivate(bMDI); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 786a41a62cca..48fe120bbe74 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -103,7 +103,7 @@ sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; -void ScTabViewShell::Activate(sal_Bool bMDI) +void ScTabViewShell::Activate(bool bMDI) { SfxViewShell::Activate(bMDI); bIsActive = true; @@ -225,7 +225,7 @@ void ScTabViewShell::Activate(sal_Bool bMDI) ::sfx2::sidebar::EnumContext::Context_Default); } -void ScTabViewShell::Deactivate(sal_Bool bMDI) +void ScTabViewShell::Deactivate(bool bMDI) { HideTip(); diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 518eabf0712b..573fb792f689 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -340,7 +340,7 @@ void DrawDocShell::InPlaceActivate( bool bActive ) } } -void DrawDocShell::Activate( sal_Bool bMDI) +void DrawDocShell::Activate( bool bMDI) { if (bMDI) { @@ -349,7 +349,7 @@ void DrawDocShell::Activate( sal_Bool bMDI) } } -void DrawDocShell::Deactivate( sal_Bool ) +void DrawDocShell::Deactivate( bool ) { } diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 031ed17217f0..c8b22c8240ec 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -71,8 +71,8 @@ public: virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( sal_Bool bMDI ); - virtual void Deactivate( sal_Bool bMDI ); + virtual void Activate( bool bMDI ); + virtual void Deactivate( bool bMDI ); virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual bool ImportFrom(SfxMedium &rMedium, css::uno::Reference<css::text::XTextRange> const& xInsertPosition) diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index a6537d6c2e9f..73414906a7ff 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -150,8 +150,8 @@ public: void SelectionHasChanged(); void ModelHasChanged(); - virtual void Activate(sal_Bool bIsMDIActivate); - virtual void Deactivate(sal_Bool IsMDIActivate); + virtual void Activate(bool bIsMDIActivate); + virtual void Deactivate(bool IsMDIActivate); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); virtual OUString GetSelectionText( bool bCompleteWords = false ); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index f69132ba9986..deb9307a89cb 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -78,8 +78,8 @@ public: virtual void AddWindow(::sd::Window* pWin); virtual void RemoveWindow(::sd::Window* pWin); - virtual void Activate( sal_Bool IsMDIActivate ); - virtual void Deactivate( sal_Bool IsMDIActivate ); + virtual void Activate( bool IsMDIActivate ); + virtual void Deactivate( bool IsMDIActivate ); virtual SdPage* GetActualPage(); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index bed98a2be47d..f23f501716a0 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -56,7 +56,7 @@ protected: private: Rectangle maOldVisArea; - virtual void Activate (sal_Bool bIsMDIActivate); + virtual void Activate (bool bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index dd0684241087..6e212a243075 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -110,8 +110,8 @@ public: */ virtual void ArrangeGUIElements (void); - virtual void Activate (sal_Bool IsMDIActivate); - virtual void Deactivate (sal_Bool IsMDIActivate); + virtual void Activate (bool IsMDIActivate); + virtual void Deactivate (bool IsMDIActivate); //===== Drag and Drop ===================================================== diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 7fab33cda0c5..759bed49a220 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -541,8 +541,8 @@ protected: virtual void UpdateHRuler(); virtual void UpdateVRuler(); - virtual void Activate(sal_Bool IsMDIActivate); - virtual void Deactivate(sal_Bool IsMDIActivate); + virtual void Activate(bool IsMDIActivate); + virtual void Deactivate(bool IsMDIActivate); virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index c8bc54f64f6a..03689244a198 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -153,8 +153,8 @@ public: virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual void Activate (sal_Bool IsMDIActivate); - virtual void Deactivate (sal_Bool IsMDIActivate); + virtual void Activate (bool IsMDIActivate); + virtual void Deactivate (bool IsMDIActivate); virtual void SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 2cbeb8680e65..ce71491687a6 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -492,7 +492,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout) SfxRequest aRequest (mrBase.GetViewFrame(), SID_ASSIGN_LAYOUT); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATPAGE, ((*iPage)->GetPageNum()-1)/2)); aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout)); - pMainViewShell->ExecuteSlot (aRequest, sal_Bool(sal_False)); + pMainViewShell->ExecuteSlot (aRequest, false); } } while(false); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 87ef407e6d86..9e6d070c70d2 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -562,7 +562,7 @@ void SlideSorterViewShell::ArrangeGUIElements (void) -void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate) +void SlideSorterViewShell::Activate (bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); if (mbIsArrangeGUIElementsPending) @@ -601,7 +601,7 @@ void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate) -void SlideSorterViewShell::Deactivate (sal_Bool /*bIsMDIActivate*/) +void SlideSorterViewShell::Deactivate (bool /*bIsMDIActivate*/) { // Save Settings - Specifically SlidesPerRow to retrieve it later WriteFrameViewData(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index c585ca44bb5d..9c14f4aaba6a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -793,7 +793,7 @@ void ViewShellBase::ReadUserDataSequence ( -void ViewShellBase::Activate (sal_Bool bIsMDIActivate) +void ViewShellBase::Activate (bool bIsMDIActivate) { SfxViewShell::Activate(bIsMDIActivate); @@ -811,7 +811,7 @@ void ViewShellBase::Activate (sal_Bool bIsMDIActivate) -void ViewShellBase::Deactivate (sal_Bool bIsMDIActivate) +void ViewShellBase::Deactivate (bool bIsMDIActivate) { SfxViewShell::Deactivate(bIsMDIActivate); } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index bfb8ef893439..dba0ca8ee24f 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1334,7 +1334,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) } // Now we can deactivate the shell. - pShell->Deactivate(sal_True); + pShell->Deactivate(true); } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 009288e5dba7..51db4f60a4b4 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -88,7 +88,7 @@ using namespace com::sun::star; namespace sd { -void DrawViewShell::Activate(sal_Bool bIsMDIActivate) +void DrawViewShell::Activate(bool bIsMDIActivate) { ViewShell::Activate(bIsMDIActivate); } @@ -114,7 +114,7 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) } -void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate) +void DrawViewShell::Deactivate(bool bIsMDIActivate) { // Temporarily disable context broadcasting while the Deactivate() // call is forwarded to our base class. diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5aff9af4bee9..c3b780d7cc59 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -359,7 +359,7 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin) /** * Activate(): during the first invocation the fields get updated */ -void OutlineViewShell::Activate( sal_Bool bIsMDIActivate ) +void OutlineViewShell::Activate( bool bIsMDIActivate ) { if ( ! mbInitialized) { @@ -382,7 +382,7 @@ void OutlineViewShell::Activate( sal_Bool bIsMDIActivate ) } } -void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate ) +void OutlineViewShell::Deactivate( bool bIsMDIActivate ) { pOlView->DisconnectFromApplication(); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 143b31ef5fe6..94988d8ff4cb 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -127,7 +127,7 @@ SvxRuler* PresentationViewShell::CreateVRuler(::sd::Window*) } -void PresentationViewShell::Activate( sal_Bool bIsMDIActivate ) +void PresentationViewShell::Activate( bool bIsMDIActivate ) { DrawViewShell::Activate( bIsMDIActivate ); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 1770bc053b2b..d3bfeecd7de3 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -287,7 +287,7 @@ void ViewShell::Exit (void) pView->UnmarkAll(); } - Deactivate (sal_True); + Deactivate (true); if (IsMainViewShell()) { @@ -303,7 +303,7 @@ void ViewShell::Exit (void) /** * set focus to working window */ -void ViewShell::Activate(sal_Bool bIsMDIActivate) +void ViewShell::Activate(bool bIsMDIActivate) { // Do not forward to SfxShell::Activate() @@ -371,7 +371,7 @@ void ViewShell::UIDeactivated( SfxInPlaceClient* ) } -void ViewShell::Deactivate(sal_Bool bIsMDIActivate) +void ViewShell::Deactivate(bool bIsMDIActivate) { // remove view from a still active drag'n'drop session SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 45165c558e4c..64ff4327572f 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -573,7 +573,7 @@ SfxApplication::ChooseScript() uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() ); AbstractScriptSelectorDialog* pDlg = - pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame ); + pFact->CreateScriptSelectorDialog( NULL, false, xFrame ); SAL_INFO( "sfx.appl", "done, now exec it"); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 3e8a8939def8..a80a91a9f776 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1194,7 +1194,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) do // artificial loop for flow control { AbstractScriptSelectorDialog* pDlg = pFact->CreateScriptSelectorDialog( - lcl_getDialogParent( xFrame, GetTopWindow() ), sal_False, xFrame ); + lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame ); OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" ); if ( !pDlg ) break; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 59005019f08b..ff10f76ea3be 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -218,7 +218,7 @@ OUString SfxHelp_Impl::GetHelpText( const OUString& aCommandURL, const OUString& } SfxHelp::SfxHelp() : - bIsDebug( sal_False ), + bIsDebug( false ), pImp ( NULL ) { // read the environment variable "HELP_DEBUG" @@ -528,7 +528,7 @@ static bool impl_showOnlineHelp( const OUString& rURL ) return false; } -sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword) +bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword) { OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); AppendConfigToken(aHelpRootURL, sal_True); @@ -605,13 +605,11 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const if ( !impl_hasHelpInstalled() ) { if ( impl_showOnlineHelp( aHelpURL ) ) - return sal_True; - else - { - NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) ); - aErrBox.Execute(); - return sal_False; - } + return true; + + NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) ); + aErrBox.Execute(); + return false; } Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); @@ -632,7 +630,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const else pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow()); if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow) - return sal_False; + return false; #ifdef DBG_UTIL OStringBuffer aTmp("SfxHelp: HelpId = "); @@ -649,7 +647,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const if ( xTopWindow.is() ) xTopWindow->toFront(); - return sal_True; + return true; } OUString SfxHelp::CreateHelpURL(const OUString& aCommandURL, const OUString& rModuleName) diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index f06cbc87c61b..95b4751949f6 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -62,7 +62,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] = { 0, 0 } }; -SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc, +SfxHTMLParser::SfxHTMLParser( SvStream& rStream, bool bIsNewDoc, SfxMedium *pMed ) : HTMLParser(rStream, bIsNewDoc) , pMedium(pMed) @@ -238,9 +238,9 @@ void SfxHTMLParser::StartFileDownload(const OUString& rURL) pDLMedium->DownLoad(); } -sal_Bool SfxHTMLParser::FinishFileDownload( OUString& rStr ) +bool SfxHTMLParser::FinishFileDownload( OUString& rStr ) { - sal_Bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0; + bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0; if( bOK ) { SvStream* pStream = pDLMedium->GetInStream(); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index a831ec977022..d74bd22c4c9c 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1692,9 +1692,9 @@ void SfxDispatcher::FlushImpl() if (!pImp->bActive) continue; if (i->bPush) - i->pCluster->DoActivate_Impl(pImp->pFrame, sal_True); + i->pCluster->DoActivate_Impl(pImp->pFrame, true); else - i->pCluster->DoDeactivate_Impl(pImp->pFrame, sal_True); + i->pCluster->DoDeactivate_Impl(pImp->pFrame, true); } aToDoCopy = pImp->aToDoCopyStack.back(); @@ -2354,7 +2354,7 @@ void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell ) { pImp->aStack.erase( pImp->aStack.begin() + n ); rShell.SetDisableFlags( 0 ); - rShell.DoDeactivate_Impl(pImp->pFrame, sal_True); + rShell.DoDeactivate_Impl(pImp->pFrame, true); break; } } diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index c10a49676818..f77261b4a5f8 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -90,10 +90,10 @@ struct SfxShell_Impl: public SfxBroadcaster // ViewFrame/ViewShell/SubShell list SfxViewFrame* pFrame; // Frame, if <UI-active> SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent; - sal_Bool bInAppBASIC; - sal_Bool bActive; - sal_uIntPtr nDisableFlags; - sal_uIntPtr nHelpId; + bool bInAppBASIC; + bool bActive; + sal_uIntPtr nDisableFlags; + sal_uIntPtr nHelpId; svtools::AsynchronLink* pExecuter; svtools::AsynchronLink* pUpdater; SfxVerbSlotArr_Impl aSlotArr; @@ -134,9 +134,9 @@ SfxShell::SfxShell() pImp->pViewSh = 0; pImp->pFrame = 0; pImp->pRepeatTarget = 0; - pImp->bInAppBASIC = sal_False; + pImp->bInAppBASIC = false; pImp->nHelpId = 0L; - pImp->bActive = sal_False; + pImp->bActive = false; pImp->nDisableFlags = 0; } @@ -159,9 +159,9 @@ SfxShell::SfxShell( SfxViewShell *pViewSh ) pImp->pViewSh = pViewSh; pImp->pFrame = 0; pImp->pRepeatTarget = 0; - pImp->bInAppBASIC = sal_False; + pImp->bInAppBASIC = false; pImp->nHelpId = 0L; - pImp->bActive = sal_False; + pImp->bActive = false; } @@ -547,7 +547,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ) -void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) +void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, bool bMDI ) /* [Description] @@ -575,7 +575,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) { // Remember Frame, in which it was activated pImp->pFrame = pFrame; - pImp->bActive = sal_True; + pImp->bActive = true; } // Notify Subclass @@ -584,7 +584,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) -void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) +void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, bool bMDI ) /* [Description] @@ -613,7 +613,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) { // deliver pImp->pFrame = 0; - pImp->bActive = sal_False; + pImp->bActive = false; } // Notify Subclass @@ -622,7 +622,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) -sal_Bool SfxShell::IsActive() const +bool SfxShell::IsActive() const { return pImp->bActive; } @@ -631,7 +631,7 @@ sal_Bool SfxShell::IsActive() const void SfxShell::Activate ( - sal_Bool /*bMDI*/ /* TRUE + bool /*bMDI*/ /* TRUE the <SfxDispatcher>, on which the SfxShell is located, is activated or the SfxShell instance was pushed on an active SfxDispatcher. @@ -651,7 +651,7 @@ void SfxShell::Activate [Cross-reference] - StarView SystemWindow::Activate(sal_Bool) + StarView SystemWindow::Activate(bool) */ { @@ -662,7 +662,7 @@ void SfxShell::Activate void SfxShell::Deactivate ( - sal_Bool /*bMDI*/ /* TRUE + bool /*bMDI*/ /* TRUE the <SfxDispatcher>, on which the SfxShell is located, is inactivated or the SfxShell instance was popped on an active SfxDispatcher. @@ -682,7 +682,7 @@ void SfxShell::Deactivate [Cross-reference] - StarView SystemWindow::Dectivate(sal_Bool) + StarView SystemWindow::Dectivate(bool) */ { @@ -777,7 +777,7 @@ long ShellCall_Impl( void* pObj, void* pArg ) */ -const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync ) +const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync ) { if( !bAsync ) return ExecuteSlot( rReq, (SfxInterface*)0L ); @@ -1048,7 +1048,7 @@ void SfxShell::VerbExec(SfxRequest& rReq) SfxViewShell *pViewShell = GetViewShell(); if ( pViewShell ) { - sal_Bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly(); + bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly(); com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aList = pViewShell->GetVerbs(); for (sal_Int32 n=0, nVerb=0; n<aList.getLength(); n++) { @@ -1118,9 +1118,9 @@ SfxObjectShell* SfxShell::GetObjectShell() -sal_Bool SfxShell::HasUIFeature( sal_uInt32 ) +bool SfxShell::HasUIFeature( sal_uInt32 ) { - return sal_False; + return false; } long DispatcherUpdate_Impl( void*, void* pArg ) diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index 9da42533ac16..58dee4128d7c 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -126,9 +126,9 @@ SfxStyleFamilies::~SfxStyleFamilies() -sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId ) +bool SfxStyleFamilies::updateImages( const ResId& _rId ) { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; { ::svt::OLocalResourceAccess aLocalRes( _rId ); @@ -154,7 +154,7 @@ sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId ) pItem->SetImage( aImages.GetImage( aImages.GetImageId( i ) ) ); } - bSuccess = sal_True; + bSuccess = true; } } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index f22ba538eaeb..7fc23cb4ea3a 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -198,13 +198,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument Sequence< Reference< frame::XController > > m_seqControllers ; Reference< container::XIndexAccess > m_contViewData ; sal_uInt16 m_nControllerLockCount ; - sal_Bool m_bClosed ; - sal_Bool m_bClosing ; - sal_Bool m_bSaving ; - sal_Bool m_bSuicide ; - sal_Bool m_bInitialized ; - sal_Bool m_bExternalTitle ; - sal_Bool m_bModifiedSinceLastSave ; + bool m_bClosed ; + bool m_bClosing ; + bool m_bSaving ; + bool m_bSuicide ; + bool m_bInitialized ; + bool m_bExternalTitle ; + bool m_bModifiedSinceLastSave ; Reference< view::XPrintable> m_xPrintable ; Reference< script::provider::XScriptProvider > m_xScriptProvider ; Reference< ui::XUIConfigurationManager2 > m_xUIConfigurationManager; @@ -221,13 +221,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument : m_pObjectShell ( pObjectShell ) , m_aInterfaceContainer ( rMutex ) , m_nControllerLockCount ( 0 ) - , m_bClosed ( sal_False ) - , m_bClosing ( sal_False ) - , m_bSaving ( sal_False ) - , m_bSuicide ( sal_False ) - , m_bInitialized ( sal_False ) - , m_bExternalTitle ( sal_False ) - , m_bModifiedSinceLastSave( sal_False ) + , m_bClosed ( false ) + , m_bClosing ( false ) + , m_bSaving ( false ) + , m_bSuicide ( false ) + , m_bInitialized ( false ) + , m_bExternalTitle ( false ) + , m_bModifiedSinceLastSave( false ) , m_pStorageModifyListen ( NULL ) , m_xTitleHelper () , m_xNumberedControllers () @@ -453,13 +453,13 @@ class SfxSaveGuard public: SfxSaveGuard(const Reference< frame::XModel >& xModel , IMPL_SfxBaseModel_DataContainer* pData , - sal_Bool bRejectConcurrentSaveRequest); + bool bRejectConcurrentSaveRequest); ~SfxSaveGuard(); }; SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel , IMPL_SfxBaseModel_DataContainer* pData , - sal_Bool bRejectConcurrentSaveRequest) + bool bRejectConcurrentSaveRequest) : m_xModel (xModel) , m_pData (pData ) , m_pFramesLock(0 ) @@ -477,7 +477,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel OUString("Concurrent save requests on the same document are not possible."), Reference< XInterface >()); - m_pData->m_bSaving = sal_True; + m_pData->m_bSaving = true; m_pFramesLock = new SfxOwnFramesLocker(m_pData->m_pObjectShell); } @@ -487,7 +487,7 @@ SfxSaveGuard::~SfxSaveGuard() m_pFramesLock = 0; delete pFramesLock; - m_pData->m_bSaving = sal_False; + m_pData->m_bSaving = false; // m_bSuicide was set e.g. in case someone tried to close a document, while it was used for // storing at the same time. Further m_bSuicide was set to sal_True only if close(sal_True) was called. @@ -499,7 +499,7 @@ SfxSaveGuard::~SfxSaveGuard() { // Reset this state. In case the new close() request is not accepted by someone else ... // it's not a good idea to have two "owners" for close .-) - m_pData->m_bSuicide = sal_False; + m_pData->m_bSuicide = false; try { Reference< util::XCloseable > xClose(m_xModel, UNO_QUERY); @@ -893,7 +893,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& // but _only_ before load() or initNew() methods if ( m_pData->m_pObjectShell.Is() && !m_pData->m_pObjectShell->GetMedium() ) { - sal_Bool bEmb = sal_Bool(); + sal_Bool bEmb(sal_False); if ( ( rArgs[0].Value >>= bEmb ) && bEmb ) m_pData->m_pObjectShell->SetCreateMode_Impl( SFX_CREATE_MODE_EMBEDDED ); } @@ -1395,14 +1395,14 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo if ( m_pData->m_bSaving ) { if (bDeliverOwnership) - m_pData->m_bSuicide = sal_True; + m_pData->m_bSuicide = true; throw util::CloseVetoException( OUString("Cant close while saving."), static_cast< util::XCloseable* >(this)); } // no own objections against closing! - m_pData->m_bClosing = sal_True; + m_pData->m_bClosing = true; pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) ); if (pContainer!=NULL) { @@ -1420,8 +1420,8 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo } } - m_pData->m_bClosed = sal_True; - m_pData->m_bClosing = sal_False; + m_pData->m_bClosed = true; + m_pData->m_bClosing = false; dispose(); } @@ -1537,7 +1537,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > if ( m_pData->m_pObjectShell.Is() ) { m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeSelf" ) ); - SfxSaveGuard aSaveGuard(this, m_pData, sal_False); + SfxSaveGuard aSaveGuard(this, m_pData, false); sal_Bool bCheckIn = sal_False; for ( sal_Int32 nInd = 0; nInd < aSeqArgs.getLength(); nInd++ ) @@ -1667,9 +1667,9 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL if ( m_pData->m_pObjectShell.Is() ) { m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeAsURL" ) ); - SfxSaveGuard aSaveGuard(this, m_pData, sal_False); + SfxSaveGuard aSaveGuard(this, m_pData, false); - impl_store( rURL, rArgs, sal_False ); + impl_store( rURL, rArgs, false ); Sequence< beans::PropertyValue > aSequence ; TransformItems( SID_OPENDOC, *m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence ); @@ -1708,12 +1708,12 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL if ( m_pData->m_pObjectShell.Is() ) { m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeToURL" ) ); - SfxSaveGuard aSaveGuard(this, m_pData, sal_False); - impl_store( rURL, rArgs, sal_True ); + SfxSaveGuard aSaveGuard(this, m_pData, false); + impl_store( rURL, rArgs, true ); } } -::sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception ) +sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); return m_pData->m_bModifiedSinceLastSave; @@ -1724,11 +1724,11 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocatio SfxModelGuard aGuard( *this ); // delegate - SfxSaveGuard aSaveGuard( this, m_pData, sal_False ); - impl_store( i_TargetLocation, i_MediaDescriptor, sal_True ); + SfxSaveGuard aSaveGuard( this, m_pData, false ); + impl_store( i_TargetLocation, i_MediaDescriptor, true ); // no need for subsequent calls to storeToRecoveryFile, unless we're modified, again - m_pData->m_bModifiedSinceLastSave = sal_False; + m_pData->m_bModifiedSinceLastSave = false; } void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception ) @@ -2790,7 +2790,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , { impl_getPrintHelper(); ListenForStorage_Impl( m_pData->m_pObjectShell->GetStorage() ); - m_pData->m_bModifiedSinceLastSave = sal_False; + m_pData->m_bModifiedSinceLastSave = false; } break; @@ -2810,7 +2810,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , case SFX_EVENT_DOCCREATED: { impl_getPrintHelper(); - m_pData->m_bModifiedSinceLastSave = sal_False; + m_pData->m_bModifiedSinceLastSave = false; } break; @@ -2884,12 +2884,12 @@ SfxObjectShell* SfxBaseModel::GetObjectShell() const // public impl. -sal_Bool SfxBaseModel::IsInitialized() const +bool SfxBaseModel::IsInitialized() const { if ( !m_pData || !m_pData->m_pObjectShell ) { OSL_FAIL( "SfxBaseModel::IsInitialized: this should have been caught earlier!" ); - return sal_False; + return false; } return m_pData->m_pObjectShell->GetMedium() != NULL; @@ -2903,7 +2903,7 @@ void SfxBaseModel::MethodEntryCheck( const bool i_mustBeInitialized ) const throw lang::NotInitializedException( OUString(), *const_cast< SfxBaseModel* >( this ) ); } -sal_Bool SfxBaseModel::impl_isDisposed() const +bool SfxBaseModel::impl_isDisposed() const { return ( m_pData == NULL ) ; } @@ -2927,7 +2927,7 @@ OUString SfxBaseModel::GetMediumFilterName_Impl() void SfxBaseModel::impl_store( const OUString& sURL , const Sequence< beans::PropertyValue >& seqArguments , - sal_Bool bSaveTo ) + bool bSaveTo ) { if( sURL.isEmpty() ) throw frame::IllegalArgumentIOException(); @@ -3284,7 +3284,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const } /** returns true if someone added a XEventListener to this XEventBroadcaster */ -sal_Bool SfxBaseModel::hasEventListeners() const +bool SfxBaseModel::hasEventListeners() const { return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) ); } @@ -3455,12 +3455,12 @@ OUString SfxBaseModel::getRuntimeUID() const return m_pData->m_sRuntimeUID; } -sal_Bool SfxBaseModel::hasValidSignatures() const +bool SfxBaseModel::hasValidSignatures() const { SolarMutexGuard aGuard; if ( m_pData->m_pObjectShell.Is() ) return ( m_pData->m_pObjectShell->ImplGetSignatureState( false ) == SIGNATURESTATE_SIGNATURES_OK ); - return sal_False; + return false; } void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const @@ -4034,7 +4034,7 @@ void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) SfxModelGuard aGuard( *this ); impl_getTitleHelper()->setTitle (sTitle); - m_pData->m_bExternalTitle = sal_True; + m_pData->m_bExternalTitle = true; } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index b5a4ebb349c9..edade4ae15d8 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -390,7 +390,7 @@ void SfxViewFrame::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY GetViewShell()->SetZoomFactor( rZoomX, rZoomY ); } -void SfxViewFrame::Activate( sal_Bool bMDI ) +void SfxViewFrame::Activate( bool bMDI ) { DBG_ASSERT(GetViewShell(), "No Shell"); if ( bMDI ) @@ -398,7 +398,7 @@ void SfxViewFrame::Activate( sal_Bool bMDI ) //(mba): here maybe as in Beanframe NotifyEvent ?! } -void SfxViewFrame::Deactivate( sal_Bool bMDI ) +void SfxViewFrame::Deactivate( bool bMDI ) { DBG_ASSERT(GetViewShell(), "No Shell"); if ( bMDI ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index beb399352f04..59a0e8a54db9 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -983,7 +983,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const -void SfxViewShell::Activate( sal_Bool bMDI ) +void SfxViewShell::Activate( bool bMDI ) { if ( bMDI ) { @@ -997,7 +997,7 @@ void SfxViewShell::Activate( sal_Bool bMDI ) -void SfxViewShell::Deactivate(sal_Bool /*bMDI*/) +void SfxViewShell::Deactivate(bool /*bMDI*/) { } diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 92973a2e35e5..f231bda96351 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -266,8 +266,8 @@ protected: virtual bool HasPrintOptionsPage() const; virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent, const SfxItemSet &rOptions); - virtual void Deactivate(sal_Bool IsMDIActivate); - virtual void Activate(sal_Bool IsMDIActivate); + virtual void Deactivate(bool IsMDIActivate); + virtual void Activate(bool IsMDIActivate); virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); virtual void InnerResizePixel(const Point &rOfs, const Size &rSize); virtual void OuterResizePixel(const Point &rOfs, const Size &rSize); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index e6f6add3c627..c3d5c493edbf 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -2023,7 +2023,7 @@ SmViewShell::~SmViewShell() delete pImpl; } -void SmViewShell::Deactivate( sal_Bool bIsMDIActivate ) +void SmViewShell::Deactivate( bool bIsMDIActivate ) { SAL_INFO( "starmath", "SmViewShell::Deactivate" ); @@ -2035,7 +2035,7 @@ void SmViewShell::Deactivate( sal_Bool bIsMDIActivate ) } -void SmViewShell::Activate( sal_Bool bIsMDIActivate ) +void SmViewShell::Activate( bool bIsMDIActivate ) { SAL_INFO( "starmath", "SmViewShell::Activate" ); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index b336f9c5f9ac..d7f37c636124 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -321,9 +321,9 @@ void FmFormShell::impl_setDesignMode(bool bDesign) } -sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature ) +bool FmFormShell::HasUIFeature( sal_uInt32 nFeature ) { - sal_Bool bResult = sal_False; + bool bResult = false; if ((nFeature & FM_UI_FEATURE_SHOW_DATABASEBAR) == FM_UI_FEATURE_SHOW_DATABASEBAR) { // nur wenn auch formulare verfuegbar @@ -363,7 +363,7 @@ sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature ) || ( ( nFeature & FM_UI_FEATURE_TB_FORMDESIGN ) == FM_UI_FEATURE_TB_FORMDESIGN ) ) { - bResult = sal_True; + bResult = true; } return bResult; @@ -1251,7 +1251,7 @@ void FmFormShell::SetY2KState(sal_uInt16 n) } -void FmFormShell::Activate(sal_Bool bMDI) +void FmFormShell::Activate(bool bMDI) { SfxShell::Activate(bMDI); @@ -1260,7 +1260,7 @@ void FmFormShell::Activate(sal_Bool bMDI) } -void FmFormShell::Deactivate(sal_Bool bMDI) +void FmFormShell::Deactivate(bool bMDI) { SfxShell::Deactivate(bMDI); diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index 8caf03f81809..aa04ee30931a 100644 --- a/sw/source/core/uibase/inc/view.hxx +++ b/sw/source/core/uibase/inc/view.hxx @@ -378,8 +378,8 @@ protected: virtual void SelectShell(); - virtual void Activate(sal_Bool); - virtual void Deactivate(sal_Bool); + virtual void Activate(bool); + virtual void Deactivate(bool); virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); @@ -403,7 +403,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; - virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); + virtual bool HasUIFeature( sal_uInt32 nFeature ); virtual void ShowCursor( bool bOn = true ); virtual ErrCode DoVerb( long nVerb ); diff --git a/sw/source/core/uibase/shells/textfld.cxx b/sw/source/core/uibase/shells/textfld.cxx index 8a8c88085b60..a2ba08153bb1 100644 --- a/sw/source/core/uibase/shells/textfld.cxx +++ b/sw/source/core/uibase/shells/textfld.cxx @@ -119,7 +119,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if(rLink.IsVisible()) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( pMDI, &rSh.GetLinkManager(), sal_False, &rLink ); + SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( pMDI, &rSh.GetLinkManager(), false, &rLink ); if ( pDlg ) { pDlg->Execute(); diff --git a/sw/source/core/uibase/uiview/view1.cxx b/sw/source/core/uibase/uiview/view1.cxx index 14a3c1c4f601..975c87966f22 100644 --- a/sw/source/core/uibase/uiview/view1.cxx +++ b/sw/source/core/uibase/uiview/view1.cxx @@ -42,7 +42,7 @@ extern int bDocSzUpdated; -void SwView::Activate(sal_Bool bMDIActivate) +void SwView::Activate(bool bMDIActivate) { // fdo#40438 Update the layout to make sure everything is correct before showing the content m_pWrtShell->StartAction(); @@ -115,7 +115,7 @@ void SwView::Activate(sal_Bool bMDIActivate) SfxViewShell::Activate(bMDIActivate); } -void SwView::Deactivate(sal_Bool bMDIActivate) +void SwView::Deactivate(bool bMDIActivate) { extern bool bFlushCharBuffer ; // Are Characters still in the input buffer? diff --git a/sw/source/core/uibase/uiview/viewstat.cxx b/sw/source/core/uibase/uiview/viewstat.cxx index 7e5362e282b9..df30fefee526 100644 --- a/sw/source/core/uibase/uiview/viewstat.cxx +++ b/sw/source/core/uibase/uiview/viewstat.cxx @@ -512,9 +512,9 @@ void SwView::GetDrawState(SfxItemSet &rSet) } } -sal_Bool SwView::HasUIFeature( sal_uInt32 nFeature ) +bool SwView::HasUIFeature( sal_uInt32 nFeature ) { - sal_Bool bRet = sal_False; + bool bRet = false; switch(nFeature) { case CHILDWIN_LABEL : bRet = m_pWrtShell->IsLabelDoc(); break; |