diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:30:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:47:07 +0100 |
commit | 973b47a336b239cc92f1789013d28e5bd55f859f (patch) | |
tree | 6481f2803208409896aecf6745239cf07953baab /include/unotools | |
parent | 9ad3fc29dd98167c35fcb599da0b4e764ddf04dd (diff) |
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
Diffstat (limited to 'include/unotools')
27 files changed, 313 insertions, 313 deletions
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx index 617fc421d5e1..7a64584024de 100644 --- a/include/unotools/atom.hxx +++ b/include/unotools/atom.hxx @@ -47,7 +47,7 @@ namespace utl { AtomProvider(); ~AtomProvider(); - int getAtom( const OUString&, sal_Bool bCreate = sal_False ); + int getAtom( const OUString&, bool bCreate = false ); const OUString& getString( int ) const; }; @@ -59,7 +59,7 @@ namespace utl { MultiAtomProvider(); ~MultiAtomProvider(); - int getAtom( int atomClass, const OUString& rString, sal_Bool bCreate = sal_False ); + int getAtom( int atomClass, const OUString& rString, bool bCreate = false ); const OUString& getString( int atomClass, int atom ) const; }; diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index 43b85a2a7e3b..a8bfba2fe7d0 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -95,7 +95,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: @onerror We return an empty list. *//*-*****************************************************************************************************/ - sal_Bool HasEntries( CmdOption eOption ) const; + bool HasEntries( CmdOption eOption ) const; /*-****************************************************************************************************//** @short Lookup if a command URL is inside a given list @@ -110,7 +110,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: @onerror - *//*-*****************************************************************************************************/ - sal_Bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const; + bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const; /*-****************************************************************************************************//** @short register an office frame, which must update its dispatches if diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 9f3c86cc2fab..d278ccba6b7c 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -117,7 +117,7 @@ namespace utl com::sun::star::uno::Sequence< sal_Bool > GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames); - sal_Bool PutProperties( + bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues); @@ -129,15 +129,15 @@ namespace utl @see Notify @see DisableNotification */ - sal_Bool EnableNotification(const com::sun::star::uno::Sequence< OUString >& rNames, - sal_Bool bEnableInternalNotification = sal_False); + bool EnableNotification(const com::sun::star::uno::Sequence< OUString >& rNames, + bool bEnableInternalNotification = false); /** disables notifications about changes on sub nodes/values, which previosly had been enabled with EnableNotification @see Notify @see EnableNotification */ void DisableNotification(); - sal_Bool IsInternalNotification()const {return IsInValueChange();} + bool IsInternalNotification()const {return IsInValueChange();} //returns all members of a node in a specific format com::sun::star::uno::Sequence< OUString > @@ -146,16 +146,16 @@ namespace utl com::sun::star::uno::Sequence< OUString > GetNodeNames(const OUString& rNode, ConfigNameFormat eFormat); // remove all members of a set - sal_Bool ClearNodeSet(const OUString& rNode); + bool ClearNodeSet(const OUString& rNode); // remove selected members of a set - sal_Bool ClearNodeElements(const OUString& rNode, + bool ClearNodeElements(const OUString& rNode, com::sun::star::uno::Sequence< OUString >& rElements); // change or add members to a set - sal_Bool SetSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); + bool SetSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); // remove, change or add members of a set - sal_Bool ReplaceSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); + bool ReplaceSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); // add a new node without setting any properties - sal_Bool AddNode(const OUString& rNode, const OUString& rNewNode); + bool AddNode(const OUString& rNode, const OUString& rNewNode); public: virtual ~ConfigItem(); diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 32c7706be4ec..295569de4c1b 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -59,7 +59,7 @@ namespace utl m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object) ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDummy; - sal_Bool m_bEscapeNames; /// escape names before accessing children ? + bool m_bEscapeNames; /// escape names before accessing children ? OUString m_sCompletePath; @@ -77,7 +77,7 @@ namespace utl public: /// constructs an empty and invalid node object - OConfigurationNode() :m_bEscapeNames(sal_False) { } + OConfigurationNode() :m_bEscapeNames(false) { } /// copy ctor OConfigurationNode(const OConfigurationNode& _rSource); @@ -123,9 +123,9 @@ namespace utl If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes, the method will fail. */ - sal_Bool removeNode(const OUString& _rName) const throw(); + bool removeNode(const OUString& _rName) const throw(); - sal_Bool removeNode( const sal_Char* _pAsciiName ) const + bool removeNode( const sal_Char* _pAsciiName ) const { return removeNode( OUString::createFromAscii( _pAsciiName ) ); } @@ -152,9 +152,9 @@ namespace utl node. @return sal_True if and only if the write was successful. */ - sal_Bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); + bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); - sal_Bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const + bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const { return setNodeValue( OUString::createFromAscii( _pAsciiPath ), _rValue ); } @@ -169,11 +169,11 @@ namespace utl escaping for such names may not be supported by the underlying API objects. @see getEscape */ - void setEscape(sal_Bool _bEnable = sal_True); + void setEscape(bool _bEnable = true); /** get the flag specifying the current escape behaviour @see setEscape */ - sal_Bool getEscape() const { return m_bEscapeNames; } + bool getEscape() const { return m_bEscapeNames; } /// invalidate the object virtual void clear() throw(); @@ -182,21 +182,21 @@ namespace utl // meta information about the node /// checks whether or not the object represents a set node. - sal_Bool isSetNode() const; + bool isSetNode() const; /// checks whether or not a direct child with a given name exists - sal_Bool hasByName(const OUString& _rName) const throw(); - sal_Bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( OUString::createFromAscii( _pAsciiName ) ); } + bool hasByName(const OUString& _rName) const throw(); + bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( OUString::createFromAscii( _pAsciiName ) ); } /// checks whether or not a descendent (no matter if direct or indirect) with the given name exists - sal_Bool hasByHierarchicalName( const OUString& _rName ) const throw(); - sal_Bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); } + bool hasByHierarchicalName( const OUString& _rName ) const throw(); + bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); } /// check if the objects represents a valid configuration node - sal_Bool isValid() const { return m_xHierarchyAccess.is(); } + bool isValid() const { return m_xHierarchyAccess.is(); } /// check whether the object is read-only of updatable - sal_Bool isReadonly() const { return !m_xReplaceAccess.is(); } + bool isReadonly() const { return !m_xReplaceAccess.is(); } protected: // OEventListenerAdapter @@ -278,7 +278,7 @@ namespace utl const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, - sal_Bool _bLazyWrite = sal_True + bool _bLazyWrite = true ); /** open a new top-level configuration node<p/> @@ -294,7 +294,7 @@ namespace utl @param _eMode specifies which privileges should be applied when retrieving the node */ static OConfigurationTreeRoot createWithComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true); /** tolerant version of the <member>createWithServiceFactory</member> @@ -303,14 +303,14 @@ namespace utl given node path does not exist) are still asserted.</p> */ static OConfigurationTreeRoot tryCreateWithComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True ); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true ); /** commit all changes made on the subtree the object is the root for<p/> All changes made on any OConfigurationNode object retrieved (maybe indirect) from this root object are committed when calling this method. @return sal_True if and only if the commit was successful */ - sal_Bool commit() const throw(); + bool commit() const throw(); /// invalidate the object virtual void clear() throw(); diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx index 20f3a20e3de6..c8a1f1b3b8a2 100644 --- a/include/unotools/configpaths.hxx +++ b/include/unotools/configpaths.hxx @@ -52,7 +52,7 @@ namespace utl <FALSE/>, if the path was a one-level path or an invalid path */ - UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, + UNOTOOLS_DLLPUBLIC bool splitLastFromConfigurationPath(OUString const& _sInPath, OUString& _rsOutPath, OUString& _rsLocalName); @@ -98,7 +98,7 @@ namespace utl If both paths are equal <TRUE/> is returned. */ - sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, + bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath); //---------------------------------------------------------------------------- diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index b095d239fe6b..5e3b738f2e2b 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -145,7 +145,7 @@ namespace utl @see read @see commit */ - void write( sal_Bool _bCommit = sal_True ); + void write( bool _bCommit = true ); /** commits any changes done @@ -160,7 +160,7 @@ namespace utl If <FALSE/>, only the current values in the config nodes (as present since the last call to <method>write</method>) are committed. */ - void commit( sal_Bool _bWrite = sal_True ); + void commit( bool _bWrite = true ); private: /// implements the ctors diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index d2288659ea70..765c38d6af92 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -80,9 +80,9 @@ public: void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); OUString GetEventName( sal_Int32 nID ); }; diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index 39331232fe27..f2467835b104 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -38,53 +38,53 @@ public: virtual void Commit(); void Load(); - void SetLoadWordBasicCode( sal_Bool bFlag ); - sal_Bool IsLoadWordBasicCode() const; - void SetLoadWordBasicExecutable( sal_Bool bFlag ); - sal_Bool IsLoadWordBasicExecutable() const; - void SetLoadWordBasicStorage( sal_Bool bFlag ); - sal_Bool IsLoadWordBasicStorage() const; - - void SetLoadExcelBasicCode( sal_Bool bFlag ); - sal_Bool IsLoadExcelBasicCode() const; - void SetLoadExcelBasicExecutable( sal_Bool bFlag ); - sal_Bool IsLoadExcelBasicExecutable() const; - void SetLoadExcelBasicStorage( sal_Bool bFlag ); - sal_Bool IsLoadExcelBasicStorage() const; - - void SetLoadPPointBasicCode( sal_Bool bFlag ); - sal_Bool IsLoadPPointBasicCode() const; - void SetLoadPPointBasicStorage( sal_Bool bFlag ); - sal_Bool IsLoadPPointBasicStorage() const; - - sal_Bool IsMathType2Math() const; - void SetMathType2Math( sal_Bool bFlag ); - sal_Bool IsMath2MathType() const; - void SetMath2MathType( sal_Bool bFlag ); - - sal_Bool IsWinWord2Writer() const; - void SetWinWord2Writer( sal_Bool bFlag ); - sal_Bool IsWriter2WinWord() const; - void SetWriter2WinWord( sal_Bool bFlag ); - - sal_Bool IsUseEnhancedFields() const; - - sal_Bool IsExcel2Calc() const; - void SetExcel2Calc( sal_Bool bFlag ); - sal_Bool IsCalc2Excel() const; - void SetCalc2Excel( sal_Bool bFlag ); - - sal_Bool IsPowerPoint2Impress() const; - void SetPowerPoint2Impress( sal_Bool bFlag ); - sal_Bool IsImpress2PowerPoint() const; - void SetImpress2PowerPoint( sal_Bool bFlag ); - - sal_Bool IsSmartArt2Shape() const; - void SetSmartArt2Shape( sal_Bool bFlag ); - - sal_Bool IsEnablePPTPreview() const; - sal_Bool IsEnableCalcPreview() const; - sal_Bool IsEnableWordPreview() const; + void SetLoadWordBasicCode( bool bFlag ); + bool IsLoadWordBasicCode() const; + void SetLoadWordBasicExecutable( bool bFlag ); + bool IsLoadWordBasicExecutable() const; + void SetLoadWordBasicStorage( bool bFlag ); + bool IsLoadWordBasicStorage() const; + + void SetLoadExcelBasicCode( bool bFlag ); + bool IsLoadExcelBasicCode() const; + void SetLoadExcelBasicExecutable( bool bFlag ); + bool IsLoadExcelBasicExecutable() const; + void SetLoadExcelBasicStorage( bool bFlag ); + bool IsLoadExcelBasicStorage() const; + + void SetLoadPPointBasicCode( bool bFlag ); + bool IsLoadPPointBasicCode() const; + void SetLoadPPointBasicStorage( bool bFlag ); + bool IsLoadPPointBasicStorage() const; + + bool IsMathType2Math() const; + void SetMathType2Math( bool bFlag ); + bool IsMath2MathType() const; + void SetMath2MathType( bool bFlag ); + + bool IsWinWord2Writer() const; + void SetWinWord2Writer( bool bFlag ); + bool IsWriter2WinWord() const; + void SetWriter2WinWord( bool bFlag ); + + bool IsUseEnhancedFields() const; + + bool IsExcel2Calc() const; + void SetExcel2Calc( bool bFlag ); + bool IsCalc2Excel() const; + void SetCalc2Excel( bool bFlag ); + + bool IsPowerPoint2Impress() const; + void SetPowerPoint2Impress( bool bFlag ); + bool IsImpress2PowerPoint() const; + void SetImpress2PowerPoint( bool bFlag ); + + bool IsSmartArt2Shape() const; + void SetSmartArt2Shape( bool bFlag ); + + bool IsEnablePPTPreview() const; + bool IsEnableCalcPreview() const; + bool IsEnableWordPreview() const; static SvtFilterOptions& Get(); }; diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index 8a6f21e0485c..39c881f1dc88 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -88,11 +88,11 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op @onerror No error should occur! *//*-*****************************************************************************************************/ - sal_Bool IsFontHistoryEnabled ( ) const ; - void EnableFontHistory ( sal_Bool bState ) ; + bool IsFontHistoryEnabled ( ) const ; + void EnableFontHistory ( bool bState ) ; - sal_Bool IsFontWYSIWYGEnabled ( ) const ; - void EnableFontWYSIWYG ( sal_Bool bState ) ; + bool IsFontWYSIWYGEnabled ( ) const ; + void EnableFontWYSIWYG ( bool bState ) ; private: /*-****************************************************************************************************//** diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index 6df81e901161..a28598c6a35f 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -56,7 +56,7 @@ private: CollatorWrapper* pCaseCollator; void ImplNewLocaleData() const; - void ImplNewCollator( sal_Bool bCaseSensitive ) const; + void ImplNewCollator( bool bCaseSensitive ) const; public: @@ -81,14 +81,14 @@ public: const CollatorWrapper* getCollator() const { if ( !pCollator ) - ImplNewCollator( sal_False ); + ImplNewCollator( false ); return pCollator; } /// case sensitive collator const CollatorWrapper* getCaseCollator() const { if ( !pCaseCollator ) - ImplNewCollator( sal_True ); + ImplNewCollator( true ); return pCaseCollator; } }; diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index eb9c99df1d06..8ce4961c472c 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -40,15 +40,15 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions ::com::sun::star::uno::Sequence< OUString > aActiveDics; ::com::sun::star::uno::Sequence< OUString > aActiveConvDics; - sal_Bool bROActiveDics; - sal_Bool bROActiveConvDics; + bool bROActiveDics; + bool bROActiveConvDics; // Hyphenator service specific options sal_Int16 nHyphMinLeading, nHyphMinTrailing, nHyphMinWordLength; - sal_Bool bROHyphMinLeading, + bool bROHyphMinLeading, bROHyphMinTrailing, bROHyphMinWordLength; @@ -57,72 +57,72 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions sal_Int16 nDefaultLanguage_CJK; sal_Int16 nDefaultLanguage_CTL; - sal_Bool bRODefaultLanguage; - sal_Bool bRODefaultLanguage_CJK; - sal_Bool bRODefaultLanguage_CTL; + bool bRODefaultLanguage; + bool bRODefaultLanguage_CJK; + bool bRODefaultLanguage_CTL; // spelling options (non-service specific) - sal_Bool bIsSpellSpecial; - sal_Bool bIsSpellAuto; - sal_Bool bIsSpellReverse; + bool bIsSpellSpecial; + bool bIsSpellAuto; + bool bIsSpellReverse; - sal_Bool bROIsSpellSpecial; - sal_Bool bROIsSpellAuto; - sal_Bool bROIsSpellReverse; + bool bROIsSpellSpecial; + bool bROIsSpellAuto; + bool bROIsSpellReverse; // hyphenation options (non-service specific) - sal_Bool bIsHyphSpecial; - sal_Bool bIsHyphAuto; + bool bIsHyphSpecial; + bool bIsHyphAuto; - sal_Bool bROIsHyphSpecial; - sal_Bool bROIsHyphAuto; + bool bROIsHyphSpecial; + bool bROIsHyphAuto; // common to SpellChecker, Hyphenator and Thesaurus service - sal_Bool bIsUseDictionaryList; - sal_Bool bIsIgnoreControlCharacters; + bool bIsUseDictionaryList; + bool bIsIgnoreControlCharacters; - sal_Bool bROIsUseDictionaryList; - sal_Bool bROIsIgnoreControlCharacters; + bool bROIsUseDictionaryList; + bool bROIsIgnoreControlCharacters; // SpellChecker service specific options - sal_Bool bIsSpellWithDigits, + bool bIsSpellWithDigits, bIsSpellUpperCase, bIsSpellCapitalization; - sal_Bool bROIsSpellWithDigits, + bool bROIsSpellWithDigits, bROIsSpellUpperCase, bROIsSpellCapitalization; // text conversion specific options - sal_Bool bIsIgnorePostPositionalWord; - sal_Bool bIsAutoCloseDialog; - sal_Bool bIsShowEntriesRecentlyUsedFirst; - sal_Bool bIsAutoReplaceUniqueEntries; - sal_Bool bIsDirectionToSimplified; - sal_Bool bIsUseCharacterVariants; - sal_Bool bIsTranslateCommonTerms; - sal_Bool bIsReverseMapping; - - sal_Bool bROIsIgnorePostPositionalWord; - sal_Bool bROIsAutoCloseDialog; - sal_Bool bROIsShowEntriesRecentlyUsedFirst; - sal_Bool bROIsAutoReplaceUniqueEntries; - sal_Bool bROIsDirectionToSimplified; - sal_Bool bROIsUseCharacterVariants; - sal_Bool bROIsTranslateCommonTerms; - sal_Bool bROIsReverseMapping; + bool bIsIgnorePostPositionalWord; + bool bIsAutoCloseDialog; + bool bIsShowEntriesRecentlyUsedFirst; + bool bIsAutoReplaceUniqueEntries; + bool bIsDirectionToSimplified; + bool bIsUseCharacterVariants; + bool bIsTranslateCommonTerms; + bool bIsReverseMapping; + + bool bROIsIgnorePostPositionalWord; + bool bROIsAutoCloseDialog; + bool bROIsShowEntriesRecentlyUsedFirst; + bool bROIsAutoReplaceUniqueEntries; + bool bROIsDirectionToSimplified; + bool bROIsUseCharacterVariants; + bool bROIsTranslateCommonTerms; + bool bROIsReverseMapping; // check value need to determine if the configuration needs to updatet // or not (used for a quick check if data files have been changed/added // or deleted sal_Int32 nDataFilesChangedCheckValue; - sal_Bool bRODataFilesChangedCheckValue; + bool bRODataFilesChangedCheckValue; - sal_Bool bIsGrammarAuto; - sal_Bool bIsGrammarInteractive; + bool bIsGrammarAuto; + bool bIsGrammarInteractive; - sal_Bool bROIsGrammarAuto; - sal_Bool bROIsGrammarInteractive; + bool bROIsGrammarAuto; + bool bROIsGrammarInteractive; SvtLinguOptions(); }; @@ -172,7 +172,7 @@ public: GetProperties( const com::sun::star::uno::Sequence< OUString > &rNames ); // - sal_Bool + bool ReplaceSetProperties( const OUString &rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues ); @@ -182,24 +182,24 @@ public: com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const OUString &rPropertyName, + bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); - sal_Bool SetProperty( sal_Int32 nPropertyHandle, + bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); - sal_Bool GetOptions( SvtLinguOptions &rOptions ) const; + bool GetOptions( SvtLinguOptions &rOptions ) const; - sal_Bool IsReadOnly( const OUString &rPropertyName ) const; + bool IsReadOnly( const OUString &rPropertyName ) const; //! //! the following functions work on the 'ServiceManager' sub node of the //! linguistic configuration only //! - sal_Bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; + bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; // - sal_Bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; + bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; - sal_Bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; + bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; com::sun::star::uno::Sequence< OUString > GetDisabledDictionaries() const; diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 3f206f4cafe6..17050d758ae5 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -75,8 +75,8 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable sal_uInt16 nCurrPositiveFormat; sal_uInt16 nCurrNegativeFormat; sal_uInt16 nCurrDigits; - sal_Bool bLocaleDataItemValid; - sal_Bool bReservedWordValid; + bool bLocaleDataItemValid; + bool bReservedWordValid; mutable ::utl::ReadWriteMutex aMutex; // dummies, to be implemented or provided by XML locale data @@ -106,7 +106,7 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable sal_Unicode* ImplAddFormatNum( sal_Unicode* pBuf, sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const; + bool bUseThousandSep, bool bTrailingZeros ) const; void getDigitGroupingImpl(); @@ -245,10 +245,10 @@ public: DateFormat getLongDateFormat() const; /// only numerical values of Gregorian calendar OUString getDate( const Date& rDate ) const; - OUString getTime( const Time& rTime, sal_Bool bSec = sal_True, - sal_Bool b100Sec = sal_False ) const; + OUString getTime( const Time& rTime, bool bSec = true, + bool b100Sec = false ) const; OUString getDuration( const Time& rTime, - sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const; + bool bSec = true, bool b100Sec = false ) const; /** The CalendarWrapper already <b>MUST</b> have loaded a calendar. @@ -268,9 +268,9 @@ public: OUString getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek = 1, - sal_Bool bDayOfMonthWithLeadingZero = sal_False, + bool bDayOfMonthWithLeadingZero = false, sal_Int16 nDisplayMonth = 1, - sal_Bool bTwoDigitYear = sal_False + bool bTwoDigitYear = false ) const; /** Simple number formatting @@ -283,31 +283,31 @@ public: if the value is not an integer value. */ OUString getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep = sal_True, - sal_Bool bTrailingZeros = sal_True ) const; + bool bUseThousandSep = true, + bool bTrailingZeros = true ) const; /// "Secure" currency formatted string. OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, const OUString& rCurrencySymbol, - sal_Bool bUseThousandSep = sal_True ) const; + bool bUseThousandSep = true ) const; /** Default currency formatted string, use with care as default currency may change in any locale, for example, DEM -> EUR */ OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep = sal_True ) const + bool bUseThousandSep = true ) const { return getCurr( nNumber, nDecimals, getCurrSymbol(), bUseThousandSep ); } // dummy returns, to be implemented inline sal_Unicode getCurrZeroChar() const { return cCurrZeroChar; } - inline sal_Bool isNumLeadingZero() const - { return sal_True; } + inline bool isNumLeadingZero() const + { return true; } /// standard decimal places inline sal_uInt16 getNumDigits() const { return 2; } - inline sal_Bool isNumTrailingZeros() const - { return sal_True; } + inline bool isNumTrailingZeros() const + { return true; } // reserved words diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx index a059e5e49f19..6f695800dfa9 100644 --- a/include/unotools/localfilehelper.hxx +++ b/include/unotools/localfilehelper.hxx @@ -35,7 +35,7 @@ namespace utl Returning sal_True and an empty URL means that the URL doesn't point to a local file. */ static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn); - static sal_Bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ); + static bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ); /** Converts a "UCB compatible" URL into a "physical" file name. @@ -44,13 +44,13 @@ namespace utl file system is present ( watch: this doesn't mean that this file really exists! ) */ static bool ConvertURLToPhysicalName( const OUString& rName, OUString& rReturn ); - static sal_Bool ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ); + static bool ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ); - static sal_Bool IsLocalFile(const OUString& rName); - static sal_Bool IsFileContent(const OUString& rName); + static bool IsLocalFile(const OUString& rName); + static bool IsFileContent(const OUString& rName); static ::com::sun::star::uno::Sequence< OUString > - GetFolderContents( const OUString& rFolder, sal_Bool bFolder ); + GetFolderContents( const OUString& rFolder, bool bFolder ); }; } diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx index ccc1fb649571..d359c374ee19 100644 --- a/include/unotools/localisationoptions.hxx +++ b/include/unotools/localisationoptions.hxx @@ -77,7 +77,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de @onerror No error should occur! *//*-*****************************************************************************************************/ - sal_Bool IsAutoMnemonic ( ) const ; + bool IsAutoMnemonic ( ) const ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale" diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 1eb6b7a6b0fe..1cd206387160 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -131,7 +131,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - sal_Bool addInputStream(); + bool addInputStream(); //--------------------------------------- /** @short it checks if the descriptor already has a valid @@ -150,7 +150,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - sal_Bool addInputStreamOwnLock(); + bool addInputStreamOwnLock(); //--------------------------------------- /** @short it checks if the descriptor describes a readonly stream. @@ -170,7 +170,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream must be interpreted as readonly ... FALSE otherwise. */ - sal_Bool isStreamReadOnly() const; + bool isStreamReadOnly() const; //--------------------------------------- /** Returns a value from the sequence contained in the property @@ -291,7 +291,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @throw [css::lang::IllegalArgumentException] if the given PostData stream is <NULL/>. */ - SAL_DLLPRIVATE sal_Bool impl_openStreamWithPostData( + SAL_DLLPRIVATE bool impl_openStreamWithPostData( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData ) throw(::com::sun::star::uno::RuntimeException); @@ -317,9 +317,9 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @throw [css::uno::RuntimeException] if the MediaDescriptor seems to be invalid! */ - SAL_DLLPRIVATE sal_Bool impl_openStreamWithURL( + SAL_DLLPRIVATE bool impl_openStreamWithURL( const OUString& sURL, - sal_Bool bLockFile + bool bLockFile ) throw(::com::sun::star::uno::RuntimeException); //--------------------------------------- @@ -339,7 +339,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - SAL_DLLPRIVATE sal_Bool impl_addInputStream( sal_Bool bLockFile ); + SAL_DLLPRIVATE bool impl_addInputStream( bool bLockFile ); }; } diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx index 5cdfadef41a8..30c52ef3bdce 100644 --- a/include/unotools/misccfg.hxx +++ b/include/unotools/misccfg.hxx @@ -34,14 +34,14 @@ public: MiscCfg( ); virtual ~MiscCfg( ); - sal_Bool IsNotFoundWarning() const; - void SetNotFoundWarning( sal_Bool bSet); + bool IsNotFoundWarning() const; + void SetNotFoundWarning( bool bSet); - sal_Bool IsPaperSizeWarning() const; - void SetPaperSizeWarning(sal_Bool bSet); + bool IsPaperSizeWarning() const; + void SetPaperSizeWarning(bool bSet); - sal_Bool IsPaperOrientationWarning() const; - void SetPaperOrientationWarning( sal_Bool bSet); + bool IsPaperOrientationWarning() const; + void SetPaperOrientationWarning( bool bSet); // 0 ... 99 sal_Int32 GetYear2000() const; diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 6ea2a3f7cc4f..4ef1236633ba 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -103,15 +103,15 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: SvtModuleOptions(); virtual ~SvtModuleOptions(); - sal_Bool IsModuleInstalled ( EModule eModule ) const; + bool IsModuleInstalled ( EModule eModule ) const; OUString GetModuleName ( EModule eModule ) const; OUString GetFactoryName ( EFactory eFactory ) const; OUString GetFactoryStandardTemplate( EFactory eFactory ) const; OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; - sal_Bool IsDefaultFilterReadonly ( EFactory eFactory ) const; + bool IsDefaultFilterReadonly ( EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const OUString& sName , + static bool ClassifyFactoryByName ( const OUString& sName , EFactory& eFactory ); void SetFactoryStandardTemplate( EFactory eFactory , const OUString& sTemplate ); @@ -176,14 +176,14 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: OUString GetDefaultModuleName(); - sal_Bool IsMath () const; - sal_Bool IsChart () const; - sal_Bool IsCalc () const; - sal_Bool IsDraw () const; - sal_Bool IsWriter () const; - sal_Bool IsImpress () const; - sal_Bool IsBasicIDE () const; - sal_Bool IsDataBase () const; + bool IsMath () const; + bool IsChart () const; + bool IsCalc () const; + bool IsDraw () const; + bool IsWriter () const; + bool IsImpress () const; + bool IsBasicIDE () const; + bool IsDataBase () const; ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx index ec6f2ed6f7f5..aae2cf0a1542 100644 --- a/include/unotools/optionsdlg.hxx +++ b/include/unotools/optionsdlg.hxx @@ -34,10 +34,10 @@ public: SvtOptionsDialogOptions(); virtual ~SvtOptionsDialogOptions(); - sal_Bool IsGroupHidden ( const OUString& _rGroup ) const; - sal_Bool IsPageHidden ( const OUString& _rPage, + bool IsGroupHidden ( const OUString& _rGroup ) const; + bool IsPageHidden ( const OUString& _rPage, const OUString& _rGroup ) const; - sal_Bool IsOptionHidden ( const OUString& _rOption, + bool IsOptionHidden ( const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const; }; diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx index 8a2835f70717..c83a1ed63260 100644 --- a/include/unotools/printwarningoptions.hxx +++ b/include/unotools/printwarningoptions.hxx @@ -74,15 +74,15 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::de @seealso configuration package "org.openoffice.Office.Common/_3D-Engine" *//*-*****************************************************************************************************/ - sal_Bool IsPaperSize() const; - sal_Bool IsPaperOrientation() const; - sal_Bool IsTransparency() const; - sal_Bool IsModifyDocumentOnPrintingAllowed() const; - - void SetPaperSize( sal_Bool bState ); - void SetPaperOrientation( sal_Bool bState ); - void SetTransparency( sal_Bool bState ); - void SetModifyDocumentOnPrintingAllowed( sal_Bool bState ); + bool IsPaperSize() const; + bool IsPaperOrientation() const; + bool IsTransparency() const; + bool IsModifyDocumentOnPrintingAllowed() const; + + void SetPaperSize( bool bState ); + void SetPaperOrientation( bool bState ); + void SetTransparency( bool bState ); + void SetModifyDocumentOnPrintingAllowed( bool bState ); private: diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx index 5e7a9c205efc..8247e4b277f8 100644 --- a/include/unotools/saveopt.hxx +++ b/include/unotools/saveopt.hxx @@ -70,58 +70,58 @@ public: void SetAutoSaveTime( sal_Int32 n ); sal_Int32 GetAutoSaveTime() const; - void SetUseUserData( sal_Bool b ); - sal_Bool IsUseUserData() const; + void SetUseUserData( bool b ); + bool IsUseUserData() const; - void SetBackup( sal_Bool b ); - sal_Bool IsBackup() const; + void SetBackup( bool b ); + bool IsBackup() const; - void SetAutoSave( sal_Bool b ); - sal_Bool IsAutoSave() const; + void SetAutoSave( bool b ); + bool IsAutoSave() const; - void SetAutoSavePrompt( sal_Bool b ); - sal_Bool IsAutoSavePrompt() const; + void SetAutoSavePrompt( bool b ); + bool IsAutoSavePrompt() const; - void SetUserAutoSave( sal_Bool b ); - sal_Bool IsUserAutoSave() const; + void SetUserAutoSave( bool b ); + bool IsUserAutoSave() const; - void SetDocInfoSave(sal_Bool b); - sal_Bool IsDocInfoSave() const; + void SetDocInfoSave(bool b); + bool IsDocInfoSave() const; - void SetSaveWorkingSet( sal_Bool b ); - sal_Bool IsSaveWorkingSet() const; + void SetSaveWorkingSet( bool b ); + bool IsSaveWorkingSet() const; - void SetSaveDocView( sal_Bool b ); - sal_Bool IsSaveDocView() const; + void SetSaveDocView( bool b ); + bool IsSaveDocView() const; - void SetSaveRelINet( sal_Bool b ); - sal_Bool IsSaveRelINet() const; + void SetSaveRelINet( bool b ); + bool IsSaveRelINet() const; - void SetSaveRelFSys( sal_Bool b ); - sal_Bool IsSaveRelFSys() const; + void SetSaveRelFSys( bool b ); + bool IsSaveRelFSys() const; - sal_Bool IsSaveUnpacked() const; + bool IsSaveUnpacked() const; - void SetLoadUserSettings(sal_Bool b); - sal_Bool IsLoadUserSettings() const; + void SetLoadUserSettings(bool b); + bool IsLoadUserSettings() const; - void SetPrettyPrinting( sal_Bool _bEnable ); - sal_Bool IsPrettyPrinting( ) const; + void SetPrettyPrinting( bool _bEnable ); + bool IsPrettyPrinting( ) const; - void SetWarnAlienFormat( sal_Bool _bEnable ); - sal_Bool IsWarnAlienFormat( ) const; + void SetWarnAlienFormat( bool _bEnable ); + bool IsWarnAlienFormat( ) const; - void SetLoadDocumentPrinter( sal_Bool _bEnable ); - sal_Bool IsLoadDocumentPrinter( ) const; + void SetLoadDocumentPrinter( bool _bEnable ); + bool IsLoadDocumentPrinter( ) const; void SetODFDefaultVersion( ODFDefaultVersion eVersion ); ODFDefaultVersion GetODFDefaultVersion() const; - sal_Bool IsUseSHA1InODF12() const; + bool IsUseSHA1InODF12() const; - sal_Bool IsUseBlowfishInODF12() const; + bool IsUseBlowfishInODF12() const; - sal_Bool IsReadOnly( EOption eOption ) const; + bool IsReadOnly( EOption eOption ) const; }; #endif diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index d76a02fba341..6b05a2c6bbd0 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -44,66 +44,66 @@ public: // General Options // - sal_Bool IsWholeWordsOnly() const; - sal_Bool IsBackwards() const; - sal_Bool IsUseRegularExpression() const; - sal_Bool IsSimilaritySearch() const; - sal_Bool IsUseAsianOptions() const; - sal_Bool IsMatchCase() const; // also Japanese search option - sal_Bool IsNotes() const; - - void SetWholeWordsOnly( sal_Bool bVal ); - void SetBackwards( sal_Bool bVal ); - void SetUseRegularExpression( sal_Bool bVal ); - void SetSearchForStyles( sal_Bool bVal ); - void SetSimilaritySearch( sal_Bool bVal ); - void SetUseAsianOptions( sal_Bool bVal ); - void SetMatchCase( sal_Bool bVal ); // also Japanese search option - void SetNotes( sal_Bool bVal); + bool IsWholeWordsOnly() const; + bool IsBackwards() const; + bool IsUseRegularExpression() const; + bool IsSimilaritySearch() const; + bool IsUseAsianOptions() const; + bool IsMatchCase() const; // also Japanese search option + bool IsNotes() const; + + void SetWholeWordsOnly( bool bVal ); + void SetBackwards( bool bVal ); + void SetUseRegularExpression( bool bVal ); + void SetSearchForStyles( bool bVal ); + void SetSimilaritySearch( bool bVal ); + void SetUseAsianOptions( bool bVal ); + void SetMatchCase( bool bVal ); // also Japanese search option + void SetNotes( bool bVal); // // Japanese search options // - sal_Bool IsMatchFullHalfWidthForms() const; - sal_Bool IsMatchHiraganaKatakana() const; - sal_Bool IsMatchContractions() const; - sal_Bool IsMatchMinusDashChoon() const; - sal_Bool IsMatchRepeatCharMarks() const; - sal_Bool IsMatchVariantFormKanji() const; - sal_Bool IsMatchOldKanaForms() const; - sal_Bool IsMatchDiziDuzu() const; - sal_Bool IsMatchBavaHafa() const; - sal_Bool IsMatchTsithichiDhizi() const; - sal_Bool IsMatchHyuiyuByuvyu() const; - sal_Bool IsMatchSesheZeje() const; - sal_Bool IsMatchIaiya() const; - sal_Bool IsMatchKiku() const; - sal_Bool IsIgnorePunctuation() const; - sal_Bool IsIgnoreWhitespace() const; - sal_Bool IsIgnoreProlongedSoundMark() const; - sal_Bool IsIgnoreMiddleDot() const; - sal_Bool IsIgnoreDiacritics_CTL() const; - - void SetMatchFullHalfWidthForms( sal_Bool bVal ); - void SetMatchHiraganaKatakana( sal_Bool bVal ); - void SetMatchContractions( sal_Bool bVal ); - void SetMatchMinusDashChoon( sal_Bool bVal ); - void SetMatchRepeatCharMarks( sal_Bool bVal ); - void SetMatchVariantFormKanji( sal_Bool bVal ); - void SetMatchOldKanaForms( sal_Bool bVal ); - void SetMatchDiziDuzu( sal_Bool bVal ); - void SetMatchBavaHafa( sal_Bool bVal ); - void SetMatchTsithichiDhizi( sal_Bool bVal ); - void SetMatchHyuiyuByuvyu( sal_Bool bVal ); - void SetMatchSesheZeje( sal_Bool bVal ); - void SetMatchIaiya( sal_Bool bVal ); - void SetMatchKiku( sal_Bool bVal ); - void SetIgnorePunctuation( sal_Bool bVal ); - void SetIgnoreWhitespace( sal_Bool bVal ); - void SetIgnoreProlongedSoundMark( sal_Bool bVal ); - void SetIgnoreMiddleDot( sal_Bool bVal ); - void SetIgnoreDiacritics_CTL( sal_Bool bVal ); + bool IsMatchFullHalfWidthForms() const; + bool IsMatchHiraganaKatakana() const; + bool IsMatchContractions() const; + bool IsMatchMinusDashChoon() const; + bool IsMatchRepeatCharMarks() const; + bool IsMatchVariantFormKanji() const; + bool IsMatchOldKanaForms() const; + bool IsMatchDiziDuzu() const; + bool IsMatchBavaHafa() const; + bool IsMatchTsithichiDhizi() const; + bool IsMatchHyuiyuByuvyu() const; + bool IsMatchSesheZeje() const; + bool IsMatchIaiya() const; + bool IsMatchKiku() const; + bool IsIgnorePunctuation() const; + bool IsIgnoreWhitespace() const; + bool IsIgnoreProlongedSoundMark() const; + bool IsIgnoreMiddleDot() const; + bool IsIgnoreDiacritics_CTL() const; + + void SetMatchFullHalfWidthForms( bool bVal ); + void SetMatchHiraganaKatakana( bool bVal ); + void SetMatchContractions( bool bVal ); + void SetMatchMinusDashChoon( bool bVal ); + void SetMatchRepeatCharMarks( bool bVal ); + void SetMatchVariantFormKanji( bool bVal ); + void SetMatchOldKanaForms( bool bVal ); + void SetMatchDiziDuzu( bool bVal ); + void SetMatchBavaHafa( bool bVal ); + void SetMatchTsithichiDhizi( bool bVal ); + void SetMatchHyuiyuByuvyu( bool bVal ); + void SetMatchSesheZeje( bool bVal ); + void SetMatchIaiya( bool bVal ); + void SetMatchKiku( bool bVal ); + void SetIgnorePunctuation( bool bVal ); + void SetIgnoreWhitespace( bool bVal ); + void SetIgnoreProlongedSoundMark( bool bVal ); + void SetIgnoreMiddleDot( bool bVal ); + void SetIgnoreDiacritics_CTL( bool bVal ); }; diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index 33043548a301..3e906b2c9624 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -133,7 +133,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occur! *//*-*****************************************************************************************************/ - sal_Bool IsReadOnly( EOption eOption ) const ; + bool IsReadOnly( EOption eOption ) const ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" @@ -180,7 +180,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail sal_Int32 GetMacroSecurityLevel ( ) const ; void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; - sal_Bool IsMacroDisabled ( ) const ; + bool IsMacroDisabled ( ) const ; /** Check whether the given uri is either no dangerous macro-execution @@ -209,14 +209,14 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail bool IsOptionEnabled ( EOption eOption ) const ; // xmlsec05 deprecated methods - sal_Bool IsExecutePlugins() const; - void SetExecutePlugins( sal_Bool bSet ); + bool IsExecutePlugins() const; + void SetExecutePlugins( bool bSet ); EBasicSecurityMode GetBasicMode( ) const ; void SetBasicMode( EBasicSecurityMode eMode ) ; - sal_Bool IsWarningEnabled() const; - void SetWarningEnabled( sal_Bool bSet ); - sal_Bool IsConfirmationEnabled() const; - void SetConfirmationEnabled( sal_Bool bSet ); + bool IsWarningEnabled() const; + void SetWarningEnabled( bool bSet ); + bool IsConfirmationEnabled() const; + void SetConfirmationEnabled( bool bSet ); //------------------------------------------------------------------------------------------------------------- // private methods diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index 7060742afba9..7b9864694570 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -49,15 +49,15 @@ class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base protected: ::osl::Mutex m_aMutex; SvStream* m_pSvStream; - sal_Bool m_bSvStreamOwner : 1; + bool m_bSvStreamOwner : 1; OInputStreamWrapper() - { m_pSvStream = 0; m_bSvStreamOwner = sal_False; } - void SetStream(SvStream* _pStream, sal_Bool bOwner ) + { m_pSvStream = 0; m_bSvStreamOwner = false; } + void SetStream(SvStream* _pStream, bool bOwner ) { m_pSvStream = _pStream; m_bSvStreamOwner = bOwner; } public: OInputStreamWrapper(SvStream& _rStream); - OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=sal_False); + OInputStreamWrapper(SvStream* pStream, bool bOwner=false); virtual ~OInputStreamWrapper(); // stario::XInputStream @@ -88,7 +88,7 @@ protected: OSeekableInputStreamWrapper() {} public: OSeekableInputStreamWrapper(SvStream& _rStream); - OSeekableInputStreamWrapper(SvStream* _pStream, sal_Bool _bOwner = sal_False); + OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner = false); // XSeekable virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index def98536354e..b6c3a1c42ada 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -62,8 +62,8 @@ namespace utl UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream ); static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, sal_Bool bCloseStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, sal_Bool bCloseStream ); + static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, bool bCloseStream ); + static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, bool bCloseStream ); }; } diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx index e61394a37dd0..5a32cc02077f 100644 --- a/include/unotools/useroptions.hxx +++ b/include/unotools/useroptions.hxx @@ -80,7 +80,7 @@ public: // set the address token void SetCustomerNumber (OUString const&); - sal_Bool IsTokenReadonly (sal_uInt16 nToken) const; + bool IsTokenReadonly (sal_uInt16 nToken) const; OUString GetToken (sal_uInt16 nToken) const; void SetToken (sal_uInt16 nToken, OUString const& rNewToken); diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index a262648d896c..89d2d20111e6 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -165,7 +165,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror No error should occur. *//*-*****************************************************************************************************/ - sal_Bool Exists() const; + bool Exists() const; /*-****************************************************************************************************//** @short use it to delete an entry of dynamic view set @@ -181,7 +181,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror We return sal_False. *//*-*****************************************************************************************************/ - sal_Bool Delete(); + bool Delete(); /*-****************************************************************************************************//** @short use it to set/get the window state of your view @@ -222,8 +222,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror An assertion is thrown in debug version. Otherwise we do nothing! *//*-*****************************************************************************************************/ - sal_Bool IsVisible ( ) const; - void SetVisible( sal_Bool bState ); + bool IsVisible ( ) const; + void SetVisible( bool bState ); /** Return true if the "Visible" property actually has a non-nil value diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index eac33424844f..25fea269d33d 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -40,8 +40,8 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume public: OReadAccelatorDocumentHandler( SvtAcceleratorItemList& aNewAcceleratorItemList ) : m_nElementDepth( 0 ), - m_bAcceleratorMode( sal_False ), - m_bItemCloseExpected( sal_False ), + m_bAcceleratorMode( false ), + m_bItemCloseExpected( false ), m_xLocator( 0 ), m_aReadAcceleratorList( aNewAcceleratorItemList ) {} virtual ~OReadAccelatorDocumentHandler() {} @@ -79,8 +79,8 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume OUString getErrorLineString(); int m_nElementDepth; - sal_Bool m_bAcceleratorMode; - sal_Bool m_bItemCloseExpected; + bool m_bAcceleratorMode; + bool m_bItemCloseExpected; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; SvtAcceleratorItemList& m_aReadAcceleratorList; }; |