diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-25 16:42:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-27 13:45:07 +0200 |
commit | 65c3e11ea90964726c7d7671447d12e767167d12 (patch) | |
tree | e20a9eec669bf03258ef90f656f3e57eaf6809b8 /include/framework | |
parent | d4aa726f16899ecc75b5c7c3736f21509e7a4e9c (diff) |
framework: sal_Bool->bool
Change-Id: If3276f184c63e85762fe54ce19655c30e00aeb15
Diffstat (limited to 'include/framework')
-rw-r--r-- | include/framework/addonmenu.hxx | 10 | ||||
-rw-r--r-- | include/framework/addonsoptions.hxx | 8 | ||||
-rw-r--r-- | include/framework/configimporter.hxx | 2 | ||||
-rw-r--r-- | include/framework/framelistanalyzer.hxx | 6 | ||||
-rw-r--r-- | include/framework/interaction.hxx | 2 | ||||
-rw-r--r-- | include/framework/preventduplicateinteraction.hxx | 6 | ||||
-rw-r--r-- | include/framework/statusbarconfiguration.hxx | 4 | ||||
-rw-r--r-- | include/framework/titlehelper.hxx | 2 | ||||
-rw-r--r-- | include/framework/toolboxconfiguration.hxx | 4 | ||||
-rw-r--r-- | include/framework/undomanagerhelper.hxx | 6 |
10 files changed, 25 insertions, 25 deletions
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index 3218cba98e41..d100263d0d24 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -50,9 +50,9 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu ~AddonPopupMenu(); // Check if command URL string has the unique prefix to identify addon popup menus - static sal_Bool IsCommandURLPrefix( const OUString& aCmdURL ); + static bool IsCommandURLPrefix( const OUString& aCmdURL ); - void SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } + void SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } const OUString& GetCommandURL() const { return m_aCommandURL; } protected: @@ -75,12 +75,12 @@ class FWE_DLLPUBLIC AddonMenuManager ADDON_POPUPMENU }; - static sal_Bool HasAddonMenuElements(); + static bool HasAddonMenuElements(); - static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } + static bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } // Check if the context string matches the provided xModel context - static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const OUString& aContext ); + static bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const OUString& aContext ); // Factory method to create different Add-On menu types static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 6f0a0d43ff9a..6f795ca3bc9f 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -190,10 +190,10 @@ class FWE_DLLPUBLIC AddonsOptions @descr Call to retrieve if a addons menu is available - @return sal_True if there is a menu otherwise sal_False + @return true if there is a menu otherwise false *//*-*****************************************************************************************************/ - sal_Bool HasAddonsMenu() const; + bool HasAddonsMenu() const; /*-**************************************************************************************************** @short returns number of addons toolbars @@ -308,8 +308,8 @@ class FWE_DLLPUBLIC AddonsOptions @onerror An empty image *//*-*****************************************************************************************************/ - Image GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; - Image GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const; + Image GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ) const; + Image GetImageFromURL( const OUString& aURL, bool bBig ) const; // private methods diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx index c5552a354592..776c94405db9 100644 --- a/include/framework/configimporter.hxx +++ b/include/framework/configimporter.hxx @@ -33,7 +33,7 @@ namespace framework class FWE_DLLPUBLIC UIConfigurationImporterOOo1x { public: - static sal_Bool ImportCustomToolbars( + static bool ImportCustomToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 >& rContainerFactory, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index 1d132148190d..8c12a093f5c2 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -140,17 +140,17 @@ class FWE_DLLPUBLIC FrameListAnalyzer /** is set to true only, if the reference frame is a hidden one. This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */ - sal_Bool m_bReferenceIsHidden; + bool m_bReferenceIsHidden; /** is set to true only, if the reference frame contains the help component. In this case the member m_xHelp is set to NULL every time. This value is undefined if m_eDetectMode doesn't have set the flag E_HELP! */ - sal_Bool m_bReferenceIsHelp; + bool m_bReferenceIsHelp; /** is set to true only, if the reference frame contains the backing component. In this case the member m_xBackingComponent is set to NULL every time. This value is undefined if m_eDetectMode doesn't have set the flag E_BACKINGCOMPONENT! */ - sal_Bool m_bReferenceIsBacking; + bool m_bReferenceIsBacking; // interface diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index 2855f30edd4b..175a7fc84b55 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -69,7 +69,7 @@ class FWE_DLLPUBLIC RequestFilterSelect public: RequestFilterSelect( const OUString& sURL ); ~RequestFilterSelect(); - sal_Bool isAbort () const; + bool isAbort () const; OUString getFilter() const; com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 0de2d72d424e..4353fc2f4f07 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -224,12 +224,12 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 - the interaction itself, so it can be analyzed further @return [boolean] - sal_True if the queried interaction could be found. - sal_False otherwise. + true if the queried interaction could be found. + false otherwise. @threadsafe yes */ - virtual sal_Bool getInteractionInfo(const css::uno::Type& aInteraction, + virtual bool getInteractionInfo(const css::uno::Type& aInteraction, PreventDuplicateInteraction::InteractionInfo* pReturn ) const; }; diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx index c63e0c33872e..402f56fc936b 100644 --- a/include/framework/statusbarconfiguration.hxx +++ b/include/framework/statusbarconfiguration.hxx @@ -35,12 +35,12 @@ namespace framework class FWE_DLLPUBLIC StatusBarConfiguration { public: - static sal_Bool LoadStatusBar( + static bool LoadStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration ); - static sal_Bool StoreStatusBar( + static bool StoreStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration ); diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 7123de31e4b3..839e57ce30ef 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -187,7 +187,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex It was set from outside and so outside code has to make sure it will be updated. */ - ::sal_Bool m_bExternalTitle; + bool m_bExternalTitle; /** the actual title value */ OUString m_sTitle; diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx index 5bac1c323936..f19410cf0ea6 100644 --- a/include/framework/toolboxconfiguration.hxx +++ b/include/framework/toolboxconfiguration.hxx @@ -34,12 +34,12 @@ namespace framework class FWE_DLLPUBLIC ToolBoxConfiguration { public: - static sal_Bool LoadToolBox( + static bool LoadToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration ); - static sal_Bool StoreToolBox( + static bool StoreToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration ); diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index a82c681cb0b0..d4c12f3f23e8 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -126,8 +126,8 @@ namespace framework void addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock ); void undo( IMutexGuard& i_instanceLock ); void redo( IMutexGuard& i_instanceLock ); - ::sal_Bool isUndoPossible() const; - ::sal_Bool isRedoPossible() const; + bool isUndoPossible() const; + bool isRedoPossible() const; OUString getCurrentUndoActionTitle() const; OUString getCurrentRedoActionTitle() const; ::com::sun::star::uno::Sequence< OUString > @@ -143,7 +143,7 @@ namespace framework // XLockable, base of XUndoManager, equivalents void lock(); void unlock(); - ::sal_Bool isLocked(); + bool isLocked(); // XModifyBroadcaster equivalents void addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& i_listener ); |