diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-15 17:06:22 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-17 17:55:18 +0100 |
commit | 5dd4a0690124c0d3fc1835a59e0fca2d12773afe (patch) | |
tree | b34af0cc9b2ab34bae22fe84be715934daccb0f4 /l10ntools/inc | |
parent | a450e0eea2d06ca0a9148c0de083e17566ac27de (diff) |
l10ntools: sal_Bool -> bool
Change-Id: Ifffdc0942b83b5761cbbbfc5db7d241be60815cb
Diffstat (limited to 'l10ntools/inc')
-rw-r--r-- | l10ntools/inc/cfgmerge.hxx | 6 | ||||
-rw-r--r-- | l10ntools/inc/export.hxx | 34 | ||||
-rw-r--r-- | l10ntools/inc/lngmerge.hxx | 8 | ||||
-rw-r--r-- | l10ntools/inc/xmlparse.hxx | 2 | ||||
-rw-r--r-- | l10ntools/inc/xrmmerge.hxx | 8 |
5 files changed, 29 insertions, 29 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index 6d8a92f5eb46..d5d5e541b367 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -103,7 +103,7 @@ protected: CfgStack aStack; CfgStackData *pStackData; - sal_Bool bLocalize; + bool bLocalize; virtual void WorkOnText( OString &rText, @@ -122,7 +122,7 @@ private: const OString &rIsoLang, const OString &rResTyp ); - sal_Bool IsTokenClosed(const OString &rToken); + bool IsTokenClosed(const OString &rToken); public: CfgParser(); @@ -163,7 +163,7 @@ private: ResData *pResData; OString sFilename; - sal_Bool bEnglish; + bool bEnglish; std::ofstream pOutputStream; diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index ee44f6686096..97923e0070c5 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -71,15 +71,15 @@ class ResData public: ResData( const OString &rGId ); ResData( const OString &rGId , const OString &rFilename ); - sal_Bool SetId(const OString &rId, sal_uInt16 nLevel); + bool SetId(const OString &rId, sal_uInt16 nLevel); sal_uInt16 nIdLevel; - sal_Bool bChild; - sal_Bool bChildWithText; + bool bChild; + bool bChildWithText; - sal_Bool bText; - sal_Bool bQuickHelpText; - sal_Bool bTitle; + bool bText; + bool bQuickHelpText; + bool bTitle; OString sResTyp; OString sId; @@ -130,23 +130,23 @@ private: ResStack aResStack; ///< stack for parsing recursive - sal_Bool bDefine; // cur. res. in a define? - sal_Bool bNextMustBeDefineEOL; ///< define but no \ at lineend + bool bDefine; // cur. res. in a define? + bool bNextMustBeDefineEOL; ///< define but no \ at lineend std::size_t nLevel; // res. recursiv? how deep? sal_uInt16 nList; ///< cur. res. is List std::size_t nListIndex; std::size_t nListLevel; - sal_Bool bMergeMode; + bool bMergeMode; OString sMergeSrc; - sal_Bool bError; // any errors while export? - sal_Bool bReadOver; + bool bError; // any errors while export? + bool bReadOver; OString sFilename; OString sLanguages; std::vector<OString> aLanguages; - sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False ); ///< called befor dest. cur ResData - sal_Bool WriteExportList( ResData *pResData, ExportList& rExportList, const sal_uInt16 nTyp ); + bool WriteData( ResData *pResData, bool bCreateNew = false ); ///< called befor dest. cur ResData + bool WriteExportList( ResData *pResData, ExportList& rExportList, const sal_uInt16 nTyp ); OString MergePairedList( OString const & sLine , OString const & sText ); @@ -179,8 +179,8 @@ public: void Init(); int Execute( int nToken, const char * pToken ); ///< called from lexer - void SetError() { bError = sal_True; } - sal_Bool GetError() { return bError; } + void SetError() { bError = true; } + bool GetError() { return bError; } ParserQueue* pParseQueue; // public!! }; @@ -214,7 +214,7 @@ public: sTitle[ rId ] = rTitle; bTitleFirst[ rId ] = true; } - bool GetText( OString &rReturn, sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel = sal_False ); + bool GetText( OString &rReturn, sal_uInt16 nTyp, const OString &nLangIndex, bool bDel = false ); /** Generate QTZ string with ResData @@ -293,7 +293,7 @@ public: ~MergeData(); MergeEntrys* GetMergeEntries(); - sal_Bool operator==( ResData *pData ); + bool operator==( ResData *pData ); }; // diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx index ab3cfa2d787b..b566accb0ec3 100644 --- a/l10ntools/inc/lngmerge.hxx +++ b/l10ntools/inc/lngmerge.hxx @@ -46,7 +46,7 @@ private: sal_uInt16 nError; LngLineList *pLines; OString sSource; - sal_Bool bULF; + bool bULF; std::vector<OString> aLanguages; bool isNextGroup(OString &sGroup_out, const OString &sLine_in); @@ -56,11 +56,11 @@ private: const OString &rActFileName, const OString &rID); public: LngParser(const OString &rLngFile, - sal_Bool bULFFormat); + bool bULFFormat); ~LngParser(); - sal_Bool CreatePO( const OString &rPOFile ); - sal_Bool Merge(const OString &rPOFile, const OString &rDestinationFile, + bool CreatePO( const OString &rPOFile ); + bool Merge(const OString &rPOFile, const OString &rDestinationFile, const OString &rLanguage ); }; diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 547ffcea7102..b3d332a1de60 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -160,7 +160,7 @@ public: XMLHashMap* GetStrings(){ return m_pXMLStrings; } void Write( OString const &rFilename ); - sal_Bool Write( std::ofstream &rStream, XMLNode *pCur = NULL ); + bool Write( std::ofstream &rStream, XMLNode *pCur = NULL ); bool CheckExportStatus( XMLParentNode *pCur = NULL ); diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx index 7c593c227869..c3eb7426ab40 100644 --- a/l10ntools/inc/xrmmerge.hxx +++ b/l10ntools/inc/xrmmerge.hxx @@ -32,8 +32,8 @@ private: OString sGID; OString sLID; - sal_Bool bError; - sal_Bool bText; + bool bError; + bool bText; OString sCurrentOpenTag; OString sCurrentCloseTag; @@ -65,8 +65,8 @@ public: int Execute( int nToken, char * pToken ); - void SetError( sal_Bool bErr = sal_True ) { bError = bErr; } - sal_Bool GetError() { return bError; } + void SetError( bool bErr = true ) { bError = bErr; } + bool GetError() { return bError; } }; |