diff options
Diffstat (limited to 'framework/inc')
71 files changed, 314 insertions, 314 deletions
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index ab2558ce4388..66e6c1dda593 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -89,17 +89,17 @@ class ActionTriggerPropertySet : private cppu::BaseMutex, // helper - sal_Bool impl_tryToChangeProperty( const OUString& aCurrentValue , + bool impl_tryToChangeProperty( const OUString& aCurrentValue , const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::awt::XBitmap > xBitmap, + bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::awt::XBitmap > xBitmap, const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xInterface, + bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xInterface, const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index a70084c5d2d4..65409a57e8f1 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -87,7 +87,7 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex, // helper - sal_Bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , + bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 2805bcf7fb10..6708edce44ec 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -175,7 +175,7 @@ class CheckedIterator @return True if internalk state E_UNKNOWN - false otherwise. *//*-*****************************************************************************************************/ - inline sal_Bool isUninitialized() + inline bool isUninitialized() { return( m_eEndState == E_UNKNOWN ); } @@ -188,7 +188,7 @@ class CheckedIterator @return True if end reached; false otherwise. *//*-*****************************************************************************************************/ - inline sal_Bool isEnd() + inline bool isEnd() { // Is true if one end state is set! return ( @@ -205,7 +205,7 @@ class CheckedIterator @return True if end multiple reached; false otherwise. *//*-*****************************************************************************************************/ - inline sal_Bool isAfterEnd() + inline bool isAfterEnd() { // Is true only, if special end state is set! return( m_eEndState == E_AFTEREND ); diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 55a20d14bf5e..63cbafb67105 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -86,12 +86,12 @@ class FilterCache : private TransactionBase @descr Call this methods to get information about the state of the current cache. *//*-*****************************************************************************************************/ - sal_Bool isValidOrRepairable() const; - sal_Bool hasTypes () const; - sal_Bool hasFilters () const; - sal_Bool hasDetectors () const; - sal_Bool hasLoaders () const; - sal_Bool hasContentHandlers () const; + bool isValidOrRepairable() const; + bool hasTypes () const; + bool hasFilters () const; + bool hasDetectors () const; + bool hasLoaders () const; + bool hasContentHandlers () const; /*-**************************************************************************************************** @short search routines to find items which match given parameter @@ -115,27 +115,27 @@ class FilterCache : private TransactionBase @onerror We return false. *//*-*****************************************************************************************************/ - sal_Bool searchType ( const OUString& sURL , - const OUString& sMediaType , - const OUString& sClipboardFormat , - CheckedTypeIterator& aStartEntry , - OUString& sResult ) const; + bool searchType ( const OUString& sURL , + const OUString& sMediaType , + const OUString& sClipboardFormat , + CheckedTypeIterator& aStartEntry , + OUString& sResult ) const; - sal_Bool searchFilterForType ( const OUString& sInternalTypeName , - CheckedStringListIterator& aStartEntry , - OUString& sResult ) const; + bool searchFilterForType ( const OUString& sInternalTypeName , + CheckedStringListIterator& aStartEntry , + OUString& sResult ) const; - sal_Bool searchDetectorForType ( const OUString& sInternalTypeName , - CheckedStringListIterator& aStartEntry , - OUString& sResult ) const; + bool searchDetectorForType ( const OUString& sInternalTypeName , + CheckedStringListIterator& aStartEntry , + OUString& sResult ) const; - sal_Bool searchLoaderForType ( const OUString& sInternalTypeName , - CheckedStringListIterator& aStartEntry , - OUString& sResult ) const; + bool searchLoaderForType ( const OUString& sInternalTypeName , + CheckedStringListIterator& aStartEntry , + OUString& sResult ) const; - sal_Bool searchContentHandlerForType ( const OUString& sInternalTypeName , - CheckedStringListIterator& aStartEntry , - OUString& sResult ) const; + bool searchContentHandlerForType ( const OUString& sInternalTypeName , + CheckedStringListIterator& aStartEntry , + OUString& sResult ) const; /*-**************************************************************************************************** @short get all properties of a cache entry by given name @@ -169,11 +169,11 @@ class FilterCache : private TransactionBase Loader getLoader ( const OUString& sName ) const; ContentHandler getContentHandler ( const OUString& sName ) const; - sal_Bool existsType ( const OUString& sName ) const; - sal_Bool existsFilter ( const OUString& sName ) const; - sal_Bool existsDetector ( const OUString& sName ) const; - sal_Bool existsLoader ( const OUString& sName ) const; - sal_Bool existsContentHandler ( const OUString& sName ) const; + bool existsType ( const OUString& sName ) const; + bool existsFilter ( const OUString& sName ) const; + bool existsDetector ( const OUString& sName ) const; + bool existsLoader ( const OUString& sName ) const; + bool existsContentHandler ( const OUString& sName ) const; /*-**************************************************************************************************** @short support special query modes @@ -237,48 +237,48 @@ class FilterCache : private TransactionBase @onerror We return false then. *//*-*****************************************************************************************************/ - sal_Bool addFilter ( const OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties , - sal_Bool bException ) throw(css::container::ElementExistException , + bool addFilter ( const OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties , + bool bException ) throw(css::container::ElementExistException , css::registry::InvalidRegistryException); - sal_Bool replaceFilter( const OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties , - sal_Bool bException ) throw(css::container::NoSuchElementException , + bool replaceFilter( const OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties , + bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool removeFilter ( const OUString& sName , - sal_Bool bException ) throw(css::container::NoSuchElementException , + bool removeFilter ( const OUString& sName , + bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool addType ( const OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties , - sal_Bool bException ) throw(css::container::ElementExistException , + bool addType ( const OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties , + bool bException ) throw(css::container::ElementExistException , css::registry::InvalidRegistryException); - sal_Bool replaceType ( const OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties , - sal_Bool bException ) throw(css::container::NoSuchElementException , + bool replaceType ( const OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties , + bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool removeType ( const OUString& sName , - sal_Bool bException ) throw(css::container::NoSuchElementException , + bool removeType ( const OUString& sName , + bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool addDetector ( const OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties , - sal_Bool bException ) throw(css::container::ElementExistException , + bool addDetector ( const OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties , + bool bException ) throw(css::container::ElementExistException , css::registry::InvalidRegistryException); - sal_Bool replaceDetector( const OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties , - sal_Bool bException ) throw(css::container::NoSuchElementException , + bool replaceDetector( const OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties , + bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool removeDetector ( const OUString& sName , - sal_Bool bException ) throw(css::container::NoSuchElementException , + bool removeDetector ( const OUString& sName , + bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool validateAndRepair(); - sal_Bool validateAndRepairTypes(); - sal_Bool validateAndRepairFilter(); - sal_Bool validateAndRepairDetectors(); - sal_Bool validateAndRepairLoader(); - sal_Bool validateAndRepairHandler(); + bool validateAndRepair(); + bool validateAndRepairTypes(); + bool validateAndRepairFilter(); + bool validateAndRepairDetectors(); + bool validateAndRepairLoader(); + bool validateAndRepairHandler(); // private variables diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index beb5e67016c6..da342fcaf471 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -88,7 +88,7 @@ struct FileType inline void impl_clear() { - bPreferred = sal_False; + bPreferred = false; sName = OUString(); sMediaType = OUString(); sClipboardFormat = OUString(); @@ -115,11 +115,11 @@ struct FileType public: - sal_Bool bPreferred; - OUString sName; + bool bPreferred; + OUString sName; OUStringHashMap lUINames; - OUString sMediaType; - OUString sClipboardFormat; + OUString sMediaType; + OUString sClipboardFormat; sal_Int32 nDocumentIconID; OUStringList lURLPattern; OUStringList lExtensions; @@ -386,10 +386,10 @@ class PerformanceHash : public ::boost::unordered_map< OUString // and could be used for further searches again, which should be started at next element! // We stop search at the end of hash. You can start it again by setting it to the begin by himself. - inline sal_Bool findPatternKey( const OUString& sSearchValue , + inline bool findPatternKey( const OUString& sSearchValue , const_iterator& pStepper ) { - sal_Bool bFound = sal_False; + bool bFound = false; // If this is the forst call - start search on first element. // Otherwise start search on further elements! @@ -400,14 +400,14 @@ class PerformanceHash : public ::boost::unordered_map< OUString while( ( pStepper != end() ) && - ( bFound == sal_False ) + ( bFound == false ) ) { bFound = Wildcard::match( sSearchValue, pStepper->first ); // If element was found - break loop by setting right return value // and don't change "pStepper". He must point to found element! // Otherwise step to next one. - if( bFound == sal_False ) + if( bFound == false ) ++pStepper; } return bFound; @@ -464,41 +464,41 @@ class DataContainer void startListener(); void stopListener (); - sal_Bool isModified(); + bool isModified(); void free(); - sal_Bool isValidOrRepairable () const; - sal_Bool validateAndRepair (); - sal_Bool validateAndRepairTypes (); - sal_Bool validateAndRepairFilter (); - sal_Bool validateAndRepairDetectors(); - sal_Bool validateAndRepairLoader (); - sal_Bool validateAndRepairHandler (); - - sal_Bool existsType ( const OUString& sName ); - sal_Bool existsFilter ( const OUString& sName ); - sal_Bool existsDetector ( const OUString& sName ); - sal_Bool existsLoader ( const OUString& sName ); - sal_Bool existsContentHandler ( const OUString& sName ); - - void addType ( const FileType& aType , sal_Bool bSetModified ); - void addFilter ( const Filter& aFilter , sal_Bool bSetModified ); - void addDetector ( const Detector& aDetector, sal_Bool bSetModified ); - void addLoader ( const Loader& aLoader , sal_Bool bSetModified ); - void addContentHandler ( const ContentHandler& aHandler , sal_Bool bSetModified ); - - void replaceType ( const FileType& aType , sal_Bool bSetModified ); - void replaceFilter ( const Filter& aFilter , sal_Bool bSetModified ); - void replaceDetector ( const Detector& aDetector, sal_Bool bSetModified ); - void replaceLoader ( const Loader& aLoader , sal_Bool bSetModified ); - void replaceContentHandler( const ContentHandler& aHandler , sal_Bool bSetModified ); - - void removeType ( const OUString& sName , sal_Bool bSetModified ); - void removeFilter ( const OUString& sName , sal_Bool bSetModified ); - void removeDetector ( const OUString& sName , sal_Bool bSetModified ); - void removeLoader ( const OUString& sName , sal_Bool bSetModified ); - void removeContentHandler ( const OUString& sName , sal_Bool bSetModified ); + bool isValidOrRepairable () const; + bool validateAndRepair (); + bool validateAndRepairTypes (); + bool validateAndRepairFilter (); + bool validateAndRepairDetectors(); + bool validateAndRepairLoader (); + bool validateAndRepairHandler (); + + bool existsType ( const OUString& sName ); + bool existsFilter ( const OUString& sName ); + bool existsDetector ( const OUString& sName ); + bool existsLoader ( const OUString& sName ); + bool existsContentHandler ( const OUString& sName ); + + void addType ( const FileType& aType , bool bSetModified ); + void addFilter ( const Filter& aFilter , bool bSetModified ); + void addDetector ( const Detector& aDetector, bool bSetModified ); + void addLoader ( const Loader& aLoader , bool bSetModified ); + void addContentHandler ( const ContentHandler& aHandler , bool bSetModified ); + + void replaceType ( const FileType& aType , bool bSetModified ); + void replaceFilter ( const Filter& aFilter , bool bSetModified ); + void replaceDetector ( const Detector& aDetector, bool bSetModified ); + void replaceLoader ( const Loader& aLoader , bool bSetModified ); + void replaceContentHandler( const ContentHandler& aHandler , bool bSetModified ); + + void removeType ( const OUString& sName , bool bSetModified ); + void removeFilter ( const OUString& sName , bool bSetModified ); + void removeDetector ( const OUString& sName , bool bSetModified ); + void removeLoader ( const OUString& sName , bool bSetModified ); + void removeContentHandler ( const OUString& sName , bool bSetModified ); static void convertFileTypeToPropertySequence ( const FileType& aSource , css::uno::Sequence< css::beans::PropertyValue >& lDestination , @@ -555,11 +555,11 @@ class DataContainer PreferredHash m_aPreferredTypesCache; /// assignment of extensions to preferred types for it Loader m_aGenericLoader; /// information about our default frame loader OUString m_sLocale; /// current set locale of configuration to handle right UIName from set of all UINames! - sal_Bool m_bTypesModified; - sal_Bool m_bFiltersModified; - sal_Bool m_bDetectorsModified; - sal_Bool m_bLoadersModified; - sal_Bool m_bHandlersModified; + bool m_bTypesModified; + bool m_bFiltersModified; + bool m_bDetectorsModified; + bool m_bLoadersModified; + bool m_bHandlersModified; }; /*-************************************************************************************************************ @@ -626,11 +626,11 @@ class FilterCFGAccess : public ::utl::ConfigItem // debug checks private: - static sal_Bool implcp_ctor ( const OUString& sPath , // methods to check incoming parameter on our interface methods! + static bool implcp_ctor ( const OUString& sPath , // methods to check incoming parameter on our interface methods! sal_Int32 nVersion , sal_Int16 nMode ); - static sal_Bool implcp_read ( const DataContainer& rData ); - static sal_Bool implcp_write( const DataContainer& rData ); + static bool implcp_read ( const DataContainer& rData ); + static bool implcp_write( const DataContainer& rData ); // member diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index f8a2990e29e5..b7b2381e4dbe 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -82,7 +82,7 @@ class FrameContainer css::uno::Reference< css::frame::XFrame > getActive ( ) const; /// checks and free memory - sal_Bool exist ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; + bool exist ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; void clear ( ); /// deprecated IndexAccess! diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index 194bc69a51c5..ea450142077d 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -59,7 +59,7 @@ private: css::uno::Reference< css::awt::XContainerWindowProvider > m_xWinProvider; void CreateDialog(); - sal_Bool CallMethod( const OUString& rMethod ); + bool CallMethod( const OUString& rMethod ); public: FwkTabPage( diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 549948e53128..5f23d3d65fa7 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -50,8 +50,8 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference< css::frame::XFrame >& rFrame, Menu* pMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + bool bDelete, + bool bDeleteChildren ); virtual ~MenuManager(); @@ -71,7 +71,7 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener static void FillMenuImages( css::uno::Reference< css::frame::XFrame >& xFrame, Menu* _pMenu, - sal_Bool bShowMenuImages + bool bShowMenuImages ); protected: @@ -84,7 +84,7 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener void UpdateSpecialWindowMenu( Menu* pMenu ); void ClearMenuDispatch(const css::lang::EventObject& Source = css::lang::EventObject(),bool _bRemoveOnly = true); void SetHdl(); - void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren); + void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,bool _bDelete,bool _bDeleteChildren); sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; struct MenuItemHandler @@ -108,12 +108,12 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); - sal_Bool m_bInitialized; - sal_Bool m_bDeleteMenu; - sal_Bool m_bDeleteChildren; - sal_Bool m_bActive; - sal_Bool m_bIsBookmarkMenu; - sal_Bool m_bShowMenuImages; + bool m_bInitialized; + bool m_bDeleteMenu; + bool m_bDeleteChildren; + bool m_bActive; + bool m_bIsBookmarkMenu; + bool m_bShowMenuImages; OUString m_aMenuItemCommand; Menu* m_pVCLMenu; css::uno::Reference< css::frame::XFrame > m_xFrame; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 2dadf978f1e0..f6c23546a3af 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -60,7 +60,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet ListenerHash m_lSimpleChangeListener; ListenerHash m_lVetoChangeListener; - sal_Bool m_bReleaseLockOnCall; + bool m_bReleaseLockOnCall; // hold it weak ... otherwise this helper has to be "killed" explicitly .-) css::uno::WeakReference< css::uno::XInterface > m_xBroadcaster; @@ -82,7 +82,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet */ PropertySetHelper( osl::Mutex & mutex, TransactionManager* pExternalTransactionManager , - sal_Bool bReleaseLockOnCall ); + bool bReleaseLockOnCall ); /** free all needed memory. */ @@ -200,7 +200,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet /* internal helper */ private: - sal_Bool impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent); + bool impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent); void impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent); }; diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 9070e15ffff2..40539bdd0759 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -114,8 +114,8 @@ class FWI_DLLPUBLIC HandlerCache HandlerCache(); virtual ~HandlerCache(); - sal_Bool search( const OUString& sURL, ProtocolHandler* pReturn ) const; - sal_Bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const; + bool search( const OUString& sURL, ProtocolHandler* pReturn ) const; + bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const; void takeOver(HandlerHash* pHandler, PatternHash* pPattern); }; diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 16705d1ea640..bfa20500c7f6 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -103,9 +103,9 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, private: void FillContainer(); - sal_Bool m_bContainerCreated; - sal_Bool m_bContainerChanged; - sal_Bool m_bInContainerCreation; + bool m_bContainerCreated; + bool m_bContainerChanged; + bool m_bInContainerCreation; const Menu* m_pMenu; const OUString* m_pMenuIdentifier; }; diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index d8631b876e76..e51602d1f455 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -55,7 +55,7 @@ class TaskCreator virtual ~TaskCreator( ); css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName , - sal_Bool bVisible ); + bool bVisible ); // helper private: diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index e1499ed5fc33..758fcae8fb27 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -63,12 +63,12 @@ class Wildcard @descr You can use wildcards in pattern only! @param "sText" is the text, in which we search given pattern. @param "sPattern" is the searched pattern with includes wildcards. - @return sal_True , if pattern was found. - @return sal_False, if pattern don't match the text. + @return true , if pattern was found. + @return false, if pattern don't match the text. *//*-*****************************************************************************************************/ - static sal_Bool match( const OUString& sText , - const OUString& sPattern ); + static bool match( const OUString& sText , + const OUString& sPattern ); }; // class Wildcard diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 0ac4621f8da7..d338cc0e1644 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -185,10 +185,10 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< @return [boolean] sal_True if closing was successfully. */ - sal_Bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , - sal_Bool bAllowSuspend , - sal_Bool bCloseAllOtherViewsToo, - sal_Bool& bControllerSuspended ); + bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , + bool bAllowSuspend , + bool bCloseAllOtherViewsToo, + bool& bControllerSuspended ); /** @short close the member m_xCloseFrame. @@ -204,7 +204,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< @return [bool] sal_True if closing was successfully. */ - sal_Bool implts_closeFrame(); + bool implts_closeFrame(); /** @short set the special BackingComponent (now StartModule) as new component of our m_xCloseFrame. @@ -212,7 +212,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< @return [bool] sal_True if operation was successfully. */ - sal_Bool implts_establishBackingMode(); + bool implts_establishBackingMode(); /** @short calls XDesktop->terminate(). @@ -225,7 +225,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< @return [bool] sal_True if termination of the application was started ... */ - sal_Bool implts_terminateApplication(); + bool implts_terminateApplication(); /** @short notify a DispatchResultListener. diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 8f15e13be11a..dadcfd3a3db2 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -110,7 +110,7 @@ class DispatchProvider : private TransactionBase , const css::uno::Reference< css::frame::XFrame >& xOwner , const OUString& sTarget = OUString() , sal_Int32 nSearchFlags = 0 ); - sal_Bool implts_isLoadableContent ( const css::util::URL& aURL ); + bool implts_isLoadableContent ( const css::util::URL& aURL ); css::uno::Reference< css::frame::XDispatch > implts_queryDesktopDispatch ( const css::uno::Reference< css::frame::XFrame > xDesktop , const css::util::URL& aURL , const OUString& sTargetFrameName , diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 199c47e2de4b..af39e0284a28 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -145,7 +145,7 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< /** @short it regulates, which interceptor is used first. The last or the first registered one. */ - static sal_Bool m_bPreferrFirstInterceptor; + static bool m_bPreferrFirstInterceptor; // native interface diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 000011ae9ec7..5ab7a8b98721 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -92,7 +92,7 @@ class MailToDispatcher : public ::cppu::WeakImplHelper3< /* internal */ private: - sal_Bool implts_dispatch( const css::util::URL& aURL , + bool implts_dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); }; // class MailToDispatcher diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 48abdd4f8b52..4fa20001ac05 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -167,7 +167,7 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< /*-**************************************************************************************************** *//*-*****************************************************************************************************/ - sal_Bool impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource = sal_False ); + bool impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource = false ); /*-**************************************************************************************************** *//*-*****************************************************************************************************/ @@ -183,8 +183,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< css::uno::Reference< css::uno::XComponentContext > m_xContext; /// factory shared with our owner to create new services! osl::Mutex m_mutex; IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs - sal_Bool m_bAlreadyDisposed; /// Protection against multiple disposing calls. - sal_Bool m_bActivateListener; /// dispatcher is listener for frame activation + bool m_bAlreadyDisposed; /// Protection against multiple disposing calls. + bool m_bActivateListener; /// dispatcher is listener for frame activation MenuManager* m_pMenuManager; /// menu manager controlling menu dispatches }; // class MenuDispatcher diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 82b501588d14..7c2c4e74283b 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -136,8 +136,8 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper5< css::uno::Reference< css::uno::XComponentContext > m_xContext; /// factory shared with our owner to create new services! osl::Mutex m_mutex; IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs - sal_Bool m_bAlreadyDisposed; /// Protection against multiple disposing calls. - sal_Bool m_bActivateListener; /// dispatcher is listener for frame activation + bool m_bAlreadyDisposed; /// Protection against multiple disposing calls. + bool m_bActivateListener; /// dispatcher is listener for frame activation }; // class PopupMenuDispatcher diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 5bbc3d0e01c7..beee6407b967 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -121,14 +121,14 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< /** @short check if StartModule can be shown. */ - sal_Bool implts_isBackingModePossible(); + bool implts_isBackingModePossible(); /** @short open the special BackingComponent (now StartModule) @return [bool] sal_True if operation was successfully. */ - sal_Bool implts_establishBackingMode(); + bool implts_establishBackingMode(); /** @short notify a DispatchResultListener. diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index a8548b38d2ee..40e72c13eb08 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -131,7 +131,7 @@ FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame ,OUString& _rModuleIdentifier - ,sal_Bool& _rIni + ,bool& _rIni ,const sal_Char* _pName); FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems, diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 82dc392a319a..6c634692d800 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -178,7 +178,7 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co private: - static sal_Bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner ); + static bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner ); // variables // (should be private everyway!) diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index d05d798af598..d12d45a6a406 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -162,8 +162,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star private: - static sal_Bool impldbg_checkParameter_OComponentEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); - static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); + static bool impldbg_checkParameter_OComponentEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); + static bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); // variables // (should be private everyway!) diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 010ae1ba4482..5e1bc562e0c1 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -211,11 +211,11 @@ class OFrames : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr *//*-*****************************************************************************************************/ private: - static sal_Bool impldbg_checkParameter_OFramesCtor ( const css::uno::Reference< css::frame::XFrame >& xOwner , + static bool impldbg_checkParameter_OFramesCtor ( const css::uno::Reference< css::frame::XFrame >& xOwner , FrameContainer* pFrameContainer ); - static sal_Bool impldbg_checkParameter_append ( const css::uno::Reference< css::frame::XFrame >& xFrame ); - static sal_Bool impldbg_checkParameter_remove ( const css::uno::Reference< css::frame::XFrame >& xFrame ); - static sal_Bool impldbg_checkParameter_queryFrames ( sal_Int32 nSearchFlags ); + static bool impldbg_checkParameter_append ( const css::uno::Reference< css::frame::XFrame >& xFrame ); + static bool impldbg_checkParameter_remove ( const css::uno::Reference< css::frame::XFrame >& xFrame ); + static bool impldbg_checkParameter_queryFrames ( sal_Int32 nSearchFlags ); // variables // (should be private everyway!) @@ -223,7 +223,7 @@ class OFrames : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr private: css::uno::WeakReference< css::frame::XFrame > m_xOwner; /// reference to owner of this instance (Hold no hard reference!) FrameContainer* m_pFrameContainer; /// with owner shared list to hold all direct children of an XFramesSupplier - sal_Bool m_bRecursiveSearchProtection; /// flag to protect against recursive searches of frames at parents + bool m_bRecursiveSearchProtection; /// flag to protect against recursive searches of frames at parents }; diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 439e46d8e6df..e6691279abf4 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -68,7 +68,7 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2< css::uno::WeakReference< css::frame::XFrame > m_xFrame; /// we call SetWindowState one times only for the same frame! - sal_Bool m_bWindowStateAlreadySet; + bool m_bWindowStateAlreadySet; // interface diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 47d3ce058353..4778abf14da3 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -115,7 +115,7 @@ struct IndicatorInfo are not interesting then. Because mor then one child indicator can use the same values ... */ - sal_Bool operator==(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator) + bool operator==(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator) { return (m_xIndicator == xIndicator); } @@ -179,13 +179,13 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< There we set this member m_bAllowReschedule to sal_True. Next time if our impl_reschedule() method is called, we know, that an Application::Reschedule() should be made. Because the last made Reschedule can be was taken long time ago ... may be.*/ - sal_Bool m_bAllowReschedule; + bool m_bAllowReschedule; /** enable/disable automatic showing of our parent window. */ - sal_Bool m_bAllowParentShow; + bool m_bAllowParentShow; /** enable/disable rescheduling. Default=enabled*/ - sal_Bool m_bDisableReschedule; + bool m_bDisableReschedule; /** prevent recursive calling of Application::Reschedule(). */ static sal_Int32 m_nInReschedule; @@ -291,7 +291,7 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< @param Overwrites our algorithm for Reschedule and force it to be shure that our progress was painted right. */ - void impl_reschedule(sal_Bool bForceUpdate); + void impl_reschedule(bool bForceUpdate); void impl_startWakeUpThread(); void impl_stopWakeUpThread(); diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index b62a881bb5c8..2089cf3295d6 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -117,7 +117,7 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3< sal_True in casee module could be identified and all needed values could be read. sal_False otherwise. */ - sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, + bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ); /** @short set a new icon and title on the title bar of our connected frame window. diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index bf631c26977d..a672a9f6b07f 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -106,7 +106,7 @@ class UIElementWrapperBase : private cppu::BaseMutex, OUString m_aResourceURL; com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame > m_xWeakFrame; sal_Int16 m_nType; - sal_Bool m_bInitialized : 1, + bool m_bInitialized : 1, m_bDisposed; }; diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index c2456c15e7cb..e5d623bef4ff 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -108,7 +108,7 @@ class QuietInteraction : public ::cppu::WeakImplHelper1< @threadsafe yes */ - sal_Bool wasUsed() const; + bool wasUsed() const; }; } // namespace framework diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 7234a236b385..1df5e344c08a 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -144,7 +144,7 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS sal_True if the given URL is any default one ... sal_False otherwise. */ - sal_Bool its_isHelpUrlADefaultOne(const OUString& sHelpURL); + bool its_isHelpUrlADefaultOne(const OUString& sHelpURL); /** @short checks, if the help module should be shown automaticly for the currently opened office module. diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index 6cbc8bbc069e..32e6f4d72ce4 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -142,17 +142,17 @@ class Job : public ::cppu::WeakImplHelper3< The used references are not really enough to detect a valid listener connection. Thats why we use this additional information here too. */ - sal_Bool m_bListenOnDesktop; - sal_Bool m_bListenOnFrame; - sal_Bool m_bListenOnModel; + bool m_bListenOnDesktop; + bool m_bListenOnFrame; + bool m_bListenOnModel; /** In case we got a close request from our desktop/frame/model (on which we listen) ... and the ownership was delivered there ... we have to close ourself and this object in case the internal wrapped and running job finish his work. */ - sal_Bool m_bPendingCloseFrame; - sal_Bool m_bPendingCloseModel; + bool m_bPendingCloseFrame; + bool m_bPendingCloseModel; /** indicates in which state the internal job currently exist. diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 4bbf0fa7186b..9a575e5c4248 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -192,8 +192,8 @@ class JobData css::uno::Sequence< css::beans::NamedValue > getConfig () const; css::uno::Sequence< css::beans::NamedValue > getJobConfig () const; - sal_Bool hasConfig () const; - sal_Bool hasCorrectContext ( const OUString& rModuleIdent ) const; + bool hasConfig () const; + bool hasCorrectContext ( const OUString& rModuleIdent ) const; void setEnvironment ( EEnvironment eEnvironment ); void setAlias ( const OUString& sAlias ); diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index 064bf5c7b159..33b5049eb0da 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -90,7 +90,7 @@ class JobResult But we provide this information here only. Doing so is part of any user of us. */ - sal_Bool m_bDeactivate; + bool m_bDeactivate; /** represent the part "DispatchResult" @@ -111,7 +111,7 @@ class JobResult void operator=( const JobResult& rCopy ); - sal_Bool existPart ( sal_uInt32 eParts ) const; + bool existPart ( sal_uInt32 eParts ) const; css::uno::Sequence< css::beans::NamedValue > getArguments ( ) const; css::frame::DispatchResultEvent getDispatchResult( ) const; }; diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index 1312967ad109..afbd15e90856 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -103,16 +103,16 @@ class JobURL public: JobURL ( const OUString& sURL ); - sal_Bool isValid ( ) const; - sal_Bool getEvent ( OUString& sEvent ) const; - sal_Bool getAlias ( OUString& sAlias ) const; - sal_Bool getService ( OUString& sService ) const; + bool isValid ( ) const; + bool getEvent ( OUString& sEvent ) const; + bool getAlias ( OUString& sAlias ) const; + bool getService ( OUString& sService ) const; // private helper private: - static sal_Bool implst_split( const OUString& sPart , + static bool implst_split( const OUString& sPart , const sal_Char* pPartIdentifier , sal_Int32 nPartLength , OUString& rPartValue , diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 328591d3a46e..7ec6c21b2bcc 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -125,9 +125,9 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic @return sal_True if command was executed successfully; sal_False otherwise. */ - sal_Bool impl_execute(const OUString& sCommand , + bool impl_execute(const OUString& sCommand , const css::uno::Sequence< OUString >& lArguments , - sal_Bool bCheckExitCode); + bool bCheckExitCode); }; } // namespace framework diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 689f724af00b..18933981399f 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -255,12 +255,12 @@ class PropHelper * @return <True/> if value of this property will be changed; <False/> otherwise. */ - static sal_Bool willPropertyBeChanged( const css::uno::Any& aCurrentValue , + static bool willPropertyBeChanged( const css::uno::Any& aCurrentValue , const css::uno::Any& aNewValue , css::uno::Any& aOldValue , css::uno::Any& aChangedValue ) { - sal_Bool bChanged = sal_False; + bool bChanged = sal_False; // clear return parameter to be shure, to put out only valid values ... aOldValue.clear(); diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 982dd7c08c00..9857388e9118 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -122,9 +122,9 @@ class ProtocolCheck It should be used instead of specifyProtocol() if only this question is interesting to perform the code. We must not check for all possible protocols here... */ - static sal_Bool isProtocol( const OUString& sURL, EProtocol eRequired ) + static bool isProtocol( const OUString& sURL, EProtocol eRequired ) { - sal_Bool bRet = sal_False; + bool bRet = sal_False; switch(eRequired) { case E_PRIVATE: diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 4ba853cf0840..52ffe1fe1e31 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -323,15 +323,15 @@ class QueryAnalyzer sal_uInt32 getIFlags () const { return m_nIFlags; } sal_uInt32 getEFlags () const { return m_nEFlags; } ESortProp getSortProp () const { return m_eSortProp; } - sal_Bool getDescending () const { return m_bDescending; } - sal_Bool getCaseSensitive() const { return m_bCaseSensitive; } - sal_Bool getUseOrder () const { return m_bUseOrder; } - sal_Bool getDefaultFirst () const { return m_bDefaultFirst; } + bool getDescending () const { return m_bDescending; } + bool getCaseSensitive() const { return m_bCaseSensitive; } + bool getUseOrder () const { return m_bUseOrder; } + bool getDefaultFirst () const { return m_bDefaultFirst; } // this method checks if given string match any supported query. // (ignore additional parameters!) - static sal_Bool isQuery( const OUString& sQuery ) + static bool isQuery( const OUString& sQuery ) { return( sQuery.startsWith("_query_") || // new style @@ -344,10 +344,10 @@ class QueryAnalyzer sal_uInt32 m_nIFlags; sal_uInt32 m_nEFlags; ESortProp m_eSortProp; - sal_Bool m_bDescending; - sal_Bool m_bCaseSensitive; - sal_Bool m_bUseOrder; - sal_Bool m_bDefaultFirst; + bool m_bDescending; + bool m_bCaseSensitive; + bool m_bUseOrder; + bool m_bDefaultFirst; }; // class QueryAnalyzer diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 0f03a48c06b4..80128e748d9d 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -88,7 +88,7 @@ class DispatchRecorder private: void SAL_CALL implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - sal_Bool bAsComment, OUStringBuffer& ); + bool bAsComment, OUStringBuffer& ); void SAL_CALL AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer ); }; // class DispatcRecorder diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 4a687dd20e83..e8bcf35171c7 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -343,7 +343,7 @@ class Desktop : private cppu::BaseMutex, * @see impl_sendCancelTerminationEvent() */ void impl_sendQueryTerminationEvent(TTerminateListenerList& lCalledListener, - sal_Bool& bVeto ); + bool& bVeto ); /** calls cancelTermination() on every termination listener * where queryTermination() was called before. @@ -383,17 +383,17 @@ class Desktop : private cppu::BaseMutex, * * @return true if all frames could be closed; false otherwise. */ - sal_Bool impl_closeFrames(sal_Bool bAllowUI); + bool impl_closeFrames(bool bAllowUI); // debug methods // (should be private everytime!) private: - static sal_Bool implcp_addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ); - static sal_Bool implcp_removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ); + static bool implcp_addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ); + static bool implcp_removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ); - sal_Bool m_bIsTerminated; /// check flag to protect us against dispose before terminate! + bool m_bIsTerminated; /// check flag to protect us against dispose before terminate! /// see dispose() for further information! // variables @@ -409,10 +409,10 @@ class Desktop : private cppu::BaseMutex, ELoadState m_eLoadState; /// hold information about state of asynchron loading of component for loadComponentFromURL()! css::uno::Reference< css::frame::XFrame > m_xLastFrame; /// last target of "loadComponentFromURL()"! css::uno::Any m_aInteractionRequest; - sal_Bool m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto + bool m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto SvtCommandOptions m_aCommandOptions; /// ref counted class to support disabling commands defined by configuration file - OUString m_sName; - OUString m_sTitle; + OUString m_sName; + OUString m_sTitle; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier; /** special terminate listener to close pipe and block external requests diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 469fa4605fa2..88e3364b19b5 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -176,7 +176,7 @@ namespace framework virtual void requestLayout( Hint eHint ) SAL_OVERRIDE; /// Reading of settings - shared with ToolbarLayoutManager. - static sal_Bool readWindowStateData( const OUString& rName, UIElement& rElementData, + static bool readWindowStateData( const OUString& rName, UIElement& rElementData, const css::uno::Reference< css::container::XNameAccess > &rPersistentWindowState, GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings, const css::uno::Reference< css::uno::XComponentContext > &rComponentContext ); @@ -191,43 +191,43 @@ namespace framework // menu bar void impl_clearUpMenuBar(); - void implts_reset( sal_Bool bAttach ); + void implts_reset( bool bAttach ); void implts_updateMenuBarClose(); - sal_Bool implts_resetMenuBar(); + bool implts_resetMenuBar(); // locking void implts_lock(); - sal_Bool implts_unlock(); + bool implts_unlock(); // query ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName ); void implts_writeNewStateData( const OUString& aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow ); - sal_Bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData ); + bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData ); void implts_writeWindowStateData( const OUString& rName, const UIElement& rElementData ); void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow ); void implts_sortUIElements(); void implts_destroyElements(); - void implts_toggleFloatingUIElementsVisibility( sal_Bool bActive ); + void implts_toggleFloatingUIElementsVisibility( bool bActive ); void implts_reparentChildWindows(); ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const OUString& aElementName ); - sal_Bool implts_isEmbeddedLayoutManager() const; + bool implts_isEmbeddedLayoutManager() const; sal_Int16 implts_getCurrentSymbolsSize(); sal_Int16 implts_getCurrentSymbolsStyle(); ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const OUString& aName ); // layouting methods - sal_Bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos ); + bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos ); ::Size implts_getTopBottomDockingAreaSizes(); ::Size implts_getContainerWindowOutputSize(); void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace ); ::com::sun::star::awt::Rectangle implts_calcDockingAreaSizes(); - sal_Bool implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize ); - void implts_doLayout_notify( sal_Bool bOuterResize ); + bool implts_doLayout( bool bForceRequestBorderSpace, bool bOuterResize ); + void implts_doLayout_notify( bool bOuterResize ); // internal methods to control status/progress bar ::Size implts_getStatusBarSize(); @@ -236,11 +236,11 @@ namespace framework void implts_createProgressBar(); void implts_destroyProgressBar(); void implts_setStatusBarPosSize( const ::Point& rPos, const ::Size& rSize ); - sal_Bool implts_showStatusBar( sal_Bool bStoreState=sal_False ); - sal_Bool implts_hideStatusBar( sal_Bool bStoreState=sal_False ); + bool implts_showStatusBar( bool bStoreState=false ); + bool implts_hideStatusBar( bool bStoreState=false ); void implts_readStatusBarState( const OUString& rStatusBarName ); - sal_Bool implts_showProgressBar(); - sal_Bool implts_hideProgressBar(); + bool implts_showProgressBar(); + bool implts_hideProgressBar(); void implts_backupProgressBarWrapper(); void implts_setOffset( const sal_Int32 nBottomOffset ); @@ -250,9 +250,9 @@ namespace framework void implts_resetInplaceMenuBar() throw (::com::sun::star::uno::RuntimeException); - void implts_setVisibleState( sal_Bool bShow ); - void implts_updateUIElementsVisibleState( sal_Bool bShow ); - void implts_setCurrentUIVisibility( sal_Bool bShow ); + void implts_setVisibleState( bool bShow ); + void implts_updateUIElementsVisibleState( bool bShow ); + void implts_setCurrentUIVisibility( bool bShow ); void implts_notifyListeners( short nEvent, ::com::sun::star::uno::Any aInfoParam ); DECL_LINK( OptionsChanged, void* ); diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 9f601da976f3..9edf5544f03d 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -140,7 +140,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , }; sal_Int32 impl_GetPageIdFromIndex( ::sal_Int32 nIndex ) const; - sal_Bool impl_CheckIndex( ::sal_Int32 nIndex ) const; + bool impl_CheckIndex( ::sal_Int32 nIndex ) const; void implts_LayoutWindows() const; void impl_SetTitle( const OUString& rTitle ); TabControl* impl_GetTabControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xTabControlWindow ) const; @@ -149,7 +149,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , typedef std::vector< sal_uInt16 > PageIdVector; - sal_Bool m_bInitialized : 1, + bool m_bInitialized : 1, m_bDisposed : 1; sal_Int32 m_nNextTabID; OUString m_aTitlePropName; diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index 08ac20332411..b3cc6cd299e9 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -55,8 +55,8 @@ class Gate : public IGate @descr These initialize the object right as an open gate. *//*-*****************************************************************************************************/ inline Gate() - : m_bClosed ( sal_False ) - , m_bGapOpen ( sal_False ) + : m_bClosed ( false ) + , m_bGapOpen ( false ) { open(); } @@ -145,18 +145,18 @@ class Gate : public IGate @onerror We return false. *//*-*****************************************************************************************************/ - virtual sal_Bool wait( const TimeValue* pTimeOut = NULL ) SAL_OVERRIDE + virtual bool wait( const TimeValue* pTimeOut = NULL ) SAL_OVERRIDE { // We must safe access to our internal member! ::osl::ClearableMutexGuard aLock( m_aAccessLock ); // If gate not closed - caller can pass it. - sal_Bool bSuccessful = sal_True; - if( m_bClosed == sal_True ) + bool bSuccessful = true; + if( m_bClosed ) { // Otherwise first new thread must close an open gap! - if( m_bGapOpen == sal_True ) + if( m_bGapOpen ) { - m_bGapOpen = sal_False; + m_bGapOpen = false; m_aPassage.reset(); } // Then we must release used access lock - @@ -176,8 +176,8 @@ class Gate : public IGate ::osl::Mutex m_aAccessLock; ::osl::Condition m_aPassage; - sal_Bool m_bClosed; - sal_Bool m_bGapOpen; + bool m_bClosed; + bool m_bGapOpen; }; // class Gate diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h index 957493c8972a..0eec80743da8 100644 --- a/framework/inc/threadhelp/igate.h +++ b/framework/inc/threadhelp/igate.h @@ -44,7 +44,7 @@ class IGate virtual void open ( ) = 0; virtual void close ( ) = 0; virtual void openGap ( ) = 0; - virtual sal_Bool wait ( const TimeValue* pTimeOut = NULL ) = 0; + virtual bool wait ( const TimeValue* pTimeOut = NULL ) = 0; protected: ~IGate() {} diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h index 0cbb084ab9eb..6e2b013ef4f4 100644 --- a/framework/inc/threadhelp/itransactionmanager.h +++ b/framework/inc/threadhelp/itransactionmanager.h @@ -118,7 +118,7 @@ class ITransactionManager *//*-*****************************************************************************************************/ virtual EWorkingMode getWorkingMode ( ) const = 0; virtual void setWorkingMode ( EWorkingMode eMode ) = 0; - virtual sal_Bool isCallRejected ( ERejectReason& eReason ) const = 0; + virtual bool isCallRejected ( ERejectReason& eReason ) const = 0; virtual void registerTransaction ( EExceptionMode eMode , ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException ) = 0; virtual void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException ) = 0; diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index 8b204aff39fc..e003f5e9c891 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -59,7 +59,7 @@ class FWI_DLLPUBLIC TransactionManager : public ITransactionManager virtual ~TransactionManager ( ); virtual void setWorkingMode ( EWorkingMode eMode ) SAL_OVERRIDE; virtual EWorkingMode getWorkingMode ( ) const SAL_OVERRIDE; - virtual sal_Bool isCallRejected ( ERejectReason& eReason ) const SAL_OVERRIDE; + virtual bool isCallRejected ( ERejectReason& eReason ) const SAL_OVERRIDE; virtual void registerTransaction ( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException ) SAL_OVERRIDE; virtual void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException ) SAL_OVERRIDE; diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index b4809ad5da06..acff40510c39 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -63,8 +63,8 @@ class GlobalSettings }; // settings access - sal_Bool HasStatesInfo( UIElementType eElementType ); - sal_Bool GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); + bool HasStatesInfo( UIElementType eElementType ); + bool GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); private: GlobalSettings(); diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 8f62dc9e1e5b..561ef253f587 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -84,7 +84,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - sal_Bool m_bInitialized : 1, + bool m_bInitialized : 1, m_bDisposed : 1; OUString m_aCommandURL; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index 358565c62211..9b8ddae17d53 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -38,7 +38,7 @@ struct CommandInfo sal_uInt16 nWidth; ::std::vector< sal_uInt16 > aIds; sal_Int16 nImageInfo; - sal_Bool bMirrored : 1, + bool bMirrored : 1, bRotated : 1; }; diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index 1105fc1a2511..b849233e7102 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -89,7 +89,7 @@ class ComplexToolbarController : public svt::ToolboxController ToolBox* m_pToolbar; sal_uInt16 m_nID; - sal_Bool m_bMadeInvisible; + bool m_bMadeInvisible; mutable ::com::sun::star::util::URL m_aURL; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; }; diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index a35ea9b4035c..b7aec23011be 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -56,7 +56,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4< public: ConstItemContainer(); ConstItemContainer( const ItemContainer& rtemContainer ); - ConstItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSourceContainer, sal_Bool bFastCopy = sal_False ); + ConstItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSourceContainer, bool bFastCopy = false ); virtual ~ConstItemContainer(); // XUnoTunnel diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx index 56dbed0087ef..d6fe1f0d9f64 100644 --- a/framework/inc/uielement/genericstatusbarcontroller.hxx +++ b/framework/inc/uielement/genericstatusbarcontroller.hxx @@ -47,8 +47,8 @@ class GenericStatusbarController : public svt::StatusbarController ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - sal_Bool m_bEnabled; - sal_Bool m_bOwnerDraw; + bool m_bEnabled; + bool m_bOwnerDraw; AddonStatusbarItemData *m_pItemData; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > m_xGraphic; }; diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index 84c7f1a72998..c6d867b3b261 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -55,7 +55,7 @@ class GenericToolbarController : public svt::ToolboxController protected: ToolBox* m_pToolbar; sal_uInt16 m_nID; - sal_Bool m_bEnumCommand : 1, + bool m_bEnumCommand : 1, m_bMadeInvisible : 1; OUString m_aEnumCommand; }; diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index bd4556453403..d4f493a127f2 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -50,7 +50,7 @@ class ImageButtonToolbarController : public ComplexToolbarController virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) SAL_OVERRIDE; private: - sal_Bool ReadImageFromURL( sal_Bool bBigImage, const OUString& aImageURL, Image& aImage ); + bool ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ); }; } diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index 03f3c39ff1aa..38246ecea298 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -75,7 +75,7 @@ namespace framework MODE_SetLanguageAllTextMenu }; - sal_Bool m_bShowMenu; + bool m_bShowMenu; OUString m_aLangStatusCommandURL; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xLanguageDispatch; OUString m_aMenuCommandURL_Lang; diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 0861ff160f08..15c343021d26 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -81,16 +81,16 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, AddonMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + bool bDelete, + bool bDeleteChildren ); MenuBarManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, AddonPopupMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + bool bDelete, + bool bDeleteChildren ); public: MenuBarManager( @@ -100,8 +100,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const OUString& aModuleIdentifier, Menu* pMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + bool bDelete, + bool bDeleteChildren ); virtual ~MenuBarManager(); @@ -151,8 +151,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + bool bDelete, + bool bDeleteChildren ); void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); void GetPopupController( PopupControllerCache& rPopupController ); @@ -165,7 +165,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener void RemoveListener(); void RequestImages(); void RetrieveImageManagers(); - static sal_Bool MustBeHidden( PopupMenu* pPopupMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); + static bool MustBeHidden( PopupMenu* pPopupMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); OUString RetrieveLabelFromCommand(const OUString& rCmdURL); private: @@ -178,12 +178,12 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : nItemId( aItemId ), - bCheckHide( sal_True ), + bCheckHide( true ), xSubMenuManager( xManager ), xMenuItemDispatch( rDispatch ) {} sal_uInt16 nItemId; - sal_Bool bCheckHide; + bool bCheckHide; OUString aTargetFrame; OUString aMenuItemURL; OUString aFilter; @@ -207,22 +207,22 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const OUString& aModuleIdentifier ); MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); - sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); + bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); void AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId); sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; - void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false); + void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp = false); void SetHdl(); - sal_Bool m_bDisposed : 1, + bool m_bDisposed : 1, m_bInitialized : 1, m_bDeleteMenu : 1, m_bDeleteChildren : 1, m_bActive : 1, m_bIsBookmarkMenu : 1, m_bShowMenuImages : 1; - sal_Bool m_bRetrieveImages : 1, + bool m_bRetrieveImages : 1, m_bAcceleratorCfg : 1; - sal_Bool m_bModuleIdentified; + bool m_bModuleIdentified; OUString m_aMenuItemCommand; OUString m_aModuleIdentifier; Menu* m_pVCLMenu; diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index e686edd0a5f9..58cfe489131c 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -49,7 +49,7 @@ class MenuBarWrapper : public UIConfigElementWrapperBase, FWK_DECLARE_XTYPEPROVIDER MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); } - void InvalidatePopupControllerCache() { m_bRefreshPopupControllerCache = sal_True; } + void InvalidatePopupControllerCache() { m_bRefreshPopupControllerCache = true; } // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -76,7 +76,7 @@ class MenuBarWrapper : public UIConfigElementWrapperBase, virtual void impl_fillNewData() SAL_OVERRIDE; void fillPopupControllerCache(); - sal_Bool m_bRefreshPopupControllerCache : 1; + bool m_bRefreshPopupControllerCache : 1; com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuBarManager; PopupControllerCache m_aPopupControllerCache; com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 4801c14eac7a..943ef9206fff 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -94,11 +94,11 @@ namespace framework std::vector< KeyCode >& aMenuShortCuts ); void setAccelerators( PopupMenu* pPopupMenu ); void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode ); - void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages ); + void setMenuImages( PopupMenu* pPopupMenu, bool bSetImages ); private: // members - sal_Bool m_bShowImages : 1, + bool m_bShowImages : 1, m_bNewMenu : 1, m_bModuleIdentified : 1, m_bAcceleratorCfg : 1; diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index ac690ee250e1..648754892884 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -43,7 +43,7 @@ class ProgressBarWrapper : public UIElementWrapperBase virtual ~ProgressBarWrapper(); // public interfaces - void setStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rStatusBar, sal_Bool bOwnsInstance = sal_False ); + void setStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rStatusBar, bool bOwnsInstance = false ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getStatusBar() const; // wrapped methods of ::com::sun::star::task::XStatusIndicator @@ -72,7 +72,7 @@ class ProgressBarWrapper : public UIElementWrapperBase private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xStatusBar; // Reference to our status bar XWindow ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xProgressBarIfacWrapper; - sal_Bool m_bOwnsInstance; // Indicator that we are owner of the XWindow + bool m_bOwnsInstance; // Indicator that we are owner of the XWindow sal_Int32 m_nRange; sal_Int32 m_nValue; OUString m_aText; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 8daf0ed0bc52..6cd72edc6426 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -99,10 +99,10 @@ class StatusBarManager : public ::cppu::WeakImplHelper3< protected: typedef std::map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusbarController > > StatusBarControllerMap; - sal_Bool m_bDisposed : 1, + bool m_bDisposed : 1, m_bFrameActionRegistered : 1, m_bUpdateControllers : 1; - sal_Bool m_bModuleIdentified; + bool m_bModuleIdentified; StatusBar* m_pStatusBar; OUString m_aModuleIdentifier; OUString m_aResourceName; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index c8326a9441c8..90458fb0ce64 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -160,7 +160,7 @@ class ToolBarManager : public ToolbarManager_Base void RequestImages(); sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; - sal_Bool IsPluginMode() const; + bool IsPluginMode() const; Image QueryAddonsImage( const OUString& aCommandURL, bool bBigImages ); long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( )); void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter); @@ -211,7 +211,7 @@ class ToolBarManager : public ToolbarManager_Base Timer m_aAsyncUpdateControllersTimer; OUString m_sIconTheme; MenuDescriptionMap m_aMenuMap; - sal_Bool m_bAcceleratorCfg; + bool m_bAcceleratorCfg; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 74377c0bccfa..5b96a0d74a07 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -88,7 +88,7 @@ namespace framework OUString getUINameFromCommand( const OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL ); void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel ); - sal_Bool isContextSensitiveToolbarNonVisible(); + bool isContextSensitiveToolbarNonVisible(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; @@ -98,8 +98,8 @@ namespace framework OUString m_aModuleIdentifier; OUString m_aPropUIName; OUString m_aPropResourceURL; - sal_Bool m_bModuleIdentified; - sal_Bool m_bResetActive; + bool m_bModuleIdentified; + bool m_bResetActive; std::vector< OUString > m_aCommandVector; IntlWrapper m_aIntlWrapper; }; diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index ab54ab9b0b9e..83a8459f7244 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -98,7 +98,7 @@ public: UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const OUString& _sName); void impl_fillElements(const sal_Char* _pName); - sal_Bool m_bConfigRead; + bool m_bConfigRead; OUString m_aPrivateResourceURL; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ModuleToCommandFileMap m_aModuleToCommandFileMap; diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index d158d98214d7..2025ed6a48e2 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -67,7 +67,7 @@ namespace framework { } }; - sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const; + bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const; mutable osl::Mutex m_aMutex; OUString m_aPropType; @@ -79,7 +79,7 @@ namespace framework { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigListener; - sal_Bool m_bConfigAccessInitialized; + bool m_bConfigAccessInitialized; }; } // namespace framework diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index ffdc8368cb75..8360f8b09a46 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -84,7 +84,7 @@ private: } }; - sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; + bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; mutable osl::Mutex m_mutex; OUString m_aPropCommand; @@ -96,7 +96,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigAccessListener; - sal_Bool m_bConfigAccessInitialized; + bool m_bConfigAccessInitialized; bool m_bAskValue; }; diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index 58dc386f7220..0fb8bfe51cd4 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -80,11 +80,11 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: /** @short used to detect if an accelerator list occurs recursive inside xml. */ - sal_Bool m_bInsideAcceleratorList; + bool m_bInsideAcceleratorList; /** @short used to detect if an accelerator item occurs recursive inside xml. */ - sal_Bool m_bInsideAcceleratorItem; + bool m_bInsideAcceleratorItem; /** @short is used to map key codes to its string representation. diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index a2919a965236..90d8f3932b37 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -90,12 +90,12 @@ struct ImageListsDescriptor class ImagesConfiguration { public: - static sal_Bool LoadImages( + static bool LoadImages( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ); - static sal_Bool StoreImages( + static bool StoreImages( 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 ImageListsDescriptor& rItems ); diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 90ae3272bc71..7659d39cc17a 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -120,14 +120,14 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::s } }; - sal_Bool m_bImageContainerStartFound; - sal_Bool m_bImageContainerEndFound; - sal_Bool m_bImagesStartFound; - sal_Bool m_bImagesEndFound; - sal_Bool m_bImageStartFound; - sal_Bool m_bExternalImagesStartFound; - sal_Bool m_bExternalImagesEndFound; - sal_Bool m_bExternalImageStartFound; + bool m_bImageContainerStartFound; + bool m_bImageContainerEndFound; + bool m_bImagesStartFound; + bool m_bImagesEndFound; + bool m_bImageStartFound; + bool m_bExternalImagesStartFound; + bool m_bExternalImagesEndFound; + bool m_bExternalImageStartFound; sal_Int32 m_nHashMaskModeBitmap; sal_Int32 m_nHashMaskModeColor; ImageHashMap m_aImageMap; diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 1f0afbec15a9..c5af17c81a90 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -128,7 +128,7 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas private: int m_nElementDepth; - sal_Bool m_bMenuBarMode; + bool m_bMenuBarMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuDocumentHandler @@ -166,7 +166,7 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase private: int m_nElementDepth; - sal_Bool m_bMenuMode; + bool m_bMenuMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuBarHandler @@ -203,7 +203,7 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase private: int m_nElementDepth; - sal_Bool m_bMenuPopupMode; + bool m_bMenuPopupMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuHandler @@ -243,7 +243,7 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase enum NextElementClose { ELEM_CLOSE_NONE, ELEM_CLOSE_MENUITEM, ELEM_CLOSE_MENUSEPARATOR }; int m_nElementDepth; - sal_Bool m_bMenuMode; + bool m_bMenuMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 41b1b1cc63d7..88c094ef137b 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -116,9 +116,9 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : } }; - sal_Bool m_bStatusBarStartFound; - sal_Bool m_bStatusBarEndFound; - sal_Bool m_bStatusBarItemStartFound; + bool m_bStatusBarStartFound; + bool m_bStatusBarEndFound; + bool m_bStatusBarItemStartFound; StatusBarHashMap m_aStatusBarMap; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_aStatusBarItems; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 99596ed6dafe..9eadc337ae01 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -121,12 +121,12 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : } }; - sal_Bool m_bToolBarStartFound : 1; - sal_Bool m_bToolBarEndFound : 1; - sal_Bool m_bToolBarItemStartFound : 1; - sal_Bool m_bToolBarSpaceStartFound : 1; - sal_Bool m_bToolBarBreakStartFound : 1; - sal_Bool m_bToolBarSeparatorStartFound : 1; + bool m_bToolBarStartFound : 1; + bool m_bToolBarEndFound : 1; + bool m_bToolBarItemStartFound : 1; + bool m_bToolBarSpaceStartFound : 1; + bool m_bToolBarBreakStartFound : 1; + bool m_bToolBarSeparatorStartFound : 1; ToolBoxHashMap m_aToolBoxMap; com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > m_rItemContainer; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; |