diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-13 10:22:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-14 07:50:34 +0200 |
commit | 5fe7ecc04f35ef785510e3ef404f46eb6f05a123 (patch) | |
tree | 4c141983d092ef097c09187abb634f2e4a717452 /include/sfx2 | |
parent | c2324940d384186ff02581e49a24ea8235cd584c (diff) |
sfx2: sal_Bool->bool
Change-Id: I56a50ee4a169c8f82c830ebf498f7ead1335f0b5
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 36 | ||||
-rw-r--r-- | include/sfx2/dispatch.hxx | 42 | ||||
-rw-r--r-- | include/sfx2/docfac.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/docfile.hxx | 96 | ||||
-rw-r--r-- | include/sfx2/dockwin.hxx | 10 | ||||
-rw-r--r-- | include/sfx2/docmacromode.hxx | 24 | ||||
-rw-r--r-- | include/sfx2/doctempl.hxx | 28 |
7 files changed, 119 insertions, 119 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index beffc572a5d2..86e466a4146b 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -62,9 +62,9 @@ struct CustomProperty; class SFX2_DLLPUBLIC SfxDocumentInfoItem : public SfxStringItem { private: - sal_Int32 m_AutoloadDelay; + sal_Int32 m_AutoloadDelay; OUString m_AutoloadURL; - sal_Bool m_isAutoloadEnabled; + bool m_isAutoloadEnabled; OUString m_DefaultTarget; OUString m_TemplateName; OUString m_Author; @@ -73,15 +73,15 @@ private: ::com::sun::star::util::DateTime m_ModificationDate; OUString m_PrintedBy; ::com::sun::star::util::DateTime m_PrintDate; - sal_Int16 m_EditingCycles; - sal_Int32 m_EditingDuration; + sal_Int16 m_EditingCycles; + sal_Int32 m_EditingDuration; OUString m_Description; OUString m_Keywords; OUString m_Subject; OUString m_Title; - sal_Bool m_bHasTemplate; - sal_Bool m_bDeleteUserData; - sal_Bool m_bUseUserData; + bool m_bHasTemplate; + bool m_bDeleteUserData; + bool m_bUseUserData; std::vector< CustomProperty* > m_aCustomProperties; ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > m_aCmisProperties; @@ -93,7 +93,7 @@ public: ::com::sun::star::document::XDocumentProperties> & i_xDocProps, const ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty> & i_cmisProps, - sal_Bool bUseUserData ); + bool bUseUserData ); SfxDocumentInfoItem( const SfxDocumentInfoItem& ); virtual ~SfxDocumentInfoItem(); @@ -103,10 +103,10 @@ public: ::com::sun::star::document::XDocumentProperties> & i_xDocProps, bool i_bDoNotUpdateUserDefined = false) const; - sal_Bool isCmisDocument() const { return m_aCmisProperties.getLength() > 0;} + bool isCmisDocument() const { return m_aCmisProperties.getLength() > 0;} - sal_Bool isAutoloadEnabled() const { return m_isAutoloadEnabled; } - void setAutoloadEnabled(sal_Bool i_val) { m_isAutoloadEnabled = i_val; } + bool isAutoloadEnabled() const { return m_isAutoloadEnabled; } + void setAutoloadEnabled(bool i_val) { m_isAutoloadEnabled = i_val; } sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; } void setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; } OUString getAutoloadURL() const { return m_AutoloadURL; } @@ -154,12 +154,12 @@ public: /// reset user-specific data (author, modified-by, ...) void resetUserData(const OUString & i_rAuthor); - void SetTemplate( sal_Bool b ) { m_bHasTemplate = b; } - sal_Bool HasTemplate() const { return m_bHasTemplate; } - void SetDeleteUserData( sal_Bool bSet ); - void SetUseUserData( sal_Bool bSet ); - sal_Bool IsDeleteUserData() const; - sal_Bool IsUseUserData() const; + void SetTemplate( bool b ) { m_bHasTemplate = b; } + bool HasTemplate() const { return m_bHasTemplate; } + void SetDeleteUserData( bool bSet ); + void SetUseUserData( bool bSet ); + bool IsDeleteUserData() const; + bool IsUseUserData() const; std::vector< CustomProperty* > GetCustomProperties() const; void ClearCustomProperties(); @@ -207,7 +207,7 @@ private: OUString m_aUnknownSize; OUString m_aMultiSignedStr; - sal_Bool bEnableUseUserData : 1, + bool bEnableUseUserData : 1, bHandleDelete : 1; DECL_LINK(DeleteHdl, void *); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 0f1f908dcd23..f9d1d3a50a95 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -68,7 +68,7 @@ class SFX2_DLLPUBLIC SfxDispatcher private: // Search for temporary evaluated Todos - SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep ); + SAL_DLLPRIVATE bool CheckVirtualStack( const SfxShell& rShell, bool bDeep ); #ifndef _SFX_HXX @@ -78,8 +78,8 @@ friend class SfxViewFrame; DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * ); DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * ); - SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord ); - SAL_DLLPRIVATE void _Update_Impl( sal_Bool,sal_Bool,sal_Bool,SfxWorkWindow*); + SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord ); + SAL_DLLPRIVATE void _Update_Impl( bool,bool,bool,SfxWorkWindow*); SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*); protected: @@ -89,9 +89,9 @@ friend class SfxPopupMenuManager; friend class SfxHelp; // For bindings: Finding the Message; // level for re-access - SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); - sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); - sal_Bool _FillState( const SfxSlotServer &rServer, + SAL_DLLPRIVATE bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal ); + bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal ); + bool _FillState( const SfxSlotServer &rServer, SfxItemSet &rState, const SfxSlot *pRealSlot ); void _Execute( SfxShell &rShell, const SfxSlot &rSlot, SfxRequest &rReq, @@ -135,7 +135,7 @@ public: const SfxSlot* GetSlot( const OUString& rCommand ); - sal_Bool IsActive( const SfxShell& rShell ); + bool IsActive( const SfxShell& rShell ); sal_uInt16 GetShellLevel( const SfxShell &rShell ); SfxBindings* GetBindings() const; @@ -153,15 +153,15 @@ public: static void ExecutePopup( sal_uInt16 nConfigId = 0, Window *pWin = 0, const Point *pPosPixel = 0 ); - sal_Bool IsAppDispatcher() const; + bool IsAppDispatcher() const; bool IsFlushed() const; void Flush(); - void Lock( sal_Bool bLock ); - sal_Bool IsLocked( sal_uInt16 nSID = 0 ) const; + void Lock( bool bLock ); + bool IsLocked( sal_uInt16 nSID = 0 ) const; void SetSlotFilter( sal_Bool bEnable = sal_False, sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 ); - void HideUI( sal_Bool bHide = sal_True ); + void HideUI( bool bHide = true ); void ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const; sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const; @@ -173,21 +173,21 @@ public: sal_uInt32 GetDisableFlags() const; SAL_DLLPRIVATE void SetMenu_Impl(); - SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc. - SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const; + SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc. + SAL_DLLPRIVATE bool IsUpdated_Impl() const; SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, - sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True ); - SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool bOn ); - SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const; + bool bOwnShellsOnly, bool bModal, bool bRealSlot=true ); + SAL_DLLPRIVATE void SetReadOnly_Impl( bool bOn ); + SAL_DLLPRIVATE bool GetReadOnly_Impl() const; SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const; - SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn ); - SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const; + SAL_DLLPRIVATE void SetQuietMode_Impl( bool bOn ); + SAL_DLLPRIVATE bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const; SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell ); SAL_DLLPRIVATE void DoParentActivate_Impl(); SAL_DLLPRIVATE void DoParentDeactivate_Impl(); - SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld ); - SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ); - SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool); + SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI, SfxViewFrame* pOld ); + SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew ); + SAL_DLLPRIVATE void InvalidateBindings_Impl(bool); SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, OUString *pStr ); }; diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index af0b7f9c98ff..85d25fec608d 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -71,7 +71,7 @@ public: OUString GetFactoryURL() const; // shortcut for "private:factory/GetShortName()" OUString GetFactoryName() const { return OUString::createFromAscii(pShortName); } OUString GetModuleName() const; - SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const; + SfxFilterContainer *GetFilterContainer( bool bForceLoad = true) const; // Views void RegisterViewFactory(SfxViewFactory &rFactory); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 33450a3895d7..ef9ef9bdc6cf 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase SAL_DLLPRIVATE void SetIsRemote_Impl(); SAL_DLLPRIVATE void CloseInStream_Impl(); - SAL_DLLPRIVATE sal_Bool CloseOutStream_Impl(); + SAL_DLLPRIVATE bool CloseOutStream_Impl(); SAL_DLLPRIVATE void CloseStreams_Impl(); DECL_DLLPRIVATE_STATIC_LINK( SfxMedium, UCBHdl_Impl, sal_uInt32 * ); @@ -102,20 +102,20 @@ public: ~SfxMedium(); - void UseInteractionHandler( sal_Bool ); + void UseInteractionHandler( bool ); css::uno::Reference< css::task::XInteractionHandler > GetInteractionHandler(); void setStreamToLoadFrom( const css::uno::Reference<css::io::XInputStream>& xInputStream, - sal_Bool bIsReadOnly); + bool bIsReadOnly); void SetLoadTargetFrame(SfxFrame* pFrame ); SfxFrame* GetLoadTargetFrame() const; - void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False); + void SetFilter(const SfxFilter *pFlt, bool bResetOrig = false); const SfxFilter* GetFilter() const; - const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const; + const SfxFilter * GetOrigFilter( bool bNotCurrent = false ) const; const OUString& GetOrigURL() const; SfxItemSet * GetItemSet() const; @@ -127,13 +127,13 @@ public: const INetURLObject& GetURLObject() const; void CheckFileDate( const css::util::DateTime& aInitDate ); - sal_Bool DocNeedsFileDateCheck(); - css::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue ); + bool DocNeedsFileDateCheck(); + css::util::DateTime GetInitFileDate( bool bIgnoreOldValue ); css::uno::Reference< css::ucb::XContent > GetContent() const; const OUString& GetPhysicalName() const; - sal_Bool IsRemote(); - sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; } + bool IsRemote(); + bool IsOpen() const; // { return aStorage.Is() || pInStream; } void DownLoad( const Link& aLink = Link()); void SetDoneLink( const Link& rLink ); @@ -147,36 +147,36 @@ public: void AddLog( const OUString& aMessage ); void CloseInStream(); - sal_Bool CloseOutStream(); + bool CloseOutStream(); void CloseStorage(); StreamMode GetOpenMode() const; - void SetOpenMode( StreamMode nStorOpen, sal_Bool bDontClose = sal_False ); + void SetOpenMode( StreamMode nStorOpen, bool bDontClose = false ); SvStream* GetInStream(); SvStream* GetOutStream(); - sal_Bool Commit(); - sal_Bool IsStorage(); + bool Commit(); + bool IsStorage(); - sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ); - void LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ); - void UnlockFile( sal_Bool bReleaseLockStream ); + sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< OUString >& aData, bool bIsLoading, bool bOwnLock ); + void LockOrigFileOnDemand( bool bLoading, bool bNoUI ); + void UnlockFile( bool bReleaseLockStream ); - css::uno::Reference< css::embed::XStorage > GetStorage( sal_Bool bCreateTempIfNo = sal_True ); + css::uno::Reference< css::embed::XStorage > GetStorage( bool bCreateTempIfNo = true ); css::uno::Reference< css::embed::XStorage > GetOutputStorage(); void ResetError(); - sal_Bool UsesCache() const; - void SetUsesCache( sal_Bool ); - sal_Bool IsExpired() const; - void SetName( const OUString& rName, sal_Bool bSetOrigURL = sal_False ); - sal_Bool IsAllowedForExternalBrowser() const; + bool UsesCache() const; + void SetUsesCache( bool ); + bool IsExpired() const; + void SetName( const OUString& rName, bool bSetOrigURL = false ); + bool IsAllowedForExternalBrowser() const; long GetFileVersion() const; const css::uno::Sequence < css::util::RevisionTag >& GetVersionList( bool _bNoReload = false ); - sal_Bool IsReadOnly(); + bool IsReadOnly(); // Whether the medium had originally been opened r/o, independent of later // changes via SetOpenMode; used to keep track of the "true" state of the @@ -185,21 +185,21 @@ public: css::uno::Reference< css::io::XInputStream > GetInputStream(); - void CreateTempFile( sal_Bool bReplace = sal_True ); + void CreateTempFile( bool bReplace = true ); void CreateTempFileNoCopy(); - OUString SwitchDocumentToTempFile(); - sal_Bool SwitchDocumentToFile( const OUString& aURL ); + OUString SwitchDocumentToTempFile(); + bool SwitchDocumentToFile( const OUString& aURL ); - OUString GetBaseURL( bool bForSaving=false ); + OUString GetBaseURL( bool bForSaving=false ); void SetInCheckIn( bool bInCheckIn ); bool IsInCheckIn( ); - SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const; + SAL_DLLPRIVATE bool HasStorage_Impl() const; SAL_DLLPRIVATE void StorageBackup_Impl(); SAL_DLLPRIVATE OUString GetBackup_Impl(); - SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True ); + SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( bool bReadOnly = true ); SAL_DLLPRIVATE void CloseZipStorage_Impl(); // the storage that will be returned by the medium on GetStorage request @@ -208,36 +208,36 @@ public: SAL_DLLPRIVATE css::uno::Reference< css::io::XInputStream > GetInputStream_Impl(); SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl(); SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( css::util::RevisionTag& rVersion ); - SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium ); - SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML ); - SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const OUString& rVersion ); + SAL_DLLPRIVATE bool TransferVersionList_Impl( SfxMedium& rMedium ); + SAL_DLLPRIVATE bool SaveVersionList_Impl( bool bUseXML ); + SAL_DLLPRIVATE bool RemoveVersion_Impl( const OUString& rVersion ); SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime ); SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl(); // Diese Protokolle liefern MIME Typen - SAL_DLLPRIVATE sal_Bool SupportsMIME_Impl() const; + SAL_DLLPRIVATE bool SupportsMIME_Impl() const; SAL_DLLPRIVATE void Init_Impl(); - SAL_DLLPRIVATE void ForceSynchronStream_Impl( sal_Bool bSynchron ); + SAL_DLLPRIVATE void ForceSynchronStream_Impl( bool bSynchron ); SAL_DLLPRIVATE void GetLockingStream_Impl(); SAL_DLLPRIVATE void GetMedium_Impl(); - SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ); + SAL_DLLPRIVATE bool TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ); SAL_DLLPRIVATE void Transfer_Impl(); SAL_DLLPRIVATE void CreateFileStream(); - SAL_DLLPRIVATE void SetUpdatePickList(sal_Bool); - SAL_DLLPRIVATE sal_Bool IsUpdatePickList() const; + SAL_DLLPRIVATE void SetUpdatePickList(bool); + SAL_DLLPRIVATE bool IsUpdatePickList() const; SAL_DLLPRIVATE void SetLongName(const OUString &rName); SAL_DLLPRIVATE const OUString & GetLongName() const; - SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( sal_Bool bSilent, sal_Bool bAllowRO = sal_True ); - SAL_DLLPRIVATE sal_Bool IsPreview_Impl(); + SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( bool bSilent, bool bAllowRO = true ); + SAL_DLLPRIVATE bool IsPreview_Impl(); SAL_DLLPRIVATE void ClearBackup_Impl(); SAL_DLLPRIVATE void Done_Impl( ErrCode ); SAL_DLLPRIVATE void SetPhysicalName_Impl(const OUString& rName); - SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage ); - SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl(); + SAL_DLLPRIVATE void CanDisposeStorage_Impl( bool bDisposeStorage ); + SAL_DLLPRIVATE bool WillDisposeStorageOnClose_Impl(); SAL_DLLPRIVATE void DoBackup_Impl(); SAL_DLLPRIVATE void DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent ); @@ -246,16 +246,16 @@ public: const OUString& aExtension, const OUString& aDestDir ); - SAL_DLLPRIVATE sal_Bool UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent, + SAL_DLLPRIVATE bool UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent, const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv ); - SAL_DLLPRIVATE sal_Bool StorageCommit_Impl(); + SAL_DLLPRIVATE bool StorageCommit_Impl(); - SAL_DLLPRIVATE sal_Bool TransactedTransferForFS_Impl( const INetURLObject& aSource, + SAL_DLLPRIVATE bool TransactedTransferForFS_Impl( const INetURLObject& aSource, const INetURLObject& aDest, const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv ); - SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ); + SAL_DLLPRIVATE bool SignContents_Impl( bool bScriptingContent, const OUString& aODFVersion, bool bHasValidDocumentSignature ); // the following two methods must be used and make sence only during saving currently // TODO/LATER: in future the signature state should be controlled by the medium not by the document @@ -266,10 +266,10 @@ public: static css::uno::Sequence < css::util::RevisionTag > GetVersionList( const css::uno::Reference< css::embed::XStorage >& xStorage ); static OUString CreateTempCopyWithExt( const OUString& aURL ); - static sal_Bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, sal_Bool bAllowAbort ); + static bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, bool bAllowAbort ); - static sal_Bool SetWritableForUserOnly( const OUString& aURL ); - static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter ); + static bool SetWritableForUserOnly( const OUString& aURL ); + static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter ); }; SV_DECL_IMPL_REF( SfxMedium ) diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 19ffcb8b2412..f29988968b1f 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -99,8 +99,8 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ); - virtual void FadeIn( sal_Bool ); - void AutoShow( sal_Bool bShow = sal_True ); + virtual void FadeIn( bool ); + void AutoShow( bool bShow = true ); DECL_LINK(TimerHdl, void *); SAL_DLLPRIVATE void Initialize_Impl(); @@ -108,9 +108,9 @@ public: SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize ); SAL_DLLPRIVATE void Disappear_Impl(); SAL_DLLPRIVATE void Reappear_Impl(); - SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const; - SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True ); - SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned ); + SAL_DLLPRIVATE bool IsAutoHide_Impl() const; + SAL_DLLPRIVATE void AutoShow_Impl( bool bShow = true ); + SAL_DLLPRIVATE void Pin_Impl( bool bPinned ); SAL_DLLPRIVATE void ReleaseChildWindow_Impl(); }; diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 016f94a3f0b7..c971cb93462d 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -82,7 +82,7 @@ namespace sfx2 see getCurrentMacroExecMode */ - virtual sal_Bool + virtual bool setCurrentMacroExecMode( sal_uInt16 ) = 0; /** returns the origin of the document @@ -123,7 +123,7 @@ namespace sfx2 isn't sufficient (e.g. database documents which contain sub documents which can also contain macro/script storages). */ - virtual sal_Bool + virtual bool documentStorageHasMacros() const = 0; /** provides access to the XEmbeddedScripts interface of the document @@ -161,8 +161,8 @@ namespace sfx2 @seealso <sfx2/signaturestate.hxx> */ - virtual sal_Bool - hasTrustedScriptingSignature( sal_Bool bAllowUIToAddAuthor ) = 0; + virtual bool + hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) = 0; /** shows a warning that the document's signature is broken @@ -214,7 +214,7 @@ namespace sfx2 @return <TRUE/>, always */ - sal_Bool allowMacroExecution(); + bool allowMacroExecution(); /** disallows macro execution in the document @@ -223,7 +223,7 @@ namespace sfx2 @return <TRUE/>, always */ - sal_Bool disallowMacroExecution(); + bool disallowMacroExecution(); /** checks whether the document allows executing contained macros. @@ -245,7 +245,7 @@ namespace sfx2 @return <TRUE/> if and only if macro execution in this document is allowed. */ - sal_Bool adjustMacroMode( + bool adjustMacroMode( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ); @@ -267,7 +267,7 @@ namespace sfx2 denying macro execution, in which ->adjustMacroMode will return <FALSE/>, and the next call to isMacroExecutionDisallowed will return <TRUE/>. */ - sal_Bool isMacroExecutionDisallowed() const; + bool isMacroExecutionDisallowed() const; /** determines whether the document actually has a macros library @@ -275,7 +275,7 @@ namespace sfx2 IMacroDocumentAccess::getEmbeddedDocumentScripts().getBasicLibraries) for content. */ - sal_Bool hasMacroLibrary() const; + bool hasMacroLibrary() const; /** determines whether the given document storage has sub storages containing scripts or macros. @@ -284,10 +284,10 @@ namespace sfx2 BeanShell-/JavaScript-/Python-Scripts are stored, and a sub storage named "Basic" (where Basic scripts are stored). */ - static sal_Bool + static bool storageHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage ); - static sal_Bool containerHasBasicMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xContainter ); + static bool containerHasBasicMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xContainter ); /** checks the macro execution mode while loading the document. This must be called when the loading is effectively finished, but before any macro action @@ -310,7 +310,7 @@ namespace sfx2 @see hasMacroLibrary @see IMacroDocumentAccess::checkForBrokenScriptingSignatures */ - sal_Bool + bool checkMacrosOnLoading( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ); diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx index cc3fc4e0ea74..36008bce373f 100644 --- a/include/sfx2/doctempl.hxx +++ b/include/sfx2/doctempl.hxx @@ -48,14 +48,14 @@ class SFX2_DLLPUBLIC SfxDocumentTemplates private: SfxDocTemplate_ImplRef pImp; - SAL_DLLPRIVATE sal_Bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, - sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, sal_Bool bMove ); + SAL_DLLPRIVATE bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, bool bMove ); public: SfxDocumentTemplates(); SfxDocumentTemplates(const SfxDocumentTemplates &); ~SfxDocumentTemplates(); - sal_Bool IsConstructed() { return pImp != NULL; } + bool IsConstructed() { return pImp != NULL; } void Construct(); const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &); @@ -81,18 +81,18 @@ public: int nCount, const OUString& rString); - sal_Bool Copy(sal_uInt16 nTargetRegion, + bool Copy(sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx); - sal_Bool Move(sal_uInt16 nTargetRegion, + bool Move(sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx); - sal_Bool Delete(sal_uInt16 nRegion, sal_uInt16 nIdx); - sal_Bool InsertDir(const OUString &rText, sal_uInt16 nRegion); + bool Delete(sal_uInt16 nRegion, sal_uInt16 nIdx); + bool InsertDir(const OUString &rText, sal_uInt16 nRegion); - sal_Bool InsertTemplate (sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const OUString &rName, const OUString &rPath); + bool InsertTemplate (sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const OUString &rName, const OUString &rPath); /** Change the name of an entry or a directory @@ -107,13 +107,13 @@ public: sal_True if the action could be performed, sal_False otherwise */ - sal_Bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); + bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); - sal_Bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const OUString &rName) const; - sal_Bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, OUString &rName); + bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const OUString &rName) const; + bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, OUString &rName); - sal_Bool GetFull( const OUString& rRegion, const OUString& rName, OUString& rPath ); - sal_Bool GetLogicNames( const OUString& rPath, OUString& rRegion, OUString& rName ) const; + bool GetFull( const OUString& rRegion, const OUString& rName, OUString& rPath ); + bool GetLogicNames( const OUString& rPath, OUString& rRegion, OUString& rName ) const; /** updates the configuration where the document templates structure is stored. @@ -130,7 +130,7 @@ public: <br/> So set <arg>_bSmart</arg> to <TRUE/> to do a check for necessity first. */ - void Update( sal_Bool _bSmart = sal_True ); + void Update( bool _bSmart = true ); }; #endif // #ifndef _SFXDOCTEMPL_HXX |