summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--l10ntools/inc/cfgmerge.hxx6
-rw-r--r--l10ntools/inc/export.hxx34
-rw-r--r--l10ntools/inc/lngmerge.hxx8
-rw-r--r--l10ntools/inc/xmlparse.hxx2
-rw-r--r--l10ntools/inc/xrmmerge.hxx8
-rw-r--r--l10ntools/source/cfgmerge.cxx22
-rw-r--r--l10ntools/source/export.cxx102
-rw-r--r--l10ntools/source/lngmerge.cxx24
-rw-r--r--l10ntools/source/merge.cxx24
-rw-r--r--l10ntools/source/xmlparse.cxx4
-rw-r--r--l10ntools/source/xrmmerge.cxx32
11 files changed, 133 insertions, 133 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; }
};
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index fc3e594f76e6..74e4e1bcd034 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -133,7 +133,7 @@ CfgStackData *CfgStack::GetStackData()
CfgParser::CfgParser()
: pStackData( NULL ),
- bLocalize( sal_False )
+ bLocalize( false )
{
}
@@ -141,7 +141,7 @@ CfgParser::~CfgParser()
{
}
-sal_Bool CfgParser::IsTokenClosed(const OString &rToken)
+bool CfgParser::IsTokenClosed(const OString &rToken)
{
return rToken[rToken.getLength() - 2] == '/';
}
@@ -169,7 +169,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
OString sTokenName;
OString sTokenId;
- sal_Bool bOutput = sal_True;
+ bool bOutput = true;
switch ( nToken ) {
case CFG_TOKEN_PACKAGE:
@@ -202,7 +202,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
break;
case CFG_TOKEN_OORNAME:
sSearch = "oor:name=";
- bLocalize = sal_True;
+ bLocalize = true;
break;
case CFG_TOKEN_OORVALUE:
sSearch = "oor:value=";
@@ -217,7 +217,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
sCurrentIsoLang = sTemp.getToken(1, '"');
if ( sCurrentIsoLang == NO_TRANSLATE_ISO )
- bLocalize = sal_False;
+ bLocalize = false;
pStackData->sTextTag = sToken;
@@ -272,11 +272,11 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
case CFG_TEXTCHAR:
sCurrentText += sToken;
- bOutput = sal_False;
+ bOutput = false;
break;
case CFG_TOKEN_NO_TRANSLATE:
- bLocalize = sal_False;
+ bLocalize = false;
break;
}
@@ -399,7 +399,7 @@ CfgMerge::CfgMerge(
: pMergeDataFile( NULL ),
pResData( NULL ),
sFilename( rFilename ),
- bEnglish( sal_False )
+ bEnglish( false )
{
pOutputStream.open(
rOutputFile.getStr(), std::ios_base::out | std::ios_base::trunc);
@@ -451,7 +451,7 @@ void CfgMerge::WorkOnText(OString &, const OString& rLangIndex)
}
if (rLangIndex.equalsIgnoreAsciiCase("en-US"))
- bEnglish = sal_True;
+ bEnglish = true;
}
}
@@ -472,7 +472,7 @@ void CfgMerge::WorkOnResourceEnd()
sCur = aLanguages[ i ];
OString sContent;
- pEntrys->GetText( sContent, STRING_TYP_TEXT, sCur , sal_True );
+ pEntrys->GetText( sContent, STRING_TYP_TEXT, sCur , true );
if (
( !sCur.equalsIgnoreAsciiCase("en-US") ) && !sContent.isEmpty())
{
@@ -511,7 +511,7 @@ void CfgMerge::WorkOnResourceEnd()
}
delete pResData;
pResData = NULL;
- bEnglish = sal_False;
+ bEnglish = false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index a1a2bc433a0a..a230b1cfa967 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -146,7 +146,7 @@ int GetError()
// class ResData
//
-sal_Bool ResData::SetId( const OString& rId, sal_uInt16 nLevel )
+bool ResData::SetId( const OString& rId, sal_uInt16 nLevel )
{
if ( nLevel > nIdLevel )
{
@@ -166,10 +166,10 @@ sal_Bool ResData::SetId( const OString& rId, sal_uInt16 nLevel )
sId = sId.copy(0, 255).trim();
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//
@@ -196,15 +196,15 @@ static sal_Int32 lcl_countOccurrences(const OString& text, char c)
Export::Export(const OString &rOutput)
:
- bDefine( sal_False ),
- bNextMustBeDefineEOL( sal_False ),
+ bDefine( false ),
+ bNextMustBeDefineEOL( false ),
nLevel( 0 ),
nList( LIST_NON ),
nListIndex( 0 ),
nListLevel( 0 ),
bMergeMode( false ),
- bError( sal_False ),
- bReadOver( sal_False ),
+ bError( false ),
+ bReadOver( false ),
sFilename( global::inputPathname ),
sLanguages( OString() ),
pParseQueue( new ParserQueue( *this ) )
@@ -220,16 +220,16 @@ Export::Export(
const OString &rMergeSource, const OString &rOutput,
const OString &rLanguage, bool bUTF8BOM)
:
- bDefine( sal_False ),
- bNextMustBeDefineEOL( sal_False ),
+ bDefine( false ),
+ bNextMustBeDefineEOL( false ),
nLevel( 0 ),
nList( LIST_NON ),
nListIndex( 0 ),
nListLevel( 0 ),
- bMergeMode( sal_True ),
+ bMergeMode( true ),
sMergeSrc( rMergeSource ),
- bError( sal_False ),
- bReadOver( sal_False ),
+ bError( false ),
+ bReadOver( false ),
sFilename( global::inputPathname ),
sLanguages( rLanguage ),
pParseQueue( new ParserQueue( *this ) )
@@ -243,8 +243,8 @@ Export::Export(
void Export::Init()
{
// resets the internal status, used before parseing another file
- bDefine = sal_False;
- bNextMustBeDefineEOL = sal_False;
+ bDefine = false;
+ bNextMustBeDefineEOL = false;
nLevel = 0;
nList = LIST_NON;
nListIndex = 0;
@@ -291,9 +291,9 @@ int Export::Execute( int nToken, const char * pToken )
sTestToken = sTestToken.replaceAll("\t", OString()).
replaceAll(" ", OString());
if (( !bReadOver ) && ( sTestToken.startsWith("#ifndef__RSC_PARSER")))
- bReadOver = sal_True;
+ bReadOver = true;
else if (( bReadOver ) && ( sTestToken.startsWith("#endif") ))
- bReadOver = sal_False;
+ bReadOver = false;
}
if ((( nToken < FILTER_LEVEL ) || ( bReadOver )) &&
(!(( bNextMustBeDefineEOL ) && ( sOrig == "\n" )))) {
@@ -329,13 +329,13 @@ int Export::Execute( int nToken, const char * pToken )
if ( bNextMustBeDefineEOL ) {
if ( nToken != RSCDEFINELEND ) {
// end of macro found, so destroy res.
- bDefine = sal_False;
+ bDefine = false;
Execute( LEVELDOWN, "" );
- bNextMustBeDefineEOL = sal_False;
+ bNextMustBeDefineEOL = false;
}
else {
// next line also in macro definition
- bNextMustBeDefineEOL = sal_False;
+ bNextMustBeDefineEOL = false;
if ( bMergeMode )
WriteToMerged( sOrig , false );
return 1;
@@ -344,11 +344,11 @@ int Export::Execute( int nToken, const char * pToken )
}
}
- sal_Bool bExecuteDown = sal_False;
+ bool bExecuteDown = false;
if ( nToken != LEVELDOWN ) {
sal_uInt16 nOpen = 0;
sal_uInt16 nClose = 0;
- sal_Bool bReadOver1 = sal_False;
+ bool bReadOver1 = false;
sal_uInt16 i = 0;
for ( i = 0; i < sToken.getLength(); i++ ) {
if ( sToken[i] == '"' )
@@ -357,7 +357,7 @@ int Export::Execute( int nToken, const char * pToken )
nOpen++;
}
- bReadOver1 = sal_False;
+ bReadOver1 = false;
for ( i = 0; i < sToken.getLength(); i++ ) {
if ( sToken[i] == '"' )
bReadOver1 = !bReadOver1;
@@ -366,10 +366,10 @@ int Export::Execute( int nToken, const char * pToken )
}
if ( nOpen < nClose )
- bExecuteDown = sal_True;
+ bExecuteDown = true;
}
- sal_Bool bWriteToMerged = bMergeMode;
+ bool bWriteToMerged = bMergeMode;
switch ( nToken ) {
case NORMDEFINE:
@@ -377,16 +377,16 @@ int Export::Execute( int nToken, const char * pToken )
WriteToMerged( sOrig , false );
return 0;
case RSCDEFINE:
- bDefine = sal_True; // res. defined in macro
+ bDefine = true; // res. defined in macro
case RESOURCE:
case RESOURCEEXPR: {
if ( nToken != RSCDEFINE )
- bNextMustBeDefineEOL = sal_False;
+ bNextMustBeDefineEOL = false;
// this is the beginning of a new res.
nLevel++;
if ( nLevel > 1 ) {
- aResStack[ nLevel - 2 ]->bChild = sal_True;
+ aResStack[ nLevel - 2 ]->bChild = true;
}
// create new instance for this res. and fill mandatory fields
@@ -421,10 +421,10 @@ int Export::Execute( int nToken, const char * pToken )
break;
case SMALRESOURCE: {
// this is the beginning of a new res.
- bNextMustBeDefineEOL = sal_False;
+ bNextMustBeDefineEOL = false;
nLevel++;
if ( nLevel > 1 ) {
- aResStack[ nLevel - 2 ]->bChild = sal_True;
+ aResStack[ nLevel - 2 ]->bChild = true;
}
// create new instance for this res. and fill mandatory fields
@@ -453,7 +453,7 @@ int Export::Execute( int nToken, const char * pToken )
sLowerTyp = "unknown";
nLevel++;
if ( nLevel > 1 ) {
- aResStack[ nLevel - 2 ]->bChild = sal_True;
+ aResStack[ nLevel - 2 ]->bChild = true;
}
ResData *pNewData = new ResData( FullId() , sFilename );
@@ -466,8 +466,8 @@ int Export::Execute( int nToken, const char * pToken )
if ( !nList || !nListLevel ) {
if ( nLevel ) {
if ( bDefine && (nLevel == 1 )) {
- bDefine = sal_False;
- bNextMustBeDefineEOL = sal_False;
+ bDefine = false;
+ bNextMustBeDefineEOL = false;
}
WriteData( pResData );
ResStack::iterator it = aResStack.begin();
@@ -485,7 +485,7 @@ int Export::Execute( int nToken, const char * pToken )
else
{
if ( bDefine )
- bNextMustBeDefineEOL = sal_True;
+ bNextMustBeDefineEOL = true;
nListLevel--;
}
}
@@ -604,7 +604,7 @@ int Export::Execute( int nToken, const char * pToken )
if ( sLangIndex.equalsIgnoreAsciiCase("en-US") )
pResData->SetId( sText, ID_LEVEL_TEXT );
- pResData->bText = sal_True;
+ pResData->bText = true;
pResData->sTextTyp = sOrigKey;
if ( !bMergeMode )
{
@@ -613,7 +613,7 @@ int Export::Execute( int nToken, const char * pToken )
}
else if ( sKey == "QUICKHELPTEXT" ) {
SetChildWithText();
- pResData->bQuickHelpText = sal_True;
+ pResData->bQuickHelpText = true;
if ( !bMergeMode )
{
pResData->sQuickHelpText[ sLangIndex ] = sText;
@@ -621,7 +621,7 @@ int Export::Execute( int nToken, const char * pToken )
}
else if ( sKey == "TITLE" ) {
SetChildWithText();
- pResData->bTitle = sal_True;
+ pResData->bTitle = true;
if ( !bMergeMode )
{
pResData->sTitle[ sLangIndex ] = sText;
@@ -636,14 +636,14 @@ int Export::Execute( int nToken, const char * pToken )
break;
case CONDITION: {
if ( nLevel ) {
- WriteData( pResData, sal_True );
+ WriteData( pResData, true );
}
}
break;
case EMPTYLINE : {
if ( bDefine ) {
- bNextMustBeDefineEOL = sal_False;
- bDefine = sal_False;
+ bNextMustBeDefineEOL = false;
+ bDefine = false;
while ( nLevel )
Parse( LEVELDOWN, "" );
}
@@ -691,11 +691,11 @@ void Export::CutComment( OString &rText )
}
}
-sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
+bool Export::WriteData( ResData *pResData, bool bCreateNew )
{
if ( bMergeMode ) {
MergeRest( pResData );
- return sal_True;
+ return true;
}
// mandatory to export: en-US
@@ -755,7 +755,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
if ( bCreateNew )
pResData->m_aList.clear();
}
- return sal_True;
+ return true;
}
OString Export::GetPairedListID(const OString& rText)
@@ -780,7 +780,7 @@ OString Export::StripList(const OString & rText)
return s1.copy( 0 , s1.lastIndexOf('\"'));
}
-sal_Bool Export::WriteExportList(ResData *pResData, ExportList& rExportList,
+bool Export::WriteExportList(ResData *pResData, ExportList& rExportList,
const sal_uInt16 nTyp)
{
OString sGID(pResData->sGId);
@@ -823,7 +823,7 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList& rExportList,
sType, sGID, sLID, OString(), sText);
}
- return sal_True;
+ return true;
}
OString Export::FullId()
@@ -1012,15 +1012,15 @@ void Export::ConvertExportContent( OString& rText )
void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString& rTextType )
{
- sal_Bool bAddSemicolon = sal_False;
- sal_Bool bFirst = sal_True;
+ bool bAddSemicolon = false;
+ bool bFirst = true;
OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
sCur = aLanguages[ n ];
OString sText;
- sal_Bool bText = pEntry->GetText( sText, nType, sCur , sal_True );
+ bool bText = pEntry->GetText( sText, nType, sCur , true );
if ( bText && !sText.isEmpty() ) {
OStringBuffer sOutput;
if ( bNextMustBeDefineEOL) {
@@ -1029,7 +1029,7 @@ void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OStrin
else
sOutput.append(";\t\\\n");
}
- bFirst=sal_False;
+ bFirst=false;
sOutput.append("\t" + rTextType);
if ( !sCur.equalsIgnoreAsciiCase("en-US") ) {
@@ -1044,7 +1044,7 @@ void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OStrin
else if ( !bNextMustBeDefineEOL )
sOutput.append(";\n");
else
- bAddSemicolon = sal_True;
+ bAddSemicolon = true;
for ( sal_uInt16 j = 1; j < nLevel; j++ )
sOutput.append("\t");
WriteToMerged( sOutput.makeStringAndClear() , true );
@@ -1154,7 +1154,7 @@ void Export::MergeRest( ResData *pResData )
MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
OString sText;
- bool bText = pEntrys ? pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, sal_True ) : false;
+ bool bText = pEntrys ? pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, true ) : false;
if( bText && !sText.isEmpty())
{
@@ -1203,7 +1203,7 @@ void Export::SetChildWithText()
{
if ( aResStack.size() > 1 ) {
for ( size_t i = 0; i < aResStack.size() - 1; i++ ) {
- aResStack[ i ]->bChildWithText = sal_True;
+ aResStack[ i ]->bChildWithText = true;
}
}
}
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index e221f1695398..0b14a2c59379 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -48,7 +48,7 @@ static void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
// class LngParser
//
LngParser::LngParser(const OString &rLngFile,
- sal_Bool bULFFormat)
+ bool bULFFormat)
: nError( LNG_OK )
, pLines( NULL )
, sSource( rLngFile )
@@ -89,7 +89,7 @@ LngParser::~LngParser()
delete pLines;
}
-sal_Bool LngParser::CreatePO( const OString &rPOFile )
+bool LngParser::CreatePO( const OString &rPOFile )
{
PoOfstream aPOStream( rPOFile, PoOfstream::APP );
if (!aPOStream.isOpen()) {
@@ -97,7 +97,7 @@ sal_Bool LngParser::CreatePO( const OString &rPOFile )
}
size_t nPos = 0;
- sal_Bool bStart = true;
+ bool bStart = true;
OString sGroup, sLine;
OStringHashMap Text;
OString sID;
@@ -126,7 +126,7 @@ void LngParser::WritePO(PoOfstream &aPOStream,
const OString &rID)
{
- sal_Bool bExport = true;
+ bool bExport = true;
if ( bExport )
{
common::writePoEntry(
@@ -159,7 +159,7 @@ void LngParser::ReadLine(const OString &rLine_in,
}
}
-sal_Bool LngParser::Merge(
+bool LngParser::Merge(
const OString &rPOFile,
const OString &rDestinationFile,
const OString &rLanguage )
@@ -176,7 +176,7 @@ sal_Bool LngParser::Merge(
aLanguages = aMergeDataFile.GetLanguages();
size_t nPos = 0;
- sal_Bool bGroup = sal_False;
+ bool bGroup = false;
OString sGroup;
// seek to next group
@@ -187,7 +187,7 @@ sal_Bool LngParser::Merge(
if ( sLine.startsWith("[") && sLine.endsWith("]") )
{
sGroup = getBracketedContent(sLine).trim();
- bGroup = sal_True;
+ bGroup = true;
}
nPos ++;
}
@@ -201,7 +201,7 @@ sal_Bool LngParser::Merge(
pResData->sResTyp = "LngText";
MergeEntrys *pEntrys = aMergeDataFile.GetMergeEntrys( pResData );
// read languages
- bGroup = sal_False;
+ bGroup = false;
OString sLanguagesDone;
@@ -212,7 +212,7 @@ sal_Bool LngParser::Merge(
if ( sLine.startsWith("[") && sLine.endsWith("]") )
{
sGroup = getBracketedContent(sLine).trim();
- bGroup = sal_True;
+ bGroup = true;
nPos ++;
sLanguagesDone = "";
}
@@ -242,7 +242,7 @@ sal_Bool LngParser::Merge(
if( !sLang.isEmpty() )
{
OString sNewText;
- pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True );
+ pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, true );
if( sLang == "qtz" )
continue;
@@ -280,7 +280,7 @@ sal_Bool LngParser::Merge(
{
OString sNewText;
- pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True );
+ pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, true );
if( sCur == "qtz" )
continue;
if ( !sNewText.isEmpty() && sCur != "x-comment")
@@ -314,7 +314,7 @@ sal_Bool LngParser::Merge(
aDestination << (*pLines)[i]->getStr() << '\n';
aDestination.close();
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 8b1f51767494..455ef456e95f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -66,11 +66,11 @@ namespace
ResData::ResData( const OString &rGId )
:
nIdLevel( ID_LEVEL_NULL ),
- bChild( sal_False ),
- bChildWithText( sal_False ),
- bText( sal_False ),
- bQuickHelpText( sal_False ),
- bTitle( sal_False ),
+ bChild( false ),
+ bChildWithText( false ),
+ bText( false ),
+ bQuickHelpText( false ),
+ bTitle( false ),
sGId( rGId ),
sTextTyp( "Text" )
{
@@ -80,11 +80,11 @@ ResData::ResData( const OString &rGId )
ResData::ResData( const OString &rGId, const OString &rFilename)
:
nIdLevel( ID_LEVEL_NULL ),
- bChild( sal_False ),
- bChildWithText( sal_False ),
- bText( sal_False ),
- bQuickHelpText( sal_False ),
- bTitle( sal_False ),
+ bChild( false ),
+ bChildWithText( false ),
+ bText( false ),
+ bQuickHelpText( false ),
+ bTitle( false ),
sGId( rGId ),
sFilename( rFilename ),
sTextTyp( "Text" )
@@ -97,7 +97,7 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
//
bool MergeEntrys::GetText( OString &rReturn,
- sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel )
+ sal_uInt16 nTyp, const OString &nLangIndex, bool bDel )
{
bool bReturn = true;
switch ( nTyp ) {
@@ -214,7 +214,7 @@ MergeEntrys* MergeData::GetMergeEntries()
return pMergeEntrys;
}
-sal_Bool MergeData::operator==( ResData *pData )
+bool MergeData::operator==( ResData *pData )
{
return pData->sId == sLID && pData->sGId == sGID
&& pData->sResTyp.equalsIgnoreAsciiCase(sTyp);
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 74f126df4694..69d4881792a3 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -172,7 +172,7 @@ void XMLFile::Write( OString const &aFilename )
s.close();
}
-sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
+bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
{
if ( !pCur )
Write( rStream, this );
@@ -237,7 +237,7 @@ sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
break;
}
}
- return sal_True;
+ return true;
}
void XMLFile::Print( XMLNode *pCur, sal_uInt16 nLevel )
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 046d02adc1d6..9db719d45ced 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -40,8 +40,8 @@ void YYWarning( const char * );
// set of global variables
bool bMergeMode;
-sal_Bool bDisplayName;
-sal_Bool bExtensionDescription;
+bool bDisplayName;
+bool bExtensionDescription;
OString sLanguage;
OString sInputFileName;
OString sOutputFile;
@@ -55,8 +55,8 @@ extern "C" {
extern char *GetOutputFile( int argc, char* argv[])
{
- bDisplayName = sal_False;
- bExtensionDescription = sal_False;
+ bDisplayName = false;
+ bExtensionDescription = false;
common::HandledArgs aArgs;
if ( common::handleArguments(argc, argv, aArgs) )
@@ -149,8 +149,8 @@ int GetError()
XRMResParser::XRMResParser()
- : bError( sal_False ),
- bText( sal_False )
+ : bError( false ),
+ bText( false )
{
}
@@ -168,7 +168,7 @@ int XRMResParser::Execute( int nToken, char * pToken )
if ( sNewGID != sGID ) {
sGID = sNewGID;
}
- bText = sal_True;
+ bText = true;
sCurrentText = "";
sCurrentOpenTag = rToken;
Output( rToken );
@@ -182,26 +182,26 @@ int XRMResParser::Execute( int nToken, char * pToken )
WorkOnText( sCurrentOpenTag, sCurrentText );
Output( sCurrentText );
EndOfText( sCurrentOpenTag, sCurrentCloseTag );
- bText = sal_False;
+ bText = false;
rToken = OString("");
sCurrentText = OString("");
}
break;
case DESC_DISPLAY_NAME_START:{
- bDisplayName = sal_True;
+ bDisplayName = true;
}
break;
case DESC_DISPLAY_NAME_END:{
- bDisplayName = sal_False;
+ bDisplayName = false;
}
break;
case DESC_TEXT_START:{
if (bDisplayName) {
sGID = OString("dispname");
- bText = sal_True;
+ bText = true;
sCurrentText = "";
sCurrentOpenTag = rToken;
Output( rToken );
@@ -217,7 +217,7 @@ int XRMResParser::Execute( int nToken, char * pToken )
WorkOnText( sCurrentOpenTag, sCurrentText );
Output( sCurrentText );
EndOfText( sCurrentOpenTag, sCurrentCloseTag );
- bText = sal_False;
+ bText = false;
rToken = OString("");
sCurrentText = OString("");
}
@@ -225,12 +225,12 @@ int XRMResParser::Execute( int nToken, char * pToken )
break;
case DESC_EXTENSION_DESCRIPTION_START: {
- bExtensionDescription = sal_True;
+ bExtensionDescription = true;
}
break;
case DESC_EXTENSION_DESCRIPTION_END: {
- bExtensionDescription = sal_False;
+ bExtensionDescription = false;
}
break;
@@ -420,7 +420,7 @@ void XRMResMerge::WorkOnDesc(
OString sContent;
if ( !sCur.equalsIgnoreAsciiCase("en-US") &&
( pEntrys->GetText(
- sContent, STRING_TYP_TEXT, sCur, sal_True )) &&
+ sContent, STRING_TYP_TEXT, sCur, true )) &&
!sContent.isEmpty())
{
OString sText( sContent );
@@ -509,7 +509,7 @@ void XRMResMerge::EndOfText(
OString sContent;
if (!sCur.equalsIgnoreAsciiCase("en-US") &&
( pEntrys->GetText(
- sContent, STRING_TYP_TEXT, sCur, sal_True )) &&
+ sContent, STRING_TYP_TEXT, sCur, true )) &&
!sContent.isEmpty() &&
helper::isWellFormedXML( sContent ))
{
generated by cgit (git 2.34.1) at 2025-01-14 11:10:31 +0000