diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-04 15:53:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-07 13:53:49 +0200 |
| commit | a6287e21f1dab6ae382c24ceeb4c0212b7cad2d7 (patch) | |
| tree | f0bb68a88c56647fc9165ec69cc05cd5bc441ea6 /framework | |
| parent | c2e98d3cc9e2642d746a9933fcd91230a7378aa1 (diff) | |
framework: sal_Bool->bool
Change-Id: Ia6e87e2b382bd4005637e14088bde9e809996a25
Diffstat (limited to 'framework')
189 files changed, 1576 insertions, 1576 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; diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 5ed4aa75fa6d..5e0a032f222d 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -59,13 +59,13 @@ AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy) return *this; } -sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const +bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const { SolarMutexGuard g; return (m_lKey2Commands.find(aKey) != m_lKey2Commands.end()); } -sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const +bool AcceleratorCache::hasCommand(const OUString& sCommand) const { SolarMutexGuard g; return (m_lCommand2Keys.find(sCommand) != m_lCommand2Keys.end()); diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 51c91474d461..366e6056e604 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -127,7 +127,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE 1); SolarMutexGuard g; - AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache! + AcceleratorCache& rCache = impl_getCFG(true); // sal_True => force getting of a writeable cache! rCache.setKeyCommandPair(aKeyEvent, sCommand); } @@ -136,7 +136,7 @@ throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; - AcceleratorCache& rCache = impl_getCFG(sal_True); // true => force using of a writeable cache + AcceleratorCache& rCache = impl_getCFG(true); // true => force using of a writeable cache if (!rCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( OUString(), @@ -212,7 +212,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co 0); SolarMutexGuard g; - AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache! + AcceleratorCache& rCache = impl_getCFG(true); // sal_True => force getting of a writeable cache! if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( OUString("Command does not exists inside this container."), @@ -228,10 +228,10 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() css::uno::Reference< css::io::XStream > xStreamNoLang; { SolarMutexGuard g; - xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create! + xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), true); // sal_True => open or create! try { - xStreamNoLang = m_aPresetHandler.openPreset(PresetHandler::PRESET_DEFAULT(), sal_True); + xStreamNoLang = m_aPresetHandler.openPreset(PresetHandler::PRESET_DEFAULT(), true); } catch(const css::io::IOException&) {} // does not have to exist } @@ -269,7 +269,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() css::uno::Reference< css::io::XStream > xStream; { SolarMutexGuard g; - xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create! + xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), true); // sal_True => open or create! } css::uno::Reference< css::io::XOutputStream > xOut; @@ -297,7 +297,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R xStorage, PresetHandler::TARGET_CURRENT(), css::embed::ElementModes::READWRITE, - sal_False); // False => no fallback from read/write to readonly! + false); // False => no fallback from read/write to readonly! css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); @@ -325,7 +325,7 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() css::uno::Reference< css::io::XStream > xStream; { SolarMutexGuard g; - xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create! + xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), true); // sal_True => open or create! } css::uno::Reference< css::io::XOutputStream > xOut; @@ -431,7 +431,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream) { - sal_Bool bChanged; + bool bChanged; AcceleratorCache aCache; css::uno::Reference< css::uno::XComponentContext > xContext; { @@ -474,7 +474,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c } } -AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested) +AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(bool bWriteAccessRequested) { SolarMutexGuard g; @@ -531,9 +531,9 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati { SolarMutexGuard g; - AcceleratorCache::TKeyList lKeys = impl_getCFG(sal_True).getAllKeys(); //get keys from PrimaryKeys set + AcceleratorCache::TKeyList lKeys = impl_getCFG(true).getAllKeys(); //get keys from PrimaryKeys set - AcceleratorCache::TKeyList lSecondaryKeys = impl_getCFG(sal_False).getAllKeys(); //get keys from SecondaryKeys set + AcceleratorCache::TKeyList lSecondaryKeys = impl_getCFG(false).getAllKeys(); //get keys from SecondaryKeys set lKeys.reserve(lKeys.size()+lSecondaryKeys.size()); AcceleratorCache::TKeyList::const_iterator pIt; AcceleratorCache::TKeyList::const_iterator pEnd = lSecondaryKeys.end(); @@ -549,8 +549,8 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c { SolarMutexGuard g; - AcceleratorCache& rPrimaryCache = impl_getCFG(sal_True ); - AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False); + AcceleratorCache& rPrimaryCache = impl_getCFG(true ); + AcceleratorCache& rSecondaryCache = impl_getCFG(false); if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( @@ -589,8 +589,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE SolarMutexGuard g; - AcceleratorCache& rPrimaryCache = impl_getCFG(sal_True, sal_True ); // sal_True => force getting of a writeable cache! - AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); // sal_True => force getting of a writeable cache! + AcceleratorCache& rPrimaryCache = impl_getCFG(true, true ); // sal_True => force getting of a writeable cache! + AcceleratorCache& rSecondaryCache = impl_getCFG(false, true); // sal_True => force getting of a writeable cache! if ( rPrimaryCache.hasKey(aKeyEvent) ) { @@ -651,8 +651,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K { SolarMutexGuard g; - AcceleratorCache& rPrimaryCache = impl_getCFG(sal_True, sal_True ); - AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); + AcceleratorCache& rPrimaryCache = impl_getCFG(true, true ); + AcceleratorCache& rSecondaryCache = impl_getCFG(false, true); if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( @@ -697,8 +697,8 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati SolarMutexGuard g; - AcceleratorCache& rPrimaryCache = impl_getCFG(sal_True ); - AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False); + AcceleratorCache& rPrimaryCache = impl_getCFG(true ); + AcceleratorCache& rSecondaryCache = impl_getCFG(false); if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( @@ -742,7 +742,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g sal_Int32 i = 0; sal_Int32 c = lCommandList.getLength(); css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! - AcceleratorCache& rCache = impl_getCFG(sal_True); + AcceleratorCache& rCache = impl_getCFG(true); for (i=0; i<c; ++i) { @@ -784,8 +784,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co SolarMutexGuard g; - AcceleratorCache& rPrimaryCache = impl_getCFG(sal_True, sal_True ); - AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); + AcceleratorCache& rPrimaryCache = impl_getCFG(true, true ); + AcceleratorCache& rSecondaryCache = impl_getCFG(false, true); if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( @@ -806,10 +806,10 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() SolarMutexGuard g; - sal_Bool bPreferred; + bool bPreferred; css::uno::Reference< css::container::XNameAccess > xAccess; - bPreferred = sal_True; + bPreferred = true; m_aPrimaryReadCache = AcceleratorCache(); if (m_pPrimaryWriteCache) { @@ -821,7 +821,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; impl_ts_load(bPreferred, xAccess); // load the preferred keys - bPreferred = sal_False; + bPreferred = false; m_aSecondaryReadCache = AcceleratorCache(); if (m_pSecondaryWriteCache) { @@ -842,18 +842,18 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store() SolarMutexGuard g; - sal_Bool bPreferred; + bool bPreferred; css::uno::Reference< css::container::XNameAccess > xAccess; - bPreferred = sal_True; + bPreferred = true; // on-demand creation of the primary write cache - impl_getCFG(bPreferred, sal_True); + impl_getCFG(bPreferred, true); m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; impl_ts_save(bPreferred, xAccess); - bPreferred = sal_False; + bPreferred = false; // on-demand creation of the secondary write cache - impl_getCFG(bPreferred, sal_True); + impl_getCFG(bPreferred, true); m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; impl_ts_save(bPreferred, xAccess); } @@ -1066,7 +1066,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com // nop } -void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg ) +void XCUBasedAcceleratorConfiguration::impl_ts_load( bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg ) { AcceleratorCache aReadCache = AcceleratorCache(); css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1134,7 +1134,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Sequence< OUString > sToken(4); const sal_Int32 nToken = 4; - sal_Bool bValid = sal_True; + bool bValid = true; sal_Int32 k; for (k=0; k<nToken; ++k) { @@ -1144,7 +1144,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const sToken[k] = sKey.getToken(0, '_', nIndex); if (sToken[k].isEmpty()) { - bValid = sal_False; + bValid = false; break; } @@ -1158,7 +1158,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3; else { - bValid = sal_False; + bValid = false; break; } } @@ -1174,7 +1174,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const m_aSecondaryReadCache.takeOver(aReadCache); } -void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/) +void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/) { if (bPreferred) { @@ -1185,7 +1185,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c for ( pIt = lPrimaryReadKeys.begin(); pIt != lPrimaryReadKeys.end(); ++pIt ) { if (!m_pPrimaryWriteCache->hasKey(*pIt)) - removeKeyFromConfiguration(*pIt, sal_True); + removeKeyFromConfiguration(*pIt, true); } for ( pIt = lPrimaryWriteKeys.begin(); pIt != lPrimaryWriteKeys.end(); ++pIt ) @@ -1193,13 +1193,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt); if (!m_aPrimaryReadCache.hasKey(*pIt)) { - insertKeyToConfiguration(*pIt, sCommand, sal_True); + insertKeyToConfiguration(*pIt, sCommand, true); } else { OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt); if (sReadCommand != sCommand) - insertKeyToConfiguration(*pIt, sCommand, sal_True); + insertKeyToConfiguration(*pIt, sCommand, true); } } @@ -1223,7 +1223,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c for ( pIt = lSecondaryReadKeys.begin(); pIt != lSecondaryReadKeys.end(); ++pIt) { if (!m_pSecondaryWriteCache->hasKey(*pIt)) - removeKeyFromConfiguration(*pIt, sal_False); + removeKeyFromConfiguration(*pIt, false); } for ( pIt = lSecondaryWriteKeys.begin(); pIt != lSecondaryWriteKeys.end(); ++pIt ) @@ -1231,13 +1231,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt); if (!m_aSecondaryReadCache.hasKey(*pIt)) { - insertKeyToConfiguration(*pIt, sCommand, sal_False); + insertKeyToConfiguration(*pIt, sCommand, false); } else { OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt); if (sReadCommand != sCommand) - insertKeyToConfiguration(*pIt, sCommand, sal_False); + insertKeyToConfiguration(*pIt, sCommand, false); } } @@ -1255,7 +1255,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c ::comphelper::ConfigurationHelper::flush(m_xCfg); } -void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred ) +void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; css::uno::Reference< css::container::XNameContainer > xContainer; @@ -1301,7 +1301,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand)); } -void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred ) +void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; css::uno::Reference< css::container::XNameContainer > xContainer; @@ -1396,7 +1396,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe } } -AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested) +AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(bool bPreferred, bool bWriteAccessRequested) { SolarMutexGuard g; diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 77d89d038461..9e72199bc460 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -142,7 +142,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer { // Attention! xStorage must be accepted too, if it's NULL ! - sal_Bool bForgetOldStorages; + bool bForgetOldStorages; { SolarMutexGuard g; bForgetOldStorages = m_xDocumentRoot.is(); diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index c5d219860110..c13007bf0d83 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -186,14 +186,14 @@ OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) return OUString::number(nCode); } -sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, - sal_uInt16& rCode ) +bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, + sal_uInt16& rCode ) { sal_Int32 nCode = sIdentifier.toInt32(); if (nCode > 0) { rCode = (sal_uInt16)nCode; - return sal_True; + return true; } // 0 is normaly an error of the called method toInt32() ... diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 291e68396adc..6ae1ee2f9ca9 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -386,8 +386,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; - xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, sal_True ); - xUser = impl_openPathIgnoringErrors(sRelPathUser , eUserMode , sal_False); + xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, true ); + xUser = impl_openPathIgnoringErrors(sRelPathUser , eUserMode , false); } break; @@ -401,8 +401,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; - xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, sal_True ); - xUser = impl_openPathIgnoringErrors(sRelPathUser , eUserMode , sal_False); + xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, true ); + xUser = impl_openPathIgnoringErrors(sRelPathUser , eUserMode , false); } break; @@ -440,18 +440,18 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType { // First try to find the right localized set inside share layer. // Fallbacks are allowed there. - OUString aShareLocale( rLanguageTag.getBcp47()); - OUString sLocalizedSharePath(sRelPathShare); - sal_Bool bAllowFallbacks = sal_True; - xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks); + OUString aShareLocale( rLanguageTag.getBcp47()); + OUString sLocalizedSharePath(sRelPathShare); + bool bAllowFallbacks = true; + xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, true , aShareLocale, bAllowFallbacks); // The try to locate the right sub dir inside user layer ... without using fallbacks! // Normaly the corresponding sub dir should be created matching the specified locale. // Because we allow creation of storages inside user layer by default. - OUString aUserLocale( rLanguageTag.getBcp47()); + OUString aUserLocale( rLanguageTag.getBcp47()); OUString sLocalizedUserPath(sRelPathUser); - bAllowFallbacks = sal_False; - xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks); + bAllowFallbacks = false; + xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode, false, aUserLocale, bAllowFallbacks); sRelPathShare = sLocalizedSharePath; sRelPathUser = sLocalizedUserPath; @@ -568,7 +568,7 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset, } css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset, - sal_Bool bUseNoLangGlobal) + bool bUseNoLangGlobal) { css::uno::Reference< css::embed::XStorage > xFolder; { @@ -589,7 +589,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString } css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget , - sal_Bool bCreateIfMissing) + bool bCreateIfMissing) { css::uno::Reference< css::embed::XStorage > xFolder; { @@ -727,7 +727,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , - sal_Bool bShare) + bool bShare) { css::uno::Reference< css::embed::XStorage > xPath; try @@ -747,7 +747,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring ::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue( const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag, - sal_Bool bAllowFallbacks ) + bool bAllowFallbacks ) { ::std::vector< OUString >::const_iterator pFound = lLocalizedValues.end(); if (bAllowFallbacks) @@ -777,9 +777,9 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors( OUString& sPath , sal_Int32 eMode , - sal_Bool bShare , + bool bShare , OUString& rLanguageTag , - sal_Bool bAllowFallback) + bool bAllowFallback) { css::uno::Reference< css::embed::XStorage > xPath = impl_openPathIgnoringErrors(sPath, eMode, bShare); ::std::vector< OUString > lSubFolders = impl_getSubFolderNames(xPath); diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 10a524035ff4..7cd7d88e4d33 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -129,7 +129,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri try { - xChild = StorageHolder::openSubStorageWithFallback(xParent, sChild, nOpenMode, sal_True); // TODO think about delegating fallback decision to our own calli! + xChild = StorageHolder::openSubStorageWithFallback(xParent, sChild, nOpenMode, true); // TODO think about delegating fallback decision to our own calli! } catch(const css::uno::RuntimeException&) { throw; } @@ -410,7 +410,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy) css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStorage , sal_Int32 eOpenMode , - sal_Bool bAllowFallback) + bool bAllowFallback) { // a) try it first with user specified open mode // ignore errors ... but save it for later use! @@ -449,7 +449,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStream , sal_Int32 eOpenMode , - sal_Bool bAllowFallback) + bool bAllowFallback) { // a) try it first with user specified open mode // ignore errors ... but save it for later use! diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 5e4806fc23f9..fbeb5f2633b9 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -107,7 +107,7 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF @threadsafe yes *****************************************************************************************************************/ -sal_Bool FrameContainer::exist( const css::uno::Reference< css::frame::XFrame >& xFrame ) const +bool FrameContainer::exist( const css::uno::Reference< css::frame::XFrame >& xFrame ) const { SolarMutexGuard g; return( ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ) != m_aContainer.end() ); diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 0219bd273894..f7af3e77b04b 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -124,9 +124,9 @@ void FwkTabPage::CreateDialog() } } -sal_Bool FwkTabPage::CallMethod( const OUString& rMethod ) +bool FwkTabPage::CallMethod( const OUString& rMethod ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_xEventHdl.is() ) { try diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 4b6472911fc6..6c513f543b48 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -104,17 +104,17 @@ const char UNO_COMMAND[] = ".uno:"; MenuManager::MenuManager( const Reference< XComponentContext >& rxContext, - Reference< XFrame >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) + Reference< XFrame >& rFrame, Menu* pMenu, bool bDelete, bool bDeleteChildren ) : m_xContext(rxContext) { - m_bActive = sal_False; + m_bActive = false; m_bDeleteMenu = bDelete; m_bDeleteChildren = bDeleteChildren; m_pVCLMenu = pMenu; m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_False; + m_bInitialized = false; + m_bIsBookmarkMenu = false; acquire(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); @@ -164,7 +164,7 @@ MenuManager::MenuManager( aItemCommand = "slot:" + OUString::number( ITEMID_ADDONLIST ); pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand ); - AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); + AddMenu(pSubMenu,OUString(),nItemId,true,false); // Set image for the addon popup menu item if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST )) { @@ -186,7 +186,7 @@ MenuManager::MenuManager( BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_NEWMENU ); pMenu->SetPopupMenu( nItemId, pSubMenu ); - AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); + AddMenu(pSubMenu,OUString(),nItemId,true,false); if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); @@ -200,7 +200,7 @@ MenuManager::MenuManager( BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_WIZARDMENU ); pMenu->SetPopupMenu( nItemId, pSubMenu ); - AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); + AddMenu(pSubMenu,OUString(),nItemId,true,false); if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { @@ -325,15 +325,15 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; { - sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; - sal_Bool bMenuItemEnabled = m_pVCLMenu->IsItemEnabled( pStatusChangedMenu->nItemId ); + bool bSetCheckmark = false; + bool bCheckmark = false; + bool bMenuItemEnabled = m_pVCLMenu->IsItemEnabled( pStatusChangedMenu->nItemId ); - if ( Event.IsEnabled != bMenuItemEnabled ) + if ( Event.IsEnabled != (bMenuItemEnabled ? 1 : 0) ) m_pVCLMenu->EnableItem( pStatusChangedMenu->nItemId, Event.IsEnabled ); if ( Event.State >>= bCheckmark ) - bSetCheckmark = sal_True; + bSetCheckmark = true; if ( bSetCheckmark ) m_pVCLMenu->CheckItem( pStatusChangedMenu->nItemId, bCheckmark ); @@ -713,9 +713,9 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( pMenu == m_pVCLMenu ) { // set/unset hiding disabled menu entries - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + bool bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_uInt16 nFlag = pMenu->GetMenuFlags(); if ( bDontHide ) @@ -727,7 +727,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( m_bActive ) return 0; - m_bActive = sal_True; + m_bActive = true; OUString aCommand( m_aMenuItemCommand ); if (m_aMenuItemCommand.matchIgnoreAsciiCase(UNO_COMMAND)) @@ -811,7 +811,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) - m_bActive = sal_False; + m_bActive = false; return 1; } @@ -894,7 +894,7 @@ IMPL_LINK_NOARG(MenuManager, Highlight) return 0; } -void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren) +void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,bool _bDelete,bool _bDeleteChildren) { MenuManager* pSubMenuManager = new MenuManager( m_xContext, m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren ); @@ -921,7 +921,7 @@ sal_uInt16 MenuManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sa } return nItemId; } -void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,sal_Bool bShowMenuImages) +void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,bool bShowMenuImages) { AddonsOptions aAddonOptions; @@ -940,7 +940,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,sal_ if ( bTmpShowMenuImages ) { - sal_Bool bImageSet = sal_False; + bool bImageSet = false; OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = @@ -954,7 +954,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,sal_ Image aImage = GetImageFromURL( _xFrame, aImageId, false ); if ( !!aImage ) { - bImageSet = sal_True; + bImageSet = true; _pMenu->SetItemImage( nId, aImage ); } } diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 21393a5f2d66..84b8071ff1ed 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -58,7 +58,7 @@ TaskCreator::~TaskCreator() TODO document me *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName , - sal_Bool bVisible ) + bool bVisible ) { css::uno::Reference< css::lang::XSingleServiceFactory > xCreator; OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index a4b888a2f5ec..04c12a4ee77a 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -202,7 +202,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aWriteLock.clear(); // <- SAFE ---------------------------------- - sal_Bool bIsSynchron = sal_False; + bool bIsSynchron = false; for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ ) { if ( lArguments[nArgs].Name == "SynchronMode" ) @@ -242,10 +242,10 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // Allow calling of XController->suspend() everytimes. // Dispatch is an UI functionality. We implement such dispatch object here. // And further XController->suspend() was designed to bring an UI ... - sal_Bool bAllowSuspend = sal_True; - sal_Bool bControllerSuspended = sal_False; + bool bAllowSuspend = true; + bool bControllerSuspended = false; - sal_Bool bCloseAllViewsToo; + bool bCloseAllViewsToo; EOperation eOperation; css::uno::Reference< css::uno::XComponentContext > xContext; css::uno::Reference< css::frame::XFrame > xCloseFrame; @@ -268,9 +268,9 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) if (! xCloseFrame.is()) return 0; - sal_Bool bCloseFrame = sal_False; - sal_Bool bEstablishBackingMode = sal_False; - sal_Bool bTerminateApp = sal_False; + bool bCloseFrame = false; + bool bEstablishBackingMode = false; + bool bTerminateApp = false; // Analyze the environment a first time. // If we found some special cases, we can @@ -285,7 +285,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // is responsible for closing the application or accepting closing of the application // by others. if ( ! xCloseFrame->getCreator().is()) - bCloseFrame = sal_True; + bCloseFrame = true; // b) The help window cant disagree with any request. // Because it doesn't implement a controller - it uses a window only. @@ -293,7 +293,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // right inside this CloseDispatcher implementation. // => close it! else if (aCheck1.m_bReferenceIsHelp) - bCloseFrame = sal_True; + bCloseFrame = true; // c) If we are already in "backing mode", we have to terminate // the application, if this special frame is closed. @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // are open then. // => terminate the application! else if (aCheck1.m_bReferenceIsBacking) - bTerminateApp = sal_True; + bTerminateApp = true; // d) Otherwhise we have to: close all views to the same document, close the // document inside our own frame and decide then again, what has to be done! @@ -317,7 +317,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // different from our one. And its not the help! // => close our frame only - nothing else. if (aCheck2.m_lOtherVisibleFrames.getLength()>0) - bCloseFrame = sal_True; + bCloseFrame = true; else // c2) if we close the current view ... but not all other views @@ -328,7 +328,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) (!bCloseAllViewsToo ) && (aCheck2.m_lModelFrames.getLength() > 0) ) - bCloseFrame = sal_True; + bCloseFrame = true; else // c3) there is no other (visible) frame open ... @@ -338,17 +338,17 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // And that depends from the dispatched URL ... { if (eOperation == E_CLOSE_FRAME) - bTerminateApp = sal_True; + bTerminateApp = true; else if( SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE) ) - bEstablishBackingMode = sal_True; + bEstablishBackingMode = true; else - bTerminateApp = sal_True; + bTerminateApp = true; } } } // Do it now ... - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if (bCloseFrame) bSuccess = implts_closeFrame(); else if (bEstablishBackingMode) @@ -415,14 +415,14 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) return 0; } -sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , - sal_Bool bAllowSuspend , - sal_Bool bCloseAllOtherViewsToo, - sal_Bool& bControllerSuspended ) +bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , + bool bAllowSuspend , + bool bCloseAllOtherViewsToo, + bool& bControllerSuspended ) { // Frame already dead ... so this view is closed ... is closed ... is ... .-) if (! xFrame.is()) - return sal_True; + return true; // Close all views to the same document ... if forced to do so. // But dont touch our own frame here! @@ -443,8 +443,8 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc sal_Int32 i = 0; for (i=0; i<c; ++i) { - if (!fpf::closeIt(aCheck.m_lModelFrames[i], sal_False)) - return sal_False; + if (!fpf::closeIt(aCheck.m_lModelFrames[i], false)) + return false; } } @@ -457,17 +457,17 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc { bControllerSuspended = xController->suspend(sal_True); if (! bControllerSuspended) - return sal_False; + return false; } } // dont remove the component really by e.g. calling setComponent(null, null). // It's enough to suspend the controller. // If we close the frame later this controller doesn't show the same dialog again. - return sal_True; + return true; } -sal_Bool CloseDispatcher::implts_closeFrame() +bool CloseDispatcher::implts_closeFrame() { css::uno::Reference< css::frame::XFrame > xFrame; { @@ -477,23 +477,23 @@ sal_Bool CloseDispatcher::implts_closeFrame() // frame already dead ? => so it's closed ... it's closed ... if ( ! xFrame.is() ) - return sal_True; + return true; // dont deliver owner ship; our "UI user" will try it again if it failed. // OK - he will get an empty frame then. But normaly an empty frame // should be closeable always :-) - if (!fpf::closeIt(xFrame, sal_False)) - return sal_False; + if (!fpf::closeIt(xFrame, false)) + return false; { SolarMutexGuard g; m_xCloseFrame = css::uno::WeakReference< css::frame::XFrame >(); } - return sal_True; + return true; } -sal_Bool CloseDispatcher::implts_establishBackingMode() +bool CloseDispatcher::implts_establishBackingMode() { css::uno::Reference< css::uno::XComponentContext > xContext; css::uno::Reference< css::frame::XFrame > xFrame; @@ -504,11 +504,11 @@ sal_Bool CloseDispatcher::implts_establishBackingMode() } if (!xFrame.is()) - return sal_False; + return false; css::uno::Reference < css::document::XActionLockable > xLock( xFrame, css::uno::UNO_QUERY ); if ( xLock.is() && xLock->isActionLocked() ) - return sal_False; + return false; css::uno::Reference< css::awt::XWindow > xContainerWindow = xFrame->getContainerWindow(); @@ -521,10 +521,10 @@ sal_Bool CloseDispatcher::implts_establishBackingMode() xStartModule->attachFrame(xFrame); xContainerWindow->setVisible(sal_True); - return sal_True; + return true; } -sal_Bool CloseDispatcher::implts_terminateApplication() +bool CloseDispatcher::implts_terminateApplication() { css::uno::Reference< css::uno::XComponentContext > xContext; { diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index af2e05ffb740..6e2eb10aa9cc 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -146,7 +146,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp return lDispatcher; } -sal_Bool lcl_isStartModuleDispatch (const css::util::URL& aURL) +bool lcl_isStartModuleDispatch (const css::util::URL& aURL) { return aURL.Complete == CMD_UNO_SHOWSTARTMODULE; } @@ -615,7 +615,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat @threadsafe yes */ -sal_Bool DispatchProvider::implts_isLoadableContent( const css::util::URL& aURL ) +bool DispatchProvider::implts_isLoadableContent( const css::util::URL& aURL ) { LoadEnv::EContentType eType = LoadEnv::classifyContent(aURL.Complete, css::uno::Sequence< css::beans::PropertyValue >()); return ( eType == LoadEnv::E_CAN_BE_LOADED ); diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 44f0e620230c..313161fa1aaa 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -25,7 +25,7 @@ namespace framework{ -sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True; +bool InterceptionHelper::m_bPreferrFirstInterceptor = true; InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner, const css::uno::Reference< css::frame::XDispatchProvider >& xSlave) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 160bddc5fcb1..17624c9cf794 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -143,7 +143,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& // Another reason: We can use this reference as source of sending event at the end too. css::uno::Reference< css::frame::XNotifyingDispatch > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - sal_Bool bState = implts_dispatch(aURL,lArguments); + bool bState = implts_dispatch(aURL,lArguments); if (xListener.is()) { css::frame::DispatchResultEvent aEvent; @@ -173,10 +173,10 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& belive that call was successfully. <FALSE/> if necessary resource couldn't be created or an exception was thrown. */ -sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL , +bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException ) { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute = css::system::SystemShellExecute::create( m_xContext ); @@ -186,7 +186,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& // Because there is no notofocation about success - we use case of // no detected exception as SUCCESS - FAILED otherwise. xSystemShellExecute->execute( aURL.Complete, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); - bSuccess = sal_True; + bSuccess = true; } catch (const css::lang::IllegalArgumentException&) { diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 6f44bd72ba1a..a68462834106 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -58,11 +58,11 @@ using namespace ::cppu; const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610; -static sal_Bool impldbg_checkParameter_MenuDispatcher ( const css::uno::Reference< css::uno::XComponentContext >& xContext , +static bool impldbg_checkParameter_MenuDispatcher ( const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xOwner ); -static sal_Bool impldbg_checkParameter_addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , +static bool impldbg_checkParameter_addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , const css::util::URL& aURL ); -static sal_Bool impldbg_checkParameter_removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , +static bool impldbg_checkParameter_removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , const css::util::URL& aURL ); // constructor @@ -72,15 +72,15 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >& : m_xOwnerWeak ( xOwner ) , m_xContext ( xContext ) , m_aListenerContainer ( m_mutex ) - , m_bAlreadyDisposed ( sal_False ) - , m_bActivateListener ( sal_False ) + , m_bAlreadyDisposed ( false ) + , m_bActivateListener ( false ) , m_pMenuManager ( NULL ) { // Safe impossible cases // We need valid information about our owner for work. SAL_WARN_IF( !impldbg_checkParameter_MenuDispatcher( xContext, xOwner ), "fwk", "MenuDispatcher::MenuDispatcher()\nInvalid parameter detected!" ); - m_bActivateListener = sal_True; + m_bActivateListener = true; xOwner->addFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); } @@ -170,9 +170,9 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce // Safe impossible cases SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" ); - if( m_bAlreadyDisposed == sal_False ) + if( m_bAlreadyDisposed == false ) { - m_bAlreadyDisposed = sal_True; + m_bAlreadyDisposed = true; if ( m_bActivateListener ) { @@ -180,7 +180,7 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce if ( xFrame.is() ) { xFrame->removeFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); - m_bActivateListener = sal_False; + m_bActivateListener = false; if ( m_pMenuManager ) { EventObject aEventObj; @@ -220,7 +220,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce // private method -sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource ) +bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource ) { uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY ); if ( xFrame.is() ) @@ -274,24 +274,24 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR // set new menu on our system window and create new menu manager if ( bMenuFromResource ) { - m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, sal_True, sal_False ); + m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, false ); } else { - m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, sal_True, sal_True ); + m_pMenuManager = new MenuManager( m_xContext, xFrame, pMenuBar, true, true ); } pSysWindow->SetMenuBar( pMenuBar ); } - return sal_True; + return true; } } - return sal_False; + return false; } -static sal_Bool impldbg_checkParameter_MenuDispatcher( const uno::Reference< XComponentContext >& xContext , +static bool impldbg_checkParameter_MenuDispatcher( const uno::Reference< XComponentContext >& xContext , const uno::Reference< XFrame >& xOwner ) { return xContext.is() && xOwner.is(); @@ -299,11 +299,11 @@ static sal_Bool impldbg_checkParameter_MenuDispatcher( const uno::Reference< // We need a valid URL. What is meaning with "register for nothing"?! // xControl must correct to - nobody can advised otherwise! -static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, +static bool impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) { // Set default return value. - sal_Bool bOK = sal_True; + bool bOK = true; // Check parameter. if ( ( &xControl == NULL ) || @@ -311,7 +311,7 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference ( aURL.Complete.isEmpty() ) ) { - bOK = sal_False; + bOK = false; } // Return result of check. return bOK; @@ -319,11 +319,11 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference // The same goes for these case! We have added valid listener for correct URL only. // We can't remove invalid listener for nothing! -static sal_Bool impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, +static bool impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) { // Set default return value. - sal_Bool bOK = sal_True; + bool bOK = true; // Check parameter. if ( ( &xControl == NULL ) || @@ -331,7 +331,7 @@ static sal_Bool impldbg_checkParameter_removeStatusListener( const uno::Refer ( aURL.Complete.isEmpty() ) ) { - bOK = sal_False; + bOK = false; } // Return result of check. return bOK; diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 9623ebd89866..53998b5dc142 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -61,8 +61,8 @@ PopupMenuDispatcher::PopupMenuDispatcher( const uno::Reference< XComponentContext >& xContext ) : m_xContext ( xContext ) , m_aListenerContainer ( m_mutex ) - , m_bAlreadyDisposed ( sal_False ) - , m_bActivateListener ( sal_False ) + , m_bAlreadyDisposed ( false ) + , m_bActivateListener ( false ) { } @@ -151,7 +151,7 @@ throw( css::uno::Exception, css::uno::RuntimeException, std::exception) lArguments[a] >>= xFrame; m_xWeakFrame = xFrame; - m_bActivateListener = sal_True; + m_bActivateListener = true; uno::Reference< css::frame::XFrameActionListener > xFrameActionListener( (OWeakObject *)this, css::uno::UNO_QUERY ); xFrame->addFrameActionListener( xFrameActionListener ); @@ -283,9 +283,9 @@ void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( Runtim // Safe impossible cases SAL_WARN_IF( m_bAlreadyDisposed, "fwk", "MenuDispatcher::disposing(): Object already disposed .. don't call it again!" ); - if( m_bAlreadyDisposed == sal_False ) + if( m_bAlreadyDisposed == false ) { - m_bAlreadyDisposed = sal_True; + m_bAlreadyDisposed = true; if ( m_bActivateListener ) { @@ -293,7 +293,7 @@ void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( Runtim if ( xFrame.is() ) { xFrame->removeFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); - m_bActivateListener = sal_False; + m_bActivateListener = false; } } diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index c6e188cf795b..7e6eebc58c5f 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -112,10 +112,10 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere { } -sal_Bool StartModuleDispatcher::implts_isBackingModePossible () +bool StartModuleDispatcher::implts_isBackingModePossible() { if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) - return sal_False; + return false; css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create( m_xContext ), css::uno::UNO_QUERY); @@ -125,7 +125,7 @@ sal_Bool StartModuleDispatcher::implts_isBackingModePossible () css::uno::Reference< css::frame::XFrame >(), FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT); - sal_Bool bIsPossible = sal_False; + bool bIsPossible = false; ::sal_Int32 nVisibleFrames = aCheck.m_lOtherVisibleFrames.getLength (); if ( @@ -133,13 +133,13 @@ sal_Bool StartModuleDispatcher::implts_isBackingModePossible () ( nVisibleFrames < 1 ) ) { - bIsPossible = sal_True; + bIsPossible = true; } return bIsPossible; } -sal_Bool StartModuleDispatcher::implts_establishBackingMode() +bool StartModuleDispatcher::implts_establishBackingMode() { css::uno::Reference< css::frame::XDesktop2> xDesktop = css::frame::Desktop::create( m_xContext ); css::uno::Reference< css::frame::XFrame > xFrame = xDesktop->findFrame(SPECIALTARGET_BLANK, 0); @@ -151,7 +151,7 @@ sal_Bool StartModuleDispatcher::implts_establishBackingMode() xStartModule->attachFrame(xFrame); xContainerWindow->setVisible(sal_True); - return sal_True; + return true; } void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 2290aab92017..6c345d13fda2 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -166,7 +166,7 @@ throw( IllegalArgumentException ) // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! // Initialize return value with sal_False !!! // (Handle can be invalid) - sal_Bool bReturn = sal_False; + bool bReturn = false; switch( nHandle ) { @@ -324,7 +324,7 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr return seqActionTriggerPropertyDescriptor; } -sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( +bool ActionTriggerPropertySet::impl_tryToChangeProperty( const OUString& sCurrentValue , const Any& aNewValue , Any& aOldValue , @@ -332,7 +332,7 @@ sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( throw( IllegalArgumentException ) { // Set default return value if method failed. - sal_Bool bReturn = sal_False; + bool bReturn = false; // Get new value from any. // IllegalArgumentException() can be thrown! OUString sValue; @@ -345,7 +345,7 @@ throw( IllegalArgumentException ) aOldValue <<= sCurrentValue; aConvertedValue <<= sValue; // Return OK - "value will be change ..." - bReturn = sal_True; + bReturn = true; } else { @@ -353,13 +353,13 @@ throw( IllegalArgumentException ) aOldValue.clear (); aConvertedValue.clear (); // Return NOTHING - "value will not be change ..." - bReturn = sal_False; + bReturn = false; } return bReturn; } -sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( +bool ActionTriggerPropertySet::impl_tryToChangeProperty( const Reference< XBitmap > aCurrentValue , const Any& aNewValue , Any& aOldValue , @@ -367,7 +367,7 @@ sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( throw( IllegalArgumentException ) { // Set default return value if method failed. - sal_Bool bReturn = sal_False; + bool bReturn = false; // Get new value from any. // IllegalArgumentException() can be thrown! Reference< XBitmap > aValue; @@ -380,7 +380,7 @@ throw( IllegalArgumentException ) aOldValue <<= aCurrentValue; aConvertedValue <<= aValue; // Return OK - "value will be change ..." - bReturn = sal_True; + bReturn = true; } else { @@ -388,13 +388,13 @@ throw( IllegalArgumentException ) aOldValue.clear (); aConvertedValue.clear (); // Return NOTHING - "value will not be change ..." - bReturn = sal_False; + bReturn = false; } return bReturn; } -sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( +bool ActionTriggerPropertySet::impl_tryToChangeProperty( const Reference< XInterface > aCurrentValue , const Any& aNewValue , Any& aOldValue , @@ -402,7 +402,7 @@ sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( throw( IllegalArgumentException ) { // Set default return value if method failed. - sal_Bool bReturn = sal_False; + bool bReturn = false; // Get new value from any. // IllegalArgumentException() can be thrown! Reference< XInterface > aValue; @@ -415,7 +415,7 @@ throw( IllegalArgumentException ) aOldValue <<= aCurrentValue; aConvertedValue <<= aValue; // Return OK - "value will be change ..." - bReturn = sal_True; + bReturn = true; } else { @@ -423,7 +423,7 @@ throw( IllegalArgumentException ) aOldValue.clear (); aConvertedValue.clear (); // Return NOTHING - "value will not be change ..." - bReturn = sal_False; + bReturn = false; } return bReturn; diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 6e4e93e73437..ba3ce6f3eeea 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -159,7 +159,7 @@ throw( IllegalArgumentException ) // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! // Initialize return value with sal_False !!! // (Handle can be invalid) - sal_Bool bReturn = sal_False; + bool bReturn = false; switch( nHandle ) { @@ -265,7 +265,7 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp return seqActionTriggerPropertyDescriptor; } -sal_Bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty( +bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty( sal_Int16 aCurrentValue , const Any& aNewValue , Any& aOldValue , @@ -273,7 +273,7 @@ sal_Bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty( throw( IllegalArgumentException ) { // Set default return value if method failed. - sal_Bool bReturn = sal_False; + bool bReturn = false; // Get new value from any. // IllegalArgumentException() can be thrown! sal_Int16 aValue = 0; @@ -286,7 +286,7 @@ throw( IllegalArgumentException ) aOldValue <<= aCurrentValue; aConvertedValue <<= aValue; // Return OK - "value will be change ..." - bReturn = sal_True; + bReturn = true; } else { @@ -294,7 +294,7 @@ throw( IllegalArgumentException ) aOldValue.clear (); aConvertedValue.clear (); // Return NOTHING - "value will not be change ..." - bReturn = sal_False; + bReturn = false; } return bReturn; diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index f2f5b384b03a..b8fcc8d49c17 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -60,7 +60,7 @@ class BmkMenu_Impl static sal_uInt16 m_nMID; public: - sal_Bool m_bInitialized; + bool m_bInitialized; BmkMenu_Impl(); ~BmkMenu_Impl(); @@ -71,7 +71,7 @@ class BmkMenu_Impl sal_uInt16 BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START; BmkMenu_Impl::BmkMenu_Impl() : - m_bInitialized(sal_False) + m_bInitialized(false) { } @@ -107,7 +107,7 @@ void BmkMenu::Initialize() if( _pImp->m_bInitialized ) return; - _pImp->m_bInitialized = sal_True; + _pImp->m_bInitialized = true; Sequence< Sequence< PropertyValue > > aDynamicMenuEntries; @@ -117,7 +117,7 @@ void BmkMenu::Initialize() aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_WIZARDMENU ); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + bool bShowMenuImages = rSettings.GetUseImagesInMenus(); OUString aTitle; OUString aURL; @@ -136,7 +136,7 @@ void BmkMenu::Initialize() InsertSeparator(); else { - sal_Bool bImageSet = sal_False; + bool bImageSet = false; sal_uInt16 nId = CreateMenuId(); if ( bShowMenuImages ) @@ -146,7 +146,7 @@ void BmkMenu::Initialize() Image aImage = GetImageFromURL( m_xFrame, aImageId, false ); if ( !!aImage ) { - bImageSet = sal_True; + bImageSet = true; InsertItem( nId, aTitle, aImage ); } } diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index de7b2617daeb..dbd71a12472d 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -226,7 +226,7 @@ void FrameListAnalyzer::impl_analyze() // Add it to the list of "other frames". But look for it's // visible state ... if it's allowed to do so. - sal_Bool bHidden = sal_False; + bool bHidden = false; if ((m_eDetectMode & E_HIDDEN) == E_HIDDEN ) { xSet = css::uno::Reference< css::beans::XPropertySet >(xFrame, css::uno::UNO_QUERY); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 291afd10946c..fa408c64023a 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -45,9 +45,9 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier ) : PropertySetContainer() - , m_bContainerCreated( sal_False ) - , m_bContainerChanged( sal_False ) - , m_bInContainerCreation( sal_False ) + , m_bContainerCreated( false ) + , m_bContainerChanged( false ) + , m_bInContainerCreation( false ) , m_pMenu( pMenu ) , m_pMenuIdentifier( pMenuIdentifier ) { @@ -129,7 +129,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept FillContainer(); if ( !m_bInContainerCreation ) - m_bContainerChanged = sal_True; + m_bContainerChanged = true; PropertySetContainer::insertByIndex( Index, Element ); } @@ -142,7 +142,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std FillContainer(); if ( !m_bInContainerCreation ) - m_bContainerChanged = sal_True; + m_bContainerChanged = true; PropertySetContainer::removeByIndex( Index ); } @@ -156,7 +156,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept FillContainer(); if ( !m_bInContainerCreation ) - m_bContainerChanged = sal_True; + m_bContainerChanged = true; PropertySetContainer::replaceByIndex( Index, Element ); } @@ -284,13 +284,13 @@ Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() // private implementation helper void RootActionTriggerContainer::FillContainer() { - m_bContainerCreated = sal_True; - m_bInContainerCreation = sal_True; + m_bContainerCreated = true; + m_bInContainerCreation = true; Reference<XIndexContainer> xXIndexContainer( (OWeakObject *)this, UNO_QUERY ); ActionTriggerHelper::FillActionTriggerContainerFromMenu( xXIndexContainer, m_pMenu ); - m_bInContainerCreation = sal_False; + m_bInContainerCreation = false; } OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::exception ) { diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index dd47309dda03..6f3e2021b6f3 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -45,7 +45,7 @@ namespace framework // implementation helper ( menu => ActionTrigger ) -sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) +bool IsSeparator( Reference< XPropertySet > xPropertySet ) { Reference< XServiceInfo > xServiceInfo( xPropertySet, UNO_QUERY ); try @@ -56,7 +56,7 @@ sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) { } - return sal_False; + return false; } void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet, @@ -149,7 +149,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC // handle bitmap if ( xBitmap.is() ) { - sal_Bool bImageSet = sal_False; + bool bImageSet = false; Reference< XUnoTunnel > xUnoTunnel( xBitmap, UNO_QUERY ); if ( xUnoTunnel.is() ) @@ -165,7 +165,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC if ( !!aMenuImage ) pSubMenu->SetItemImage( nNewItemId, aMenuImage ); - bImageSet = sal_True; + bImageSet = true; } } diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 4b84364cb7fc..67883a656190 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -131,7 +131,7 @@ sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const c throw (css::uno::RuntimeException, std::exception) { css::uno::Any aRequest = xRequest->getRequest(); - sal_Bool bHandleIt = sal_True; + bool bHandleIt = true; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 7fda794be26c..66f6c1d7eb95 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -218,7 +218,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( OReadMenuDocumentHandler::OReadMenuDocumentHandler( const Reference< XIndexContainer >& rMenuBarContainer ) : m_nElementDepth( 0 ), - m_bMenuBarMode( sal_False ), + m_bMenuBarMode( false ), m_xMenuBarContainer( rMenuBarContainer ), m_xContainerFactory( rMenuBarContainer, UNO_QUERY ) { @@ -256,7 +256,7 @@ throw( SAXException, RuntimeException, std::exception ) else if ( aName == ELEMENT_MENUBAR ) { ++m_nElementDepth; - m_bMenuBarMode = sal_True; + m_bMenuBarMode = true; m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_xMenuBarContainer, m_xContainerFactory )); m_xReader->startDocument(); @@ -279,7 +279,7 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) { m_xReader->endDocument(); m_xReader.clear(); - m_bMenuBarMode = sal_False; + m_bMenuBarMode = false; if ( aName != ELEMENT_MENUBAR ) { OUString aErrorMessage = getErrorLineString(); @@ -294,7 +294,7 @@ OReadMenuBarHandler::OReadMenuBarHandler( const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) : m_nElementDepth( 0 ), - m_bMenuMode( sal_False ), + m_bMenuMode( false ), m_xMenuBarContainer( rMenuBarContainer ), m_xContainerFactory( rFactory ) { @@ -332,7 +332,7 @@ throw( SAXException, RuntimeException, std::exception ) OUString aLabel; sal_Int16 nItemBits(0); - m_bMenuMode = sal_True; + m_bMenuMode = true; // Container must be factory to create sub container Reference< XComponentContext > xComponentContext( @@ -418,7 +418,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) { m_xReader->endDocument(); m_xReader.clear(); - m_bMenuMode = sal_False; + m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { OUString aErrorMessage = getErrorLineString(); @@ -435,7 +435,7 @@ OReadMenuHandler::OReadMenuHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : m_nElementDepth( 0 ), - m_bMenuPopupMode( sal_False ), + m_bMenuPopupMode( false ), m_xMenuContainer( rMenuContainer ), m_xContainerFactory( rFactory ) { @@ -467,7 +467,7 @@ throw( SAXException, RuntimeException, std::exception ) else if ( aName == ELEMENT_MENUPOPUP ) { ++m_nElementDepth; - m_bMenuPopupMode = sal_True; + m_bMenuPopupMode = true; m_xReader = Reference< XDocumentHandler >( new OReadMenuPopupHandler( m_xMenuContainer, m_xContainerFactory )); m_xReader->startDocument(); } @@ -494,7 +494,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) { m_xReader->endDocument(); m_xReader.clear(); - m_bMenuPopupMode = sal_False; + m_bMenuPopupMode = false; if ( aName != ELEMENT_MENUPOPUP ) { OUString aErrorMessage = getErrorLineString(); @@ -511,7 +511,7 @@ OReadMenuPopupHandler::OReadMenuPopupHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : m_nElementDepth( 0 ), - m_bMenuMode( sal_False ), + m_bMenuMode( false ), m_xMenuContainer( rMenuContainer ), m_xContainerFactory( rFactory ), m_xComponentContext( comphelper::getProcessComponentContext() ), @@ -548,7 +548,7 @@ throw( SAXException, RuntimeException, std::exception ) OUString aLabel; sal_Int16 nItemBits(0); - m_bMenuMode = sal_True; + m_bMenuMode = true; // Container must be factory to create sub container Reference< XIndexContainer > xSubItemContainer; @@ -689,7 +689,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { m_xReader->endDocument(); m_xReader.clear(); - m_bMenuMode = sal_False; + m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { OUString aErrorMessage = getErrorLineString(); @@ -781,7 +781,7 @@ void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMen throw ( SAXException, RuntimeException ) { sal_Int32 nItemCount = rMenuContainer->getCount(); - sal_Bool bSeparator = sal_False; + bool bSeparator = false; Any aAny; for ( sal_Int32 nItemPos = 0; nItemPos < nItemCount; nItemPos++ ) @@ -804,7 +804,7 @@ throw ( SAXException, RuntimeException ) aCommandURL == AUTOPILOTMENU_CMD ) { WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits ); - bSeparator = sal_False; + bSeparator = false; } else if ( !aCommandURL.isEmpty() && !AddonPopupMenu::IsCommandURLPrefix( aCommandURL )) { @@ -833,7 +833,7 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENU ) ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = sal_False; + bSeparator = false; } } else @@ -842,7 +842,7 @@ throw ( SAXException, RuntimeException ) { if ( !aCommandURL.isEmpty() ) { - bSeparator = sal_False; + bSeparator = false; WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits ); } } @@ -850,7 +850,7 @@ throw ( SAXException, RuntimeException ) { // Don't write two separators together WriteMenuSeparator(); - bSeparator = sal_True; + bSeparator = true; } } } diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 042876987869..0b706edb1e28 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -169,9 +169,9 @@ OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( } } - m_bStatusBarStartFound = sal_False; - m_bStatusBarEndFound = sal_False; - m_bStatusBarItemStartFound = sal_False; + m_bStatusBarStartFound = false; + m_bStatusBarEndFound = false; + m_bStatusBarItemStartFound = false; } OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() @@ -218,7 +218,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bStatusBarStartFound = sal_True; + m_bStatusBarStartFound = true; } break; @@ -243,9 +243,9 @@ throw( SAXException, RuntimeException, std::exception ) sal_Int16 nItemBits( ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D ); sal_Int16 nWidth( 0 ); sal_Int16 nOffset( STATUSBAR_OFFSET ); - sal_Bool bCommandURL( sal_False ); + bool bCommandURL( false ); - m_bStatusBarItemStartFound = sal_True; + m_bStatusBarItemStartFound = true; for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) { pStatusBarEntry = m_aStatusBarMap.find( xAttribs->getNameByIndex( n ) ); @@ -255,7 +255,7 @@ throw( SAXException, RuntimeException, std::exception ) { case SB_ATTRIBUTE_URL: { - bCommandURL = sal_True; + bCommandURL = true; aCommandURL = xAttribs->getValueByIndex( n ); } break; @@ -417,7 +417,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bStatusBarStartFound = sal_False; + m_bStatusBarStartFound = false; } break; @@ -430,7 +430,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bStatusBarItemStartFound = sal_False; + m_bStatusBarItemStartFound = false; } break; diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index caf1b6056847..3c9038ca870f 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -63,7 +63,7 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp, OUString& rTooltip, sal_Int16& rStyle, sal_Int16& rWidth, - sal_Bool& rVisible, + bool& rVisible, sal_Int16& rType ) { for ( sal_Int32 i = 0; i < rProp.getLength(); i++ ) @@ -179,12 +179,12 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde m_nHashCode_Style_Text = OUString( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); m_nHashCode_Style_Image = OUString( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); - m_bToolBarStartFound = sal_False; - m_bToolBarEndFound = sal_False; - m_bToolBarItemStartFound = sal_False; - m_bToolBarSpaceStartFound = sal_False; - m_bToolBarBreakStartFound = sal_False; - m_bToolBarSeparatorStartFound = sal_False; + m_bToolBarStartFound = false; + m_bToolBarEndFound = false; + m_bToolBarItemStartFound = false; + m_bToolBarSpaceStartFound = false; + m_bToolBarBreakStartFound = false; + m_bToolBarSeparatorStartFound = false; } OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() @@ -267,7 +267,7 @@ throw( SAXException, RuntimeException, std::exception ) } } - m_bToolBarStartFound = sal_True; + m_bToolBarStartFound = true; } break; @@ -290,16 +290,16 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - sal_Bool bAttributeURL = sal_False; + bool bAttributeURL = false; - m_bToolBarItemStartFound = sal_True; + m_bToolBarItemStartFound = true; OUString aLabel; OUString aCommandURL; OUString aHelpURL; OUString aTooltip; OUString aBitmapName; sal_uInt16 nItemBits( 0 ); - sal_Bool bVisible( sal_True ); + bool bVisible( true ); for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) { @@ -322,7 +322,7 @@ throw( SAXException, RuntimeException, std::exception ) case TB_ATTRIBUTE_URL: { - bAttributeURL = sal_True; + bAttributeURL = true; aCommandURL = xAttribs->getValueByIndex( n ).intern(); } break; @@ -336,9 +336,9 @@ throw( SAXException, RuntimeException, std::exception ) case TB_ATTRIBUTE_VISIBLE: { if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_TRUE ) - bVisible = sal_True; + bVisible = true; else if ( xAttribs->getValueByIndex( n ) == ATTRIBUTE_BOOLEAN_FALSE ) - bVisible = sal_False; + bVisible = false; else { OUString aErrorMessage = getErrorLineString(); @@ -461,7 +461,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarSpaceStartFound = sal_True; + m_bToolBarSpaceStartFound = true; Sequence< PropertyValue > aToolbarItemProp( 2 ); aToolbarItemProp[0].Name = m_aCommandURL; @@ -486,7 +486,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarBreakStartFound = sal_True; + m_bToolBarBreakStartFound = true; Sequence< PropertyValue > aToolbarItemProp( 2 ); aToolbarItemProp[0].Name = m_aCommandURL; @@ -511,7 +511,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarSeparatorStartFound = sal_True; + m_bToolBarSeparatorStartFound = true; Sequence< PropertyValue > aToolbarItemProp( 2 ); aToolbarItemProp[0].Name = m_aCommandURL; @@ -549,7 +549,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarStartFound = sal_False; + m_bToolBarStartFound = false; } break; @@ -562,7 +562,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarItemStartFound = sal_False; + m_bToolBarItemStartFound = false; } break; @@ -575,7 +575,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarBreakStartFound = sal_False; + m_bToolBarBreakStartFound = false; } break; @@ -588,7 +588,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarSpaceStartFound = sal_False; + m_bToolBarSpaceStartFound = false; } break; @@ -601,7 +601,7 @@ throw( SAXException, RuntimeException, std::exception ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bToolBarSeparatorStartFound = sal_False; + m_bToolBarSeparatorStartFound = false; } break; @@ -730,7 +730,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw OUString aLabel; OUString aHelpURL; OUString aTooltip; - sal_Bool bVisible( sal_True ); + bool bVisible( true ); sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); sal_Int16 nWidth( 0 ); sal_Int16 nStyle( 0 ); diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 5cd8d1cdb7c8..4e784d397cb2 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -28,7 +28,7 @@ namespace framework{ PropertySetHelper::PropertySetHelper( osl::Mutex & mutex, TransactionManager* pExternalTransactionManager , - sal_Bool bReleaseLockOnCall ) + bool bReleaseLockOnCall ) : m_lSimpleChangeListener(mutex) , m_lVetoChangeListener (mutex) , m_bReleaseLockOnCall (bReleaseLockOnCall ) @@ -96,7 +96,7 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet() m_lProps.free(); } -sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent) +bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent) { /* Dont use the lock here! The used helper is threadsafe and it lives for the whole lifetime of @@ -104,7 +104,7 @@ sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEven */ ::cppu::OInterfaceContainerHelper* pVetoListener = m_lVetoChangeListener.getContainer(aEvent.PropertyName); if (! pVetoListener) - return sal_False; + return false; ::cppu::OInterfaceIteratorHelper pListener(*pVetoListener); while (pListener.hasMoreElements()) @@ -119,10 +119,10 @@ sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEven catch(const css::uno::RuntimeException&) { pListener.remove(); } catch(const css::beans::PropertyVetoException&) - { return sal_True; } + { return true; } } - return sal_False; + return false; } void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent) @@ -180,11 +180,11 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, css::beans::Property aPropInfo = pIt->second; - sal_Bool bLocked = sal_True; + bool bLocked = true; if (m_bReleaseLockOnCall) { aWriteLock.clear(); - bLocked = sal_False; + bLocked = false; // <- SAFE } @@ -194,10 +194,10 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, { // SAFE -> aWriteLock.reset(); - bLocked = sal_True; + bLocked = true; } - sal_Bool bWillBeChanged = (aCurrentValue != aValue); + bool bWillBeChanged = (aCurrentValue != aValue); if (! bWillBeChanged) return; @@ -212,7 +212,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, if (m_bReleaseLockOnCall) { aWriteLock.clear(); - bLocked = sal_False; + bLocked = false; // <- SAFE } @@ -374,7 +374,7 @@ sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) SolarMutexGuard g; PropertySetHelper::TPropInfoHash::iterator pIt = m_lProps.find(sName); - sal_Bool bExist = (pIt != m_lProps.end()); + bool bExist = (pIt != m_lProps.end()); return bExist; } diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 20ed248460ea..ff8e032911f2 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -125,16 +125,16 @@ HandlerCache::~HandlerCache() @descr It frees all used memory. In further implementations (may if we support write access too) it's a good place to flush changes back to the configuration - but not needed yet. */ -sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) const +bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) const { - sal_Bool bFound = sal_False; + bool bFound = false; /* SAFE */{ osl::MutexGuard g(LockHelper::getGlobalLock()); PatternHash::const_iterator pItem = m_pPattern->findPatternKey(sURL); if (pItem!=m_pPattern->end()) { *pReturn = (*m_pHandler)[pItem->second]; - bFound = sal_True; + bFound = true; } /* SAFE */} return bFound; @@ -146,7 +146,7 @@ sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) and call our other search method ... It's a helper for outside code. */ -sal_Bool HandlerCache::search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const +bool HandlerCache::search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const { return search( aURL.Complete, pReturn ); } diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index 5ad024035358..ab041d1e06e3 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -65,7 +65,7 @@ OUString RetrieveLabelFromCommand( uno::Reference< container::XNameAccess >& _xUICommandLabels, const uno::Reference< frame::XFrame >& _xFrame, OUString& _rModuleIdentifier, - sal_Bool& _rIni, + bool& _rIni, const sal_Char* _pName) { OUString aLabel; @@ -77,7 +77,7 @@ OUString RetrieveLabelFromCommand( { if ( !_rIni ) { - _rIni = sal_True; + _rIni = true; Reference< XModuleManager2 > xModuleManager = ModuleManager::create( _xContext ); try diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 98aabbe7cbaf..366b38505b90 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -70,7 +70,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) { // Safe member access. ::osl::ClearableMutexGuard aAccessGuard( m_aAccessLock ); - sal_Bool bWaitFor = sal_False; + bool bWaitFor = false; // Change working mode first! if ( ( m_eWorkingMode == E_INIT && eMode == E_WORK ) || @@ -82,7 +82,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) m_eWorkingMode = eMode; if( m_eWorkingMode == E_BEFORECLOSE || m_eWorkingMode == E_CLOSE ) { - bWaitFor = sal_True; + bWaitFor = true; } } @@ -92,7 +92,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) // ... and we will wait forever here!!!) // Don't forget to release access mutex before. aAccessGuard.clear(); - if( bWaitFor == sal_True ) + if( bWaitFor ) { m_aBarrier.wait(); } @@ -160,7 +160,7 @@ void TransactionManager::registerTransaction( EExceptionMode eMode, ERejectReas // Look for rejected calls first. // If call was refused we throw some exceptions or do nothing! // It depends from given parameter eMode. - if( isCallRejected( eReason ) == sal_True ) + if( isCallRejected( eReason ) ) { impl_throwExceptions( eMode, eReason ); } @@ -215,7 +215,7 @@ void TransactionManager::unregisterTransaction() throw( css::uno::RuntimeExcept @onerror We return false. *//*-*****************************************************************************************************/ -sal_Bool TransactionManager::isCallRejected( ERejectReason& eReason ) const +bool TransactionManager::isCallRejected( ERejectReason& eReason ) const { // This call must safe access to internal member only. // Set "possible reason" for return and check reject-state then! diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 1f453922d435..00dd42f29bc7 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -122,7 +122,7 @@ ConstItemContainer::ConstItemContainer( const ItemContainer& rItemContainer ) copyItemContainer( rItemContainer.m_aItemVector ); } -ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSourceContainer, sal_Bool bFastCopy ) +ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSourceContainer, bool bFastCopy ) { // We also have to copy the UIName property try diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 8eb4893e9d6d..3d52f89ef007 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -264,7 +264,7 @@ throw( com::sun::star::lang::IllegalArgumentException ) { // Initialize state with sal_False !!! // (Handle can be invalid) - sal_Bool bReturn = sal_False; + bool bReturn = false; switch( nHandle ) { diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index c1acf844d02f..85b65cfc7c32 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -90,7 +90,7 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std:: SolarMutexGuard g; // Set default return value, if method failed. - sal_Bool bReturn = sal_False; + bool bReturn = false; // Try to "lock" the desktop for access to task container. css::uno::Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY ); @@ -181,7 +181,7 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ -sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner ) +bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner ) { return xOwner.is(); } diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index e92c06593868..84d57565c9c1 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -132,22 +132,22 @@ void OComponentEnumeration::impl_resetObject() -----------------------------------------------------------------------------------------------------------------*/ // An empty list is allowed ... hasMoreElements() will return false then! -sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) +bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) { // Set default return value. - sal_Bool bOK = sal_True; + bool bOK = true; // Check parameter. if ( ( &seqComponents == NULL ) ) { - bOK = sal_False; + bOK = false; } // Return result of check. return bOK; } -sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent ) +bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent ) { return aEvent.Source.is(); } diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 9c41a190ea73..70b6a17304b4 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -40,7 +40,7 @@ OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner FrameContainer* pFrameContainer ) : m_xOwner ( xOwner ) , m_pFrameContainer ( pFrameContainer ) - , m_bRecursiveSearchProtection( sal_False ) + , m_bRecursiveSearchProtection( false ) { // Safe impossible cases // Method is not defined for ALL incoming parameters! @@ -120,7 +120,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int if ( xOwner.is() ) { // Work only, if search was not started here ...! - if( m_bRecursiveSearchProtection == sal_False ) + if( m_bRecursiveSearchProtection == false ) { // This class is a helper for services, which must implement XFrames. // His parent and children are MY parent and children to. @@ -161,7 +161,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int { // Else; start a new search. // Protect this instance against recursive calls from parents. - m_bRecursiveSearchProtection = sal_True; + m_bRecursiveSearchProtection = true; // Ask parent of my owner for frames and append results to return list. css::uno::Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY ); // If a parent exist ... @@ -172,7 +172,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int } // We have all searched information. // Reset protection-mode. - m_bRecursiveSearchProtection = sal_False; + m_bRecursiveSearchProtection = false; } // If searched for children, step over all elements in container and collect the information. @@ -264,7 +264,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception SolarMutexGuard g; // Set default return value. - sal_Bool bHasElements = sal_False; + bool bHasElements = false; // Do the follow only, if owner instance valid. // Lock owner for follow operations - make a "hard reference"! css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY ); @@ -274,7 +274,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception if ( m_pFrameContainer->getCount() > 0 ) { // ... change this state value! - bHasElements = sal_True; + bHasElements = true; } } // Return result of this operation. @@ -350,32 +350,32 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram // An instance of this class can only work with valid initialization. // We share the mutex with our owner class, need a valid factory to instanciate new services and // use the access to our owner for some operations. -sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Reference< XFrame >& xOwner , - FrameContainer* pFrameContainer ) +bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Reference< XFrame >& xOwner , + FrameContainer* pFrameContainer ) { return xOwner.is() && pFrameContainer != 0; } // Its only allowed to add valid references to container. // AND - alle frames must support XFrames-interface! -sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame ) +bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame ) { return xFrame.is(); } // Its only allowed to add valid references to container... // ... => You can only delete valid references! -sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame ) +bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame ) { return xFrame.is(); } // A search for frames must initiate with right flags. // Some one are superflous and not supported yet. But here we control only the range of incoming parameter! -sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) +bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) { // Set default return value. - sal_Bool bOK = sal_True; + bool bOK = true; // Check parameter. if ( ( nSearchFlags != FrameSearchFlag::AUTO ) && @@ -389,7 +389,7 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) ( !( nSearchFlags & FrameSearchFlag::GLOBAL ) ) ) { - bOK = sal_False; + bOK = false; } // Return result of check. return bOK; diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 411e3dbf03a1..1a9e07e2173b 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -42,7 +42,7 @@ namespace framework{ PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) - , m_bWindowStateAlreadySet(sal_False ) + , m_bWindowStateAlreadySet(false ) { } @@ -83,7 +83,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv { css::uno::Reference< css::uno::XComponentContext > xContext; css::uno::Reference< css::frame::XFrame > xFrame; - sal_Bool bRestoreWindowState; + bool bRestoreWindowState; { SolarMutexGuard g; xContext = m_xContext; @@ -114,7 +114,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName); PersistentWindowState::implst_setWindowStateOnWindow(xWindow,sWindowState); SolarMutexGuard g; - m_bWindowStateAlreadySet = sal_True; + m_bWindowStateAlreadySet = true; } } break; @@ -266,8 +266,8 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere return; // check for system and work window - its necessary to guarantee correct pointer cast! - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + bool bSystemWindow = pWindow->IsSystemWindow(); + bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 101039e1be29..b1e10a5f8383 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -55,9 +55,9 @@ const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar"; StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_pWakeUp (0 ) - , m_bAllowReschedule (sal_False) - , m_bAllowParentShow (sal_False) - , m_bDisableReschedule(sal_False) + , m_bAllowReschedule (false) + , m_bAllowParentShow (false) + , m_bDisableReschedule(false) { } @@ -93,8 +93,8 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css:: m_xFrame = lArgs.getUnpackedValueOrDefault("Frame" , css::uno::Reference< css::frame::XFrame >()); m_xPluggWindow = lArgs.getUnpackedValueOrDefault("Window" , css::uno::Reference< css::awt::XWindow >() ); - m_bAllowParentShow = lArgs.getUnpackedValueOrDefault("AllowParentShow" , (sal_Bool)sal_False ); - m_bDisableReschedule = lArgs.getUnpackedValueOrDefault("DisableReschedule", (sal_Bool)sal_False ); + m_bAllowParentShow = lArgs.getUnpackedValueOrDefault("AllowParentShow" , sal_False ); + m_bDisableReschedule = lArgs.getUnpackedValueOrDefault("DisableReschedule", sal_False ); } } @@ -114,7 +114,7 @@ void SAL_CALL StatusIndicatorFactory::update() throw(css::uno::RuntimeException, std::exception) { osl::MutexGuard g(m_mutex); - m_bAllowReschedule = sal_True; + m_bAllowReschedule = true; } void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, @@ -143,7 +143,7 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus xProgress->start(sText, nRange); impl_startWakeUpThread(); - impl_reschedule(sal_True); + impl_reschedule(true); } void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild) @@ -173,7 +173,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus ) xProgress->reset(); - impl_reschedule(sal_True); + impl_reschedule(true); } void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIndicator >& xChild) @@ -226,7 +226,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn impl_stopWakeUpThread(); } - impl_reschedule(sal_True); + impl_reschedule(true); } void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, @@ -255,7 +255,7 @@ void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStat xProgress->setText(sText); } - impl_reschedule(sal_True); + impl_reschedule(true); } void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XStatusIndicator >& xChild , @@ -287,7 +287,7 @@ void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XSt xProgress->setValue(nValue); } - impl_reschedule(sal_False); + impl_reschedule(false); } void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() @@ -315,7 +315,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() // Supress any setVisible() or toFront() call in case the initial show was // already made. css::uno::Reference< css::awt::XWindow2 > xVisibleCheck(xParentWindow, css::uno::UNO_QUERY); - sal_Bool bIsVisible = sal_False; + bool bIsVisible = false; if (xVisibleCheck.is()) bIsVisible = xVisibleCheck->isVisible(); @@ -345,7 +345,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() // on saving documents. Because there is no progress set on the MediaDescriptor. // But that's wrong. In case the document was opened hidden, they should not use any progress .-( // They only possible workaround: dont show the parent window here, if the document was opened hidden. - sal_Bool bHiddenDoc = sal_False; + bool bHiddenDoc = false; if (xFrame.is()) { css::uno::Reference< css::frame::XController > xController; @@ -358,7 +358,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() utl::MediaDescriptor lDocArgs(xModel->getArgs()); bHiddenDoc = lDocArgs.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN(), - (sal_Bool)sal_False); + sal_False); } } @@ -494,7 +494,7 @@ void StatusIndicatorFactory::impl_hideProgress() } } -void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) +void StatusIndicatorFactory::impl_reschedule(bool bForce) { // SAFE -> osl::ClearableMutexGuard aReadLock(m_mutex); @@ -503,12 +503,12 @@ void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) aReadLock.clear(); // <- SAFE - sal_Bool bReschedule = bForce; + bool bReschedule = bForce; if (!bReschedule) { osl::MutexGuard g(m_mutex); bReschedule = m_bAllowReschedule; - m_bAllowReschedule = sal_False; + m_bAllowReschedule = false; } if (!bReschedule) diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 69802119989e..4200de514b30 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -84,7 +84,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent return; } - sal_Bool bModified = xModel->isModified (); + bool bModified = xModel->isModified (); // SYNCHRONIZED -> SolarMutexGuard aSolarGuard; @@ -93,8 +93,8 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent if ( ! pWindow) return; - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + bool bSystemWindow = pWindow->IsSystemWindow(); + bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 5f6791cff4bf..cd7ef0f3a9ea 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -191,11 +191,11 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr // <- VCL SYNCHRONIZED } -sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, - TModuleInfo& rInfo ) +bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, + TModuleInfo& rInfo ) { if ( ! xFrame.is ()) - return sal_False; + return false; try { @@ -210,13 +210,13 @@ sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::fr // Note: If we could retrieve a module id ... everything is OK. // UIName and Icon ID are optional values ! - sal_Bool bSuccess = !rInfo.sID.isEmpty(); + bool bSuccess = !rInfo.sID.isEmpty(); return bSuccess; } catch(const css::uno::Exception&) {} - return sal_False; + return false; } void TitleBarUpdate::impl_forceUpdate() diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index e93535c41e08..2ed6c60d2bc7 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -173,7 +173,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& { // Initialize state with sal_False !!! // (Handle can be invalid) - sal_Bool bReturn = sal_False; + bool bReturn = false; switch( nHandle ) { @@ -314,7 +314,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa } case UIELEMENT_PROPHANDLE_PERSISTENT: { - sal_Bool bBool( m_bPersistent ); + bool bBool( m_bPersistent ); aValue >>= bBool; m_bPersistent = bBool; break; @@ -330,7 +330,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa break; case UIELEMENT_PROPHANDLE_NOCLOSE: { - sal_Bool bBool( m_bNoClose ); + bool bBool( m_bNoClose ); aValue >>= bBool; m_bNoClose = bBool; break; diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 90c150a861f7..df5f7a4300e2 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -48,8 +48,8 @@ UIElementWrapperBase::UIElementWrapperBase( sal_Int16 nType ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) , m_aListenerContainer ( m_aMutex ) , m_nType ( nType ) - , m_bInitialized ( sal_False ) - , m_bDisposed ( sal_False ) + , m_bInitialized ( false ) + , m_bDisposed ( false ) { } @@ -106,7 +106,7 @@ throw ( Exception, RuntimeException, std::exception ) } } - m_bInitialized = sal_True; + m_bInitialized = true; } } diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index a49cb1ca3393..e9779f770824 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -107,8 +107,8 @@ class AcceleratorCache @return [bool] sal_True if the speicfied key exists inside this container. */ - virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; - virtual sal_Bool hasCommand(const OUString& sCommand) const; + virtual bool hasKey(const css::awt::KeyEvent& aKey) const; + virtual bool hasCommand(const OUString& sCommand) const; /** TODO document me */ virtual TKeyList getAllKeys() const; diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 8065456744f6..15fe9a5bc236 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -241,7 +241,7 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage, const OUString& sSubStorage , - sal_Bool bOutStream ); + bool bOutStream ); /** @short returns a reference to one of our internal cache members. @@ -261,7 +261,7 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, @return [AcceleratorCache] c++ reference(!) to one of our internal caches. */ - AcceleratorCache& impl_getCFG(sal_Bool bWriteAccessRequested = sal_False); + AcceleratorCache& impl_getCFG(bool bWriteAccessRequested = false); }; @@ -410,14 +410,14 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< private: - void impl_ts_load(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); - void impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); + void impl_ts_load(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); + void impl_ts_save(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); - void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred); - void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred); + void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const bool bPreferred); + void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const bool bPreferred); void reloadChanged(const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey); - AcceleratorCache& impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested = sal_False); + AcceleratorCache& impl_getCFG(bool bPreferred, bool bWriteAccessRequested = false); }; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 18562325b487..9d79e3188775 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -123,7 +123,7 @@ class KeyMapping @return [boolean] sal_True if conversion was successfully. */ - sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, + bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ); }; diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index d7cea6a7e097..31bf59874cfa 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -335,7 +335,7 @@ class PresetHandler @return The opened preset stream ... or NULL if the preset does not exists. */ css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset, - sal_Bool bUseNoLangGlobal = sal_False); + bool bUseNoLangGlobal = false); /** @short open the specified target as stream object and return it. @@ -356,7 +356,7 @@ class PresetHandler or couldnt be created as new one. */ css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget , - sal_Bool bCreateIfMissing); + bool bCreateIfMissing); /** @short do anything which is necessary to flush all changes back to disk. @@ -392,7 +392,7 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , - sal_Bool bShare); + bool bShare); /** @short try to find the specified locale inside list of possible ones. @@ -418,7 +418,7 @@ class PresetHandler */ ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag , - sal_Bool bAllowFallbacks ); + bool bAllowFallbacks ); /** @short open a config path ignoring errors (catching exceptions). @@ -449,9 +449,9 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString& sPath , sal_Int32 eMode , - sal_Bool bShare , + bool bShare , OUString& rLanguageTag , - sal_Bool bAllowFallback); + bool bAllowFallback); /** @short returns the names of all sub storages of specified storage. diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index c0c4269dba66..cdd292957ebf 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -168,12 +168,12 @@ class StorageHolder static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStorage , sal_Int32 eOpenMode , - sal_Bool bAllowFallback); + bool bAllowFallback); static css::uno::Reference< css::io::XStream > openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStream , sal_Int32 eOpenMode , - sal_Bool bAllowFallback); + bool bAllowFallback); // helper private: diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index accc6fa003a5..bbf6a01829a6 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -43,7 +43,7 @@ class ActionLockGuard /** @short knows if a lock exists on the internal lock object forced by this guard instance. */ - sal_Bool m_bActionLocked; + bool m_bActionLocked; // interface @@ -56,7 +56,7 @@ class ActionLockGuard in a mode "use guard for more then one resources". */ ActionLockGuard() - : m_bActionLocked(sal_False) + : m_bActionLocked(false) { } @@ -66,7 +66,7 @@ class ActionLockGuard points to the outside resource, which should be locked. */ ActionLockGuard(const css::uno::Reference< css::document::XActionLockable >& xLock) - : m_bActionLocked(sal_False) + : m_bActionLocked(false) { setResource(xLock); } @@ -90,18 +90,18 @@ class ActionLockGuard @return sal_True, if new resource could be set and locked. sal_False otherwise. */ - virtual sal_Bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock) + virtual bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock) { osl::MutexGuard g(m_mutex); if (m_bActionLocked || !xLock.is()) - return sal_False; + return false; m_xActionLock = xLock; m_xActionLock->addActionLock(); m_bActionLocked = m_xActionLock->isActionLocked(); - return sal_True; + return true; } /** @short set a new resource for locking at this guard. @@ -121,10 +121,10 @@ class ActionLockGuard osl::ClearableMutexGuard aMutexLock(m_mutex); css::uno::Reference< css::document::XActionLockable > xLock = m_xActionLock; - sal_Bool bLocked = m_bActionLocked; + bool bLocked = m_bActionLocked; m_xActionLock.clear(); - m_bActionLocked = sal_False; + m_bActionLocked = false; aMutexLock.clear(); // <- SAFE .......................... @@ -153,7 +153,7 @@ class ActionLockGuard m_xActionLock->removeActionLock(); // dont check for any locks here ... // May another guard use the same lock object :-( - m_bActionLocked = sal_False; + m_bActionLocked = false; } } }; diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 3006e82adbc1..876366ae63c4 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -163,7 +163,7 @@ private: load request and must be closed in case loading (not handling!) operation failed. The default value is sal_False! */ - sal_Bool m_bCloseFrameOnError; + bool m_bCloseFrameOnError; /** @short it indicates, that the old document (which was located inside m_xBaseFrame in combination with the m_sTarget value "_self") was suspended. @@ -171,7 +171,7 @@ private: loading (not handling!) failed, it must be reactivated. The default value is sal_False! */ - sal_Bool m_bReactivateControllerOnError; + bool m_bReactivateControllerOnError; /** @short it holds one (!) asynchronous used contenthandler or frameloader alive, till the asynchronous operation will be finished. @@ -184,7 +184,7 @@ private: (in case the micht existing old document was reactivated) we must hold the result of the load process explicitly. */ - sal_Bool m_bLoaded; + bool m_bLoaded; /** @short holds an XActionLock on the internal used task member. @@ -323,7 +323,7 @@ public: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0); + bool waitWhileLoading(sal_uInt32 nTimeout = 0); /** TODO document me ... */ css::uno::Reference< css::lang::XComponent > getTargetComponent() const; @@ -371,7 +371,7 @@ public: ); /** TODO document me ... */ - void impl_setResult(sal_Bool bResult); + void impl_setResult(bool bResult); /** TODO document me ... */ css::uno::Reference< css::uno::XInterface > impl_searchLoader(); @@ -445,7 +445,7 @@ private: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - sal_Bool impl_handleContent() + bool impl_handleContent() throw(LoadEnvException, css::uno::RuntimeException); /** @short tries to use FrameLoader objects for loading. @@ -464,7 +464,7 @@ private: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - sal_Bool impl_loadContent() + bool impl_loadContent() throw(LoadEnvException, css::uno::RuntimeException); /** @short checks if the specified content is already loaded. @@ -550,7 +550,7 @@ private: This mode is needed by a) */ void impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , - sal_Bool bForceToFront); + bool bForceToFront); /** @short checks whether a frame is already used for another load request or not. @@ -563,7 +563,7 @@ private: sal_True if this frame is already used for loading, sal_False otherwise. */ - sal_Bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const; + bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const; /** @short try to determine the used application module of this load request and applay right position and size @@ -573,7 +573,7 @@ private: /** @short determine if it's allowed to open new document frames. */ - sal_Bool impl_furtherDocsAllowed(); + bool impl_furtherDocsAllowed(); /** @short jumps to the requested bookmark inside a given document. */ diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 618cc486d8a7..d0c960df754d 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -71,7 +71,7 @@ class TargetHelper @return It returns <TRUE/> if <var>sCheckTarget</var> represent the expected <var>eSpecialTarget</var> value; <FALSE/> otherwise. */ - static sal_Bool matchSpecialTarget(const OUString& sCheckTarget , + static bool matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget); /** @short it checks, if the given name can be used @@ -93,7 +93,7 @@ class TargetHelper @param sName the new frame name, which sould be checked. */ - static sal_Bool isValidNameForFrame(const OUString& sName); + static bool isValidNameForFrame(const OUString& sName); }; } // namespace framework diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 38a0b8551274..ffba8acf26bb 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -68,8 +68,8 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un @return [bool] sal_True if closing failed. */ -inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource , - sal_Bool bDelegateOwnership) +inline bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource , + bool bDelegateOwnership) { css::uno::Reference< css::util::XCloseable > xClose (xResource, css::uno::UNO_QUERY); css::uno::Reference< css::lang::XComponent > xDispose(xResource, css::uno::UNO_QUERY); @@ -82,19 +82,19 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso if (xDispose.is()) xDispose->dispose(); else - return sal_False; + return false; } catch(const css::util::CloseVetoException&) - { return sal_False; } + { return false; } catch(const css::lang::DisposedException&) {} // disposed is closed is ... catch(const css::uno::RuntimeException&) { throw; } // should not be suppressed! catch(const css::uno::Exception&) - { return sal_False; } // ??? We defined to return a boolen value instead of throwing exceptions ... + { return false; } // ??? We defined to return a boolen value instead of throwing exceptions ... // (OK: RuntimeExceptions should not be catched inside the core ..) - return sal_True; + return true; } } // namespace frame diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 19ff84bb55e7..71744ed546ec 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -95,7 +95,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // <- SOLAR SAFE ---------------------------- } -static sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) +static bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // even child frame containing top level windows (e.g. query designer of database) will be closed css::uno::Reference< css::awt::XTopWindow > xTopWindowCheck(xWindow, css::uno::UNO_QUERY); @@ -112,10 +112,10 @@ static sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWin (pWindow ) && (pWindow->IsSystemWindow()) ) - return sal_True; + return true; } - return sal_False; + return false; } }; diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 0e40a5975c79..1bb35eeb344a 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -99,7 +99,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI { // warnings can be ignored => approve // errors must break loading => abort - sal_Bool bWarning = (aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK; + bool bWarning = (aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK; if (xApprove.is() && bWarning) xApprove->select(); else @@ -136,7 +136,7 @@ css::uno::Any QuietInteraction::getRequest() const return m_aRequest; } -sal_Bool QuietInteraction::wasUsed() const +bool QuietInteraction::wasUsed() const { SolarMutexGuard g; return m_aRequest.hasValue(); diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index b5cc8c70c0af..a09acbe647d2 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -122,15 +122,15 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea // b) help shows any other default page(!) => show default page for the detected module // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) OUString sCurrentHelpURL = its_getCurrentHelpURL(); - sal_Bool bCurrentHelpURLIsAnyDefaultURL = its_isHelpUrlADefaultOne(sCurrentHelpURL); - sal_Bool bShowIt = sal_False; + bool bCurrentHelpURLIsAnyDefaultURL = its_isHelpUrlADefaultOne(sCurrentHelpURL); + bool bShowIt = false; // a) if (sCurrentHelpURL.isEmpty()) - bShowIt = sal_True; + bShowIt = true; // b) else if (bCurrentHelpURLIsAnyDefaultURL) - bShowIt = sal_True; + bShowIt = true; if (bShowIt) { @@ -253,10 +253,10 @@ OUString HelpOnStartup::its_getCurrentHelpURL() return sCurrentHelpURL; } -sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) +bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) { if (sHelpURL.isEmpty()) - return sal_False; + return false; // SAFE -> osl::ClearableMutexGuard aLock(m_mutex); @@ -267,7 +267,7 @@ sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) // <- SAFE if (!xConfig.is()) - return sal_False; + return false; // check given help url against all default ones const css::uno::Sequence< OUString > lModules = xConfig->getElementNames(); @@ -288,7 +288,7 @@ sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) xModuleConfig->getByName("ooSetupFactoryHelpBaseURL") >>= sHelpBaseURL; OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem); if (sHelpURL.equals(sHelpURLForModule)) - return sal_True; + return true; } catch(const css::uno::RuntimeException&) { throw; } @@ -296,7 +296,7 @@ sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) {} } - return sal_False; + return false; } OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) @@ -317,7 +317,7 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) if (xConfig.is()) xConfig->getByName(sModule) >>= xModuleConfig; - sal_Bool bHelpEnabled = sal_False; + bool bHelpEnabled = false; if (xModuleConfig.is()) xModuleConfig->getByName("ooSetupFactoryHelpOnOpen") >>= bHelpEnabled; diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index ac85b4409609..8058431e708c 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -52,11 +52,11 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont : m_aJobCfg (xContext ) , m_xContext (xContext ) , m_xFrame (xFrame ) - , m_bListenOnDesktop (sal_False ) - , m_bListenOnFrame (sal_False ) - , m_bListenOnModel (sal_False ) - , m_bPendingCloseFrame (sal_False ) - , m_bPendingCloseModel (sal_False ) + , m_bListenOnDesktop (false ) + , m_bListenOnFrame (false ) + , m_bListenOnModel (false ) + , m_bPendingCloseFrame (false ) + , m_bPendingCloseModel (false ) , m_eRunState (E_NEW ) { } @@ -79,11 +79,11 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont : m_aJobCfg (xContext ) , m_xContext (xContext ) , m_xModel (xModel ) - , m_bListenOnDesktop (sal_False ) - , m_bListenOnFrame (sal_False ) - , m_bListenOnModel (sal_False ) - , m_bPendingCloseFrame (sal_False ) - , m_bPendingCloseModel (sal_False ) + , m_bListenOnDesktop (false ) + , m_bListenOnFrame (false ) + , m_bListenOnModel (false ) + , m_bPendingCloseFrame (false ) + , m_bPendingCloseModel (false ) , m_eRunState (E_NEW ) { } @@ -233,7 +233,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD // and to disable ourself! if (m_bPendingCloseFrame) { - m_bPendingCloseFrame = sal_False; + m_bPendingCloseFrame = false; css::uno::Reference< css::util::XCloseable > xClose(m_xFrame, css::uno::UNO_QUERY); if (xClose.is()) { @@ -247,7 +247,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD if (m_bPendingCloseModel) { - m_bPendingCloseModel = sal_False; + m_bPendingCloseModel = false; css::uno::Reference< css::util::XCloseable > xClose(m_xModel, css::uno::UNO_QUERY); if (xClose.is()) { @@ -303,8 +303,8 @@ void Job::die() m_xDesktop = css::uno::Reference< css::frame::XDesktop2 >(); m_xResultListener = css::uno::Reference< css::frame::XDispatchResultListener >(); m_xResultSourceFake = css::uno::Reference< css::uno::XInterface >(); - m_bPendingCloseFrame = sal_False; - m_bPendingCloseModel = sal_False; + m_bPendingCloseFrame = false; + m_bPendingCloseModel = false; } /** @@ -496,7 +496,7 @@ void Job::impl_startListening() m_xDesktop = css::frame::Desktop::create( m_xContext ); css::uno::Reference< css::frame::XTerminateListener > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); m_xDesktop->addTerminateListener(xThis); - m_bListenOnDesktop = sal_True; + m_bListenOnDesktop = true; } catch(const css::uno::Exception&) { @@ -514,12 +514,12 @@ void Job::impl_startListening() if (xCloseable.is()) { xCloseable->addCloseListener(xThis); - m_bListenOnFrame = sal_True; + m_bListenOnFrame = true; } } catch(const css::uno::Exception&) { - m_bListenOnFrame = sal_False; + m_bListenOnFrame = false; } } @@ -533,12 +533,12 @@ void Job::impl_startListening() if (xCloseable.is()) { xCloseable->addCloseListener(xThis); - m_bListenOnModel = sal_True; + m_bListenOnModel = true; } } catch(const css::uno::Exception&) { - m_bListenOnModel = sal_False; + m_bListenOnModel = false; } } } @@ -559,7 +559,7 @@ void Job::impl_stopListening() css::uno::Reference< css::frame::XTerminateListener > xThis(static_cast< ::cppu::OWeakObject* >(this) , css::uno::UNO_QUERY); m_xDesktop->removeTerminateListener(xThis); m_xDesktop.clear(); - m_bListenOnDesktop = sal_False; + m_bListenOnDesktop = false; } catch(const css::uno::Exception&) { @@ -576,7 +576,7 @@ void Job::impl_stopListening() if (xCloseable.is()) { xCloseable->removeCloseListener(xThis); - m_bListenOnFrame = sal_False; + m_bListenOnFrame = false; } } catch(const css::uno::Exception&) @@ -594,7 +594,7 @@ void Job::impl_stopListening() if (xCloseable.is()) { xCloseable->removeCloseListener(xThis); - m_bListenOnModel = sal_False; + m_bListenOnModel = false; } } catch(const css::uno::Exception&) @@ -809,17 +809,17 @@ void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css:: if (m_xDesktop.is() && aEvent.Source == m_xDesktop) { m_xDesktop.clear(); - m_bListenOnDesktop = sal_False; + m_bListenOnDesktop = false; } else if (m_xFrame.is() && aEvent.Source == m_xFrame) { m_xFrame = css::uno::Reference< css::frame::XFrame >(); - m_bListenOnFrame = sal_False; + m_bListenOnFrame = false; } else if (m_xModel.is() && aEvent.Source == m_xModel) { m_xModel = css::uno::Reference< css::frame::XModel >(); - m_bListenOnModel = sal_False; + m_bListenOnModel = false; } aWriteLock.clear(); diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 55270fc1f058..0e96805fa15d 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -391,7 +391,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const @return sal_True if the represented job is part of the underlying configuration package. */ -sal_Bool JobData::hasConfig() const +bool JobData::hasConfig() const { SolarMutexGuard g; return (m_eMode==E_ALIAS || m_eMode==E_EVENT); @@ -442,7 +442,7 @@ void JobData::disableJob() /** */ -sal_Bool isEnabled( const OUString& sAdminTime , +bool isEnabled( const OUString& sAdminTime , const OUString& sUserTime ) { /*Attention! @@ -453,8 +453,8 @@ sal_Bool isEnabled( const OUString& sAdminTime , static OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*"); WildCard aISOPattern(PATTERN_ISO8601); - sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime); - sal_Bool bValidUser = aISOPattern.Matches(sUserTime ); + bool bValidAdmin = aISOPattern.Matches(sAdminTime); + bool bValidUser = aISOPattern.Matches(sUserTime ); // We check for "isEnabled()" here only. // Note further: ISO8601 formated strings can be compared as strings directly! @@ -484,13 +484,13 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XC /** */ -sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const +bool JobData::hasCorrectContext(const OUString& rModuleIdent) const { sal_Int32 nContextLen = m_sContext.getLength(); sal_Int32 nModuleIdLen = rModuleIdent.getLength(); if ( nContextLen == 0 ) - return sal_True; + return true; if ( nModuleIdLen > 0 ) { @@ -502,7 +502,7 @@ sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const } } - return sal_False; + return false; } /** diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 8544172a3f06..eef4ff59b463 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -176,7 +176,7 @@ void JobResult::operator=( const JobResult& rCopy ) @return We return true only, if any set flag of the given mask match. */ -sal_Bool JobResult::existPart( sal_uInt32 eParts ) const +bool JobResult::existPart( sal_uInt32 eParts ) const { SolarMutexGuard g; return ((m_eParts & eParts) == eParts); diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 4dad4fb8f285..3f163e47cb76 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -102,7 +102,7 @@ JobURL::JobURL( /*IN*/ const OUString& sURL ) @return <TRUE/> if it represent a valid job URL. */ -sal_Bool JobURL::isValid() const +bool JobURL::isValid() const { SolarMutexGuard g; return (m_eRequest!=E_UNKNOWN); @@ -124,12 +124,12 @@ sal_Bool JobURL::isValid() const @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! */ -sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const +bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const { SolarMutexGuard g; sEvent = OUString(); - sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); + bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); if (bSet) sEvent = m_sEvent; @@ -152,12 +152,12 @@ sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! */ -sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const +bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const { SolarMutexGuard g; sAlias = OUString(); - sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); + bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); if (bSet) sAlias = m_sAlias; @@ -180,12 +180,12 @@ sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! */ -sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const +bool JobURL::getService( /*OUT*/ OUString& sService ) const { SolarMutexGuard g; sService = OUString(); - sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); + bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); if (bSet) sService = m_sService; @@ -217,14 +217,14 @@ sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const @return <TRUE/> if the identifier could be found and the string was splitted. <FALSE/> otherwise. */ -sal_Bool JobURL::implst_split( /*IN*/ const OUString& sPart , +bool JobURL::implst_split( /*IN*/ const OUString& sPart , /*IN*/ const sal_Char* pPartIdentifier , /*IN*/ sal_Int32 nPartLength , /*OUT*/ OUString& rPartValue , /*OUT*/ OUString& rPartArguments ) { // first search for the given identifier - sal_Bool bPartFound = (sPart.matchIgnoreAsciiCaseAsciiL(pPartIdentifier,nPartLength,0)); + bool bPartFound = (sPart.matchIgnoreAsciiCaseAsciiL(pPartIdentifier,nPartLength,0)); // If it exist - we can split the part and return sal_True. // Otherwhise we do nothing and return sal_False. diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 0653be8e7e83..d9a2fb5a61a3 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -88,8 +88,8 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N const OUString sCommand = lOwnCfg.getUnpackedValueOrDefault(PROP_COMMAND , OUString()); const css::uno::Sequence< OUString > lCommandArguments = lOwnCfg.getUnpackedValueOrDefault(PROP_ARGUMENTS , css::uno::Sequence< OUString >()); - const sal_Bool bDeactivateJobIfDone = lOwnCfg.getUnpackedValueOrDefault(PROP_DEACTIVATEJOBIFDONE , sal_True ); - const sal_Bool bCheckExitCode = lOwnCfg.getUnpackedValueOrDefault(PROP_CHECKEXITCODE , sal_True ); + const bool bDeactivateJobIfDone = lOwnCfg.getUnpackedValueOrDefault(PROP_DEACTIVATEJOBIFDONE , sal_True ); + const bool bCheckExitCode = lOwnCfg.getUnpackedValueOrDefault(PROP_CHECKEXITCODE , sal_True ); // replace all might existing place holder. OUString sRealCommand = impl_substituteCommandVariables(sCommand); @@ -101,7 +101,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N return ShellJob::impl_generateAnswer4Deactivation(); // do it - sal_Bool bDone = impl_execute(sRealCommand, lCommandArguments, bCheckExitCode); + bool bDone = impl_execute(sRealCommand, lCommandArguments, bCheckExitCode); if (! bDone) return css::uno::Any(); @@ -129,7 +129,7 @@ OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) try { css::uno::Reference< css::util::XStringSubstitution > xSubst( css::util::PathSubstitution::create(m_xContext) ); - const sal_Bool bSubstRequired = sal_True; + const bool bSubstRequired = true; const OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); return sCompleteCommand; @@ -140,9 +140,9 @@ OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) return OUString(); } -sal_Bool ShellJob::impl_execute(const OUString& sCommand , - const css::uno::Sequence< OUString >& lArguments , - sal_Bool bCheckExitCode) +bool ShellJob::impl_execute(const OUString& sCommand , + const css::uno::Sequence< OUString >& lArguments , + bool bCheckExitCode) { ::rtl_uString** pArgs = NULL; const ::sal_Int32 nArgs = lArguments.getLength (); @@ -156,9 +156,9 @@ sal_Bool ShellJob::impl_execute(const OUString& sCommand // executable not found or couldnt be started if (eError != osl_Process_E_None) - return sal_False; + return false; - sal_Bool bRet = sal_True; + bool bRet = true; if (bCheckExitCode) { // check its return codes ... @@ -167,7 +167,7 @@ sal_Bool ShellJob::impl_execute(const OUString& sCommand eError = osl_getProcessInfo(hProcess, osl_Process_EXITCODE, &aInfo); if (eError != osl_Process_E_None) - bRet = sal_False; + bRet = false; else bRet = (aInfo.Code == 0); } diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 0a9eb6b0a659..f5020bb22f3e 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -269,21 +269,21 @@ uno::Reference< frame::XModel > impl_getModelFromFrame( const uno::Reference< fr return xModel; } -sal_Bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel ) +bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel ) { if ( xModel.is() ) { utl::MediaDescriptor aDesc( xModel->getArgs() ); - return aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False); + return aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), sal_False); } else - return sal_False; + return false; } -sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFrame ) +bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFrame ) { if (xFrame->isTop()) - return sal_True; + return true; uno::Reference< awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), uno::UNO_QUERY); // dont use _THROW here ... it's a check only if (xWindowCheck.is()) @@ -295,7 +295,7 @@ sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFram return ( pWindow && pWindow->IsSystemWindow() ); } - return sal_False; + return false; } void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ) diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index 50deaea0799a..14264d48e89d 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -66,8 +66,8 @@ void parseResourceURL( const OUString& aResourceURL, OUString& aElementType, OUS ::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect ); ::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > impl_getModelFromFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); -sal_Bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); -sal_Bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); +bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); +bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); void impl_setDockingWindowVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName, bool bVisible ); void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xThis, const ::com::sun::star::uno::Reference< css::ui::XUIElement >& xUIElement ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const css::uno::Reference< ::com::sun::star::awt::XToolkit2 >& rToolkit, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent ); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 73063becb8b4..218215915df3 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -224,14 +224,14 @@ void LayoutManager::implts_lock() ++m_nLockCount; } -sal_Bool LayoutManager::implts_unlock() +bool LayoutManager::implts_unlock() { SolarMutexGuard g; m_nLockCount = std::max( m_nLockCount-1, static_cast<sal_Int32>(0) ); return ( m_nLockCount == 0 ); } -void LayoutManager::implts_reset( sal_Bool bAttached ) +void LayoutManager::implts_reset( bool bAttached ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ SolarMutexClearableGuard aReadLock; @@ -408,7 +408,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached ) implts_unlock(); } -sal_Bool LayoutManager::implts_isEmbeddedLayoutManager() const +bool LayoutManager::implts_isEmbeddedLayoutManager() const { SolarMutexClearableGuard aReadLock; Reference< XFrame > xFrame = m_xFrame; @@ -417,9 +417,9 @@ sal_Bool LayoutManager::implts_isEmbeddedLayoutManager() const Reference< awt::XWindow > xFrameContainerWindow = xFrame->getContainerWindow(); if ( xFrameContainerWindow == xContainerWindow ) - return sal_False; + return false; else - return sal_True; + return true; } void LayoutManager::implts_destroyElements() @@ -438,7 +438,7 @@ void LayoutManager::implts_destroyElements() aWriteLock.clear(); } -void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive ) +void LayoutManager::implts_toggleFloatingUIElementsVisibility( bool bActive ) { SolarMutexClearableGuard aReadLock; ToolbarLayoutManager* pToolbarManager = m_pToolbarManager; @@ -468,13 +468,13 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const OUStri return uno::Reference< ui::XUIElement >(); } -sal_Bool LayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) +bool LayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) { return readWindowStateData( aName, rElementData, m_xPersistentWindowState, m_pGlobalSettings, m_bGlobalSettings, m_xContext ); } -sal_Bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElementData, +bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElementData, const Reference< XNameAccess > &rPersistentWindowState, GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings, const Reference< XComponentContext > &rComponentContext ) @@ -503,7 +503,7 @@ sal_Bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& r Sequence< PropertyValue > aWindowState; if ( xPersistentWindowState->hasByName( aName ) && (xPersistentWindowState->getByName( aName ) >>= aWindowState) ) { - sal_Bool bValue( sal_False ); + bool bValue( false ); for ( sal_Int32 n = 0; n < aWindowState.getLength(); n++ ) { if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_DOCKED ) @@ -586,7 +586,6 @@ sal_Bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& r aWriteLock2.clear(); uno::Any aValue; - sal_Bool bValue = sal_Bool(); if ( pGlobalSettings->GetStateInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR, GlobalSettings::STATEINFO_LOCKED, aValue )) @@ -595,20 +594,21 @@ sal_Bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& r GlobalSettings::STATEINFO_DOCKED, aValue )) { + bool bValue; if ( aValue >>= bValue ) rElementData.m_bFloating = !bValue; } } } - return sal_True; + return true; } catch (const NoSuchElementException&) { } } - return sal_False; + return false; } void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UIElement& rElementData ) @@ -620,7 +620,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI m_bStoreWindowState = true; aWriteLock.clear(); - sal_Bool bPersistent( sal_False ); + bool bPersistent( false ); Reference< XPropertySet > xPropSet( rElementData.m_xUIElement, UNO_QUERY ); if ( xPropSet.is() ) { @@ -632,7 +632,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI catch (const beans::UnknownPropertyException&) { // Non-configurable elements should at least store their dimension/position - bPersistent = sal_True; + bPersistent = true; } catch (const lang::WrappedTargetException&) { @@ -646,9 +646,9 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI Sequence< PropertyValue > aWindowState( 8 ); aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED; - aWindowState[0].Value = makeAny( sal_Bool( !rElementData.m_bFloating )); + aWindowState[0].Value = makeAny( !rElementData.m_bFloating ); aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE; - aWindowState[1].Value = makeAny( sal_Bool( rElementData.m_bVisible )); + aWindowState[1].Value = makeAny( rElementData.m_bVisible ); aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA; aWindowState[2].Value = makeAny( static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) ); @@ -727,7 +727,7 @@ Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aNa return xUIElement; } -void LayoutManager::implts_setVisibleState( sal_Bool bShow ) +void LayoutManager::implts_setVisibleState( bool bShow ) { SolarMutexClearableGuard aWriteLock; m_aStatusBarElement.m_bMasterHide = !bShow; @@ -736,7 +736,7 @@ void LayoutManager::implts_setVisibleState( sal_Bool bShow ) implts_updateUIElementsVisibleState( bShow ); } -void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) +void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) { // notify listeners uno::Any a; @@ -794,10 +794,10 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) } if ( bMustDoLayout ) - implts_doLayout_notify( sal_False ); + implts_doLayout_notify( false ); } -void LayoutManager::implts_setCurrentUIVisibility( sal_Bool bShow ) +void LayoutManager::implts_setCurrentUIVisibility( bool bShow ) { SolarMutexClearableGuard aWriteLock; if ( !bShow && m_aStatusBarElement.m_bVisible && m_aStatusBarElement.m_xUIElement.is() ) @@ -865,7 +865,7 @@ void LayoutManager::implts_createProgressBar() xContainerWindow = m_xContainerWindow; aWriteLock.clear(); - sal_Bool bRecycled = xProgressBarBackup.is(); + bool bRecycled = xProgressBarBackup.is(); ProgressBarWrapper* pWrapper = 0; if ( bRecycled ) pWrapper = (ProgressBarWrapper*)xProgressBarBackup.get(); @@ -892,7 +892,7 @@ void LayoutManager::implts_createProgressBar() { StatusBar* pStatusBar = new StatusBar( pWindow, WinBits( WB_LEFT | WB_3DLOOK ) ); Reference< awt::XWindow > xStatusBarWindow2( VCLUnoHelper::GetInterface( pStatusBar )); - pWrapper->setStatusBar( xStatusBarWindow2, sal_True ); + pWrapper->setStatusBar( xStatusBarWindow2, true ); } } } @@ -927,7 +927,7 @@ void LayoutManager::implts_backupProgressBarWrapper() { ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)m_xProgressBarBackup.get(); if ( pWrapper ) - pWrapper->setStatusBar( Reference< awt::XWindow >(), sal_False ); + pWrapper->setStatusBar( Reference< awt::XWindow >(), false ); } // prevent us from dispose() the m_aProgressBarElement.m_xUIElement inside implts_reset() @@ -982,7 +982,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz } } -sal_Bool LayoutManager::implts_showProgressBar() +bool LayoutManager::implts_showProgressBar() { Reference< XUIElement > xStatusBar; Reference< XUIElement > xProgressBar; @@ -992,7 +992,7 @@ sal_Bool LayoutManager::implts_showProgressBar() SolarMutexClearableGuard aWriteLock; xStatusBar = Reference< XUIElement >( m_aStatusBarElement.m_xUIElement, UNO_QUERY ); xProgressBar = Reference< XUIElement >( m_aProgressBarElement.m_xUIElement, UNO_QUERY ); - sal_Bool bVisible( m_bVisible ); + bool bVisible( m_bVisible ); m_aProgressBarElement.m_bVisible = true; if ( bVisible ) @@ -1019,24 +1019,24 @@ sal_Bool LayoutManager::implts_showProgressBar() { implts_setOffset( pWindow->GetSizePixel().Height() ); pWindow->Show(); - implts_doLayout_notify( sal_False ); + implts_doLayout_notify( false ); } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool LayoutManager::implts_hideProgressBar() +bool LayoutManager::implts_hideProgressBar() { Reference< XUIElement > xProgressBar; Reference< awt::XWindow > xWindow; - sal_Bool bHideStatusBar( sal_False ); + bool bHideStatusBar( false ); SolarMutexGuard g; xProgressBar = Reference< XUIElement >( m_aProgressBarElement.m_xUIElement, UNO_QUERY ); - sal_Bool bInternalStatusBar( sal_False ); + bool bInternalStatusBar( false ); if ( xProgressBar.is() ) { Reference< awt::XWindow > xStatusBar; @@ -1057,14 +1057,14 @@ sal_Bool LayoutManager::implts_hideProgressBar() { implts_setOffset( 0 ); pWindow->Hide(); - implts_doLayout_notify( sal_False ); - return sal_True; + implts_doLayout_notify( false ); + return true; } - return sal_False; + return false; } -sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState ) +bool LayoutManager::implts_showStatusBar( bool bStoreState ) { SolarMutexClearableGuard aWriteLock; Reference< ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement; @@ -1082,15 +1082,15 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState ) { implts_setOffset( pWindow->GetSizePixel().Height() ); pWindow->Show(); - implts_doLayout_notify( sal_False ); - return sal_True; + implts_doLayout_notify( false ); + return true; } } - return sal_False; + return false; } -sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState ) +bool LayoutManager::implts_hideStatusBar( bool bStoreState ) { SolarMutexClearableGuard aWriteLock; Reference< ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement; @@ -1108,12 +1108,12 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState ) { implts_setOffset( 0 ); pWindow->Hide(); - implts_doLayout_notify( sal_False ); - return sal_True; + implts_doLayout_notify( false ); + return true; } } - return sal_False; + return false; } void LayoutManager::implts_setOffset( const sal_Int32 nBottomOffset ) @@ -1149,7 +1149,7 @@ throw (uno::RuntimeException) Reference< XDispatchProvider > xDispatchProvider; MenuBar* pMenuBar = new MenuBar; - m_pInplaceMenuBar = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, aModuleIdentifier, pMenuBar, sal_True, sal_True ); + m_pInplaceMenuBar = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, aModuleIdentifier, pMenuBar, true, true ); m_pInplaceMenuBar->SetItemContainer( xMergedMenuBar ); SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); @@ -1204,7 +1204,7 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL LayoutManager::reset() throw (RuntimeException, std::exception) { - implts_reset( sal_True ); + implts_reset( true ); } // XMenuBarMergingAcceptor @@ -1253,7 +1253,7 @@ throw ( RuntimeException, std::exception ) if ( !xDockingAreaAcceptor.is() ) m_aAsyncLayoutTimer.Stop(); - sal_Bool bAutomaticToolbars( m_bAutomaticToolbars ); + bool bAutomaticToolbars( m_bAutomaticToolbars ); std::vector< Reference< awt::XWindow > > oldDockingAreaWindows; ToolbarLayoutManager* pToolbarManager = m_pToolbarManager; @@ -1335,7 +1335,7 @@ throw ( RuntimeException, std::exception ) pToolbarManager->createStaticToolbars(); unlock(); } - implts_doLayout( sal_True, sal_False ); + implts_doLayout( true, false ); } } @@ -1415,7 +1415,7 @@ throw (RuntimeException, std::exception) SolarMutexClearableGuard aReadLock; Reference< XFrame > xFrame = m_xFrame; Reference< XURLTransformer > xURLTransformer = m_xURLTransformer; - sal_Bool bInPlaceMenu = m_bInplaceMenuSet; + bool bInPlaceMenu = m_bInplaceMenuSet; aReadLock.clear(); if ( !xFrame.is() ) @@ -1532,7 +1532,7 @@ throw (RuntimeException, std::exception) } if ( bMustBeLayouted ) - implts_doLayout_notify( sal_True ); + implts_doLayout_notify( true ); if ( bNotify ) { @@ -1772,7 +1772,7 @@ throw (RuntimeException, std::exception) { SolarMutexClearableGuard aWriteLock; if ( m_aStatusBarElement.m_xUIElement.is() && !m_aStatusBarElement.m_bMasterHide && - implts_showStatusBar( sal_True )) + implts_showStatusBar( true )) { aWriteLock.clear(); @@ -1867,7 +1867,7 @@ throw (RuntimeException, std::exception) { SolarMutexGuard g; if ( m_aStatusBarElement.m_xUIElement.is() && !m_aStatusBarElement.m_bMasterHide && - implts_hideStatusBar( sal_True )) + implts_hideStatusBar( true )) { implts_writeWindowStateData( STATUS_BAR_ALIAS, m_aStatusBarElement ); bMustLayout = true; @@ -2242,7 +2242,7 @@ throw (RuntimeException, std::exception) void SAL_CALL LayoutManager::unlock() throw (RuntimeException, std::exception) { - sal_Bool bDoLayout( implts_unlock() ); + bool bDoLayout( implts_unlock() ); SolarMutexClearableGuard aReadLock; sal_Int32 nLockCount( m_nLockCount ); @@ -2267,13 +2267,13 @@ throw (RuntimeException, std::exception) implts_notifyListeners( frame::LayoutManagerEvents::UNLOCK, a ); if ( bDoLayout ) - implts_doLayout_notify( sal_True ); + implts_doLayout_notify( true ); } void SAL_CALL LayoutManager::doLayout() throw (RuntimeException, std::exception) { - implts_doLayout_notify( sal_True ); + implts_doLayout_notify( true ); } // ILayoutNotifications @@ -2284,14 +2284,14 @@ void LayoutManager::requestLayout( Hint eHint ) doLayout(); } -void LayoutManager::implts_doLayout_notify( sal_Bool bOuterResize ) +void LayoutManager::implts_doLayout_notify( bool bOuterResize ) { bool bLayouted = implts_doLayout( false, bOuterResize ); if ( bLayouted ) implts_notifyListeners( frame::LayoutManagerEvents::LAYOUT, Any() ); } -sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize ) +bool LayoutManager::implts_doLayout( bool bForceRequestBorderSpace, bool bOuterResize ) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::implts_doLayout" ); @@ -2299,7 +2299,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_ SolarMutexClearableGuard aReadLock; if ( !m_xFrame.is() || !m_bParentWindowVisible ) - return sal_False; + return false; bool bPreserveContentSize( m_bPreserveContentSize ); bool bMustDoLayout( m_bMustDoLayout ); @@ -2312,11 +2312,11 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_ aReadLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - sal_Bool bLayouted( sal_False ); + bool bLayouted( false ); if ( bNoLock && xDockingAreaAcceptor.is() && xContainerWindow.is() && xComponentWindow.is() ) { - bLayouted = sal_True; + bLayouted = true; SolarMutexResettableGuard aWriteGuard; m_bDoLayout = true; @@ -2324,7 +2324,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_ awt::Rectangle aDockSpace( implts_calcDockingAreaSizes() ); awt::Rectangle aBorderSpace( aDockSpace ); - sal_Bool bGotRequestedBorderSpace( sal_True ); + bool bGotRequestedBorderSpace( true ); // We have to add the height of a possible status bar aBorderSpace.Height += implts_getStatusBarSize().Height(); @@ -2334,19 +2334,19 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_ // we always resize the content window (instead of the complete container window) if we're not set up // to (attempt to) preserve the content window's size if ( bOuterResize && !bPreserveContentSize ) - bOuterResize = sal_False; + bOuterResize = false; // maximized windows can resized their content window only, not their container window if ( bOuterResize && xContainerTopWindow.is() && xContainerTopWindow->getIsMaximized() ) - bOuterResize = sal_False; + bOuterResize = false; // if the component window does not have a size (yet), then we can't use it to calc the container // window size awt::Rectangle aComponentRect = xComponentWindow->getPosSize(); if ( bOuterResize && ( aComponentRect.Width == 0 ) && ( aComponentRect.Height == 0 ) ) - bOuterResize = sal_False; + bOuterResize = false; - bGotRequestedBorderSpace = sal_False; + bGotRequestedBorderSpace = false; if ( bOuterResize ) { Reference< awt::XDevice > xDevice( xContainerWindow, uno::UNO_QUERY ); @@ -2410,7 +2410,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_ return bLayouted; } -sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContainerSize, +bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContainerSize, const awt::Point& rComponentPos ) { SolarMutexClearableGuard aReadLock; @@ -2426,7 +2426,7 @@ sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContaine if (( aWorkArea.GetWidth() > 0 ) && ( aWorkArea.GetHeight() > 0 )) { if (( rContainerSize.Width > aWorkArea.GetWidth() ) || ( rContainerSize.Height > aWorkArea.GetHeight() )) - return sal_False; + return false; // Strictly, this is not correct. If we have a multi-screen display (css.awt.DisplayAccess.MultiDisplay == true), // the "effective work area" would be much larger than the work area of a single display, since we could in theory // position the container window across multiple screens. @@ -2439,18 +2439,18 @@ sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContaine xContainerWindow->setPosSize( 0, 0, rContainerSize.Width, rContainerSize.Height, awt::PosSize::SIZE ); // position the component window xComponentWindow->setPosSize( rComponentPos.X, rComponentPos.Y, 0, 0, awt::PosSize::POS ); - return sal_True; + return true; } void SAL_CALL LayoutManager::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception) { SolarMutexClearableGuard aWriteLock; - sal_Bool bWasVisible( m_bVisible ); + bool bWasVisible( m_bVisible ); m_bVisible = bVisible; aWriteLock.clear(); - if ( bWasVisible != bVisible ) + if ( (bWasVisible ? 1 : 0) != bVisible ) implts_setVisibleState( bVisible ); } @@ -2553,11 +2553,11 @@ void LayoutManager::implts_updateMenuBarClose() } } -sal_Bool LayoutManager::implts_resetMenuBar() +bool LayoutManager::implts_resetMenuBar() { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ SolarMutexClearableGuard aWriteLock; - sal_Bool bMenuVisible( m_bMenuVisible ); + bool bMenuVisible( m_bMenuVisible ); Reference< awt::XWindow > xContainerWindow( m_xContainerWindow ); MenuBar* pSetMenuBar = 0; @@ -2578,10 +2578,10 @@ sal_Bool LayoutManager::implts_resetMenuBar() { pSysWindow->SetMenuBar( pSetMenuBar ); pSetMenuBar->SetDisplayable( true ); - return sal_True; + return true; } - return sal_False; + return false; } IMPL_LINK_NOARG(LayoutManager, MenuBarClose) @@ -2717,7 +2717,7 @@ void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) thro aWriteLock.clear(); if ( bSetVisible ) - implts_updateUIElementsVisibleState( sal_True ); + implts_updateUIElementsVisibleState( true ); } } @@ -2737,7 +2737,7 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr aWriteLock.clear(); if ( bSetInvisible ) - implts_updateUIElementsVisibleState( sal_False ); + implts_updateUIElementsVisibleState( false ); } } @@ -2757,7 +2757,7 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) aReadLock.clear(); implts_setDockingAreaWindowSizes( aDockingArea ); - implts_doLayout( sal_True, sal_False ); + implts_doLayout( true, false ); return 0; } @@ -2776,9 +2776,9 @@ throw ( RuntimeException, std::exception ) m_bMustDoLayout = true; aWriteLock.clear(); - implts_reset( sal_True ); - implts_doLayout( sal_True, sal_False ); - implts_doLayout( sal_True, sal_True ); + implts_reset( true ); + implts_doLayout( true, false ); + implts_doLayout( true, true ); } else if (( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED ) || ( aEvent.Action == FrameAction_FRAME_UI_DEACTIVATING )) { @@ -2798,14 +2798,14 @@ throw ( RuntimeException, std::exception ) m_bComponentAttached = false; aWriteLock.clear(); - implts_reset( sal_False ); + implts_reset( false ); } } void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent ) throw( RuntimeException, std::exception ) { - sal_Bool bDisposeAndClear( sal_False ); + bool bDisposeAndClear( false ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ SolarMutexClearableGuard aWriteLock; @@ -2866,7 +2866,7 @@ throw( RuntimeException, std::exception ) delete m_pGlobalSettings; m_pGlobalSettings = 0; - bDisposeAndClear = sal_True; + bDisposeAndClear = true; } else if ( rEvent.Source == Reference< XInterface >( m_xContainerWindow, UNO_QUERY )) { @@ -3113,7 +3113,7 @@ void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32 n case LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY: { - sal_Bool bValue(sal_False); + bool bValue(false); if (( aValue >>= bValue ) && bValue ) { SolarMutexClearableGuard aReadLock; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 6f3fb0705961..9cde7d5a50ce 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1562,7 +1562,7 @@ void ToolbarLayoutManager::implts_destroyDockingAreaWindows() // persistence methods -sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) +bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) { return LayoutManager::readWindowStateData( aName, rElementData, m_xPersistentWindowState, m_pGlobalSettings, m_bGlobalSettings, m_xContext ); @@ -1600,9 +1600,9 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen uno::Sequence< beans::PropertyValue > aWindowState( 9 ); aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED; - aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating )); + aWindowState[0].Value = ::uno::makeAny( !rElementData.m_bFloating ); aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE; - aWindowState[1].Value = uno::makeAny( sal_Bool( rElementData.m_bVisible )); + aWindowState[1].Value = uno::makeAny( rElementData.m_bVisible ); aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA; aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) ); @@ -2206,7 +2206,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D { SingleRowColumnWindowData aRowColumnWindowData; - sal_Bool bHorzDockArea( isHorizontalDockingArea( eDockingArea )); + bool bHorzDockArea( isHorizontalDockingArea( eDockingArea )); implts_getDockingAreaElementInfoOnSingleRowCol( eDockingArea, nRowCol, aRowColumnWindowData ); if ( aRowColumnWindowData.aRowColumnWindows.empty() ) return rMovedElementRect; @@ -2732,7 +2732,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( ::Rectangle aUIElementRect( aWindowRect ); sal_Int32 nMiddle( bHorizontalDockArea ? ( aWindowRect.Left() + aWindowRect.getWidth() / 2 ) : ( aWindowRect.Top() + aWindowRect.getHeight() / 2 )); - sal_Bool bInsertBefore( bHorizontalDockArea ? ( rMousePos.X() < nMiddle ) : ( rMousePos.Y() < nMiddle )); + bool bInsertBefore( bHorizontalDockArea ? ( rMousePos.X() < nMiddle ) : ( rMousePos.Y() < nMiddle )); if ( bInsertBefore ) { if ( bHorizontalDockArea ) diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index efe6c1d59bc1..d6f6986ee463 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -265,7 +265,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a // persistence methods - sal_Bool implts_readWindowStateData( const OUString& aName, UIElement& rElementData ); + bool implts_readWindowStateData( const OUString& aName, UIElement& rElementData ); void implts_writeWindowStateData( const UIElement& rElementData ); // members diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 2d5d6b706232..b4f1a8e1c201 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -234,9 +234,9 @@ void LoadEnv::initializeLoading(const OUString& m_nSearchFlags = nSearchFlags; m_eFeature = eFeature; m_eContentType = eContentType; - m_bCloseFrameOnError = sal_False; - m_bReactivateControllerOnError = sal_False; - m_bLoaded = sal_False; + m_bCloseFrameOnError = false; + m_bReactivateControllerOnError = false; + m_bLoaded = false; // try to find out, if its really a content, which can be loaded or must be "handled" // We use a default value for this in-parameter. Then we have to start a complex check method @@ -367,7 +367,7 @@ void LoadEnv::startLoading() // Because it was made in the easiest way ... may a flat detection was made only. // And such simple detection can fail some times .-) // Use another strategy here. Try it and let it run into the case "loading not possible". - sal_Bool bStarted = sal_False; + bool bStarted = false; if ( ((m_eFeature & E_ALLOW_CONTENTHANDLER) == E_ALLOW_CONTENTHANDLER) && (m_eContentType != E_CAN_BE_SET ) /* Attention: special feature to set existing component on a frame must ignore type detection! */ @@ -391,7 +391,7 @@ void LoadEnv::startLoading() First draft does not implement timeout using [ms]. Current implementation counts yield calls only ... -----------------------------------------------*/ -sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout) +bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout) { // Because its not a good idea to block the main thread // (and we can't be sure that we are currently not used inside the @@ -447,7 +447,7 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram { osl::MutexGuard g(m_mutex); if (m_bWaitingResult) - m_pLoadEnv->impl_setResult(sal_True); + m_pLoadEnv->impl_setResult(true); m_bWaitingResult = false; } @@ -456,7 +456,7 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra { osl::MutexGuard g(m_mutex); if (m_bWaitingResult) - m_pLoadEnv->impl_setResult(sal_False); + m_pLoadEnv->impl_setResult(false); m_bWaitingResult = false; } @@ -471,15 +471,15 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult switch(aEvent.State) { case css::frame::DispatchResultState::FAILURE : - m_pLoadEnv->impl_setResult(sal_False); + m_pLoadEnv->impl_setResult(false); break; case css::frame::DispatchResultState::SUCCESS : - m_pLoadEnv->impl_setResult(sal_False); + m_pLoadEnv->impl_setResult(false); break; case css::frame::DispatchResultState::DONTKNOW : - m_pLoadEnv->impl_setResult(sal_False); + m_pLoadEnv->impl_setResult(false); break; } m_bWaitingResult = false; @@ -490,11 +490,11 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) { osl::MutexGuard g(m_mutex); if (m_bWaitingResult) - m_pLoadEnv->impl_setResult(sal_False); + m_pLoadEnv->impl_setResult(false); m_bWaitingResult = false; } -void LoadEnv::impl_setResult(sal_Bool bResult) +void LoadEnv::impl_setResult(bool bResult) { osl::MutexGuard g(m_mutex); @@ -823,7 +823,7 @@ void LoadEnv::impl_detectTypeAndFilter() // and should trigger a special handling. Then the outside call of this method here, // has to know, what he is doing .-) - sal_Bool bIsOwnTemplate = sal_False; + bool bIsOwnTemplate = false; if (!sFilter.isEmpty()) { css::uno::Reference< css::container::XNameAccess > xFilterCont(xContext->getServiceManager()->createInstanceWithContext(SERVICENAME_FILTERFACTORY, xContext), css::uno::UNO_QUERY_THROW); @@ -849,7 +849,7 @@ void LoadEnv::impl_detectTypeAndFilter() } } -sal_Bool LoadEnv::impl_handleContent() +bool LoadEnv::impl_handleContent() throw(LoadEnvException, css::uno::RuntimeException) { // SAFE -> ----------------------------------- @@ -909,13 +909,13 @@ sal_Bool LoadEnv::impl_handleContent() css::uno::Reference< css::frame::XDispatchResultListener > xListener(static_cast< css::frame::XDispatchResultListener* >(pListener), css::uno::UNO_QUERY); xHandler->dispatchWithNotification(aURL, lDescriptor, xListener); - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool LoadEnv::impl_furtherDocsAllowed() +bool LoadEnv::impl_furtherDocsAllowed() { // SAFE -> osl::ResettableMutexGuard aReadLock(m_mutex); @@ -923,7 +923,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() aReadLock.clear(); // <- SAFE - sal_Bool bAllowed = sal_True; + bool bAllowed = true; try { @@ -937,7 +937,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() // NIL means: count of allowed documents = infinite ! // => return sal_True if ( ! aVal.hasValue()) - bAllowed = sal_True; + bAllowed = true; else { sal_Int32 nMaxOpenDocuments = 0; @@ -958,7 +958,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() } } catch(const css::uno::Exception&) - { bAllowed = sal_True; } // !! internal errors are no reason to disturb the office from opening documents .-) + { bAllowed = true; } // !! internal errors are no reason to disturb the office from opening documents .-) if ( ! bAllowed ) { @@ -995,7 +995,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() return bAllowed; } -sal_Bool LoadEnv::impl_loadContent() +bool LoadEnv::impl_loadContent() throw(LoadEnvException, css::uno::RuntimeException) { // SAFE -> ----------------------------------- @@ -1008,8 +1008,8 @@ sal_Bool LoadEnv::impl_loadContent() m_xTargetFrame = impl_searchAlreadyLoaded(); if (m_xTargetFrame.is()) { - impl_setResult(sal_True); - return sal_True; + impl_setResult(true); + return true; } m_xTargetFrame = impl_searchRecycleTarget(); } @@ -1022,7 +1022,7 @@ sal_Bool LoadEnv::impl_loadContent() ) { if (! impl_furtherDocsAllowed()) - return sal_False; + return false; m_xTargetFrame = m_xBaseFrame->findFrame(SPECIALTARGET_BLANK, 0); m_bCloseFrameOnError = m_xTargetFrame.is(); } @@ -1033,7 +1033,7 @@ sal_Bool LoadEnv::impl_loadContent() if (! m_xTargetFrame.is()) { if (! impl_furtherDocsAllowed()) - return sal_False; + return false; m_xTargetFrame = m_xBaseFrame->findFrame(SPECIALTARGET_BLANK, 0); m_bCloseFrameOnError = m_xTargetFrame.is(); } @@ -1075,9 +1075,9 @@ sal_Bool LoadEnv::impl_loadContent() // So we prevent our code against wrong using. Why? // It could be, that using of this progress could make trouble. e.g. He make window visible ... // but shouldn't do that. But if no indicator is available ... nobody has a chance to do that! - sal_Bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , sal_False ); - sal_Bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED() , sal_False ); - sal_Bool bPreview = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW() , sal_False ); + bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , sal_False ); + bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED() , sal_False ); + bool bPreview = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW() , sal_False ); css::uno::Reference< css::task::XStatusIndicator > xProgress = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), css::uno::Reference< css::task::XStatusIndicator >()); if (!bHidden && !bMinimized && !bPreview && !xProgress.is()) @@ -1112,23 +1112,23 @@ sal_Bool LoadEnv::impl_loadContent() css::uno::Reference< css::frame::XLoadEventListener > xListener(static_cast< css::frame::XLoadEventListener* >(pListener), css::uno::UNO_QUERY); xAsyncLoader->load(xTargetFrame, sURL, lDescriptor, xListener); - return sal_True; + return true; } else if (xSyncLoader.is()) { - sal_Bool bResult = xSyncLoader->load(lDescriptor, xTargetFrame); + bool bResult = xSyncLoader->load(lDescriptor, xTargetFrame); // react for the result here, so the outside waiting // code can ask for it later. impl_setResult(bResult); // But the return value indicates a valid started(!) operation. // And that's true every time we reach this line :-) - return sal_True; + return true; } aWriteLock.clear(); // <- SAFE - return sal_False; + return false; } css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() @@ -1326,7 +1326,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // Hidden frames are special. // They will be used as "last chance" if there is no visible frame pointing to the same model. // Safe the result but continue with current loop might be looking for other visible frames. - sal_Bool bIsHidden = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False); + bool bIsHidden = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False); if ( ( bIsHidden ) && ( ! xHiddenTask.is()) @@ -1362,13 +1362,13 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() impl_jumpToMark(xResult, m_aURL); // bring it to front and make sure it's visible... - impl_makeFrameWindowVisible(xResult->getContainerWindow(), sal_True); + impl_makeFrameWindowVisible(xResult->getContainerWindow(), true); } return xResult; } -sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const +bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const { css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY); @@ -1376,7 +1376,7 @@ sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< c // Might its an external written frame implementation :-( // Allowing using of it ... but it can fail if its not synchronized with our processes ! if (!xLock.is()) - return sal_False; + return false; // Otherwise we have to look for any other existing lock. return xLock->isActionLocked(); @@ -1402,7 +1402,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() if (!impl_isFrameAlreadyUsedForLoading(aTasksAnalyzer.m_xBackingComponent)) { // bring it to front ... - impl_makeFrameWindowVisible(aTasksAnalyzer.m_xBackingComponent->getContainerWindow(), sal_True); + impl_makeFrameWindowVisible(aTasksAnalyzer.m_xBackingComponent->getContainerWindow(), true); return aTasksAnalyzer.m_xBackingComponent; } } @@ -1487,7 +1487,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() // OK - there is a valid target frame. // But may be it contains already a document. // Then we have to ask it, if it allows recycling of this frame .-) - sal_Bool bReactivateOldControllerOnError = sal_False; + bool bReactivateOldControllerOnError = false; css::uno::Reference< css::frame::XController > xOldDoc = xTask->getController(); if (xOldDoc.is()) { @@ -1508,7 +1508,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() // <- SAFE .................................. // bring it to front ... - impl_makeFrameWindowVisible(xTask->getContainerWindow(), sal_True); + impl_makeFrameWindowVisible(xTask->getContainerWindow(), true); return xTask; } @@ -1527,8 +1527,8 @@ void LoadEnv::impl_reactForLoadingState() // Note: We show new created frames here only. // We dont hide already visible frames here ... css::uno::Reference< css::awt::XWindow > xWindow = m_xTargetFrame->getContainerWindow(); - sal_Bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False); - sal_Bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), sal_False); + bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False); + bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), sal_False); if (bMinimized) { @@ -1542,7 +1542,7 @@ void LoadEnv::impl_reactForLoadingState() { // show frame ... if it's not still visible ... // But do nothing if it's already visible! - impl_makeFrameWindowVisible(xWindow, sal_False); + impl_makeFrameWindowVisible(xWindow, false); } // Note: Only if an existing property "FrameName" is given by this media descriptor, @@ -1569,10 +1569,10 @@ void LoadEnv::impl_reactForLoadingState() m_xTargetFrame.clear(); if (xOldDoc.is()) { - sal_Bool bReactivated = xOldDoc->suspend(sal_False); + bool bReactivated = xOldDoc->suspend(sal_False); if (!bReactivated) throw LoadEnvException(LoadEnvException::ID_COULD_NOT_REACTIVATE_CONTROLLER); - m_bReactivateControllerOnError = sal_False; + m_bReactivateControllerOnError = false; } } else if (m_bCloseFrameOnError) @@ -1633,7 +1633,7 @@ void LoadEnv::impl_reactForLoadingState() } void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , - sal_Bool bForceToFront) + bool bForceToFront) { // SAFE -> ---------------------------------- osl::ClearableMutexGuard aReadLock(m_mutex); @@ -1692,8 +1692,8 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw if (!pWindow) return; - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + bool bSystemWindow = pWindow->IsSystemWindow(); + bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index fe46e6075be7..944c5be13d37 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -21,7 +21,7 @@ namespace framework{ -sal_Bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget , +bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget) { switch(eSpecialTarget) @@ -53,11 +53,11 @@ sal_Bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget , case E_HELPTASK : return (sCheckTarget.equals(SPECIALTARGET_HELPTASK)); default: - return sal_False; + return false; } } -sal_Bool TargetHelper::isValidNameForFrame(const OUString& sName) +bool TargetHelper::isValidNameForFrame(const OUString& sName) { // some special targets are really special ones :-) // E.g. the are really used to locate one frame inside the frame tree. @@ -66,7 +66,7 @@ sal_Bool TargetHelper::isValidNameForFrame(const OUString& sName) (TargetHelper::matchSpecialTarget(sName, E_HELPTASK)) || (TargetHelper::matchSpecialTarget(sName, E_BEAMER) ) ) - return sal_True; + return true; // all other names must be checked more general // special targets starts with a "_". diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index d6879ef8a977..a97f3a39a08a 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -211,7 +211,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu if ( !sVal.isEmpty() ) { const sal_Unicode* pChars = sVal.getStr(); - sal_Bool bInString = sal_False; + bool bInString = false; for ( sal_Int32 nChar=0; nChar<sVal.getLength(); nChar ++ ) { if ( pChars[nChar] < 32 || pChars[nChar] == '"' ) @@ -221,7 +221,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu { // close current string aArgumentBuffer.appendAscii("\""); - bInString = sal_False; + bInString = false; } if ( nChar>0 ) @@ -243,7 +243,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu // start a new string aArgumentBuffer.appendAscii("\""); - bInString = sal_True; + bInString = true; } aArgumentBuffer.append( pChars[nChar] ); @@ -293,7 +293,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBu void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - sal_Bool bAsComment, OUStringBuffer& aScriptBuffer ) + bool bAsComment, OUStringBuffer& aScriptBuffer ) { OUStringBuffer aArgumentBuffer(1000); OUString sArrayName; diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 50ffc2791a94..146031c68371 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -265,9 +265,9 @@ public: TDocumentInfo() : DocumentState (E_UNKNOWN) - , UsedForSaving (sal_False) - , ListenForModify (sal_False) - , IgnoreClosing (sal_False) + , UsedForSaving (false) + , ListenForModify (false) + , IgnoreClosing (false) , ID (-1 ) {} @@ -290,14 +290,14 @@ public: we have supress our own AutoSave for the moment, a document will be already saved by others. */ - sal_Bool UsedForSaving; + bool UsedForSaving; /** For every user action, which modifies a document (e.g. key input) we get a notification as XModifyListener. That seems to be a "performance issue" .-) So we decided to listen for such modify events only for the time in which the document was stored as temp. file and was not modified again by the user. */ - sal_Bool ListenForModify; + bool ListenForModify; /** For SessionSave we must close all open documents by ourself. But because we are listen for documents events, we get some ... @@ -305,7 +305,7 @@ public: That's why we mark these documents as "Closed by ourself" so we can ignore these "OnUnload" or disposing() events .-) */ - sal_Bool IgnoreClosing; + bool IgnoreClosing; /** TODO: document me */ OUString OrgURL; @@ -369,8 +369,8 @@ private: /** @short because we stop/restart listening sometimes, it's a good idea to know if we already registered as listener .-) */ - sal_Bool m_bListenForDocEvents; - sal_Bool m_bListenForConfigChanges; + bool m_bListenForDocEvents; + bool m_bListenForConfigChanges; /** @short specify the time intervall between two save actions. @descr Time is measured in [min]. @@ -597,7 +597,7 @@ private: // TODO document me void implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo , - sal_Bool bRemoveIt = sal_False); + bool bRemoveIt = false); // TODO document me void implts_startListening(); @@ -673,7 +673,7 @@ private: @threadsafe */ void implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , - sal_Bool bStopListening = sal_True); + bool bStopListening = true); // TODO document me void implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument); @@ -683,7 +683,7 @@ private: // TODO document me void implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , - sal_Bool bSaveInProgress); + bool bSaveInProgress); // TODO document me void implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument); @@ -707,7 +707,7 @@ private: const css::uno::Reference< css::frame::XModel >& xDocument); /** TODO document me */ - void implts_changeAllDocVisibility(sal_Bool bVisible); + void implts_changeAllDocVisibility(bool bVisible); void implts_prepareSessionShutdown(); /** @short save all current opened documents to a specific @@ -745,8 +745,8 @@ private: @threadsafe */ - AutoRecovery::ETimerType implts_saveDocs( sal_Bool bAllowUserIdleLoop, - sal_Bool bRemoveLockFiles, + AutoRecovery::ETimerType implts_saveDocs( bool bAllowUserIdleLoop, + bool bRemoveLockFiles, const DispatchParams* pParams = 0); /** @short save one of the current documents to a specific @@ -866,7 +866,7 @@ private: }; // TODO document me - void implts_resetHandleStates(sal_Bool bLoadCache); + void implts_resetHandleStates(bool bLoadCache); // TODO document me void implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo); @@ -953,7 +953,7 @@ private: void implts_verifyCacheAgainstDesktopDocumentList(); /// TODO document me - sal_Bool impl_enoughDiscSpace(sal_Int32 nRequiredSpace); + bool impl_enoughDiscSpace(sal_Int32 nRequiredSpace); /// TODO document me static void impl_showFullDiscError(); @@ -1100,11 +1100,11 @@ static const sal_Int32 RETRY_STORE_ON_FULL_DISC_FOREVER = 300; // no static const sal_Int32 RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL = 3; // in case FULL DISC does not seem the real problem static const sal_Int32 GIVE_UP_RETRY = 1; // in case FULL DISC does not seem the real problem -#define SAVE_IN_PROGRESS sal_True -#define SAVE_FINISHED sal_False +#define SAVE_IN_PROGRESS true +#define SAVE_FINISHED false -#define LOCK_FOR_CACHE_ADD_REMOVE sal_True -#define LOCK_FOR_CACHE_USE sal_False +#define LOCK_FOR_CACHE_ADD_REMOVE true +#define LOCK_FOR_CACHE_USE false #define MIN_TIME_FOR_USER_IDLE 10000 // 10s user idle @@ -1133,28 +1133,28 @@ class CacheLockGuard // to prevent increasing/decreasing of m_rCacheLock more then ones // we must know if THIS guard has an actual lock set there ! - sal_Bool m_bLockedByThisGuard; + bool m_bLockedByThisGuard; public: CacheLockGuard(AutoRecovery* pOwner , osl::Mutex& rMutex , sal_Int32& rCacheLock , - sal_Bool bLockForAddRemoveVectorItems); + bool bLockForAddRemoveVectorItems); ~CacheLockGuard(); - void lock(sal_Bool bLockForAddRemoveVectorItems); + void lock(bool bLockForAddRemoveVectorItems); void unlock(); }; CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , osl::Mutex& rMutex , sal_Int32& rCacheLock , - sal_Bool bLockForAddRemoveVectorItems) + bool bLockForAddRemoveVectorItems) : m_xOwner (static_cast< css::frame::XDispatch* >(pOwner)) , m_rSharedMutex (rMutex ) , m_rCacheLock (rCacheLock ) - , m_bLockedByThisGuard(sal_False ) + , m_bLockedByThisGuard(false ) { lock(bLockForAddRemoveVectorItems); } @@ -1165,7 +1165,7 @@ CacheLockGuard::~CacheLockGuard() m_xOwner.clear(); } -void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) +void CacheLockGuard::lock(bool bLockForAddRemoveVectorItems) { /* SAFE */ { osl::MutexGuard g(m_rSharedMutex); @@ -1195,7 +1195,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) } ++m_rCacheLock; - m_bLockedByThisGuard = sal_True; + m_bLockedByThisGuard = true; } /* SAFE */ } @@ -1208,7 +1208,7 @@ void CacheLockGuard::unlock() return; --m_rCacheLock; - m_bLockedByThisGuard = sal_False; + m_bLockedByThisGuard = false; if (m_rCacheLock < 0) { @@ -1266,8 +1266,8 @@ AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContex : AutoRecovery_BASE (m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) , m_xContext (xContext ) - , m_bListenForDocEvents (sal_False ) - , m_bListenForConfigChanges (sal_False ) + , m_bListenForDocEvents (false ) + , m_bListenForConfigChanges (false ) , m_nAutoSaveTimeIntervall (0 ) , m_eJob (AutoRecovery::E_NO_JOB ) , m_aAsyncDispatcher ( LINK( this, AutoRecovery, implts_asyncDispatch ) ) @@ -1333,7 +1333,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL& if (eNewJob == AutoRecovery::E_NO_JOB) return; - sal_Bool bAsync; + bool bAsync; DispatchParams aParams; /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1366,7 +1366,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL& // independend from the configuration entry. if ((eNewJob & AutoRecovery::E_SET_AUTOSAVE_STATE) == AutoRecovery::E_SET_AUTOSAVE_STATE) { - sal_Bool bOn = lArgs.getUnpackedValueOrDefault(PROP_AUTOSAVE_STATE, (sal_Bool)sal_True); + bool bOn = lArgs.getUnpackedValueOrDefault(PROP_AUTOSAVE_STATE, sal_True); if (bOn) { // dont enable AutoSave hardly ! @@ -1428,8 +1428,8 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) // in case a new dispatch overwrites a may ba active AutoSave session // we must restore this session later. see below ... - sal_Bool bWasAutoSaveActive = ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE); - sal_Bool bWasUserAutoSaveActive = + bool bWasAutoSaveActive = ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE); + bool bWasUserAutoSaveActive = ((eJob & AutoRecovery::E_USER_AUTO_SAVE) == AutoRecovery::E_USER_AUTO_SAVE); // On the other side it make no sense to reactivate the AutoSave operation @@ -1437,7 +1437,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) // E.g. an EmergencySave/SessionSave indicates the end of life of the current office session. // It make no sense to reactivate an AutoSave then. // But a Recovery or SessionRestore should reactivate a may be already active AutoSave. - sal_Bool bAllowAutoSaveReactivation = sal_True; + bool bAllowAutoSaveReactivation = true; implts_stopTimer(); implts_stopListening(); @@ -1455,7 +1455,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) ) { SAL_INFO("fwk.autorecovery", "... prepare emergency save ..."); - bAllowAutoSaveReactivation = sal_False; + bAllowAutoSaveReactivation = false; implts_prepareEmergencySave(); } else @@ -1465,7 +1465,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) ) { SAL_INFO("fwk.autorecovery", "... do emergency save ..."); - bAllowAutoSaveReactivation = sal_False; + bAllowAutoSaveReactivation = false; implts_doEmergencySave(aParams); } else @@ -1484,7 +1484,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) ) { SAL_INFO("fwk.autorecovery", "... do session save ..."); - bAllowAutoSaveReactivation = sal_False; + bAllowAutoSaveReactivation = false; implts_doSessionSave(aParams); } else @@ -1494,7 +1494,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) ) { SAL_INFO("fwk.autorecovery", "... do session quiet quit ..."); - bAllowAutoSaveReactivation = sal_False; + bAllowAutoSaveReactivation = false; implts_doSessionQuietQuit(aParams); } else @@ -1662,7 +1662,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent // document closed => remove temp. files and configuration entries else if ( aEvent.EventName == EVENT_ON_UNLOAD ) { - implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() ! + implts_deregisterDocument(xDocument, true); // sal_True => stop listening for disposing() ! } } @@ -1691,7 +1691,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED ) { - sal_Bool bEnabled = sal_False; + bool bEnabled = false; if (pChanges[i].Element >>= bEnabled) { if (bEnabled) @@ -1753,7 +1753,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); if (xDocument.is()) { - implts_deregisterDocument(xDocument, sal_False); // sal_False => dont call removeEventListener() .. because it's not needed here + implts_deregisterDocument(xDocument, false); // sal_False => dont call removeEventListener() .. because it's not needed here return; } @@ -1817,11 +1817,11 @@ void AutoRecovery::implts_readAutoSaveConfig() css::uno::Reference< css::container::XHierarchicalNameAccess > xCommonRegistry(implts_openConfig(), css::uno::UNO_QUERY); // AutoSave [bool] - sal_Bool bEnabled = sal_False; + bool bEnabled = false; xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled; // UserAutoSave [bool] - sal_Bool bUserEnabled = sal_False; + bool bUserEnabled = false; xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled; /* SAFE */ { @@ -2077,7 +2077,7 @@ void AutoRecovery::implts_persistAllActiveViewNames() } } -void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo, sal_Bool bRemoveIt) +void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo, bool bRemoveIt) { css::uno::Reference< css::container::XHierarchicalNameAccess > xCFG; @@ -2115,7 +2115,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn { // new/modify css::uno::Reference< css::beans::XPropertySet > xSet; - sal_Bool bNew = (!xCheck->hasByName(sID)); + bool bNew = (!xCheck->hasByName(sID)); if (bNew) xSet = css::uno::Reference< css::beans::XPropertySet >(xCreate->createInstance(), css::uno::UNO_QUERY_THROW); else @@ -2186,7 +2186,7 @@ void AutoRecovery::implts_startListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; css::uno::Reference< css::frame::XGlobalEventBroadcaster > xBroadcaster; - sal_Bool bListenForDocEvents; + bool bListenForDocEvents; /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); xCFG.set (m_xRecoveryCFG, css::uno::UNO_QUERY); @@ -2201,7 +2201,7 @@ void AutoRecovery::implts_startListening() { m_xRecoveryCFGListener = new WeakChangesListener(this); xCFG->addChangesListener(m_xRecoveryCFGListener); - m_bListenForConfigChanges = sal_True; + m_bListenForConfigChanges = true; } if (!xBroadcaster.is()) @@ -2222,7 +2222,7 @@ void AutoRecovery::implts_startListening() xBroadcaster->addEventListener(m_xNewDocBroadcasterListener); /* SAFE */ { osl::MutexGuard g2(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); - m_bListenForDocEvents = sal_True; + m_bListenForDocEvents = true; } /* SAFE */ } } @@ -2246,7 +2246,7 @@ void AutoRecovery::implts_stopListening() ) { xGlobalEventBroadcaster->removeEventListener(m_xNewDocBroadcasterListener); - m_bListenForDocEvents = sal_False; + m_bListenForDocEvents = false; } if ( @@ -2255,7 +2255,7 @@ void AutoRecovery::implts_stopListening() ) { xCFG->removeChangesListener(m_xRecoveryCFGListener); - m_bListenForConfigChanges = sal_False; + m_bListenForConfigChanges = false; } } @@ -2269,7 +2269,7 @@ void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& { css::uno::Reference< css::util::XModifyListener > xThis(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY); xBroadcaster->addModifyListener(xThis); - rInfo.ListenForModify = sal_True; + rInfo.ListenForModify = true; } } @@ -2283,7 +2283,7 @@ void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& { css::uno::Reference< css::util::XModifyListener > xThis(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY); xBroadcaster->removeModifyListener(xThis); - rInfo.ListenForModify = sal_False; + rInfo.ListenForModify = false; } } @@ -2361,7 +2361,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) // check some "states", where its not allowed (better: not a good idea) to // start an AutoSave. (e.g. if the user makes drag & drop ...) // Then we poll till this "disallowed" state is gone. - sal_Bool bAutoSaveNotAllowed = Application::IsUICaptured(); + bool bAutoSaveNotAllowed = Application::IsUICaptured(); if (bAutoSaveNotAllowed) { /* SAFE */ { @@ -2380,7 +2380,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) if (m_eTimerType == AutoRecovery::E_POLL_FOR_USER_IDLE) { - sal_Bool bUserIdle = (Application::GetLastInputInterval()>MIN_TIME_FOR_USER_IDLE); + bool bUserIdle = (Application::GetLastInputInterval()>MIN_TIME_FOR_USER_IDLE); if (!bUserIdle) { implts_updateTimer(); @@ -2396,8 +2396,8 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) // force save of all currently open documents // The called method returns an info, if and how this // timer must be restarted. - sal_Bool bAllowUserIdleLoop = sal_True; - AutoRecovery::ETimerType eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_False); + bool bAllowUserIdleLoop = true; + AutoRecovery::ETimerType eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, false); // If timer isnt used for "short callbacks" (means polling // for special states) ... reset the handle state of all @@ -2410,7 +2410,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) (eSuggestedTimer == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL) ) { - implts_resetHandleStates(sal_False); + implts_resetHandleStates(false); } implts_informListener(AutoRecovery::E_AUTO_SAVE, @@ -2480,7 +2480,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame // check if this document must be ignored for recovery ! // Some use cases dont wish support for AutoSave/Recovery ... as e.g. OLE-Server / ActiveX Control etcpp. - sal_Bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), (sal_Bool)(sal_False)); + bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), sal_False); if (bNoAutoSave) return; @@ -2574,7 +2574,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame } void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , - sal_Bool bStopListening) + bool bStopListening) { AutoRecovery::TDocumentInfo aInfo; /* SAFE */ { @@ -2617,7 +2617,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra AutoRecovery::st_impl_removeFile(aInfo.OldTempURL); AutoRecovery::st_impl_removeFile(aInfo.NewTempURL); - implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config + implts_flushConfigItem(aInfo, true); // sal_True => remove it from config } void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument) @@ -2654,7 +2654,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr AutoRecovery::TDocumentInfo& rInfo = *pIt; // use sal_True as fallback ... so we recognize every document on EmergencySave/AutoRecovery! - sal_Bool bModified = sal_True; + bool bModified = true; css::uno::Reference< css::util::XModifiable > xModify(xDocument, css::uno::UNO_QUERY); if (xModify.is()) bModified = xModify->isModified(); @@ -2672,7 +2672,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr } void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , - sal_Bool bSaveInProgress) + bool bSaveInProgress) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2726,7 +2726,7 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr aInfo.Title = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTTITLE(), OUString()); } - aInfo.UsedForSaving = sal_False; + aInfo.UsedForSaving = false; } /* SAFE */ @@ -2755,7 +2755,7 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( Au namespace { - void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, sal_Bool i_bVisible ) + void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, bool i_bVisible ) { css::uno::Reference< css::container::XIndexAccess > xFramesContainer( i_rFrames->getFrames(), css::uno::UNO_QUERY ); const sal_Int32 count = xFramesContainer->getCount(); @@ -2779,7 +2779,7 @@ namespace } } -void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible) +void AutoRecovery::implts_changeAllDocVisibility(bool bVisible) { css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create(m_xContext), css::uno::UNO_QUERY); lcl_changeVisibility( xDesktop, bVisible ); @@ -2838,7 +2838,7 @@ void AutoRecovery::implts_prepareSessionShutdown() // it's fact, that we reach our deregistration method. There we // must not(!) update our configuration ... Otherwhise all // session data are lost !!! - rInfo.IgnoreClosing = sal_True; + rInfo.IgnoreClosing = true; // reset modified flag of these documents (ignoring the notification about it!) // Otherwise a message box is shown on closing these models. @@ -2892,20 +2892,20 @@ void AutoRecovery::implts_prepareSessionShutdown() So we ignore such documents only ... Hopefully next time they are not inserted in our cache. */ -sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo) +bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo) { if (! rInfo.Document.is()) - return sal_True; + return true; utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs()); - sal_Bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), (sal_Bool)(sal_False)); + bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), sal_False); return bNoAutoSave; } -AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAllowUserIdleLoop, - sal_Bool bRemoveLockFiles, - const DispatchParams* pParams ) +AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( bool bAllowUserIdleLoop, + bool bRemoveLockFiles, + const DispatchParams* pParams ) { css::uno::Reference< css::task::XStatusIndicator > xExternalProgress; if (pParams) @@ -3018,8 +3018,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl // b) Document was not postponed - and is not active now. => save it // c) Document was postponed - and is not active now. => save it // d) Document was postponed - and is active now. => save it (because user idle was checked already) - sal_Bool bActive = (xActiveModel == aInfo.Document); - sal_Bool bWasPostponed = ((aInfo.DocumentState & AutoRecovery::E_POSTPONED) == AutoRecovery::E_POSTPONED); + bool bActive = (xActiveModel == aInfo.Document); + bool bWasPostponed = ((aInfo.DocumentState & AutoRecovery::E_POSTPONED) == AutoRecovery::E_POSTPONED); if ( ! bWasPostponed && @@ -3124,7 +3124,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString& implts_flushConfigItem(rInfo); sal_Int32 nRetry = RETRY_STORE_ON_FULL_DISC_FOREVER; - sal_Bool bError = sal_False; + bool bError = false; do { try @@ -3142,13 +3142,13 @@ void AutoRecovery::implts_saveOneDoc(const OUString& throw css::uno::Exception(); #else // TRIGGER_FULL_DISC_CHECK - bError = sal_False; + bError = false; nRetry = 0; #endif // TRIGGER_FULL_DISC_CHECK } catch(const css::uno::Exception&) { - bError = sal_True; + bError = true; // a) FULL DISC seems to be the problem behind => show error and retry it forever (e.g. retry=300) // b) unknown problem (may be locking problem) => reset RETRY value to more useful value(!) (e.g. retry=3) @@ -3259,11 +3259,11 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa if (aParams.m_xProgress.is()) lDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress; - sal_Bool bBackupWasTried = ( + bool bBackupWasTried = ( ((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_BACKUP ) == AutoRecovery::E_TRY_LOAD_BACKUP) || // temp. state! ((rInfo.DocumentState & AutoRecovery::E_INCOMPLETE ) == AutoRecovery::E_INCOMPLETE ) // transport TRY_LOAD_BACKUP from last loop to this new one! ); - sal_Bool bOriginalWasTried = ((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_ORIGINAL) == AutoRecovery::E_TRY_LOAD_ORIGINAL); + bool bOriginalWasTried = ((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_ORIGINAL) == AutoRecovery::E_TRY_LOAD_ORIGINAL); if (bBackupWasTried) { @@ -3346,7 +3346,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa rInfo.DocumentState |= AutoRecovery::E_DAMAGED; } - implts_flushConfigItem(rInfo, sal_True); + implts_flushConfigItem(rInfo, true); implts_informListener(eJob, AutoRecovery::implst_createFeatureStateEvent(eJob, OPERATION_UPDATE, &rInfo)); @@ -3369,7 +3369,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa css::uno::Reference< css::util::XModifiable > xModify(rInfo.Document, css::uno::UNO_QUERY); if ( xModify.is() ) { - sal_Bool bModified = ((rInfo.DocumentState & AutoRecovery::E_MODIFIED) == AutoRecovery::E_MODIFIED); + bool bModified = ((rInfo.DocumentState & AutoRecovery::E_MODIFIED) == AutoRecovery::E_MODIFIED); xModify->setModified(bModified); } @@ -3676,7 +3676,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( return aEvent; } -void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) +void AutoRecovery::implts_resetHandleStates(bool /*bLoadCache*/) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -3707,7 +3707,7 @@ void AutoRecovery::implts_prepareEmergencySave() implts_verifyCacheAgainstDesktopDocumentList(); // hide all docs, so the user cant disturb our emergency save .-) - implts_changeAllDocVisibility(sal_False); + implts_changeAllDocVisibility(false); } void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) @@ -3734,11 +3734,11 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // Of course this method returns the right state - // because it knows, that we are running in ERMERGENCY SAVE mode .-) - sal_Bool bAllowUserIdleLoop = sal_False; // not allowed to change that .-) + bool bAllowUserIdleLoop = false; // not allowed to change that .-) AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; do { - eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_True, &aParams); + eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, true, &aParams); } while(eSuggestedTimer == AutoRecovery::E_CALL_ME_BACK); @@ -3747,7 +3747,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // was already saved during the THIS(!) EmergencySave session. // Of course following recovery session must be started without // any "handle" state ... - implts_resetHandleStates(sal_False); + implts_resetHandleStates(false); // flush config cached back to disc. impl_flushALLConfigChanges(); @@ -3772,7 +3772,7 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) // was already saved during the THIS(!) Recovery session. // Of course a may be following EmergencySave session must be started without // any "handle" state ... - implts_resetHandleStates(sal_True); + implts_resetHandleStates(true); // Reset the configuration hint "we was crashed"! ::comphelper::ConfigurationHelper::writeDirectKey( @@ -3802,12 +3802,12 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) // Of course this method returns the right state - // because it knows, that we are running in SESSION SAVE mode .-) - sal_Bool bAllowUserIdleLoop = sal_False; // not allowed to change that .-) + bool bAllowUserIdleLoop = false; // not allowed to change that .-) AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; do { // do not remove lock files of the documents, it will be done on session quit - eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_False, &aParams); + eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, false, &aParams); } while(eSuggestedTimer == AutoRecovery::E_CALL_ME_BACK); @@ -3816,7 +3816,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) // was already saved during the THIS(!) save session. // Of course following restore session must be started without // any "handle" state ... - implts_resetHandleStates(sal_False); + implts_resetHandleStates(false); // flush config cached back to disc. impl_flushALLConfigChanges(); @@ -3868,10 +3868,10 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) // was already saved during the THIS(!) Restore session. // Of course a may be following save session must be started without // any "handle" state ... - implts_resetHandleStates(sal_True); + implts_resetHandleStates(true); // make all opened documents visible - implts_changeAllDocVisibility(sal_True); + implts_changeAllDocVisibility(true); // Reset the configuration hint for "session save"! SAL_INFO("fwk.autorecovery", "... reset config key 'SessionData'"); @@ -3937,7 +3937,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) AutoRecovery::st_impl_removeFile(rInfo.OldTempURL); AutoRecovery::st_impl_removeFile(rInfo.NewTempURL); - implts_flushConfigItem(rInfo, sal_True); // sal_True => remove it from xml config! + implts_flushConfigItem(rInfo, true); // sal_True => remove it from xml config! m_lDocCache.erase(pIt); break; /// !!! pIt is not defined any longer ... further this function has finished it's work @@ -4007,7 +4007,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , { case AUTORECOVERY_PROPHANDLE_EXISTS_RECOVERYDATA : { - sal_Bool bSessionData = sal_False; + bool bSessionData = false; ::comphelper::ConfigurationHelper::readDirectKey( m_xContext, OUString(CFG_PACKAGE_RECOVERY), @@ -4015,12 +4015,12 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , OUString(CFG_ENTRY_SESSIONDATA), ::comphelper::ConfigurationHelper::E_READONLY) >>= bSessionData; - sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0)); + bool bRecoveryData = m_lDocCache.size() > 0; // exists session data ... => then we cant say, that these // data are valid for recovery. So we have to return sal_False then! if (bSessionData) - bRecoveryData = sal_False; + bRecoveryData = false; aValue <<= bRecoveryData; } @@ -4164,7 +4164,7 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()"); } -sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) +bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) { #ifdef SIMULATE_FULL_DISC return sal_False; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index cb23425865b3..1ed69b1e712d 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -154,7 +154,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon , Desktop_BASE ( m_aMutex ) , cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper ) // Init member - , m_bIsTerminated ( sal_False ) // see dispose() for further information! + , m_bIsTerminated ( false ) // see dispose() for further information! , m_xContext ( xContext ) , m_aChildTaskContainer ( ) , m_aListenerContainer ( m_aMutex ) @@ -163,7 +163,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon , m_eLoadState ( E_NOTSET ) , m_xLastFrame ( ) , m_aInteractionRequest ( ) - , m_bSuspendQuickstartVeto( sal_False ) + , m_bSuspendQuickstartVeto( false ) , m_aCommandOptions ( ) , m_sName ( ) , m_sTitle ( ) @@ -217,13 +217,13 @@ sal_Bool SAL_CALL Desktop::terminate() css::uno::Reference< css::frame::XTerminateListener > xSfxTerminator = m_xSfxTerminator; css::lang::EventObject aEvent ( static_cast< ::cppu::OWeakObject* >(this) ); - sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto; + bool bAskQuickStart = !m_bSuspendQuickstartVeto; aReadLock.clear(); // Ask normal terminate listener. They could stop terminate without closing any open document. Desktop::TTerminateListenerList lCalledTerminationListener; - sal_Bool bVeto = sal_False; + bool bVeto = false; impl_sendQueryTerminationEvent(lCalledTerminationListener, bVeto); if ( bVeto ) { @@ -233,8 +233,8 @@ sal_Bool SAL_CALL Desktop::terminate() // try to close all open frames. // Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past. - sal_Bool bAllowUI = sal_True; - sal_Bool bFramesClosed = impl_closeFrames(bAllowUI); + bool bAllowUI = true; + bool bFramesClosed = impl_closeFrames(bAllowUI); if ( ! bFramesClosed ) { impl_sendCancelTerminationEvent(lCalledTerminationListener); @@ -257,7 +257,7 @@ sal_Bool SAL_CALL Desktop::terminate() // But some of them can be dangerous. E.g. it would be dangerous if we close our pipe // and dont terminate in real because another listener throws a veto exception .-) - sal_Bool bTerminate = sal_False; + bool bTerminate = false; try { if( @@ -287,11 +287,11 @@ sal_Bool SAL_CALL Desktop::terminate() lCalledTerminationListener.push_back( xSfxTerminator ); } - bTerminate = sal_True; + bTerminate = true; } catch(const css::frame::TerminationVetoException&) { - bTerminate = sal_False; + bTerminate = false; } if ( ! bTerminate ) @@ -302,7 +302,7 @@ sal_Bool SAL_CALL Desktop::terminate() // see dispose() for further information. /* SAFE AREA --------------------------------------------------------------------------------------- */ SolarMutexClearableGuard aWriteLock; - m_bIsTerminated = sal_True; + m_bIsTerminated = true; aWriteLock.clear(); /* UNSAFE AREA ------------------------------------------------------------------------------------- */ @@ -920,7 +920,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS if ( sTargetFrameName==SPECIALTARGET_BLANK ) { TaskCreator aCreator( m_xContext ); - xTarget = aCreator.createTask(sTargetFrameName,sal_False); + xTarget = aCreator.createTask(sTargetFrameName,false); } // I.II) "_top" @@ -1004,7 +1004,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS ) { TaskCreator aCreator( m_xContext ); - xTarget = aCreator.createTask(sTargetFrameName,sal_False); + xTarget = aCreator.createTask(sTargetFrameName,false); } } @@ -1203,7 +1203,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio css::uno::Reference< css::task::XInteractionAbort > xAbort; css::uno::Reference< css::task::XInteractionApprove > xApprove; css::uno::Reference< css::document::XInteractionFilterSelect > xFilterSelect; - sal_Bool bAbort = sal_False; + bool bAbort = false; sal_Int32 nCount=lContinuations.getLength(); for( sal_Int32 nStep=0; nStep<nCount; ++nStep ) @@ -1232,20 +1232,20 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio } else if( aRequest >>= aErrorCodeRequest ) { - sal_Bool bWarning = ((aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK); + bool bWarning = ((aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK); if (xApprove.is() && bWarning) xApprove->select(); else if (xAbort.is()) { xAbort->select(); - bAbort = sal_True; + bAbort = true; } } else if( xAbort.is() ) { xAbort->select(); - bAbort = sal_True; + bAbort = true; } // Ok now it's time to break yield loop of loadComponentFromURL(). @@ -1325,7 +1325,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon // Initialize state with sal_False !!! // (Handle can be invalid) - sal_Bool bReturn = sal_False; + bool bReturn = false; switch( nHandle ) { @@ -1595,9 +1595,9 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty } void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lCalledListener, - sal_Bool& bVeto ) + bool& bVeto ) { - bVeto = sal_False; + bVeto = false; TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1621,7 +1621,7 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC catch( const css::frame::TerminationVetoException& ) { // first veto will stop notification loop. - bVeto = sal_True; + bVeto = true; return; } catch( const css::uno::Exception& ) @@ -1688,7 +1688,7 @@ void Desktop::impl_sendNotifyTerminationEvent() } } -sal_Bool Desktop::impl_closeFrames(sal_Bool bAllowUI) +bool Desktop::impl_closeFrames(bool bAllowUI) { SolarMutexClearableGuard aReadLock; css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > lFrames = m_aChildTaskContainer.getAllElements(); @@ -1706,7 +1706,7 @@ sal_Bool Desktop::impl_closeFrames(sal_Bool bAllowUI) // XController.suspend() will show an UI ... // Use it in case it was allowed from outside only. - sal_Bool bSuspended = sal_False; + bool bSuspended = false; css::uno::Reference< css::frame::XController > xController( xFrame->getController(), css::uno::UNO_QUERY ); if ( ( bAllowUI ) && @@ -1773,13 +1773,13 @@ sal_Bool Desktop::impl_closeFrames(sal_Bool bAllowUI) } // We work with valid listener only. -sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) +bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } // We work with valid listener only. -sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) +bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index f69767c93ba9..992879f226ff 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -110,7 +110,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( sal_Int32 nLength = lArguments.getLength(); aArguments.realloc( nLength + 1 ); aArguments[ nLength ].Name = "SynchronMode"; - aArguments[ nLength ].Value <<= (sal_Bool) sal_True; + aArguments[ nLength ].Value <<= sal_True; css::uno::Any aResult; if (xNotifyDispatch.is()) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 8f23fc362f17..ec6a3524afa0 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -346,7 +346,7 @@ private: // non threadsafe void impl_checkMenuCloser ( ); - void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , sal_Bool bState ); + void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , bool bState ); void impl_disposeContainerWindow ( css::uno::Reference< css::awt::XWindow >& xWindow ); // debug methods @@ -372,16 +372,16 @@ private: private: - static sal_Bool implcp_setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ); - static sal_Bool implcp_addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ); - static sal_Bool implcp_removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ); - 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 sal_Bool implcp_windowResized ( const css::awt::WindowEvent& aEvent ); - static sal_Bool implcp_focusGained ( const css::awt::FocusEvent& aEvent ); - static sal_Bool implcp_windowActivated ( const css::lang::EventObject& aEvent ); - static sal_Bool implcp_windowDeactivated ( const css::lang::EventObject& aEvent ); - static sal_Bool implcp_disposing ( const css::lang::EventObject& aEvent ); + static bool implcp_setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ); + static bool implcp_addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ); + static bool implcp_removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& 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 ); + static bool implcp_windowResized ( const css::awt::WindowEvent& aEvent ); + static bool implcp_focusGained ( const css::awt::FocusEvent& aEvent ); + static bool implcp_windowActivated ( const css::lang::EventObject& aEvent ); + static bool implcp_windowDeactivated ( const css::lang::EventObject& aEvent ); + static bool implcp_disposing ( const css::lang::EventObject& aEvent ); // variables // -threadsafe by SolarMutex @@ -401,13 +401,13 @@ private: css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > m_xDropTargetListener; /// listen to drag & drop EActiveState m_eActiveState; /// state, if i'am a member of active path in tree or i have the focus or ... OUString m_sName; /// name of this frame - sal_Bool m_bIsFrameTop; /// frame has no parent or the parent is a taskor the desktop - sal_Bool m_bConnected; /// due to FrameActionEvent + bool m_bIsFrameTop; /// frame has no parent or the parent is a taskor the desktop + bool m_bConnected; /// due to FrameActionEvent sal_Int16 m_nExternalLockCount; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier; /// is used for dispatch recording and will be set/get from outside. Frame provide it only! SvtCommandOptions m_aCommandOptions; /// ref counted class to support disabling commands defined by configuration file - sal_Bool m_bSelfClose; /// in case of CloseVetoException on method close() wqs thrown by ourself - we must close ourself later if no internal processes are running - sal_Bool m_bIsHidden; /// indicates, if this frame is used in hidden mode or not + bool m_bSelfClose; /// in case of CloseVetoException on method close() wqs thrown by ourself - we must close ourself later if no internal processes are running + bool m_bIsHidden; /// indicates, if this frame is used in hidden mode or not static css::uno::WeakReference< css::frame::XFrame2 > m_xCloserFrame; /// holds the only frame, which must show the special closer menu item (can be NULL!) css::uno::Reference< ::css::frame::XLayoutManager2 > m_xLayoutManager; /// is used to layout the child windows of the frame. css::uno::Reference< css::frame::XDispatchInformationProvider > m_xDispatchInfoHelper; @@ -527,7 +527,7 @@ Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext : TransactionBase ( ) , PropertySetHelper ( m_aMutex, &m_aTransactionManager, - sal_False) // sal_False => dont release shared mutex on calling us! + false) // sal_False => dont release shared mutex on calling us! // init member , m_xContext ( xContext ) , m_aListenerContainer ( m_aMutex ) @@ -537,11 +537,11 @@ Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext , m_xController ( ) , m_eActiveState ( E_INACTIVE ) , m_sName ( ) - , m_bIsFrameTop ( sal_True ) // I think we are top without a parent ... and there is no parent yet! - , m_bConnected ( sal_False ) // There exist no component inside of use => sal_False, we are not connected! + , m_bIsFrameTop ( true ) // I think we are top without a parent ... and there is no parent yet! + , m_bConnected ( false ) // There exist no component inside of use => sal_False, we are not connected! , m_nExternalLockCount ( 0 ) - , m_bSelfClose ( sal_False ) // Important! - , m_bIsHidden ( sal_True ) + , m_bSelfClose ( false ) // Important! + , m_bIsHidden ( true ) , m_xTitleHelper ( ) , m_pWindowCommandDispatch ( 0 ) , m_aChildFrameContainer ( ) @@ -859,7 +859,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& // if window is initially visible, we will never get a windowShowing event Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if (pWindow && pWindow->IsVisible()) - m_bIsHidden = sal_False; + m_bIsHidden = false; css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; css::uno::Reference< css::frame::XLayoutManager2 > xLayoutManager = m_xLayoutManager; @@ -1057,8 +1057,8 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr SolarMutexResettableGuard aReadLock; css::uno::Reference< css::frame::XFrame > xParent ( m_xParent, css::uno::UNO_QUERY ); css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; - sal_Bool bIsTopFrame = m_bIsFrameTop; - sal_Bool bIsTopWindow = WindowHelper::isTopWindow(m_xContainerWindow); + bool bIsTopFrame = m_bIsFrameTop; + bool bIsTopWindow = WindowHelper::isTopWindow(m_xContainerWindow); aReadLock.clear(); /* } SAFE */ @@ -1069,7 +1069,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr if ( sTargetFrameName==SPECIALTARGET_BLANK ) { TaskCreator aCreator(xContext); - xTarget = aCreator.createTask(sTargetFrameName,sal_False); + xTarget = aCreator.createTask(sTargetFrameName,false); } // I.II) "_parent" @@ -1266,7 +1266,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr ) { TaskCreator aCreator(xContext); - xTarget = aCreator.createTask(sTargetFrameName,sal_False); + xTarget = aCreator.createTask(sTargetFrameName,false); } } @@ -1542,8 +1542,8 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X css::uno::Reference< css::awt::XWindow > xOldComponentWindow = m_xComponentWindow; css::uno::Reference< css::frame::XController > xOldController = m_xController; Window* pOwnWindow = VCLUnoHelper::GetWindow( xContainerWindow ); - sal_Bool bHadFocus = pOwnWindow->HasChildPathFocus(); - sal_Bool bWasConnected = m_bConnected; + bool bHadFocus = pOwnWindow->HasChildPathFocus(); + bool bWasConnected = m_bConnected; aReadLock.clear(); /* } SAFE */ @@ -1629,7 +1629,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X m_xComponentWindow = xComponentWindow; m_xController = xController; m_bConnected = (m_xComponentWindow.is() || m_xController.is()); - sal_Bool bIsConnected = m_bConnected; + bool bIsConnected = m_bConnected; aWriteLock.clear(); /* } SAFE */ @@ -1809,7 +1809,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close if (bDeliverOwnership) { SolarMutexGuard g; - m_bSelfClose = sal_True; + m_bSelfClose = true; } throw css::util::CloseVetoException("Frame in use for loading document ...",static_cast< ::cppu::OWeakObject*>(this)); @@ -1838,7 +1838,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close /* SAFE { */ SolarMutexClearableGuard aWriteLock; - m_bIsHidden = sal_True; + m_bIsHidden = true; aWriteLock.clear(); /* } SAFE */ impl_checkMenuCloser(); @@ -2132,11 +2132,11 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception // and doesn't throw any DisposedExceptions we must guarantee best matching default values ... m_eActiveState = E_INACTIVE; m_sName = OUString(); - m_bIsFrameTop = sal_False; - m_bConnected = sal_False; + m_bIsFrameTop = false; + m_bConnected = false; m_nExternalLockCount = 0; - m_bSelfClose = sal_False; - m_bIsHidden = sal_True; + m_bSelfClose = false; + m_bIsHidden = true; // Disable this instance for further working really! m_aTransactionManager.setWorkingMode( E_CLOSE ); @@ -2539,13 +2539,13 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: *//*-*****************************************************************************************************/ void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { - static sal_Bool bFirstVisibleTask = sal_True; + static bool bFirstVisibleTask = true; /* SAFE { */ SolarMutexClearableGuard aReadLock; css::uno::Reference< css::frame::XDesktop > xDesktopCheck( m_xParent, css::uno::UNO_QUERY ); css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; - m_bIsHidden = sal_False; + m_bIsHidden = false; aReadLock.clear(); /* } SAFE */ @@ -2555,8 +2555,8 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno { /* STATIC SAFE { */ osl::ClearableMutexGuard aStaticWriteLock( LockHelper::getGlobalLock() ); - sal_Bool bMustBeTriggered = bFirstVisibleTask; - bFirstVisibleTask = sal_False; + bool bMustBeTriggered = bFirstVisibleTask; + bFirstVisibleTask = false; aStaticWriteLock.clear(); /* } STATIC SAFE */ @@ -2573,7 +2573,7 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un { /* SAFE { */ SolarMutexClearableGuard aReadLock; - m_bIsHidden = sal_True; + m_bIsHidden = true; aReadLock.clear(); /* } SAFE */ @@ -3128,8 +3128,8 @@ void Frame::implts_checkSuicide() SolarMutexClearableGuard aReadLock; // in case of lock==0 and safed state of previous close() request m_bSelfClose // we must force close() again. Because we had disagreed with that before. - sal_Bool bSuicide = (m_nExternalLockCount==0 && m_bSelfClose); - m_bSelfClose = sal_False; + bool bSuicide = (m_nExternalLockCount==0 && m_bSelfClose); + m_bSelfClose = false; aReadLock.clear(); /* } SAFE */ // force close and deliver owner ship to source of possible throwed veto exception @@ -3157,7 +3157,7 @@ void Frame::implts_checkSuicide() */ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame2 >& xFrame , - /*IN*/ sal_Bool bState ) + /*IN*/ bool bState ) { // Note: If start module isnt installed - no closer has to be shown! if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) @@ -3254,9 +3254,9 @@ void Frame::impl_checkMenuCloser() if (xCloserFrame!=xNewCloserFrame) { if (xCloserFrame.is()) - impl_setCloser(xCloserFrame, sal_False); + impl_setCloser(xCloserFrame, false); if (xNewCloserFrame.is()) - impl_setCloser(xNewCloserFrame, sal_True); + impl_setCloser(xNewCloserFrame, true); m_xCloserFrame = xNewCloserFrame; } } @@ -3265,52 +3265,52 @@ void Frame::impl_checkMenuCloser() // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer! // And we accept frames only! No tasks and desktops! -sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) +bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) { return css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is(); } -sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) +bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } -sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) +bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } -sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) +bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } -sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) +bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } -sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) +bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) { return !aEvent.Source.is(); } -sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) +bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) { return !aEvent.Source.is(); } -sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) +bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); } -sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) +bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); } -sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent ) +bool Frame::implcp_disposing( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); } diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 49ab890cb02f..3167cb00a4a3 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -56,7 +56,7 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper, sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq) throw (uno::RuntimeException, std::exception) { - sal_Bool bModified = sal_False; + bool bModified = false; for( sal_Int32 i = rSeq.getLength(); i--; ) { @@ -67,7 +67,7 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString > if (!aType.isEmpty()) { rUrl = aType; - bModified = sal_True; + bModified = true; } } return bModified; diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 29619dbebb45..0018dd3138b2 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -98,8 +98,8 @@ class PathSettings : private cppu::BaseMutex , lInternalPaths() , lUserPaths () , sWritePath () - , bIsSinglePath (sal_False) - , bIsReadonly (sal_False) + , bIsSinglePath (false) + , bIsReadonly (false) {} PathInfo(const PathInfo& rCopy) @@ -130,10 +130,10 @@ class PathSettings : private cppu::BaseMutex OUString sWritePath; /// indicates real single paths, which uses WritePath property only - sal_Bool bIsSinglePath; + bool bIsSinglePath; /// simple handling of finalized/mandatory states ... => we know one state READONLY only .-) - sal_Bool bIsReadonly; + bool bIsReadonly; }; typedef BaseHash< PathSettings::PathInfo > PathHash; @@ -172,7 +172,7 @@ private: ::cppu::OPropertyArrayHelper* m_pPropHelp; - sal_Bool m_bIgnoreEvents; + bool m_bIgnoreEvents; public: @@ -381,7 +381,7 @@ private: /** reload one path directly from the new configuration schema (because it was updated by any external code) */ PathSettings::EChangeOp impl_updatePath(const OUString& sPath , - sal_Bool bNotifyListener); + bool bNotifyListener); /** replace all might existing placeholder variables inside the given path ... or check if the given path value uses paths, which can be replaced with predefined @@ -389,10 +389,10 @@ private: */ void impl_subst( OUStringList& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , - sal_Bool bReSubst); + bool bReSubst); void impl_subst(PathSettings::PathInfo& aPath , - sal_Bool bReSubst); + bool bReSubst); /** converts our new string list schema to the old ";" separated schema ... */ OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; @@ -421,8 +421,8 @@ private: const PathSettings::PathInfo* impl_getPathAccessConst(sal_Int32 nHandle) const; /** it checks, if the given path value seems to be a valid URL or system path. */ - sal_Bool impl_isValidPath(const OUString& sPath) const; - sal_Bool impl_isValidPath(const OUStringList& lPath) const; + bool impl_isValidPath(const OUString& sPath) const; + bool impl_isValidPath(const OUStringList& lPath) const; void impl_storePath(const PathSettings::PathInfo& aPath); @@ -460,7 +460,7 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) , m_xContext (xContext) , m_pPropHelp(0 ) - , m_bIgnoreEvents(sal_False) + , m_bIgnoreEvents(false) { } @@ -510,7 +510,7 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven { sal_Int32 c = aEvent.Changes.getLength(); sal_Int32 i = 0; - sal_Bool bUpdateDescriptor = sal_False; + bool bUpdateDescriptor = false; for (i=0; i<c; ++i) { @@ -522,12 +522,12 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven OUString sPath = ::utl::extractFirstFromConfigurationPath(sChanged); if (!sPath.isEmpty()) { - PathSettings::EChangeOp eOp = impl_updatePath(sPath, sal_True); + PathSettings::EChangeOp eOp = impl_updatePath(sPath, true); if ( (eOp == PathSettings::E_ADDED ) || (eOp == PathSettings::E_REMOVED) ) - bUpdateDescriptor = sal_True; + bUpdateDescriptor = true; } } @@ -571,7 +571,7 @@ void PathSettings::impl_readAll() for (sal_Int32 i = 0; i < c; ++i) { const OUString& sPath = lPaths[i]; - impl_updatePath(sPath, sal_False); + impl_updatePath(sPath, false); } } catch(const css::uno::RuntimeException& ) @@ -642,12 +642,12 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath; // analyze finalized/mandatory states - aPathVal.bIsReadonly = sal_False; + aPathVal.bIsReadonly = false; css::uno::Reference< css::beans::XProperty > xInfo(xPath, css::uno::UNO_QUERY); if (xInfo.is()) { css::beans::Property aInfo = xInfo->getAsProperty(); - sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); + bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); // Note: Till we support finalized / mandatory on our API more in detail we handle // all states simple as READONLY ! But because all really needed paths are "mandatory" by default @@ -660,7 +660,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) { - m_bIgnoreEvents = sal_True; + m_bIgnoreEvents = true; css::uno::Reference< css::container::XNameAccess > xCfgNew = fa_getCfgNew(); css::uno::Reference< css::container::XNameAccess > xCfgOld = fa_getCfgOld(); @@ -669,7 +669,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) // So an office can be moved easialy to another location without loosing // it's related paths. PathInfo aResubstPath(aPath); - impl_subst(aResubstPath, sal_True); + impl_subst(aResubstPath, true); // update new configuration if (! aResubstPath.bIsSinglePath) @@ -700,7 +700,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) ::comphelper::ConfigurationHelper::flush(xCfgOld); } - m_bIgnoreEvents = sal_False; + m_bIgnoreEvents = false; } void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, @@ -732,7 +732,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, } PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath , - sal_Bool bNotifyListener) + bool bNotifyListener) { // SAFE -> osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -750,7 +750,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath // Do it before these old paths will be compared against the // new path configuration. Otherwise some striungs uses different variables ... but substitution // will produce strings with same content (because some variables are redundant!) - impl_subst(aPath, sal_False); + impl_subst(aPath, false); } catch(const css::uno::RuntimeException&) { throw; } @@ -768,7 +768,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath // Do it before these old paths will be compared against the // new path configuration. Otherwise some striungs uses different variables ... but substitution // will produce strings with same content (because some variables are redundant!) - impl_subst(lOldVals, fa_getSubstitution(), sal_False); + impl_subst(lOldVals, fa_getSubstitution(), false); impl_mergeOldUserPaths(aPath, lOldVals); } catch(const css::uno::RuntimeException&) @@ -959,7 +959,7 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ void PathSettings::impl_subst( OUStringList& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , - sal_Bool bReSubst) + bool bReSubst) { OUStringList::iterator pIt; @@ -979,7 +979,7 @@ void PathSettings::impl_subst( OUStringList& } void PathSettings::impl_subst(PathSettings::PathInfo& aPath , - sal_Bool bReSubst) + bool bReSubst) { css::uno::Reference< css::util::XStringSubstitution > xSubst = fa_getSubstitution(); @@ -1185,7 +1185,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , OUString sVal; aVal >>= sVal; OUStringList lList = impl_convertOldStyle2Path(sVal); - impl_subst(lList, fa_getSubstitution(), sal_False); + impl_subst(lList, fa_getSubstitution(), false); impl_purgeKnownPaths(aChangePath, lList); if (! impl_isValidPath(lList)) throw css::lang::IllegalArgumentException(); @@ -1273,7 +1273,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , pOrgPath->takeOver(aChangePath); } -sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const +bool PathSettings::impl_isValidPath(const OUStringList& lPath) const { OUStringList::const_iterator pIt; for ( pIt = lPath.begin(); @@ -1282,13 +1282,13 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const { const OUString& rVal = *pIt; if (! impl_isValidPath(rVal)) - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const +bool PathSettings::impl_isValidPath(const OUString& sPath) const { // allow empty path to reset a path. // idea by LLA to support empty paths diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 3b68e9561b93..1a498ea62d55 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -93,15 +93,15 @@ private: css::uno::Reference< css::frame::XSessionManagerClient > m_rSessionManager; // restore handling - sal_Bool m_bRestored; + bool m_bRestored; - sal_Bool m_bSessionStoreRequested; + bool m_bSessionStoreRequested; - sal_Bool m_bAllowUserInteractionOnQuit; - sal_Bool m_bTerminated; + bool m_bAllowUserInteractionOnQuit; + bool m_bTerminated; // in case of synchronous call the caller should do saveDone() call himself! - void StoreSession( sal_Bool bAsync ); + void StoreSession( bool bAsync ); // let session quietly close the documents, remove lock files, store configuration and etc. void QuitSessionQuietly(); @@ -154,15 +154,15 @@ public: virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void doSaveImpl( sal_Bool bShutdown, sal_Bool bCancelable ) throw (css::uno::RuntimeException); + void doSaveImpl( bool bShutdown, bool bCancelable ) throw (css::uno::RuntimeException); }; SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) - , m_bRestored( sal_False ) - , m_bSessionStoreRequested( sal_False ) - , m_bAllowUserInteractionOnQuit( sal_False ) - , m_bTerminated( sal_False ) + , m_bRestored( false ) + , m_bSessionStoreRequested( false ) + , m_bAllowUserInteractionOnQuit( false ) + , m_bTerminated( false ) { SAL_INFO("fwk.session", "SessionListener::SessionListener"); } @@ -177,7 +177,7 @@ SessionListener::~SessionListener() } } -void SessionListener::StoreSession( sal_Bool bAsync ) +void SessionListener::StoreSession( bool bAsync ) { SAL_INFO("fwk.session", "SessionListener::StoreSession"); osl::MutexGuard g(m_aMutex); @@ -280,7 +280,7 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" ) { if (event.FeatureDescriptor.equalsAscii("update")) - m_bRestored = sal_True; // a document was restored + m_bRestored = true; // a document was restored } else if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionSave" ) @@ -298,7 +298,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() { SAL_INFO("fwk.session", "SessionListener::doRestore"); osl::MutexGuard g(m_aMutex); - m_bRestored = sal_False; + m_bRestored = false; try { css::uno::Reference< frame::XDispatch > xDispatch = css::frame::theAutoRecovery::get( m_xContext ); @@ -309,7 +309,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() Sequence< PropertyValue > args; xDispatch->addStatusListener(this, aURL); xDispatch->dispatch(aURL, args); - m_bRestored = sal_True; + m_bRestored = true; } catch (const com::sun::star::uno::Exception& e) { SAL_WARN("fwk.session",e.Message); @@ -324,11 +324,11 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl SAL_INFO("fwk.session", "SessionListener::doSave"); if (bShutdown) { - m_bSessionStoreRequested = sal_True; // there is no need to protect it with mutex + m_bSessionStoreRequested = true; // there is no need to protect it with mutex if ( m_bAllowUserInteractionOnQuit && m_rSessionManager.is() ) m_rSessionManager->queryInteraction( static_cast< css::frame::XSessionManagerListener* >( this ) ); else - StoreSession( sal_True ); + StoreSession( true ); } // we don't have anything to do so tell the session manager we're done else if( m_rSessionManager.is() ) @@ -348,7 +348,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted try { // first of all let the session be stored to be sure that we lose no information - StoreSession( sal_False ); + StoreSession( false ); css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext ); // honestly: how many implementations of XDesktop will we ever have? @@ -376,7 +376,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted } catch( const css::uno::Exception& ) { - StoreSession( sal_True ); + StoreSession( true ); m_rSessionManager->interactionDone( this ); } @@ -385,7 +385,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted } else { - StoreSession( sal_True ); + StoreSession( true ); } } @@ -394,7 +394,7 @@ void SessionListener::shutdownCanceled() { SAL_INFO("fwk.session", "SessionListener::shutdownCanceled"); // set the state back - m_bSessionStoreRequested = sal_False; // there is no need to protect it with mutex + m_bSessionStoreRequested = false; // there is no need to protect it with mutex } void SessionListener::doQuit() diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 94c2daaeb216..b1ebfb81f20e 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -53,14 +53,14 @@ struct TTabPageInfo TTabPageInfo() : m_nIndex ( -1 ) - , m_bCreated (sal_False) + , m_bCreated (false) , m_pPage ( NULL ) , m_lProperties ( ) {} TTabPageInfo(::sal_Int32 nID) : m_nIndex ( nID ) - , m_bCreated (sal_False) + , m_bCreated (false) , m_pPage ( NULL ) , m_lProperties ( ) {} @@ -68,7 +68,7 @@ struct TTabPageInfo public: ::sal_Int32 m_nIndex; - sal_Bool m_bCreated; + bool m_bCreated; FwkTabPage* m_pPage; css::uno::Sequence< css::beans::NamedValue > m_lProperties; }; @@ -202,7 +202,7 @@ TabWindowService::TabWindowService() : TransactionBase ( ) , PropertySetHelper ( m_aMutex, &m_aTransactionManager , - sal_False ) // sal_False => dont release shared mutex on calling us! + false ) // sal_False => dont release shared mutex on calling us! , OWeakObject ( ) // Init member @@ -282,7 +282,7 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 if (pTabWin) { pTabWin->AddTabPage(rInfo.m_nIndex, rInfo.m_lProperties); - rInfo.m_bCreated = sal_True; + rInfo.m_bCreated = true; } } } diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 309693cebd5e..578622b29345 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -99,7 +99,7 @@ private: css::uno::Reference< css::awt::XWindow > implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow , const css::awt::Rectangle& aPosSize , - sal_Bool bTopWindow ); + bool bTopWindow ); void implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const; @@ -140,13 +140,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI css::uno::Reference< css::frame::XFrame > xParentFrame = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_PARENTFRAME) , css::uno::Reference< css::frame::XFrame >()); OUString sFrameName = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_FRAMENAME) , OUString() ); - sal_Bool bVisible = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_MAKEVISIBLE) , sal_False ); - sal_Bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CREATETOPWINDOW) , sal_True ); + bool bVisible = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_MAKEVISIBLE) , sal_False ); + bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CREATETOPWINDOW) , sal_True ); // only possize=[0,0,0,0] triggers default handling of vcl ! css::awt::Rectangle aPosSize = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_POSSIZE) , css::awt::Rectangle(0, 0, 0, 0) ); css::uno::Reference< css::awt::XWindow > xContainerWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CONTAINERWINDOW) , css::uno::Reference< css::awt::XWindow >() ); - sal_Bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False ); - sal_Bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True ); + bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False ); + bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True ); // We use FrameName property to set it as API name of the new created frame later. // But those frame names must be different from the set of special target names as e.g. _blank, _self etcpp ! @@ -162,7 +162,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // Parent has no own window ... // So we have to create a top level window always ! if ( ! xParentWindow.is()) - bCreateTopWindow = sal_True; + bCreateTopWindow = true; xContainerWindow = implts_createContainerWindow(xParentWindow, aPosSize, bCreateTopWindow); } @@ -173,7 +173,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // Note: Doing so it's no longer supported, that e.g. our wizards can use findFrame(_blank) // to create it's previes frames. They must do it manually by using WindowDescriptor+Toolkit! css::uno::Reference< css::frame::XDesktop > xDesktop(xParentFrame, css::uno::UNO_QUERY); - sal_Bool bTopLevelDocumentWindow = ( + bool bTopLevelDocumentWindow = ( sRightName.isEmpty() && ( (! xParentFrame.is() ) || @@ -226,7 +226,7 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow , const css::awt::Rectangle& aPosSize , - sal_Bool bTopWindow ) + bool bTopWindow ) { // get toolkit to create task container window css::uno::Reference< css::awt::XToolkit2 > xToolkit = css::awt::Toolkit::create( m_xContext ); @@ -236,7 +236,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai if ( ! bTopWindow) { if ( ! xParentWindow.is()) - bTopWindow = sal_False; + bTopWindow = false; else xParentWindowPeer = css::uno::Reference< css::awt::XWindowPeer >(xParentWindow, css::uno::UNO_QUERY_THROW); } diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index c19f9d6decdf..4e150844decc 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -307,7 +307,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL, // Check given URL css::util::URL aTestURL = aURL; - sal_Bool bParseResult = parseSmart( aTestURL, aTestURL.Protocol ); + bool bParseResult = parseSmart( aTestURL, aTestURL.Protocol ); if ( bParseResult ) { if ( !bWithPassword && !aTestURL.Password.isEmpty() ) diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 46b91c57c885..6c0836624c07 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -83,8 +83,8 @@ DEFINE_INIT_SERVICE ( TabWindow, {} ) TabWindow::TabWindow( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) - , m_bInitialized( sal_False ) - , m_bDisposed( sal_False ) + , m_bInitialized( false ) + , m_bDisposed( false ) , m_nNextTabID( 1 ) , m_aTitlePropName( "Title" ) , m_aPosPropName( "Position" ) @@ -269,7 +269,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) /* SAFE AREA ----------------------------------------------------------------------------------------------- */ SolarMutexResettableGuard aLock; - sal_Bool bInitalized( m_bInitialized ); + bool bInitalized( m_bInitialized ); css::uno::Reference< css::uno::XComponentContext > xContext( m_xContext ); aLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -341,7 +341,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ aLock.reset(); - m_bInitialized = sal_True; + m_bInitialized = true; aLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -447,7 +447,7 @@ void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::excep /* SAFE AREA ----------------------------------------------------------------------------------------------- */ aLock.reset(); - m_bDisposed = sal_True; + m_bDisposed = true; aLock.clear(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ } @@ -802,7 +802,7 @@ throw( css::lang::IllegalArgumentException ) { // Initialize state with sal_False !!! // (Handle can be invalid) - sal_Bool bReturn = sal_False; + bool bReturn = false; switch( nHandle ) { diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 314d8247c6db..56fab671f31f 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -68,14 +68,14 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper2< virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // settings access - sal_Bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); - sal_Bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); + bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); + bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); private: - sal_Bool impl_initConfigAccess(); + bool impl_initConfigAccess(); osl::Mutex m_mutex; - sal_Bool m_bDisposed : 1, + bool m_bDisposed : 1, m_bConfigRead : 1; OUString m_aConfigSettingsAccess; OUString m_aNodeRefStates; @@ -87,8 +87,8 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper2< }; GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : - m_bDisposed( sal_False ), - m_bConfigRead( sal_False ), + m_bDisposed( false ), + m_bConfigRead( false ), m_aConfigSettingsAccess( GLOBALSETTINGS_ROOT_ACCESS ), m_aNodeRefStates( GLOBALSETTINGS_NODEREF_STATES ), m_aPropStatesEnabled( GLOBALSETTINGS_PROPERTY_STATESENABLED ), @@ -108,7 +108,7 @@ throw ( css::uno::RuntimeException, std::exception ) { osl::MutexGuard g(m_mutex); m_xConfigAccess.clear(); - m_bDisposed = sal_True; + m_bDisposed = true; } void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) @@ -130,20 +130,20 @@ throw (css::uno::RuntimeException, std::exception) } // settings access -sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eElementType ) +bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eElementType ) { osl::MutexGuard g(m_mutex); if ( eElementType == GlobalSettings::UIELEMENT_TYPE_DOCKWINDOW ) - return sal_False; + return false; else if ( eElementType == GlobalSettings::UIELEMENT_TYPE_STATUSBAR ) - return sal_False; + return false; if ( m_bDisposed ) - return sal_False; + return false; if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; impl_initConfigAccess(); } @@ -152,7 +152,7 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl try { css::uno::Any a; - sal_Bool bValue = sal_Bool(); + bool bValue; a = m_xConfigAccess->getByName( m_aPropStatesEnabled ); if ( a >>= bValue ) return bValue; @@ -165,23 +165,23 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl } } - return sal_False; + return false; } -sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) +bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) { osl::MutexGuard g(m_mutex); if ( eElementType == GlobalSettings::UIELEMENT_TYPE_DOCKWINDOW ) - return sal_False; + return false; else if ( eElementType == GlobalSettings::UIELEMENT_TYPE_STATUSBAR ) - return sal_False; + return false; if ( m_bDisposed ) - return sal_False; + return false; if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; impl_initConfigAccess(); } @@ -200,7 +200,7 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle a = xNameAccess->getByName( m_aPropDocked ); aValue = a; - return sal_True; + return true; } } catch ( const css::container::NoSuchElementException& ) @@ -211,10 +211,10 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle } } - return sal_False; + return false; } -sal_Bool GlobalSettings_Access::impl_initConfigAccess() +bool GlobalSettings_Access::impl_initConfigAccess() { css::uno::Sequence< css::uno::Any > aArgs( 2 ); css::beans::PropertyValue aPropValue; @@ -254,7 +254,7 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() { } - return sal_False; + return false; } // global class @@ -280,24 +280,24 @@ GlobalSettings::~GlobalSettings() } // settings access -sal_Bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) +bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xContext )); if ( pSettings ) return pSettings->HasStatesInfo( eElementType ); else - return sal_False; + return false; } -sal_Bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) +bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xContext )); if ( pSettings ) return pSettings->GetStateInfo( eElementType, eStateInfo, aValue ); else - return sal_False; + return false; } } // namespace framework diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 4fea5649914c..495da8d36301 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -146,7 +146,7 @@ static OUString getCanonicalName( const OUString& rFileName ) } CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) : - m_bVectorInit( sal_False ), + m_bVectorInit( false ), m_aModuleIdentifier( aModuleIdentifier ), m_xContext( rxContext ), m_sIconTheme( SvtMiscOptions().GetIconTheme() ) @@ -248,7 +248,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() m_aCommandToImageNameMap.insert( CommandToImageNameMap::value_type( aCommandName, aImageName )); } - m_bVectorInit = sal_True; + m_bVectorInit = true; } } @@ -372,7 +372,7 @@ oslInterlockedCount GlobalImageList::release() return m_nRefCount; } -static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType ) +static bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType ) { static Size aNormSize( IMAGE_SIZE_NORMAL, IMAGE_SIZE_NORMAL ); static Size aLargeSize( IMAGE_SIZE_LARGE, IMAGE_SIZE_LARGE ); @@ -380,7 +380,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra if ( !rInGraphic.is() ) { rOutGraphic = Image().GetXGraphic(); - return sal_False; + return false; } // Check size and scale it @@ -402,7 +402,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra } else rOutGraphic = rInGraphic; - return sal_True; + return true; } static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType ) @@ -457,7 +457,7 @@ void ImageManagerImpl::implts_initialize() } } -sal_Bool ImageManagerImpl::implts_loadUserImages( +bool ImageManagerImpl::implts_loadUserImages( ImageType nImageType, const uno::Reference< XStorage >& xUserImageStorage, const uno::Reference< XStorage >& xUserBitmapsStorage ) @@ -509,7 +509,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages( m_pUserImageList[nImageType] = new ImageList(); m_pUserImageList[nImageType]->InsertFromHorizontalStrip ( aUserBitmap, aUserImagesVector ); - return sal_True; + return true; } } } @@ -534,10 +534,10 @@ sal_Bool ImageManagerImpl::implts_loadUserImages( delete m_pUserImageList[nImageType]; m_pUserImageList[nImageType] = new ImageList; - return sal_True; + return true; } -sal_Bool ImageManagerImpl::implts_storeUserImages( +bool ImageManagerImpl::implts_storeUserImages( ImageType nImageType, const uno::Reference< XStorage >& xUserImageStorage, const uno::Reference< XStorage >& xUserBitmapsStorage ) @@ -601,7 +601,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( xTransaction->commit(); } - return sal_True; + return true; } else { @@ -635,11 +635,11 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( if ( xTransaction.is() ) xTransaction->commit(); - return sal_True; + return true; } } - return sal_False; + return false; } const rtl::Reference< GlobalImageList >& ImageManagerImpl::implts_getGlobalImageList() @@ -852,7 +852,7 @@ throw (::com::sun::star::uno::RuntimeException) return aImageNameSeq; } -sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) +bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard g; @@ -866,11 +866,11 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); if ( m_bUseGlobal && implts_getGlobalImageList()->hasImage( nIndex, aCommandURL )) - return sal_True; + return true; else { if ( m_bUseGlobal && implts_getDefaultImageList()->hasImage( nIndex, aCommandURL )) - return sal_True; + return true; else { // User layer @@ -880,7 +880,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } } - return sal_False; + return false; } Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages( @@ -1294,12 +1294,12 @@ void ImageManagerImpl::store() if ( m_bModified ) { - sal_Bool bWritten( sal_False ); + bool bWritten( false ); for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ ) { - sal_Bool bSuccess = implts_storeUserImages( ImageType(i), m_xUserImageStorage, m_xUserBitmapsStorage ); + bool bSuccess = implts_storeUserImages( ImageType(i), m_xUserImageStorage, m_xUserBitmapsStorage ); if ( bSuccess ) - bWritten = sal_True; + bWritten = true; m_bUserImageListModified[i] = false; } @@ -1350,14 +1350,14 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage } } -sal_Bool ImageManagerImpl::isModified() +bool ImageManagerImpl::isModified() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard g; return m_bModified; } -sal_Bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard g; return m_bReadOnly; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index dbd1664bd0cb..906442902f65 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -73,7 +73,7 @@ namespace framework std::vector< OUString >& impl_getImageCommandNameVector(); private: - sal_Bool m_bVectorInit; + bool m_bVectorInit; OUString m_aModuleIdentifier; ImageList* m_pImageList[ImageType_COUNT]; CommandToImageNameMap m_aCommandToImageNameMap; @@ -118,7 +118,7 @@ namespace framework // XImageManager void reset() throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); - sal_Bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); @@ -138,8 +138,8 @@ namespace framework throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool isModified() throw (::com::sun::star::uno::RuntimeException); - sal_Bool isReadOnly() throw (::com::sun::star::uno::RuntimeException); + bool isModified() throw (::com::sun::star::uno::RuntimeException); + bool isReadOnly() throw (::com::sun::star::uno::RuntimeException); void clear(); @@ -167,10 +167,10 @@ namespace framework void implts_initialize(); void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); ImageList* implts_getUserImageList( ImageType nImageType ); - sal_Bool implts_loadUserImages( ImageType nImageType, + bool implts_loadUserImages( ImageType nImageType, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); - sal_Bool implts_storeUserImages( ImageType nImageType, + bool implts_storeUserImages( ImageType nImageType, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); const rtl::Reference< GlobalImageList >& implts_getGlobalImageList(); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 5dc3555654a4..dd3839b987fb 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -433,9 +433,9 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream )); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer ); if ( pRootItemContainer ) - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); else - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, true ) ), UNO_QUERY ); return; } catch ( const ::com::sun::star::lang::WrappedTargetException& ) @@ -456,7 +456,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); ToolBoxConfiguration::LoadToolBox( m_xContext, xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } catch ( const ::com::sun::star::lang::WrappedTargetException& ) @@ -473,7 +473,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); StatusBarConfiguration::LoadStatusBar( m_xContext, xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } catch ( const ::com::sun::star::lang::WrappedTargetException& ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 138aff04123d..d2d5a124bc02 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -98,7 +98,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces Any getUINameFromID( const OUString& rId ); Any getUINameFromCache( const OUString& rId ); Sequence< OUString > getAllIds(); - sal_Bool fillCache(); + bool fillCache(); private: typedef ::boost::unordered_map< OUString, @@ -106,7 +106,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces OUStringHash, ::std::equal_to< OUString > > IdToInfoCache; - sal_Bool initializeConfigAccess(); + bool initializeConfigAccess(); OUString m_aConfigCategoryAccess; OUString m_aPropUIName; @@ -114,8 +114,8 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; Reference< XContainerListener > m_xConfigListener; - sal_Bool m_bConfigAccessInitialized; - sal_Bool m_bCacheFilled; + bool m_bConfigAccessInitialized; + bool m_bCacheFilled; IdToInfoCache m_aIdCache; }; @@ -125,8 +125,8 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ), m_aPropUIName( CONFIGURATION_PROPERTY_NAME ), m_xGenericUICategories( rGenericUICategories ), - m_bConfigAccessInitialized( sal_False ), - m_bCacheFilled( sal_False ) + m_bConfigAccessInitialized( false ), + m_bCacheFilled( false ) { // Create configuration hierachical access name m_aConfigCategoryAccess += aModuleName; @@ -152,7 +152,7 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e if ( !m_bConfigAccessInitialized ) { initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; fillCache(); } @@ -191,12 +191,12 @@ throw ( RuntimeException, std::exception ) return sal_True; } -sal_Bool ConfigurationAccess_UICategory::fillCache() +bool ConfigurationAccess_UICategory::fillCache() { SAL_INFO( "fwk", "framework (cd100003) ::ConfigurationAccess_UICategory::fillCache" ); if ( m_bCacheFilled ) - return sal_True; + return true; sal_Int32 i( 0 ); OUString aUIName; @@ -222,9 +222,9 @@ sal_Bool ConfigurationAccess_UICategory::fillCache() } } - m_bCacheFilled = sal_True; + m_bCacheFilled = true; - return sal_True; + return true; } Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId ) @@ -281,7 +281,7 @@ Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() if ( !m_bConfigAccessInitialized ) { initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; fillCache(); } @@ -320,7 +320,7 @@ Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() return Sequence< OUString >(); } -sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() +bool ConfigurationAccess_UICategory::initializeConfigAccess() { Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; @@ -344,7 +344,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() } } - return sal_True; + return true; } catch ( const WrappedTargetException& ) { @@ -353,7 +353,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() { } - return sal_False; + return false; } // container.XContainerListener diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 0a04ab944f1d..c06508382098 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -355,9 +355,9 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream )); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer ); if ( pRootItemContainer ) - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); else - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, true ) ), UNO_QUERY ); return; } catch ( const ::com::sun::star::lang::WrappedTargetException& ) @@ -378,7 +378,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); ToolBoxConfiguration::LoadToolBox( m_xContext, xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } catch ( const ::com::sun::star::lang::WrappedTargetException& ) @@ -395,7 +395,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); StatusBarConfiguration::LoadStatusBar( m_xContext, xInputStream, xIndexContainer ); RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), UNO_QUERY ); return; } catch ( const ::com::sun::star::lang::WrappedTargetException& ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index dc21537aae5e..62e1bd78d6d2 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -212,7 +212,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo Any impl_getSequenceFromStruct( const WindowStateInfo& rWinStateInfo ); void impl_fillStructFromSequence( WindowStateInfo& rWinStateInfo, const Sequence< PropertyValue >& rSeq ); Any impl_getWindowStateFromResourceURL( const OUString& rResourceURL ); - sal_Bool impl_initializeConfigAccess(); + bool impl_initializeConfigAccess(); private: typedef ::boost::unordered_map< OUString, @@ -226,15 +226,15 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo Reference< XNameAccess > m_xConfigAccess; Reference< XContainerListener > m_xConfigListener; ResourceURLToInfoCache m_aResourceURLToInfoCache; - sal_Bool m_bConfigAccessInitialized : 1, + bool m_bConfigAccessInitialized : 1, m_bModified : 1; std::vector< OUString > m_aPropArray; }; ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) : m_aConfigWindowAccess( "/org.openoffice.Office.UI." ), - m_bConfigAccessInitialized( sal_False ), - m_bModified( sal_False ) + m_bConfigAccessInitialized( false ), + m_bModified( false ) { // Create configuration hierachical access name m_aConfigWindowAccess += aModuleName; @@ -288,7 +288,7 @@ throw ( RuntimeException, std::exception ) if ( !m_bConfigAccessInitialized ) { impl_initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } if ( m_xConfigAccess.is() ) @@ -332,7 +332,7 @@ throw ( RuntimeException, std::exception ) if ( !m_bConfigAccessInitialized ) { impl_initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } if ( m_xConfigAccess.is() ) @@ -355,7 +355,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::ex if ( !m_bConfigAccessInitialized ) { impl_initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } try @@ -394,7 +394,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException, if ( !m_bConfigAccessInitialized ) { impl_initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } // Try to ask our configuration access @@ -456,14 +456,14 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, { WindowStateInfo& rWinStateInfo = pIter->second; impl_fillStructFromSequence( rWinStateInfo, aPropSet ); - m_bModified = sal_True; + m_bModified = true; } else { if ( !m_bConfigAccessInitialized ) { impl_initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } // Try to ask our configuration access @@ -474,7 +474,7 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, { WindowStateInfo& rWinStateInfo( impl_insertCacheAndReturnWinState( rResourceURL, xNameAccess )); impl_fillStructFromSequence( rWinStateInfo, aPropSet ); - m_bModified = sal_True; + m_bModified = true; pIter = m_aResourceURLToInfoCache.find( rResourceURL ); } else @@ -488,7 +488,7 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, { WindowStateInfo aWinStateInfo( pIter->second ); OUString aResourceURL( pIter->first ); - m_bModified = sal_False; + m_bModified = false; g.clear(); try @@ -625,7 +625,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU case PROPERTY_SOFTCLOSE: case PROPERTY_CONTEXTACTIVE: { - sal_Bool bValue = sal_Bool(); + bool bValue; if ( a >>= bValue ) { sal_Int32 nValue( 1 << i ); @@ -819,7 +819,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat case PROPERTY_SOFTCLOSE: case PROPERTY_CONTEXTACTIVE: { - sal_Bool bValue = sal_Bool(); + bool bValue; if ( a >>= bValue ) { sal_Int32 nValue( 1 << i ); @@ -976,7 +976,7 @@ Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const O if ( !m_bConfigAccessInitialized ) { impl_initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } try @@ -1023,7 +1023,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn case PROPERTY_SOFTCLOSE: case PROPERTY_CONTEXTACTIVE: { - sal_Bool bValue = sal_Bool(); + bool bValue; if ( rSeq[i].Value >>= bValue ) { sal_Int32 nValue( 1 << j ); @@ -1169,21 +1169,21 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window switch ( i ) { case PROPERTY_LOCKED: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bLocked )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bLocked ) ); break; case PROPERTY_DOCKED: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bDocked )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bDocked ) ); break; case PROPERTY_VISIBLE: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bVisible )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bVisible ) ); break; case PROPERTY_CONTEXT: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bContext )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bContext ) ); break; case PROPERTY_HIDEFROMMENU: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bHideFromMenu )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bHideFromMenu ) ); break; case PROPERTY_NOCLOSE: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bNoClose )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bNoClose ) ); break; case PROPERTY_SOFTCLOSE: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bSoftClose )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bSoftClose ) ); break; case PROPERTY_CONTEXTACTIVE: - xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Bool( rWinStateInfo.bContextActive )) ); break; + xPropSet->setPropertyValue( m_aPropArray[i], makeAny( rWinStateInfo.bContextActive ) ); break; case PROPERTY_DOCKINGAREA: xPropSet->setPropertyValue( m_aPropArray[i], makeAny( sal_Int16( rWinStateInfo.aDockingArea ) ) ); break; case PROPERTY_POS: @@ -1235,7 +1235,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window } } -sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() +bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() { Sequence< Any > aArgs( 2 ); PropertyValue aPropValue; @@ -1262,7 +1262,7 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() } } - return sal_True; + return true; } catch ( const WrappedTargetException& ) { @@ -1271,7 +1271,7 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() { } - return sal_False; + return false; } typedef ::cppu::WeakComponentImplHelper2< css::container::XNameAccess, diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index c3f47b35670e..93c5458c21e0 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -95,10 +95,10 @@ AddonsToolBarManager::~AddonsToolBarManager() { } -static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) +static bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) { if ( aContextList.isEmpty() ) - return sal_True; + return true; if ( !rModuleIdentifier.isEmpty() ) { @@ -106,13 +106,13 @@ static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUStr return ( nIndex >= 0 ); } - return sal_False; + return false; } static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, const OUString& aImageId, const OUString& aURL, - sal_Bool bBigImage + bool bBigImage ) { Image aImage; @@ -172,7 +172,7 @@ bool AddonsToolBarManager::MenuItemAllowed( sal_uInt16 nId ) const void AddonsToolBarManager::RefreshImages() { - sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); + bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ ) { sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) ); @@ -221,7 +221,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue } sal_uInt32 nElements( 0 ); - sal_Bool bAppendSeparator( sal_False ); + bool bAppendSeparator( false ); Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); for ( sal_uInt32 n = 0; n < (sal_uInt32)rAddonToolbar.getLength(); n++ ) { @@ -256,7 +256,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue // We have to append a separator first if the last item is not a separator m_pToolBar->InsertSeparator(); } - bAppendSeparator = sal_False; + bAppendSeparator = false; m_pToolBar->InsertItem( nId, aTitle ); @@ -271,7 +271,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue Reference< XStatusListener > xController; - sal_Bool bMustBeInit( sal_True ); + bool bMustBeInit( true ); // Support external toolbar controller for add-ons! if ( m_xToolbarControllerFactory.is() && @@ -305,7 +305,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue catch ( uno::Exception& ) { } - bMustBeInit = sal_False; // factory called init already! + bMustBeInit = false; // factory called init already! } else { diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 7f050045270d..798cb3c96867 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -76,7 +76,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc m_xToolBarManager->dispose(); m_xToolBarManager.clear(); - m_bDisposed = sal_True; + m_bDisposed = true; } // XInitialization diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index d233d58e90c7..77b4d3a28b6b 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -58,8 +58,8 @@ ButtonToolbarController::ButtonToolbarController( ToolBox* pToolBar, const OUString& aCommand ) : cppu::OWeakObject(), - m_bInitialized( sal_False ), - m_bDisposed( sal_False ), + m_bInitialized( false ), + m_bDisposed( false ), m_aCommandURL( aCommand ), m_xContext( rxContext ), m_pToolbar( pToolBar ) @@ -117,7 +117,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException if ( !bInitialized ) { SolarMutexGuard aSolarMutexGuard; - m_bInitialized = sal_True; + m_bInitialized = true; PropertyValue aPropValue; for ( int i = 0; i < aArguments.getLength(); i++ ) @@ -152,7 +152,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R m_xURLTransformer.clear(); m_xFrame.clear(); m_pToolbar = 0; - m_bDisposed = sal_True; + m_bDisposed = true; } } diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index d1392528ea76..b2542d92165f 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -58,7 +58,7 @@ ComplexToolbarController::ComplexToolbarController( svt::ToolboxController( rxContext, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) - , m_bMadeInvisible( sal_False ) + , m_bMadeInvisible( false ) { m_xURLTransformer.set( URLTransformer::create(m_xContext) ); } @@ -144,8 +144,8 @@ throw ( RuntimeException, std::exception ) nItemBits &= ~TIB_CHECKABLE; TriState eTri = TRISTATE_FALSE; - sal_Bool bValue = sal_Bool(); - OUString aStrValue; + bool bValue; + OUString aStrValue; ItemStatus aItemState; Visibility aItemVisibility; ControlCommand aControlCommand; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index db664334a8a9..1c1840bbf4e1 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -235,7 +235,7 @@ private: void updateImagesPopupMenu( PopupMenu* pPopupMenu ); void fillPopupMenu( uno::Reference< awt::XPopupMenu >& rPopupMenu ); - sal_Bool m_bShowMenuImages : 1; + bool m_bShowMenuImages : 1; PopupMenu* m_pResPopupMenu; UrlToDispatchMap m_aURLToDispatchMap; }; @@ -381,8 +381,8 @@ void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) // Check if some modes have changed so we have to update our menu images const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); - sal_Bool bUpdateImages = (bShowMenuImages != m_bShowMenuImages); + bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + bool bUpdateImages = (bShowMenuImages != m_bShowMenuImages); if ( bUpdateImages ) { diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index aab1150d7f21..982ab0a283fc 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -49,8 +49,8 @@ GenericStatusbarController::GenericStatusbarController( const Reference< ui::XStatusbarItem >& rxItem, AddonStatusbarItemData *pItemData ) : svt::StatusbarController( rxContext, rxFrame, OUString(), 0 ) - , m_bEnabled( sal_False ) - , m_bOwnerDraw( sal_False ) + , m_bEnabled( false ) + , m_bOwnerDraw( false ) , m_pItemData( pItemData ) , m_xGraphic() { diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index ff6f23255361..38f8e23a58b5 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -51,15 +51,15 @@ using namespace ::com::sun::star::container; namespace framework { -static sal_Bool isEnumCommand( const OUString& rCommand ) +static bool isEnumCommand( const OUString& rCommand ) { INetURLObject aURL( rCommand ); if (( aURL.GetProtocol() == INET_PROT_UNO ) && ( aURL.GetURLPath().indexOf( '.' ) != -1)) - return sal_True; + return true; - return sal_False; + return false; } static OUString getEnumCommand( const OUString& rCommand ) @@ -107,7 +107,7 @@ GenericToolbarController::GenericToolbarController( const Reference< XComponentC , m_pToolbar( pToolbar ) , m_nID( nID ) , m_bEnumCommand( isEnumCommand( aCommand )) - , m_bMadeInvisible( sal_False ) + , m_bMadeInvisible( false ) , m_aEnumCommand( getEnumCommand( aCommand )) { if ( m_bEnumCommand ) @@ -192,8 +192,8 @@ throw ( RuntimeException, std::exception ) nItemBits &= ~TIB_CHECKABLE; TriState eTri = TRISTATE_FALSE; - sal_Bool bValue = sal_Bool(); - OUString aStrValue; + bool bValue; + OUString aStrValue; ItemStatus aItemState; Visibility aItemVisibility; @@ -212,9 +212,9 @@ throw ( RuntimeException, std::exception ) if ( m_bEnumCommand ) { if ( aStrValue == m_aEnumCommand ) - bValue = sal_True; + bValue = true; else - bValue = sal_False; + bValue = false; m_pToolbar->CheckItem( m_nID, bValue ); if ( bValue ) @@ -350,7 +350,7 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime Reference< XDispatchProvider > xDispatch; Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext ); pMenu = new Toolbarmenu(); - m_xMenuManager.set( new MenuBarManager( m_xContext, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) ); + m_xMenuManager.set( new MenuBarManager( m_xContext, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, true, true ) ); if ( m_xMenuManager.is() ) { MenuBarManager* pMgr = dynamic_cast< MenuBarManager* >( m_xMenuManager.get() ); diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 3fde88b62891..c4ca0d2673fc 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -107,21 +107,21 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra sal_uInt16 nId = 2; sal_uInt16 nCount = 0; - sal_Bool bAllOneState( sal_True ); - sal_Bool bLastCheck( sal_True ); - sal_Bool bFirstChecked( sal_False ); - sal_Bool bFirstItemInserted( sal_False ); + bool bAllOneState( true ); + bool bLastCheck( true ); + bool bFirstChecked( false ); + bool bFirstItemInserted( false ); for ( sal_Int32 n = 0; n < aSeqNames.getLength(); n++ ) { OUString aName = aSeqNames[n]; Reference< XPropertySet > xPropSet( xNameContainer->getByName( aName ), UNO_QUERY ); if ( xPropSet.is() ) { - sal_Bool bIsPhysical( sal_False ); + bool bIsPhysical( false ); if (( xPropSet->getPropertyValue( aIsPhysicalStr ) >>= bIsPhysical ) && bIsPhysical ) { OUString aDisplayName; - sal_Bool bHeaderIsOn( sal_False ); + bool bHeaderIsOn( false ); xPropSet->getPropertyValue( aDisplayNameStr ) >>= aDisplayName; xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; @@ -137,7 +137,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra pVCLPopupMenu->InsertItem( nId, aDisplayName, MIB_CHECKABLE ); if ( !bFirstItemInserted ) { - bFirstItemInserted = sal_True; + bFirstItemInserted = true; bFirstChecked = bHeaderIsOn; } @@ -149,7 +149,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra // Check if all entries have the same state if( bAllOneState && n && bHeaderIsOn != bLastCheck ) - bAllOneState = sal_False; + bAllOneState = false; bLastCheck = bHeaderIsOn; ++nCount; } diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 8f32782e21a1..733b3223d4bb 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -101,7 +101,7 @@ ImageButtonToolbarController::ImageButtonToolbarController( const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) { - sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); + bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, true ); @@ -157,7 +157,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star } } -sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, const OUString& aImageURL, Image& aImage ) +bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ); if ( pStream && ( pStream->GetErrorCode() == 0 )) @@ -179,12 +179,12 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con if ( aBmpSize != aNoScaleSize ) aBitmapEx.Scale( aNoScaleSize, BMP_SCALE_BESTQUALITY ); aImage = Image( aBitmapEx ); - return sal_True; + return true; } } delete pStream; - return sal_False; + return false; } } // namespace diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 2257e2a49a56..12e802dc8734 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -72,7 +72,7 @@ DEFINE_INIT_SERVICE ( LanguageSelectionMenuController, {} LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase(xContext) - , m_bShowMenu(sal_True) + , m_bShowMenu(true) , m_nScriptType(LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX) , m_aLangGuessHelper(xContext) { @@ -105,7 +105,7 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState if (rBHelper.bDisposed || rBHelper.bInDispose) return; - m_bShowMenu = sal_True; + m_bShowMenu = true; m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX; //set the default value Sequence< OUString > aSeq; @@ -124,7 +124,7 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState } else if ( !Event.State.hasValue() ) { - m_bShowMenu = sal_False; // no language -> no sub-menu entries -> disable menu + m_bShowMenu = false; // no language -> no sub-menu entries -> disable menu } } @@ -313,7 +313,7 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any > { osl::MutexGuard aLock( m_aMutex ); - sal_Bool bInitalized( m_bInitialized ); + bool bInitalized( m_bInitialized ); if ( !bInitalized ) { svt::PopupMenuControllerBase::initialize(aArguments); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index a8b4f000f29f..fc64ba93d899 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -88,7 +88,7 @@ public: return OUString("com.sun.star.comp.framework.LangSelectionStatusbarController"); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + virtual bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == "com.sun.star.frame.StatusbarController"; @@ -120,7 +120,7 @@ private: LangSelectionStatusbarController(LangSelectionStatusbarController &); // not defined void operator =(LangSelectionStatusbarController &); // not defined - sal_Bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text) + bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text) sal_Int16 m_nScriptType; // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004 OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages OUString m_aKeyboardLang; // the keyboard language @@ -132,7 +132,7 @@ private: LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< uno::XComponentContext >& xContext ) : svt::StatusbarController( xContext, uno::Reference< frame::XFrame >(), OUString(), 0 ), - m_bShowMenu( sal_True ), + m_bShowMenu( true ), m_nScriptType( LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX ), m_aLangGuessHelper( xContext ) { @@ -321,7 +321,7 @@ throw ( RuntimeException, std::exception ) if ( m_bDisposed ) return; - m_bShowMenu = sal_True; + m_bShowMenu = true; m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX; //set the default value if ( m_xStatusbarItem.is() ) @@ -353,7 +353,7 @@ throw ( RuntimeException, std::exception ) else if ( !Event.State.hasValue() ) { m_xStatusbarItem->setText( OUString() ); - m_bShowMenu = sal_False; // no language -> no menu + m_bShowMenu = false; // no language -> no menu } } } diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 5138b9c797f8..8801667efddb 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -156,8 +156,8 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* OUString MacrosMenuController::RetrieveLabelFromCommand(const OUString& rCmdURL) { - sal_Bool bModuleIdentified = !m_aModuleIdentifier.isEmpty(); - return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label"); + bool bModuleIdentified = !m_aModuleIdentifier.isEmpty(); + return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels, m_xFrame, m_aModuleIdentifier, bModuleIdentified, "Label"); } void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index e01bc9b31966..5adc7b4462fb 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -154,7 +154,7 @@ namespace framework // special uno commands for window list #define aSpecialWindowCommand ".uno:WindowList" -static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) +static sal_Int16 getImageTypeFromBools( bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) @@ -168,12 +168,12 @@ MenuBarManager::MenuBarManager( const Reference< XURLTransformer >& _xURLTransformer, const Reference< XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, - Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ): + Menu* pMenu, bool bDelete, bool bDeleteChildren ): OWeakObject() - , m_bDisposed( sal_False ) - , m_bRetrieveImages( sal_False ) - , m_bAcceleratorCfg( sal_False ) - , m_bModuleIdentified( sal_False ) + , m_bDisposed( false ) + , m_bRetrieveImages( false ) + , m_bAcceleratorCfg( false ) + , m_bModuleIdentified( false ) , m_aListenerContainer( m_mutex ) , m_xContext(rxContext) , m_xURLTransformer(_xURLTransformer) @@ -188,13 +188,13 @@ MenuBarManager::MenuBarManager( const Reference< XFrame >& rFrame, const Reference< XURLTransformer >& _xURLTransformer, AddonMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ): + bool bDelete, + bool bDeleteChildren ): OWeakObject() - , m_bDisposed( sal_False ) - , m_bRetrieveImages( sal_True ) - , m_bAcceleratorCfg( sal_False ) - , m_bModuleIdentified( sal_False ) + , m_bDisposed( false ) + , m_bRetrieveImages( true ) + , m_bAcceleratorCfg( false ) + , m_bModuleIdentified( false ) , m_aListenerContainer( m_mutex ) , m_xContext(rxContext) , m_xURLTransformer(_xURLTransformer) @@ -208,13 +208,13 @@ MenuBarManager::MenuBarManager( const Reference< XFrame >& rFrame, const Reference< XURLTransformer >& _xURLTransformer, AddonPopupMenu* pAddonPopupMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ): + bool bDelete, + bool bDeleteChildren ): OWeakObject() - , m_bDisposed( sal_False ) - , m_bRetrieveImages( sal_True ) - , m_bAcceleratorCfg( sal_False ) - , m_bModuleIdentified( sal_False ) + , m_bDisposed( false ) + , m_bRetrieveImages( true ) + , m_bAcceleratorCfg( false ) + , m_bModuleIdentified( false ) , m_aListenerContainer( m_mutex ) , m_xContext(rxContext) , m_xURLTransformer(_xURLTransformer) @@ -329,7 +329,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception { SolarMutexGuard g; Destroy(); - m_bDisposed = sal_True; + m_bDisposed = true; if ( m_xDocImageManager.is() ) { @@ -397,7 +397,7 @@ throw (RuntimeException, std::exception) return; sal_Int16 nImageType = sal_Int16(); - sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False ); + sal_Int16 nCurrentImageType = getImageTypeFromBools( false ); if (( Event.aInfo >>= nImageType ) && ( nImageType == nCurrentImageType )) RequestImages(); @@ -454,9 +454,9 @@ throw ( RuntimeException, std::exception ) MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler->aMenuItemURL == aFeatureURL ) { - sal_Bool bCheckmark( sal_False ); - sal_Bool bMenuItemEnabled( m_pVCLMenu->IsItemEnabled( pMenuItemHandler->nItemId )); - sal_Bool bEnabledItem( Event.IsEnabled ); + bool bCheckmark( false ); + bool bMenuItemEnabled( m_pVCLMenu->IsItemEnabled( pMenuItemHandler->nItemId )); + bool bEnabledItem( Event.IsEnabled ); OUString aItemText; status::Visibility aVisibilityStatus; @@ -466,7 +466,7 @@ throw ( RuntimeException, std::exception ) // Note: PasteSpecial is handled specifically by calc if ( pMenuItemHandler->aMenuItemURL == ".uno:Paste" || pMenuItemHandler->aMenuItemURL == ".uno:PasteClipboard" ) // special for draw/impress - bEnabledItem = sal_True; + bEnabledItem = true; #endif // Enable/disable item @@ -548,7 +548,7 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 void MenuBarManager::RequestImages() { - m_bRetrieveImages = sal_True; + m_bRetrieveImages = true; const sal_uInt32 nCount = m_aMenuItemHandlerVector.size(); for ( sal_uInt32 i = 0; i < nCount; ++i ) { @@ -782,10 +782,10 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) com::sun::star::uno::getCurrentContext())); // set/unset hiding disabled menu entries - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); - sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); + bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); SolarMutexGuard g; @@ -799,7 +799,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( m_bActive ) return 0; - m_bActive = sal_True; + m_bActive = true; OUString aMenuCommand( m_aMenuItemCommand ); if ( m_aMenuItemCommand == aSpecialWindowMenu || m_aMenuItemCommand == aSlotSpecialWindowMenu || aMenuCommand == aSpecialWindowCommand ) @@ -813,7 +813,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) sIconTheme != m_sIconTheme ) { m_bShowMenuImages = bShowMenuImages; - m_bRetrieveImages = sal_False; + m_bRetrieveImages = false; m_sIconTheme = sIconTheme; MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages ); } @@ -904,7 +904,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) else xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); - sal_Bool bPopupMenu( sal_False ); + bool bPopupMenu( false ); if ( !pMenuItemHandler->xPopupMenuController.is() && m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() )) { @@ -914,7 +914,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) { // Force update of popup menu pMenuItemHandler->xPopupMenuController->updatePopupMenu(); - bPopupMenu = sal_True; + bPopupMenu = true; if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId )) pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false ); } @@ -974,7 +974,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) { - m_bActive = sal_False; + m_bActive = false; if ( pMenu->IsMenuBar() && m_xDeferedItemContainer.is() ) { // Start timer to handle settings asynchronous @@ -1081,7 +1081,7 @@ IMPL_LINK_NOARG(MenuBarManager, Highlight) return 0; } -sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLTransformer >& rTransformer ) +bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLTransformer >& rTransformer ) { if ( pPopupMenu ) { @@ -1121,7 +1121,7 @@ sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< X return ( nCount == nHideCount ); } - return sal_True; + return true; } OUString MenuBarManager::RetrieveLabelFromCommand(const OUString& rCmdURL) @@ -1129,13 +1129,13 @@ OUString MenuBarManager::RetrieveLabelFromCommand(const OUString& rCmdURL) return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label"); } -sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ) +bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ) { OUString aItemCommand( pMenuItemHandler->aMenuItemURL ); // Try instanciate a popup menu controller. It is stored in the menu item handler. if ( !m_xPopupMenuControllerFactory.is() ) - return sal_False; + return false; Sequence< Any > aSeq( 2 ); PropertyValue aPropValue; @@ -1159,26 +1159,26 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa // Provide our awt popup menu to the popup menu controller pMenuItemHandler->xPopupMenuController = xPopupMenuController; xPopupMenuController->setPopupMenu( pMenuItemHandler->xPopupMenu ); - return sal_True; + return true; } - return sal_False; + return false; } -void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ) +void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, bool bDelete, bool bDeleteChildren ) { m_xFrame = rFrame; - m_bActive = sal_False; + m_bActive = false; m_bDeleteMenu = bDelete; m_bDeleteChildren = bDeleteChildren; m_pVCLMenu = pMenu; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_False; + m_bInitialized = false; + m_bIsBookmarkMenu = false; m_xDispatchProvider = rDispatchProvider; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); - m_bRetrieveImages = sal_False; + m_bRetrieveImages = false; sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); @@ -1210,7 +1210,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF } OUString aEmpty; - sal_Bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ); + bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ); sal_uInt16 nItemCount = pMenu->GetItemCount(); OUString aItemCommand; m_aMenuItemHandlerVector.reserve(nItemCount); @@ -1222,7 +1222,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( !rModuleIdentifier.isEmpty() ) { m_aModuleIdentifier = rModuleIdentifier; - m_bModuleIdentified = sal_True; + m_bModuleIdentified = true; } if (( pMenu->IsMenuBar() || bAccessibilityEnabled ) && @@ -1327,7 +1327,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF AddonMenu* pSubMenu = dynamic_cast< AddonMenu* >( pPopup ); if ( pSubMenu ) { - MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,pSubMenu, sal_True, sal_False ); + MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,pSubMenu, true, false ); AddMenu(pSubMenuManager,aItemCommand,nItemId); pSubMenuManager->m_aMenuItemCommand = OUString(); @@ -1377,9 +1377,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); else - m_bRetrieveImages = sal_True; + m_bRetrieveImages = true; } - m_bRetrieveImages = sal_True; + m_bRetrieveImages = true; } MenuItemHandler* pItemHandler = new MenuItemHandler( nItemId, xStatusListener, xDispatch ); @@ -1458,7 +1458,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh { if ( !m_bModuleIdentified ) { - m_bModuleIdentified = sal_True; + m_bModuleIdentified = true; Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext ); try @@ -1479,7 +1479,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh if ( !m_bAcceleratorCfg ) { // Retrieve references on demand - m_bAcceleratorCfg = sal_True; + m_bAcceleratorCfg = true; if ( !xDocAccelCfg.is() ) { Reference< XController > xController = m_xFrame->getController(); @@ -1618,7 +1618,7 @@ void MenuBarManager::FillMenuWithConfiguration( AddonsOptions().GetMergeMenuInstructions(), rModuleIdentifier ); - sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); + bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); if ( bHasDisabledEntries ) { sal_uInt16 nCount = pMenu->GetItemCount(); @@ -1653,8 +1653,8 @@ void MenuBarManager::FillMenu( OUString aLabel; OUString aHelpURL; OUString aModuleIdentifier( rModuleIdentifier ); - sal_Bool bShow(sal_True); - sal_Bool bEnabled(sal_True); + bool bShow(true); + bool bEnabled(true); sal_uInt16 nType = 0; Reference< XIndexAccess > xIndexContainer; Reference< XDispatchProvider > xDispatchProvider( rDispatchProvider ); @@ -1810,7 +1810,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon if ( !m_bModuleIdentified ) { - m_bModuleIdentified = sal_True; + m_bModuleIdentified = true; Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext ); try @@ -1852,7 +1852,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon // Refill menu manager again Reference< XDispatchProvider > xDispatchProvider; - FillMenuManager( m_pVCLMenu, xFrame, xDispatchProvider, m_aModuleIdentifier, sal_False, sal_True ); + FillMenuManager( m_pVCLMenu, xFrame, xDispatchProvider, m_aModuleIdentifier, false, true ); // add itself as frame action listener m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); @@ -1932,15 +1932,15 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu } return nItemId; } -void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp) +void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp) { - m_bActive = sal_False; + m_bActive = false; m_bDeleteMenu = bDelete; m_bDeleteChildren = bDeleteChildren; m_pVCLMenu = pAddonMenu; m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_True; + m_bInitialized = false; + m_bIsBookmarkMenu = true; OUString aModuleIdentifier; m_xPopupMenuControllerFactory = frame::thePopupMenuControllerFactory::get( diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 66d3bb4c8d6f..5ef7442f5008 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -81,7 +81,7 @@ MenuBarWrapper::MenuBarWrapper( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ) : UIConfigElementWrapperBase( UIElementType::MENUBAR ), - m_bRefreshPopupControllerCache( sal_True ), + m_bRefreshPopupControllerCache( true ), m_xContext( rxContext ) { } @@ -158,7 +158,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th { } - sal_Bool bMenuOnly( sal_False ); + bool bMenuOnly( false ); for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) { PropertyValue aPropValue; @@ -183,8 +183,8 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th xDispatchProvider, aModuleIdentifier, pVCLMenuBar, - sal_False, - sal_True ); + false, + true ); m_xMenuBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pMenuBarManager ), UNO_QUERY ); } @@ -244,7 +244,7 @@ void MenuBarWrapper::fillPopupControllerCache() if ( pMenuBarManager ) pMenuBarManager->GetPopupController( m_aPopupControllerCache ); if ( !m_aPopupControllerCache.empty() ) - m_bRefreshPopupControllerCache = sal_False; + m_bRefreshPopupControllerCache = false; } } diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 58e838cca1d1..d02ee3123911 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -66,7 +66,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( NewMenuController DEFINE_INIT_SERVICE ( NewMenuController, {} ) -void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages ) +void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, bool bSetImages ) { sal_uInt16 nItemCount = pPopupMenu->GetItemCount(); Image aImage; @@ -79,7 +79,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage { if ( bSetImages ) { - sal_Bool bImageSet( sal_False ); + bool bImageSet( false ); OUString aImageId; AddInfoForId::const_iterator pInfo = m_aAddInfoForItem.find( nItemId ); @@ -91,7 +91,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage aImage = GetImageFromURL( xFrame, aImageId, false ); if ( !!aImage ) { - bImageSet = sal_True; + bImageSet = true; pPopupMenu->SetItemImage( nItemId, aImage ); } } @@ -116,7 +116,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const { sal_uInt16 nCount( pPopupMenu->GetItemCount() ); sal_uInt16 nId( 0 ); - sal_Bool bFound( sal_False ); + bool bFound( false ); OUString aCommand; if ( !m_aEmptyDocURL.isEmpty() ) @@ -132,7 +132,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const if ( aCommand.startsWith( m_aEmptyDocURL ) ) { pPopupMenu->SetAccelKey( nId, rKeyCode ); - bFound = sal_True; + bFound = true; break; } } @@ -173,7 +173,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu ) if ( !m_bAcceleratorCfg ) { // Retrieve references on demand - m_bAcceleratorCfg = sal_True; + m_bAcceleratorCfg = true; if ( !xDocAccelCfg.is() ) { Reference< XController > xController = m_xFrame->getController(); @@ -296,10 +296,10 @@ void NewMenuController::retrieveShortcutsFromConfiguration( NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), - m_bShowImages( sal_True ), - m_bNewMenu( sal_False ), - m_bModuleIdentified( sal_False ), - m_bAcceleratorCfg( sal_False ), + m_bShowImages( true ), + m_bNewMenu( false ), + m_bModuleIdentified( false ), + m_bAcceleratorCfg( false ), m_aTargetFrame( "_default" ), m_xContext( xContext ) { @@ -449,7 +449,7 @@ void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) thr if ( pPopupMenu ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowImages( rSettings.GetUseImagesInMenus() ); + bool bShowImages( rSettings.GetUseImagesInMenus() ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); @@ -476,7 +476,7 @@ void NewMenuController::impl_setPopupMenu() try { m_aModuleIdentifier = xModuleManager->identify( m_xFrame ); - m_bModuleIdentified = sal_True; + m_bModuleIdentified = true; if ( !m_aModuleIdentifier.isEmpty() ) { @@ -509,7 +509,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) { osl::MutexGuard aLock( m_aMutex ); - sal_Bool bInitalized( m_bInitialized ); + bool bInitalized( m_bInitialized ); if ( !bInitalized ) { svt::PopupMenuControllerBase::initialize( aArguments ); diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 02de29f47c51..e871caec08c2 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -73,7 +73,7 @@ protected: void createPopupMenuController(); css::uno::Reference< css::uno::XComponentContext > m_xContext; - sal_Bool m_bHasController; + bool m_bHasController; css::uno::Reference< css::awt::XPopupMenu > m_xPopupMenu; private: @@ -86,7 +86,7 @@ PopupMenuToolbarController::PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString &rPopupCommand ) : m_xContext( xContext ) - , m_bHasController( sal_False ) + , m_bHasController( false ) , m_aPopupCommand( rPopupCommand ) { } @@ -483,13 +483,13 @@ void NewToolbarController::functionExecuted( const OUString &rCommand ) @return sal_True - if URL could be located as an item of the popup menu. sal_False - otherwhise. */ -static sal_Bool Impl_ExistURLInMenu( +static bool Impl_ExistURLInMenu( const css::uno::Reference< css::awt::XPopupMenu > &rPopupMenu, OUString &sURL, OUString &sFallback, Image &aImage ) { - sal_Bool bValidFallback( sal_False ); + bool bValidFallback( false ); sal_uInt16 nCount( 0 ); if ( rPopupMenu.is() && ( nCount = rPopupMenu->getItemCount() ) != 0 && sURL.getLength() ) { @@ -501,7 +501,7 @@ static sal_Bool Impl_ExistURLInMenu( if ( !bValidFallback && aCmd.getLength() ) { sFallback = aCmd; - bValidFallback = sal_True; + bValidFallback = true; } // match even if the menu command is more detailed @@ -513,7 +513,7 @@ static sal_Bool Impl_ExistURLInMenu( rPopupMenu->getItemImage( nId ) ); if ( xGraphic.is() ) aImage = Image( xGraphic ); - return sal_True; + return true; } } } @@ -526,7 +526,7 @@ static sal_Bool Impl_ExistURLInMenu( sFallback = aBuffer.makeStringAndClear(); } - return sal_False; + return false; } /** We accept URL's here only, which exist as items of our internal popup menu. @@ -543,11 +543,11 @@ void NewToolbarController::setItemImage( const OUString &rCommand ) OUString sFallback; Image aMenuImage; - sal_Bool bValid( Impl_ExistURLInMenu( m_xPopupMenu, aURL, sFallback, aMenuImage ) ); + bool bValid( Impl_ExistURLInMenu( m_xPopupMenu, aURL, sFallback, aMenuImage ) ); if ( !bValid ) aURL = sFallback; - sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge(); + bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge(); INetURLObject aURLObj( aURL ); Image aImage = SvFileInformationManager::GetImageNoDefault( aURLObj, bBig ); diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 10b67a492ec3..8e211d523f97 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -35,7 +35,7 @@ namespace framework{ ProgressBarWrapper::ProgressBarWrapper() : UIElementWrapperBase( ::com::sun::star::ui::UIElementType::PROGRESSBAR ) - , m_bOwnsInstance( sal_False ) + , m_bOwnsInstance( false ) , m_nRange( 100 ) , m_nValue( 0 ) { @@ -46,7 +46,7 @@ ProgressBarWrapper::~ProgressBarWrapper() } // public interfaces -void ProgressBarWrapper::setStatusBar( const uno::Reference< awt::XWindow >& rStatusBar, sal_Bool bOwnsInstance ) +void ProgressBarWrapper::setStatusBar( const uno::Reference< awt::XWindow >& rStatusBar, bool bOwnsInstance ) { SolarMutexGuard g; @@ -195,7 +195,7 @@ throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; OUString aText; - sal_Bool bSetValue( sal_False ); + bool bSetValue( false ); { SolarMutexGuard g; @@ -215,7 +215,7 @@ throw (uno::RuntimeException) if ( m_nValue != sal_Int32( fVal )) { m_nValue = sal_Int32( fVal ); - bSetValue = sal_True; + bSetValue = true; } nValue = m_nValue; @@ -291,7 +291,7 @@ throw (uno::RuntimeException, std::exception) } m_xStatusBar.clear(); - m_bDisposed = sal_True; + m_bDisposed = true; } } diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 77f4148aaa51..461030f6627e 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -113,12 +113,12 @@ private: void executeEntry( sal_Int32 nIndex ); std::vector< RecentFile > m_aRecentFilesItems; - sal_Bool m_bDisabled : 1; + bool m_bDisabled : 1; }; RecentFilesMenuController::RecentFilesMenuController( const uno::Reference< uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), - m_bDisabled( sal_False ) + m_bDisabled( false ) { } @@ -262,7 +262,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) // documents in the picklist will never be opened as templates aArgsList[1].Name = "AsTemplate"; - aArgsList[1].Value = makeAny( (sal_Bool) sal_False ); + aArgsList[1].Value = makeAny( sal_False ); if (!m_aModuleName.isEmpty()) { diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 89d8af0971d1..7ab55aca255d 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -132,10 +132,10 @@ StatusBarManager::StatusBarManager( const uno::Reference< frame::XFrame >& rFrame, const OUString& rResourceName, StatusBar* pStatusBar ) : - m_bDisposed( sal_False ), - m_bFrameActionRegistered( sal_False ), - m_bUpdateControllers( sal_False ), - m_bModuleIdentified( sal_False ), + m_bDisposed( false ), + m_bFrameActionRegistered( false ), + m_bUpdateControllers( false ), + m_bModuleIdentified( false ), m_pStatusBar( pStatusBar ), m_aResourceName( rResourceName ), m_xFrame( rFrame ), @@ -230,7 +230,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exc m_xFrame.clear(); m_xContext.clear(); - m_bDisposed = sal_True; + m_bDisposed = true; } } } @@ -282,12 +282,12 @@ void StatusBarManager::UpdateControllers() { if ( !m_bUpdateControllers ) { - m_bUpdateControllers = sal_True; + m_bUpdateControllers = true; std::for_each( m_aControllerMap.begin(), m_aControllerMap.end(), lcl_UpdateController< StatusBarControllerMap >() ); } - m_bUpdateControllers = sal_False; + m_bUpdateControllers = false; } void StatusBarManager::RemoveControllers() @@ -319,7 +319,7 @@ void StatusBarManager::CreateControllers() continue; OUString aCommandURL( m_pStatusBar->GetItemCommand( nId )); - sal_Bool bInit( sal_True ); + bool bInit( true ); uno::Reference< frame::XStatusbarController > xController; AddonStatusbarItemData *pItemData = static_cast< AddonStatusbarItemData *>( m_pStatusBar->GetItemData( nId ) ); uno::Reference< ui::XStatusbarItem > xStatusbarItem( @@ -369,7 +369,7 @@ void StatusBarManager::CreateControllers() m_xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( aCommandURL, aArgs, m_xContext ), uno::UNO_QUERY ); - bInit = sal_False; // Initialization is done through the factory service + bInit = false; // Initialization is done through the factory service } if ( !xController.is() ) @@ -415,7 +415,7 @@ void StatusBarManager::AddFrameActionListener() { if ( !m_bFrameActionRegistered && m_xFrame.is() ) { - m_bFrameActionRegistered = sal_True; + m_bFrameActionRegistered = true; m_xFrame->addFrameActionListener( uno::Reference< frame::XFrameActionListener >( static_cast< ::cppu::OWeakObject *>( this ), uno::UNO_QUERY )); } diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index 4e7b9c7893f0..6946e9ac6be2 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -53,8 +53,8 @@ static void lcl_ConvertSequenceToValues( AddonStatusbarItem &rItem ) { OUString sAlignment; - sal_Bool bAutoSize = sal_False; - sal_Bool bOwnerDraw = sal_False; + bool bAutoSize = false; + bool bOwnerDraw = false; PropertyValue aPropVal; for ( sal_Int32 i = 0; i < rSequence.getLength(); i++ ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index ddef60f31805..1b72a4f6d61c 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -140,7 +140,7 @@ throw ( RuntimeException, std::exception ) m_xReceiver->statusChanged( Event ); } -static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) +static sal_Int16 getImageTypeFromBools( bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) @@ -193,7 +193,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, m_aListenerContainer( m_mutex ), m_xContext( rxContext ), m_sIconTheme( SvtMiscOptions().GetIconTheme() ), - m_bAcceleratorCfg( sal_False ) + m_bAcceleratorCfg( false ) { OSL_ASSERT( m_xContext.is() ); @@ -303,7 +303,7 @@ ToolBox* ToolBarManager::GetToolBar() const void ToolBarManager::CheckAndUpdateImages() { SolarMutexGuard g; - sal_Bool bRefreshImages = sal_False; + bool bRefreshImages = false; SvtMiscOptions aMiscOptions; bool bCurrentSymbolsSmall = !aMiscOptions.AreCurrentSymbolsLarge(); @@ -329,7 +329,7 @@ void ToolBarManager::RefreshImages() { SolarMutexGuard g; - sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); + bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ ) { sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) ); @@ -371,14 +371,14 @@ void ToolBarManager::UpdateImageOrientation() OUString aMirrorCmd = aSeqMirrorCmd[i]; pIter = m_aCommandMap.find( aMirrorCmd ); if ( pIter != m_aCommandMap.end() ) - pIter->second.bMirrored = sal_True; + pIter->second.bMirrored = true; } for ( i = 0; i < aSeqRotateCmd.getLength(); i++ ) { OUString aRotateCmd = aSeqRotateCmd[i]; pIter = m_aCommandMap.find( aRotateCmd ); if ( pIter != m_aCommandMap.end() ) - pIter->second.bRotated = sal_True; + pIter->second.bRotated = true; } } @@ -846,7 +846,7 @@ void ToolBarManager::CreateControllers() Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); css::util::URL aURL; - sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); + bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); SvtCommandOptions aCmdOptions; for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ ) @@ -857,8 +857,8 @@ void ToolBarManager::CreateControllers() OUString aLoadURL( ".uno:OpenUrl" ); OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); - sal_Bool bInit( sal_True ); - sal_Bool bCreate( sal_True ); + bool bInit( true ); + bool bCreate( true ); Reference< XStatusListener > xController; CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); @@ -911,11 +911,11 @@ void ToolBarManager::CreateControllers() xController = Reference< XStatusListener >( m_xToolbarControllerFactory->createInstanceWithArgumentsAndContext( aCommandURL, aArgs, m_xContext ), UNO_QUERY ); - bInit = sal_False; // Initialization is done through the factory service + bInit = false; // Initialization is done through the factory service } if (( aCommandURL == aLoadURL ) && ( !m_pToolBar->IsItemVisible(nId))) - bCreate = sal_False; + bCreate = false; if ( !xController.is() && bCreate ) { @@ -1062,7 +1062,7 @@ void ToolBarManager::CreateControllers() { try { - sal_Bool bSupportVisible = sal_True; + bool bSupportVisible = true; Any a( xPropSet->getPropertyValue("SupportsVisible") ); a >>= bSupportVisible; if (bSupportVisible) @@ -1202,7 +1202,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine OUString aTooltip; sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); sal_uInt16 nWidth( 0 ); - sal_Bool bIsVisible( sal_True ); + bool bIsVisible( true ); sal_uInt32 nStyle( 0 ); Reference< XIndexAccess > aMenuDesc; @@ -1456,7 +1456,7 @@ void ToolBarManager::RequestImages() ++pIter; } - sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); + bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() ); if ( m_xDocImageManager.is() ) @@ -1633,9 +1633,9 @@ Reference< XModel > ToolBarManager::GetModelFromFrame() const return xModel; } -sal_Bool ToolBarManager::IsPluginMode() const +bool ToolBarManager::IsPluginMode() const { - sal_Bool bPluginMode( sal_False ); + bool bPluginMode( false ); if ( m_xFrame.is() ) { @@ -1681,7 +1681,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const } // popup menu for quick customization - sal_Bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled(); + bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled(); ::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION )); if ( m_pToolBar->IsCustomize() ) @@ -1689,7 +1689,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const sal_uInt16 nPos( 0 ); ::PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 )); - sal_Bool bIsFloating( sal_False ); + bool bIsFloating( false ); DockingManager* pDockMgr = Window::GetDockingManager(); if ( pDockMgr ) @@ -1922,7 +1922,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) Sequence< PropertyValue > aProp; sal_Int32 nVisibleIndex( -1 ); OUString aCommandURL; - sal_Bool bVisible( sal_False ); + bool bVisible( false ); if ( xItemContainer->getByIndex( i ) >>= aProp ) { @@ -2174,7 +2174,7 @@ bool ToolBarManager::RetrieveShortcut( const OUString& rCommandURL, OUString& rS if ( !m_bAcceleratorCfg ) { // Retrieve references on demand - m_bAcceleratorCfg = sal_True; + m_bAcceleratorCfg = true; if ( !xDocAccelCfg.is() ) { Reference< XController > xController = m_xFrame->getController(); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 73f1e3460793..a90b59790a78 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -88,19 +88,19 @@ struct ToolBarEntry { OUString aUIName; OUString aCommand; - sal_Bool bVisible; - sal_Bool bContextSensitive; + bool bVisible; + bool bContextSensitive; const CollatorWrapper* pCollatorWrapper; }; -sal_Bool CompareToolBarEntry( const ToolBarEntry& aOne, const ToolBarEntry& aTwo ) +bool CompareToolBarEntry( const ToolBarEntry& aOne, const ToolBarEntry& aTwo ) { sal_Int32 nComp = aOne.pCollatorWrapper->compareString( aOne.aUIName, aTwo.aUIName ); if ( nComp < 0 ) - return sal_True; + return true; else - return sal_False; + return false; } Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame >& rFrame ) @@ -138,8 +138,8 @@ ToolbarsMenuController::ToolbarsMenuController( const ::com::sun::star::uno::Ref m_xContext( xContext ), m_aPropUIName( "UIName" ), m_aPropResourceURL( "ResourceURL" ), - m_bModuleIdentified( sal_False ), - m_bResetActive( sal_False ), + m_bModuleIdentified( false ), + m_bResetActive( false ), m_aIntlWrapper( xContext, Application::GetSettings().GetLanguageTag() ) { } @@ -333,7 +333,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl return aSeq; } -sal_Bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible() +bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible() { return m_bResetActive; } @@ -352,7 +352,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r OUString aEmptyString; Reference< XLayoutManager > xLayoutManager( getLayoutManagerFromFrame( m_xFrame )); - m_bResetActive = sal_False; + m_bResetActive = false; if ( xLayoutManager.is() ) { ToolbarHashMap aToolbarHashMap; @@ -381,9 +381,9 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r while ( pIter != aToolbarHashMap.end() ) { OUString aUIName = pIter->second; - sal_Bool bHideFromMenu( sal_False ); - sal_Bool bContextSensitive( sal_False ); - sal_Bool bVisible( sal_False ); + bool bHideFromMenu( false ); + bool bContextSensitive( false ); + bool bVisible( false ); if ( aUIName.isEmpty() && m_xPersistentWindowState.is() ) { @@ -413,7 +413,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r // Check if we have to enable/disable "Reset" menu item if ( bContextSensitive && !bVisible ) - m_bResetActive = sal_True; + m_bResetActive = true; } @@ -482,7 +482,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r addCommand( m_xPopupMenu, OUString( CMD_FORMULABAR ), aEmptyString ); } - sal_Bool bAddCommand( sal_True ); + bool bAddCommand( true ); SvtCommandOptions aCmdOptions; OUString aConfigureToolbar( CONFIGURE_TOOLBARS ); @@ -490,7 +490,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r { if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, OUString( CONFIGURE_TOOLBARS_CMD ))) - bAddCommand = sal_False; + bAddCommand = false; } if ( bAddCommand ) @@ -545,8 +545,8 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev OUString aFeatureURL( Event.FeatureURL.Complete ); // All other status events will be processed here - sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; + bool bSetCheckmark = false; + bool bCheckmark = false; osl::ClearableMutexGuard aLock( m_aMutex ); Reference< css::awt::XPopupMenu > xPopupMenu( m_xPopupMenu ); @@ -572,7 +572,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev // Checkmark if ( Event.State >>= bCheckmark ) - bSetCheckmark = sal_True; + bSetCheckmark = true; if ( bSetCheckmark ) pVCLPopupMenu->CheckItem( nId, bCheckmark ); @@ -635,8 +635,8 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r if ( xPersistentWindowState->getByName( aElementName ) >>= aWindowState ) { - sal_Bool bVisible( sal_False ); - sal_Bool bContextSensitive( sal_False ); + bool bVisible( false ); + bool bContextSensitive( false ); sal_Int32 nVisibleIndex( -1 ); for ( sal_Int32 j = 0; j < aWindowState.getLength(); j++ ) { @@ -727,7 +727,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r OUStringBuffer aBuf( STATIC_PRIVATE_TB_RESOURCE ); aBuf.append( aCmd.copy( nIndex+1 )); - sal_Bool bShow( !pVCLPopupMenu->IsItemChecked( rEvent.MenuId )); + bool bShow( !pVCLPopupMenu->IsItemChecked( rEvent.MenuId )); OUString aToolBarResName( aBuf.makeStringAndClear() ); if ( bShow ) { @@ -810,7 +810,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); - sal_Bool bInitalized( m_bInitialized ); + bool bInitalized( m_bInitialized ); if ( !bInitalized ) { svt::PopupMenuControllerBase::initialize(aArguments); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index aa9e5ec85d3b..1c3ec89aac89 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -123,7 +123,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th { UIConfigElementWrapperBase::initialize( aArguments ); - sal_Bool bPopupMode( sal_False ); + bool bPopupMode( false ); for ( sal_Int32 i = 0; i < aArguments.getLength(); i++ ) { PropertyValue aPropValue; @@ -286,14 +286,14 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) { SolarMutexResettableGuard aLock; - sal_Bool bNoClose( m_bNoClose ); + bool bNoClose( m_bNoClose ); aLock.clear(); UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( nHandle, aValue ); aLock.reset(); - sal_Bool bNewNoClose( m_bNoClose ); + bool bNewNoClose( m_bNoClose ); if ( m_xToolBarManager.is() && !m_bDisposed && ( bNewNoClose != bNoClose )) { ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>( m_xToolBarManager.get() ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index ee4360345c46..7bf22b0c0044 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -133,9 +133,9 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ); Any getUILabelFromCommand( const OUString& rCommandURL ); Sequence< OUString > getAllCommands(); - sal_Bool fillCache(); - sal_Bool addGenericInfoToCache(); - void impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup, + bool fillCache(); + bool addGenericInfoToCache(); + void impl_fill(const Reference< XNameAccess >& _xConfigAccess,bool _bPopup, std::vector< OUString >& aImageCommandVector, std::vector< OUString >& aImageRotateVector, std::vector< OUString >& aImageMirrorVector); @@ -146,7 +146,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa OUStringHash, ::std::equal_to< OUString > > CommandToInfoCache; - sal_Bool initializeConfigAccess(); + bool initializeConfigAccess(); OUString m_aConfigCmdAccess; OUString m_aConfigPopupAccess; @@ -170,9 +170,9 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa Sequence< OUString > m_aCommandRotateImageList; Sequence< OUString > m_aCommandMirrorImageList; CommandToInfoCache m_aCmdInfoCache; - sal_Bool m_bConfigAccessInitialized; - sal_Bool m_bCacheFilled; - sal_Bool m_bGenericDataRetrieved; + bool m_bConfigAccessInitialized; + bool m_bCacheFilled; + bool m_bGenericDataRetrieved; }; // XInterface, XTypeProvider @@ -188,9 +188,9 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aM m_aPropProperties( PROPSET_PROPERTIES ), m_aPrivateResourceURL( PRIVATE_RESOURCE_URL ), m_xGenericUICommands( rGenericUICommands ), - m_bConfigAccessInitialized( sal_False ), - m_bCacheFilled( sal_False ), - m_bGenericDataRetrieved( sal_False ) + m_bConfigAccessInitialized( false ), + m_bCacheFilled( false ), + m_bGenericDataRetrieved( false ) { // Create configuration hierachical access name m_aConfigCmdAccess += aModuleName; @@ -223,7 +223,7 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm if ( !m_bConfigAccessInitialized ) { initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; fillCache(); } @@ -318,7 +318,7 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aComman return Any(); } -void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup, +void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _xConfigAccess,bool _bPopup, std::vector< OUString >& aImageCommandVector, std::vector< OUString >& aImageRotateVector, std::vector< OUString >& aImageMirrorVector) @@ -360,29 +360,29 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x } } } -sal_Bool ConfigurationAccess_UICommand::fillCache() +bool ConfigurationAccess_UICommand::fillCache() { if ( m_bCacheFilled ) - return sal_True; + return true; std::vector< OUString > aImageCommandVector; std::vector< OUString > aImageRotateVector; std::vector< OUString > aImageMirrorVector; - impl_fill(m_xConfigAccess,sal_False,aImageCommandVector,aImageRotateVector,aImageMirrorVector); - impl_fill(m_xConfigAccessPopups,sal_True,aImageCommandVector,aImageRotateVector,aImageMirrorVector); + impl_fill(m_xConfigAccess,false,aImageCommandVector,aImageRotateVector,aImageMirrorVector); + impl_fill(m_xConfigAccessPopups,true,aImageCommandVector,aImageRotateVector,aImageMirrorVector); // Create cached sequences for fast retrieving m_aCommandImageList = comphelper::containerToSequence( aImageCommandVector ); m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector ); m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector ); - m_bCacheFilled = sal_True; + m_bCacheFilled = true; - return sal_True; + return true; } -sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache() +bool ConfigurationAccess_UICommand::addGenericInfoToCache() { if ( m_xGenericUICommands.is() && !m_bGenericDataRetrieved ) { @@ -415,10 +415,10 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache() { } - m_bGenericDataRetrieved = sal_True; + m_bGenericDataRetrieved = true; } - return sal_True; + return true; } Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rCommandURL ) @@ -465,7 +465,7 @@ Sequence< OUString > ConfigurationAccess_UICommand::getAllCommands() if ( !m_bConfigAccessInitialized ) { initializeConfigAccess(); - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; fillCache(); } @@ -504,7 +504,7 @@ Sequence< OUString > ConfigurationAccess_UICommand::getAllCommands() return Sequence< OUString >(); } -sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() +bool ConfigurationAccess_UICommand::initializeConfigAccess() { Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; @@ -543,7 +543,7 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() } } - return sal_True; + return true; } catch (const WrappedTargetException&) { @@ -552,28 +552,28 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() { } - return sal_False; + return false; } // container.XContainerListener void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); - m_bCacheFilled = sal_False; + m_bCacheFilled = false; fillCache(); } void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); - m_bCacheFilled = sal_False; + m_bCacheFilled = false; fillCache(); } void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); - m_bCacheFilled = sal_False; + m_bCacheFilled = false; fillCache(); } diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 26f61b472bd8..fc61ca299836 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -81,7 +81,7 @@ public: // XUIElementFactory virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - sal_Bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq, + bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq, const css::uno::Reference< css::frame::XFrame >& rFrame ); private: @@ -100,10 +100,10 @@ AddonsToolBarFactory::~AddonsToolBarFactory() { } -static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) +static bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) { if ( aContextList.isEmpty() ) - return sal_True; + return true; if ( !rModuleIdentifier.isEmpty() ) { @@ -111,10 +111,10 @@ static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUStr return ( nIndex >= 0 ); } - return sal_False; + return false; } -sal_Bool AddonsToolBarFactory::hasButtonsInContext( +bool AddonsToolBarFactory::hasButtonsInContext( const Sequence< Sequence< PropertyValue > >& rPropSeqSeq, const Reference< XFrame >& rFrame ) { @@ -135,8 +135,8 @@ sal_Bool AddonsToolBarFactory::hasButtonsInContext( // the current frame context. for ( sal_uInt32 i = 0; i < (sal_uInt32)rPropSeqSeq.getLength(); i++ ) { - sal_Bool bIsButton( sal_True ); - sal_Bool bIsCorrectContext( sal_False ); + bool bIsButton( true ); + bool bIsCorrectContext( false ); sal_uInt32 nPropChecked( 0 ); const Sequence< PropertyValue >& rPropSeq = rPropSeqSeq[i]; @@ -162,10 +162,10 @@ sal_Bool AddonsToolBarFactory::hasButtonsInContext( } if ( bIsButton && bIsCorrectContext ) - return sal_True; + return true; } - return sal_False; + return false; } // XUIElementFactory diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 6836b3a82477..3f69ae5b299e 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -60,7 +60,7 @@ ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( co m_aPropController( "Controller" ), m_aPropValue( "Value" ), m_sRoot(_sRoot), - m_bConfigAccessInitialized( sal_False ), + m_bConfigAccessInitialized( false ), m_bAskValue(_bAskValue) { m_xConfigProvider = configuration::theDefaultProvider::get( rxContext ); @@ -208,7 +208,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() { } - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } if ( m_xConfigAccess.is() ) @@ -264,7 +264,7 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData() } } -sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const +bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const { Reference< XPropertySet > xPropertySet; aElement >>= xPropertySet; @@ -281,15 +281,15 @@ sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& } catch ( const com::sun::star::beans::UnknownPropertyException& ) { - return sal_False; + return false; } catch ( const com::sun::star::lang::WrappedTargetException& ) { - return sal_False; + return false; } } - return sal_True; + return true; } } // namespace framework diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index 78dfb910d745..1a139c4f76ec 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -75,8 +75,8 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL Reference< XUIConfigurationManager > xConfigSource; Reference< XFrame > xFrame; OUString aResourceURL( ResourceURL ); - sal_Bool bPersistent( sal_True ); - sal_Bool bExtraMode( sal_False ); + bool bPersistent( true ); + bool bExtraMode( false ); for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) { diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index ed52637ae649..50b19fe57c82 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -60,7 +60,7 @@ public: protected: UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode ); - sal_Bool m_bConfigRead; + bool m_bConfigRead; css::uno::Reference< css::uno::XComponentContext > m_xContext; ConfigurationAccess_ControllerFactory* m_pConfigAccess; @@ -72,7 +72,7 @@ UIControllerFactory::UIControllerFactory( const Reference< XComponentContext >& xContext, const rtl::OUString &rConfigurationNode ) : UIControllerFactory_BASE(m_aMutex) - , m_bConfigRead( sal_False ) + , m_bConfigRead( false ) , m_xContext( xContext ) , m_pConfigAccess() { @@ -108,7 +108,7 @@ throw (Exception, RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -173,7 +173,7 @@ throw (Exception, RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -203,7 +203,7 @@ throw (css::uno::RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -221,7 +221,7 @@ throw (RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -239,7 +239,7 @@ throw (RuntimeException, std::exception) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 0cc8e9689cd2..b18f82a43cf4 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -70,7 +70,7 @@ ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Re m_aPropModule( "Module" ), m_aPropFactory( "FactoryImplementation" ), m_sRoot(_sRoot), - m_bConfigAccessInitialized( sal_False ) + m_bConfigAccessInitialized( false ) { m_xConfigProvider = theDefaultProvider::get( rxContext ); } @@ -283,7 +283,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() { } - m_bConfigAccessInitialized = sal_True; + m_bConfigAccessInitialized = true; } if ( m_xConfigAccess.is() ) @@ -316,7 +316,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() } } -sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const +bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const { Reference< XPropertySet > xPropertySet; aElement >>= xPropertySet; @@ -332,15 +332,15 @@ sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aE } catch ( const com::sun::star::beans::UnknownPropertyException& ) { - return sal_False; + return false; } catch ( const com::sun::star::lang::WrappedTargetException& ) { - return sal_False; + return false; } } - return sal_True; + return true; } } // framework @@ -389,14 +389,14 @@ public: virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - sal_Bool m_bConfigRead; + bool m_bConfigRead; css::uno::Reference< css::uno::XComponentContext > m_xContext; ConfigurationAccess_FactoryManager* m_pConfigAccess; }; UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentContext >& rxContext ) : UIElementFactoryManager_BASE(m_aMutex), - m_bConfigRead( sal_False ), + m_bConfigRead( false ), m_xContext(rxContext) { m_pConfigAccess = new ConfigurationAccess_FactoryManager(rxContext, @@ -432,7 +432,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -475,7 +475,7 @@ throw ( RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -491,7 +491,7 @@ throw ( RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -524,7 +524,7 @@ throw ( ElementExistException, RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } @@ -540,7 +540,7 @@ throw ( NoSuchElementException, RuntimeException, std::exception ) if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index fcf511bcdc8c..5e12b9370dd7 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -79,14 +79,14 @@ private: virtual void SAL_CALL disposing() SAL_OVERRIDE; css::uno::Reference< css::uno::XComponentContext > m_xContext; - sal_Bool m_bConfigRead; + bool m_bConfigRead; ConfigurationAccess_FactoryManager* m_pConfigAccess; }; WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< uno::XComponentContext >& rxContext ) : WindowContentFactoryManager_BASE(m_aMutex), m_xContext( rxContext ), - m_bConfigRead( sal_False ) + m_bConfigRead( false ) { m_pConfigAccess = new ConfigurationAccess_FactoryManager( m_xContext, "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" ); @@ -168,7 +168,7 @@ throw (uno::Exception, uno::RuntimeException, std::exception) osl::MutexGuard g(rBHelper.rMutex); if ( !m_bConfigRead ) { - m_bConfigRead = sal_True; + m_bConfigRead = true; m_pConfigAccess->readConfigurationData(); } aImplementationName = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 74b7cf16b59a..6bfe69a8c7ec 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -56,8 +56,8 @@ namespace framework{ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) : m_rContainer (rContainer ) - , m_bInsideAcceleratorList(sal_False ) - , m_bInsideAcceleratorItem(sal_False ) + , m_bInsideAcceleratorList(false ) + , m_bInsideAcceleratorItem(false ) { } @@ -102,7 +102,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& THROW_PARSEEXCEPTION("An element \"accel:item\" must be embeded into 'accel:acceleratorlist'.") if (m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.") - m_bInsideAcceleratorItem = sal_True; + m_bInsideAcceleratorItem = true; OUString sCommand; css::awt::KeyEvent aEvent; @@ -173,7 +173,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& { if (m_bInsideAcceleratorList) THROW_PARSEEXCEPTION("An element \"accel:acceleratorlist\" cannot be used recursive.") - m_bInsideAcceleratorList = sal_True; + m_bInsideAcceleratorList = true; return; } } @@ -190,14 +190,14 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen { if (!m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("Found end element 'accel:item', but no start element.") - m_bInsideAcceleratorItem = sal_False; + m_bInsideAcceleratorItem = false; } if (eElement == E_ELEMENT_ACCELERATORLIST) { if (!m_bInsideAcceleratorList) THROW_PARSEEXCEPTION("Found end element 'accel:acceleratorlist', but no start element.") - m_bInsideAcceleratorList = sal_False; + m_bInsideAcceleratorList = false; } } diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index e13b7adc79c2..c8beaf3e3519 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::io; namespace framework { -sal_Bool ImagesConfiguration::LoadImages( +bool ImagesConfiguration::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 ) @@ -62,23 +62,23 @@ sal_Bool ImagesConfiguration::LoadImages( try { xParser->parseStream( aInputSource ); - return sal_True; + return true; } catch ( const RuntimeException& ) { - return sal_False; + return false; } catch( const SAXException& ) { - return sal_False; + return false; } catch( const ::com::sun::star::io::IOException& ) { - return sal_False; + return false; } } -sal_Bool ImagesConfiguration::StoreImages( +bool ImagesConfiguration::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 ) @@ -90,19 +90,19 @@ sal_Bool ImagesConfiguration::StoreImages( { OWriteImagesDocumentHandler aWriteImagesDocumentHandler( rItems, xWriter ); aWriteImagesDocumentHandler.WriteImagesDocument(); - return sal_True; + return true; } catch ( const RuntimeException& ) { - return sal_False; + return false; } catch ( const SAXException& ) { - return sal_False; + return false; } catch ( const ::com::sun::star::io::IOException& ) { - return sal_False; + return false; } } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 245ad1e3f736..4bf44ee84c2e 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -125,14 +125,14 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI } // reset states - m_bImageContainerStartFound = sal_False; - m_bImageContainerEndFound = sal_False; - m_bImagesStartFound = sal_False; - m_bImagesEndFound = sal_False; - m_bImageStartFound = sal_False; - m_bExternalImagesStartFound = sal_False; - m_bExternalImagesEndFound = sal_False; - m_bExternalImageStartFound = sal_False; + m_bImageContainerStartFound = false; + m_bImageContainerEndFound = false; + m_bImagesStartFound = false; + m_bImagesEndFound = false; + m_bImageStartFound = false; + m_bExternalImagesStartFound = false; + m_bExternalImagesEndFound = false; + m_bExternalImageStartFound = false; } OReadImagesDocumentHandler::~OReadImagesDocumentHandler() @@ -182,7 +182,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bImageContainerStartFound = sal_True; + m_bImageContainerStartFound = true; } break; @@ -205,7 +205,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_aImageList.pImageList ) m_aImageList.pImageList = new ImageListDescriptor; - m_bImagesStartFound = sal_True; + m_bImagesStartFound = true; m_pImages = new ImageListItemDescriptor; for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) @@ -306,7 +306,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_pImages->pImageItemList ) m_pImages->pImageItemList = new ImageItemListDescriptor; - m_bImageStartFound = sal_True; + m_bImageStartFound = true; // Create new image item descriptor ImageItemDescriptor* pItem = new ImageItemDescriptor; @@ -392,7 +392,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( } // Create unique external image container - m_bExternalImagesStartFound = sal_True; + m_bExternalImagesStartFound = true; m_pExternalImages = new ExternalImageItemListDescriptor; } break; @@ -423,7 +423,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bExternalImageStartFound = sal_True; + m_bExternalImageStartFound = true; ExternalImageItemDescriptor* pItem = new ExternalImageItemDescriptor; @@ -508,7 +508,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) { case IMG_ELEMENT_IMAGECONTAINER: { - m_bImageContainerEndFound = sal_True; + m_bImageContainerEndFound = true; } break; @@ -520,13 +520,13 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) m_aImageList.pImageList->push_back( m_pImages ); m_pImages = NULL; } - m_bImagesStartFound = sal_False; + m_bImagesStartFound = false; } break; case IMG_ELEMENT_ENTRY: { - m_bImageStartFound = sal_False; + m_bImageStartFound = false; } break; @@ -538,14 +538,14 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) m_aImageList.pExternalImageList = m_pExternalImages; } - m_bExternalImagesStartFound = sal_False; + m_bExternalImagesStartFound = false; m_pExternalImages = NULL; } break; case IMG_ELEMENT_EXTERNALENTRY: { - m_bExternalImageStartFound = sal_False; + m_bExternalImageStartFound = false; } break; |