diff options
-rwxr-xr-x | bin/update_pch | 2 | ||||
-rwxr-xr-x | bin/update_pch_bisect | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.cxx | 18 | ||||
-rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 18 | ||||
-rw-r--r-- | include/svtools/parrtf.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/reffind.cxx | 4 | ||||
-rw-r--r-- | svtools/source/svrtf/parrtf.cxx | 20 | ||||
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 8 |
8 files changed, 37 insertions, 37 deletions
diff --git a/bin/update_pch b/bin/update_pch index 6dc1b823ba58..7edd31f1ba71 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -176,7 +176,7 @@ def find_files(path, recurse=True): def get_filename(line): """ Strips the line from the - '#include' and angled brakets + '#include' and angled brackets and return the filename only. """ if not len(line) or line[0] != '#': diff --git a/bin/update_pch_bisect b/bin/update_pch_bisect index 8c86ac3cc2db..271cbc88ff1b 100755 --- a/bin/update_pch_bisect +++ b/bin/update_pch_bisect @@ -123,7 +123,7 @@ def bisect(lines, marks, min, max, update, command): def get_filename(line): """ Strips the line from the - '#include' and angled brakets + '#include' and angled brackets and return the filename only. """ return re.sub(r'(.*#include\s*)<(.*)>(.*)', r'\2', line) diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index e3f7dba07249..3006caf21594 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -510,20 +510,20 @@ void EditRTFParser::CalcValue() void EditRTFParser::ReadField() { // From SwRTFParser::ReadField() - int _nOpenBrakets = 1; // the first was already detected earlier + int _nOpenBrackets = 1; // the first was already detected earlier bool bFldInst = false; bool bFldRslt = false; OUString aFldInst; OUString aFldRslt; - while( _nOpenBrakets && IsParserWorking() ) + while( _nOpenBrackets && IsParserWorking() ) { switch( GetNextToken() ) { case '}': { - _nOpenBrakets--; - if ( _nOpenBrakets == 1 ) + _nOpenBrackets--; + if ( _nOpenBrackets == 1 ) { bFldInst = false; bFldRslt = false; @@ -531,7 +531,7 @@ void EditRTFParser::ReadField() } break; - case '{': _nOpenBrakets++; + case '{': _nOpenBrackets++; break; case RTF_FIELD: SkipGroup(); @@ -578,21 +578,21 @@ void EditRTFParser::ReadField() void EditRTFParser::SkipGroup() { - int _nOpenBrakets = 1; // the first was already detected earlier + int _nOpenBrackets = 1; // the first was already detected earlier - while( _nOpenBrakets && IsParserWorking() ) + while( _nOpenBrackets && IsParserWorking() ) { switch( GetNextToken() ) { case '}': { - _nOpenBrakets--; + _nOpenBrackets--; } break; case '{': { - _nOpenBrakets++; + _nOpenBrackets++; } break; } diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 8416aa0ae6db..02772c7b2920 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -273,19 +273,19 @@ void SvxRTFParser::ReadStyleTable() int bSaveChkStyleAttr = bChkStyleAttr ? 1 : 0; sal_uInt16 nStyleNo = 0; bool bHasStyleNo = false; - int _nOpenBrakets = 1; // the first was already detected earlier!! + int _nOpenBrackets = 1; // the first was already detected earlier!! std::optional<SvxRTFStyleType> xStyle(SvxRTFStyleType(*pAttrPool, aWhichMap)); xStyle->aAttrSet.Put( GetRTFDefaults() ); bIsInReadStyleTab = true; bChkStyleAttr = false; // Do not check Attribute against the Styles - while( _nOpenBrakets && IsParserWorking() ) + while( _nOpenBrackets && IsParserWorking() ) { int nToken = GetNextToken(); switch( nToken ) { - case '}': if( --_nOpenBrakets && IsParserWorking() ) + case '}': if( --_nOpenBrackets && IsParserWorking() ) // Style has been completely read, // so this is still a stable status SaveState( RTF_STYLESHEET ); @@ -306,7 +306,7 @@ void SvxRTFParser::ReadStyleTable() eState = SvParserState::Error; break; } - ++_nOpenBrakets; + ++_nOpenBrackets; } break; @@ -439,7 +439,7 @@ void SvxRTFParser::ReadColorTable() void SvxRTFParser::ReadFontTable() { - int _nOpenBrakets = 1; // the first was already detected earlier!! + int _nOpenBrackets = 1; // the first was already detected earlier!! vcl::Font aFont; short nFontNo(0), nInsFontNo (0); OUString sAltNm, sFntNm; @@ -449,7 +449,7 @@ void SvxRTFParser::ReadFontTable() aFont.SetCharSet( nSystemChar ); SetEncoding( nSystemChar ); - while( _nOpenBrakets && IsParserWorking() ) + while( _nOpenBrackets && IsParserWorking() ) { bool bCheckNewFont = false; int nToken = GetNextToken(); @@ -459,7 +459,7 @@ void SvxRTFParser::ReadFontTable() bIsAltFntNm = false; // Style has been completely read, // so this is still a stable status - if( --_nOpenBrakets <= 1 && IsParserWorking() ) + if( --_nOpenBrackets <= 1 && IsParserWorking() ) SaveState( RTF_FONTTBL ); bCheckNewFont = true; nInsFontNo = nFontNo; @@ -482,7 +482,7 @@ void SvxRTFParser::ReadFontTable() eState = SvParserState::Error; break; } - ++_nOpenBrakets; + ++_nOpenBrackets; break; case RTF_FROMAN: aFont.SetFamily( FAMILY_ROMAN ); @@ -550,7 +550,7 @@ void SvxRTFParser::ReadFontTable() break; } - if( bCheckNewFont && 1 >= _nOpenBrakets && !sFntNm.isEmpty() ) // one font is ready + if( bCheckNewFont && 1 >= _nOpenBrackets && !sFntNm.isEmpty() ) // one font is ready { // All data from the font is available, so off to the table if (!sAltNm.isEmpty()) diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index c67318a400f5..136026f56990 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -36,7 +36,7 @@ struct RtfParserState_Impl class SVT_DLLPUBLIC SvRTFParser : public SvParser<int> { std::stack< RtfParserState_Impl > aParserStates; - int nOpenBrakets; + int nOpenBrackets; rtl_TextEncoding eCodeSet; sal_uInt8 nUCharOverread; diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index e442be66ca75..57e02f0a64cc 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -98,7 +98,7 @@ sal_Int32 FindEndPosR1C1(const sal_Unicode* p, sal_Int32 nStartPos, sal_Int32 nE } else if (*p == '[') { - // Skip until the closing braket. + // Skip until the closing bracket. for (; nNewEnd <= nEndPos; ++p, ++nNewEnd) if (*p == ']') break; @@ -163,7 +163,7 @@ void ExpandToTextR1C1(const sal_Unicode* p, sal_Int32 nLen, sal_Int32& rStartPos } else if (c == ']') { - // Skip until the opening braket. + // Skip until the opening bracket. for (--rStartPos; rStartPos > 0; --rStartPos) { c = p[rStartPos]; diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index cbd3a97aad63..ef6cdbb73620 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -39,7 +39,7 @@ const int MAX_TOKEN_LEN = 128; SvRTFParser::SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize ) : SvParser<int>( rIn, nStackSize ) - , nOpenBrakets(0) + , nOpenBrackets(0) , eCodeSet(RTL_TEXTENCODING_MS_1252) , nUCharOverread(1) { @@ -225,22 +225,22 @@ int SvRTFParser::GetNextToken_() case '{': { - if( 0 <= nOpenBrakets ) + if( 0 <= nOpenBrackets ) { RtfParserState_Impl aState( nUCharOverread, GetSrcEncoding() ); aParserStates.push( aState ); } - ++nOpenBrakets; + ++nOpenBrackets; DBG_ASSERT( - static_cast<size_t>(nOpenBrakets) == aParserStates.size(), + static_cast<size_t>(nOpenBrackets) == aParserStates.size(), "ParserStateStack unequal to bracket count" ); nRet = nNextCh; } break; case '}': - --nOpenBrakets; - if( 0 <= nOpenBrakets ) + --nOpenBrackets; + if( 0 <= nOpenBrackets ) { aParserStates.pop(); if( !aParserStates.empty() ) @@ -257,7 +257,7 @@ int SvRTFParser::GetNextToken_() } } DBG_ASSERT( - static_cast<size_t>(nOpenBrakets) == aParserStates.size(), + static_cast<size_t>(nOpenBrackets) == aParserStates.size(), "ParserStateStack unequal to bracket count" ); nRet = nNextCh; break; @@ -577,7 +577,7 @@ SvParserState SvRTFParser::CallParser() rInput.ReadChar( cFirstCh ); nNextCh = static_cast<unsigned char>(cFirstCh); eState = SvParserState::Working; - nOpenBrakets = 0; + nOpenBrackets = 0; eCodeSet = RTL_TEXTENCODING_MS_1252; SetSrcEncoding( eCodeSet ); @@ -617,7 +617,7 @@ void SvRTFParser::Continue( int nToken ) switch( nToken ) { case '}': - if( nOpenBrakets ) + if( nOpenBrackets ) goto NEXTTOKEN; eState = SvParserState::Accepted; break; @@ -675,7 +675,7 @@ NEXTTOKEN: nToken = GetNextToken(); bLooping = nCurrentTokenIndex == m_nTokenIndex && nToken == nCurrentToken; } - if( SvParserState::Accepted == eState && 0 < nOpenBrakets ) + if( SvParserState::Accepted == eState && 0 < nOpenBrackets ) eState = SvParserState::Error; } diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 1c8ff364bccd..cba8355785c5 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -205,24 +205,24 @@ Any AnimationsImportHelperImpl::convertTarget( const OUString& rValue ) Any AnimationsImportHelperImpl::convertValue( XMLTokenEnum eAttributeName, const OUString& rValue ) { sal_Int32 nCommaPos = -1, nPos; - sal_Int32 nOpenBrakets = 0; + sal_Int32 nOpenBrackets = 0; for( nPos = 0; (nPos < rValue.getLength()) && (nCommaPos == -1); nPos++ ) { switch( rValue[nPos] ) { case ',': - if( nOpenBrakets == 0 ) + if( nOpenBrackets == 0 ) nCommaPos = nPos; break; case '(': case '[': case '{': - nOpenBrakets++; + nOpenBrackets++; break; case ')': case ']': case '}': - nOpenBrakets--; + nOpenBrackets--; break; } } |