mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svtools/svparser.hxx: sal_Bool->bool

Browse Source 
Change-Id: I130c40227a756b396c4f858468457867d53454b1
This commit is contained in:
Noel Grandin
2014-03-24 11:31:45 +02:00
parent b4d4ede795
commit bdd2df7723
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbaccess/source/ui/misc/HtmlReader.cxx
View File

@@ -84,7 +84,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( sal_True );
SetSwitchToUCS2( true );
}
OHTMLReader::OHTMLReader(SvStream& rIn,
@@ -106,7 +106,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( sal_True );
SetSwitchToUCS2( true );
}
OHTMLReader::~OHTMLReader()

28
include/svtools/svparser.hxx
View File

@@ -54,7 +54,7 @@ protected:
SvParser_Impl *pImplData; // interne Daten
long nTokenValue; // zusaetzlicher Wert (RTF)
sal_Bool bTokenHasValue; // indicates whether nTokenValue is valid
bool bTokenHasValue; // indicates whether nTokenValue is valid
SvParserState eState; // Status auch in abgl. Klassen
rtl_TextEncoding eSrcEnc; // Source encoding
@@ -63,7 +63,7 @@ protected:
sal_Unicode nNextCh; // Akt. Zeichen fuer die "lex"
sal_Bool bDownloadingFile : 1;// sal_True: Es wird gerade ein externes
bool bDownloadingFile : 1;// sal_True: Es wird gerade ein externes
// File geladen. d.h. alle
// DataAvailable Links muessen
// ignoriert werden.
@@ -72,16 +72,16 @@ protected:
// Stream als ANSI gelesen,
// aber als CharSet DONTKNOW
// zurueckgegeben.
sal_Bool bUCS2BSrcEnc : 1; // oder als big-endian UCS2
sal_Bool bSwitchToUCS2 : 1; // Umschalten des ist erlaubt
bool bUCS2BSrcEnc : 1; // oder als big-endian UCS2
bool bSwitchToUCS2 : 1; // Umschalten des ist erlaubt
sal_Bool bRTF_InTextRead : 1; // only for RTF-Parser!!!
bool bRTF_InTextRead : 1; // only for RTF-Parser!!!
struct TokenStackType
{
OUString sToken;
long nTokenValue;
sal_Bool bTokenHasValue;
bool bTokenHasValue;
int nTokenId;
inline TokenStackType() { nTokenId = 0; }
@@ -142,21 +142,21 @@ public:
/*virtual*/ void RestoreState();
virtual void Continue( int nToken );
inline void SetDownloadingFile( sal_Bool bSet ) { bDownloadingFile = bSet; }
inline sal_Bool IsDownloadingFile() const { return bDownloadingFile; }
inline void SetDownloadingFile( bool bSet ) { bDownloadingFile = bSet; }
inline bool IsDownloadingFile() const { return bDownloadingFile; }
// Set/get source encoding. The UCS2BEncoding flag is valid if source
// encoding is UCS2. It specifies a big endian encoding.
void SetSrcEncoding( rtl_TextEncoding eSrcEnc );
rtl_TextEncoding GetSrcEncoding() const { return eSrcEnc; }
void SetSrcUCS2BEncoding( sal_Bool bSet ) { bUCS2BSrcEnc = bSet; }
sal_Bool IsSrcUCS2BEncoding() const { return bUCS2BSrcEnc; }
void SetSrcUCS2BEncoding( bool bSet ) { bUCS2BSrcEnc = bSet; }
bool IsSrcUCS2BEncoding() const { return bUCS2BSrcEnc; }
// Darf der Zeichensatz auf UCS/2 umgeschaltet werden, wenn
// in den ersten beiden Zeichen im Stream eine BOM steht?
void SetSwitchToUCS2( sal_Bool bSet ) { bSwitchToUCS2 = bSet; }
sal_Bool IsSwitchToUCS2() const { return bSwitchToUCS2; }
void SetSwitchToUCS2( bool bSet ) { bSwitchToUCS2 = bSet; }
bool IsSwitchToUCS2() const { return bSwitchToUCS2; }
// Aus wie vielen Bytes betseht ein Zeichen
inline sal_uInt16 GetCharSize() const;
@@ -266,8 +266,8 @@ public:
/** Operation.
*/
virtual sal_Bool GetFirst (SvKeyValue &rKeyVal);
virtual sal_Bool GetNext (SvKeyValue &rKeyVal);
virtual bool GetFirst (SvKeyValue &rKeyVal);
virtual bool GetNext (SvKeyValue &rKeyVal);
virtual void Append (const SvKeyValue &rKeyVal);
};

2
sfx2/source/bastyp/sfxhtml.cxx
View File

@@ -76,7 +76,7 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, bool bIsNewDoc,
"SfxHTMLParser::SfxHTMLParser: Switch to UCS2?" );
// If the file starts with a BOM, switch to UCS2.
SetSwitchToUCS2( sal_True );
SetSwitchToUCS2( true );
}
SfxHTMLParser::~SfxHTMLParser()

4
sfx2/source/doc/objmisc.cxx
View File

@@ -148,8 +148,8 @@ public:
xIter( pSh->GetMedium()->GetHeaderAttributes_Impl() ),
bAlert( false ) {}
virtual sal_Bool GetFirst( SvKeyValue& rKV ) { return xIter->GetFirst( rKV ); }
virtual sal_Bool GetNext( SvKeyValue& rKV ) { return xIter->GetNext( rKV ); }
virtual bool GetFirst( SvKeyValue& rKV ) { return xIter->GetFirst( rKV ); }
virtual bool GetNext( SvKeyValue& rKV ) { return xIter->GetNext( rKV ); }
virtual void Append( const SvKeyValue& rKV );
void ClearForSourceView() { xIter = new SvKeyValueIterator; bAlert = false; }

18
svtools/source/svrtf/svparser.cxx
View File

@@ -164,14 +164,14 @@ sal_Unicode SvParser::GetNextChar()
if( 0xfe == c1 && 0xff == c2 )
{
eSrcEnc = RTL_TEXTENCODING_UCS2;
bUCS2BSrcEnc = sal_True;
bSeekBack = sal_False;
bUCS2BSrcEnc = true;
bSeekBack = false;
}
else if( 0xff == c1 && 0xfe == c2 )
{
eSrcEnc = RTL_TEXTENCODING_UCS2;
bUCS2BSrcEnc = sal_False;
bSeekBack = sal_False;
bUCS2BSrcEnc = false;
bSeekBack = false;
}
}
}
@@ -179,7 +179,7 @@ sal_Unicode SvParser::GetNextChar()
if( bSeekBack )
rInput.Seek( 0 );
bSwitchToUCS2 = sal_False;
bSwitchToUCS2 = false;
}
nNextChPos = rInput.Tell();
@@ -641,7 +641,7 @@ SvKeyValueIterator::~SvKeyValueIterator (void)
/*
* GetFirst.
*/
sal_Bool SvKeyValueIterator::GetFirst (SvKeyValue &rKeyVal)
bool SvKeyValueIterator::GetFirst (SvKeyValue &rKeyVal)
{
m_nPos = m_pList->size();
return GetNext (rKeyVal);
@@ -650,17 +650,17 @@ sal_Bool SvKeyValueIterator::GetFirst (SvKeyValue &rKeyVal)
/*
* GetNext.
*/
sal_Bool SvKeyValueIterator::GetNext (SvKeyValue &rKeyVal)
bool SvKeyValueIterator::GetNext (SvKeyValue &rKeyVal)
{
if (m_nPos > 0)
{
rKeyVal = (*m_pList)[--m_nPos];
return sal_True;
return true;
}
else
{
// Nothing to do.
return sal_False;
return false;
}
}