diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-15 10:42:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-15 11:14:28 +0300 |
| commit | cb6d67c21f11811c5bc023b9565c1c1b1f4081fa (patch) | |
| tree | ff8a4b192a2ca846d32111732563432244135910 /sw | |
| parent | 1a357b7394ac7b48b72821bff1aae4706265d7a4 (diff) | |
Spelling "separate" (etc) correctly is hard
Diffstat (limited to 'sw')
60 files changed, 164 insertions, 164 deletions
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 98c156761e89..187e070e8da8 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -169,7 +169,7 @@ SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev ); // Separator for jumps to different content types in document. -const sal_Unicode cMarkSeperator = '|'; +const sal_Unicode cMarkSeparator = '|'; extern const sal_Char* pMarkToTable; // Strings are extern const sal_Char* pMarkToFrame; // in Init.cxx. extern const sal_Char* pMarkToRegion; diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index e8639a6f2118..249f8385bc07 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -639,7 +639,7 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); //But default configuration should, msword-alike treak emdash - //and endash as word seperators for word-counting + //and endash as word separators for word-counting m_pDoc->AppendTxtNode(*aPaM.GetPoint()); m_pDoc->InsertString(aPaM, sTemplate.replace('X', 0x2013)); pTxtNode = aPaM.GetNode()->GetTxtNode(); diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index c21e6bc76562..cb6ec35fc33e 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -271,7 +271,7 @@ sal_uInt8 SwPaM::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes /* #i80135# */ // if there are SwPostItFields inside our current node text, we - // split the text into seperate pieces and search for text inside + // split the text into separate pieces and search for text inside // the pieces as well as inside the fields const SwpHints *pHts = ((SwTxtNode*)pNode)->GetpSwpHints(); diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 226d6bb8352f..ebc0d10f1e75 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -63,11 +63,11 @@ bool SwTable::IsTblComplexForChart( const String& rSelection ) const if( '<' == sBox.GetChar( 0 ) ) sBox.Erase( 0, 1 ); if( '>' == sBox.GetChar( sBox.Len()-1 ) ) sBox.Erase( sBox.Len()-1 ); - xub_StrLen nSeperator = sBox.Search( ':' ); - OSL_ENSURE( STRING_NOTFOUND != nSeperator, "no valid selection" ); + xub_StrLen nSeparator = sBox.Search( ':' ); + OSL_ENSURE( STRING_NOTFOUND != nSeparator, "no valid selection" ); - pSttBox = GetTblBox( sBox.Copy( 0, nSeperator )); - pEndBox = GetTblBox( sBox.Copy( nSeperator+1 )); + pSttBox = GetTblBox( sBox.Copy( 0, nSeparator )); + pEndBox = GetTblBox( sBox.Copy( nSeparator+1 )); } else { diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index ae7437fc14f5..502ed342eae5 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -297,7 +297,7 @@ bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 )); - xub_StrLen nPos = sItem.Search( cMarkSeperator ); + xub_StrLen nPos = sItem.Search( cMarkSeparator ); const CharClass& rCC = GetAppCharClass(); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 1f36b91e8a9b..f169ae5a5172 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -1343,7 +1343,7 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev ) ::_RestoreCntntIdx( pDoc, aBkmkArr, aIdx.GetIndex() ); // If the passed PaM is not in the Crsr ring, - // treat it seperately (e.g. when it's being called from AutoFormat) + // treat it separately (e.g. when it's being called from AutoFormat) if( pOldTxtNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() ) rPam.GetBound( sal_True ) = aAlphaPos; if( pOldTxtNd == rPam.GetBound( sal_False ).nContent.GetIdxReg() ) diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 65222e7ee41d..a78a59289742 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -332,7 +332,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) case RES_SETEXPFLD: case RES_HIDDENTXTFLD: case RES_HIDDENPARAFLD: - // Expression fields are treated seperately + // Expression fields are treated separately if( !pNewHt ) break; default: @@ -1226,7 +1226,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds ) { const SwFieldType* pFldType; - // process seperately: + // process separately: for( n = mpFldTypes->size(); n; ) switch( ( pFldType = (*mpFldTypes)[ --n ] )->Which() ) { diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 702156faad7c..49a36da82d3b 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -634,7 +634,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet, // TextAttributes with an end never expand their range if ( !bCharAttr && !bOtherAttr ) { - // CharFmt and URL attributes are treated seperately! + // CharFmt and URL attributes are treated separately! // TEST_TEMP ToDo: AutoFmt! SfxItemSet aTxtSet( pDoc->GetAttrPool(), RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK, @@ -2086,7 +2086,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, bNotifyLayout = true; } - // the header and footer attributes are copied seperately + // the header and footer attributes are copied separately // the content sections have to be copied in their entirety { SfxItemSet aAttrSet( rSrcDesc.GetMaster().GetAttrSet() ); @@ -2383,7 +2383,7 @@ void SwDoc::SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId, { SfxItemSet aTmp( *pTNd->GetpSwAttrSet() ); aTmp.Differentiate( *pSet ); - // we handle the adjust item seperately + // we handle the adjust item separately const SfxPoolItem* pItem; if( SFX_ITEM_SET == pTNd->GetpSwAttrSet()->GetItemState( RES_PARATR_ADJUST, sal_False, &pItem )) diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx index cf32b50adbcf..2f3306f8f82b 100644 --- a/sw/source/core/doc/ftnidx.cxx +++ b/sw/source/core/doc/ftnidx.cxx @@ -52,7 +52,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt ) const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo(); // For normal foot notes we treat per-chapter and per-document numbering - // seperately. For Endnotes we only have per-document numbering. + // separately. For Endnotes we only have per-document numbering. if( FTNNUM_CHAPTER == rFtnInfo.eNum ) { const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds(); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 38a558849628..9c389f1b906a 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -679,8 +679,8 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData, ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo()); // The LinkFileName could only consist of separators - String sCompareString = OUString(sfx2::cTokenSeperator); - sCompareString += sfx2::cTokenSeperator; + String sCompareString = OUString(sfx2::cTokenSeparator); + sCompareString += sfx2::cTokenSeparator; const bool bUpdate = (!pSection->IsLinkType() && rNewData.IsLinkType()) || (rNewData.GetLinkFileName().Len() diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index b6f27f068fca..90f371cdf831 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -815,7 +815,7 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const ->GetAttrOutlineLevel() - 1 ) --nPos; - if( !nPos ) // Get seperately when 0 + if( !nPos ) // Get separately when 0 pRet = rONds[0]->GetTxtNode(); } } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 56239af0f94f..54c3e589505d 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -560,8 +560,8 @@ const String& SwSection::GetLinkFileName() const m_RefLink->GetLinkManager()->GetDisplayNames( m_RefLink, 0, &sTmp, &sRange, &sFilter )) { - ( sTmp += sfx2::cTokenSeperator ) += sFilter; - ( sTmp += sfx2::cTokenSeperator ) += sRange; + ( sTmp += sfx2::cTokenSeparator ) += sFilter; + ( sTmp += sfx2::cTokenSeparator ) += sRange; } else if( GetFmt() && !GetFmt()->GetSectionNode() ) { @@ -1636,11 +1636,11 @@ void SwSection::CreateLink( LinkCreateType eCreateType ) case FILE_LINK_SECTION: { pLnk->SetContentType( FORMAT_FILE ); - String sFltr( sCmd.GetToken( 1, sfx2::cTokenSeperator ) ); - String sRange( sCmd.GetToken( 2, sfx2::cTokenSeperator ) ); + String sFltr( sCmd.GetToken( 1, sfx2::cTokenSeparator ) ); + String sRange( sCmd.GetToken( 2, sfx2::cTokenSeparator ) ); pFmt->GetDoc()->GetLinkManager().InsertFileLink( *pLnk, static_cast<sal_uInt16>(m_Data.GetType()), - sCmd.GetToken( 0, sfx2::cTokenSeperator ), + sCmd.GetToken( 0, sfx2::cTokenSeparator ), ( sFltr.Len() ? &sFltr : 0 ), ( sRange.Len() ? &sRange : 0 ) ); } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index b2ebf5ec8d2d..e8a553ba552d 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2051,7 +2051,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) bFirstSent = sal_True; default: if( !( rAppCC.isLetterNumeric( *pTxt, nPos ) - || '/' == cChar )) // '/' should not be a word seperator (e.g. '1/2' needs to be handled as one word for replacement) + || '/' == cChar )) // '/' should not be a word separator (e.g. '1/2' needs to be handled as one word for replacement) { --nPos; // ++nPos von dem for ungueltig machen ! ++bBreak; diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 5f79e3c7823a..a6d048ed7206 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -338,7 +338,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const OSL_FAIL("illegal property"); } if( nPart ) - rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeperator)); + rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeparator)); return true; } @@ -368,9 +368,9 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) if( nPart ) { String sTmp, sCmd( GetCmd() ); - while(3 > comphelper::string::getTokenCount(sCmd, sfx2::cTokenSeperator)) - sCmd += sfx2::cTokenSeperator; - sCmd.SetToken( nPart-1, sfx2::cTokenSeperator, ::GetString( rVal, sTmp ) ); + while(3 > comphelper::string::getTokenCount(sCmd, sfx2::cTokenSeparator)) + sCmd += sfx2::cTokenSeparator; + sCmd.SetToken( nPart-1, sfx2::cTokenSeparator, ::GetString( rVal, sTmp ) ); SetCmd( sCmd ); } return true; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 5a1eea594187..5cedf29e600d 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -586,8 +586,8 @@ bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const if( refLink->GetLinkManager()->GetDisplayNames( refLink, &sApp, &sTopic, &sItem ) ) { - ( *pFileNm = sApp ) += sfx2::cTokenSeperator; - ( *pFileNm += sTopic ) += sfx2::cTokenSeperator; + ( *pFileNm = sApp ) += sfx2::cTokenSeparator; + ( *pFileNm += sTopic ) += sfx2::cTokenSeparator; *pFileNm += sItem; pFilterNm->AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DDE" )); bRet = true; @@ -654,8 +654,8 @@ void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName ) { sal_Int32 nTmp = 0; String sApp, sTopic, sItem; - sApp = rGrfName.GetToken( 0, sfx2::cTokenSeperator, nTmp ); - sTopic = rGrfName.GetToken( 0, sfx2::cTokenSeperator, nTmp ); + sApp = rGrfName.GetToken( 0, sfx2::cTokenSeparator, nTmp ); + sTopic = rGrfName.GetToken( 0, sfx2::cTokenSeparator, nTmp ); sItem = rGrfName.Copy( nTmp ); pIDLA->GetLinkManager().InsertDDELink( refLink, sApp, sTopic, sItem ); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 106ef4741f91..22e7091e00d4 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -685,7 +685,7 @@ String SwTOXPara::GetURL() const SwFrmFmt* pFly = pNd->GetFlyFmt(); if( pFly ) { - (( aTxt = '#' ) += pFly->GetName() ) += cMarkSeperator; + (( aTxt = '#' ) += pFly->GetName() ) += cMarkSeparator; const sal_Char* pStr; switch( eType ) { @@ -746,7 +746,7 @@ String SwTOXTable::GetURL() const aTxt = ((SwTableNode*)pNd)->GetTable().GetFrmFmt()->GetName(); if( aTxt.Len() ) { - ( aTxt.Insert( '#', 0 ) += cMarkSeperator ). + ( aTxt.Insert( '#', 0 ) += cMarkSeparator ). AppendAscii( pMarkToTable ); } } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 45f5c7288baa..e1c282452d80 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -665,7 +665,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt, //additional ones can be added in under tools->options if (nWordType == i18n::WordType::WORD_COUNT) { - OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get(); + OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeparators::get(); OUStringBuffer aBuf(aPreDashReplacementText); for (sal_Int32 i = nStartPos; i < nEndPos; ++i) { diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index f75ad8ec88ad..a3793d26a3d5 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -555,7 +555,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd, if( USHRT_MAX != pSave->m_nCntnt ) { - // split at ContentPosition, delete previous char (= seperator) + // split at ContentPosition, delete previous char (= separator) OSL_ENSURE( pTxtNd, "Where is my TextNode?" ); SwIndex aCntPos( pTxtNd, pSave->m_nCntnt - 1 ); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 14484459e1ea..363c45c4efc1 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -788,7 +788,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData } aDataLen[oi] = nL; - // check that there is no other seperate sequence of data + // check that there is no other separate sequence of data // to be found because that is not supported while (ii < iiEnd) { diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 53a3de7ebb79..9d0e282212a3 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -689,10 +689,10 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, { String sTmp; if(!sParam1.Len()) - (sParam1 = sfx2::cTokenSeperator) - += sfx2::cTokenSeperator; + (sParam1 = sfx2::cTokenSeparator) + += sfx2::cTokenSeparator; - sParam1.SetToken( nPart, sfx2::cTokenSeperator, + sParam1.SetToken( nPart, sfx2::cTokenSeparator, ::GetString( rValue, sTmp )); } else if(3 == nPart) @@ -871,7 +871,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DDE_COMMAND_ELEMENT)) ? 2 : rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_IS_AUTOMATIC_UPDATE)) ? 3 : USHRT_MAX; if(nPart < 3 ) - pStr = &(sStr = sParam1.GetToken(nPart, sfx2::cTokenSeperator)); + pStr = &(sStr = sParam1.GetToken(nPart, sfx2::cTokenSeparator)); else if(3 == nPart) aRet.setValue(&bParam1, ::getBooleanCppuType()); } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 4ea1fcf9e464..749b53d823af 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -337,9 +337,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) SwSectionData aSect(eType, pDoc->GetUniqueSectionName(&tmp)); aSect.SetCondition(m_pImpl->m_pProps->m_sCondition); OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName); - sLinkNameBuf.append(sfx2::cTokenSeperator); + sLinkNameBuf.append(sfx2::cTokenSeparator); sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionFilter); - sLinkNameBuf.append(sfx2::cTokenSeperator); + sLinkNameBuf.append(sfx2::cTokenSeparator); sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionRegion); aSect.SetLinkFileName(sLinkNameBuf.makeStringAndClear()); @@ -623,14 +623,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, if (!m_pProps->m_bDDE) { OUStringBuffer buf; - buf.append(sfx2::cTokenSeperator); - buf.append(sfx2::cTokenSeperator); + buf.append(sfx2::cTokenSeparator); + buf.append(sfx2::cTokenSeparator); m_pProps->m_sLinkFileName = buf.makeStringAndClear(); m_pProps->m_bDDE = true; } String sLinkFileName(m_pProps->m_sLinkFileName); sLinkFileName.SetToken(pEntry->nWID - WID_SECT_DDE_TYPE, - sfx2::cTokenSeperator, sTmp); + sfx2::cTokenSeparator, sTmp); m_pProps->m_sLinkFileName = sLinkFileName; } else @@ -638,12 +638,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, String sLinkFileName(pSectionData->GetLinkFileName()); if (pSectionData->GetType() != DDE_LINK_SECTION) { - sLinkFileName = sfx2::cTokenSeperator; - sLinkFileName += sfx2::cTokenSeperator; + sLinkFileName = sfx2::cTokenSeparator; + sLinkFileName += sfx2::cTokenSeparator; pSectionData->SetType(DDE_LINK_SECTION); } sLinkFileName.SetToken(pEntry->nWID - WID_SECT_DDE_TYPE, - sfx2::cTokenSeperator, sTmp); + sfx2::cTokenSeparator, sTmp); pSectionData->SetLinkFileName(sLinkFileName); } } @@ -694,12 +694,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, ->GetURLObject(), aLink.FileURL, URIHelper::GetMaybeFileHdl())); } - sFileNameBuf.append(sfx2::cTokenSeperator); + sFileNameBuf.append(sfx2::cTokenSeparator); sFileNameBuf.append(aLink.FilterName); - sFileNameBuf.append(sfx2::cTokenSeperator); + sFileNameBuf.append(sfx2::cTokenSeparator); sFileNameBuf.append( pSectionData->GetLinkFileName().GetToken(2, - sfx2::cTokenSeperator)); + sfx2::cTokenSeparator)); const OUString sFileName( sFileNameBuf.makeStringAndClear()); pSectionData->SetLinkFileName(sFileName); @@ -727,11 +727,11 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, pSectionData->SetType(FILE_LINK_SECTION); } String sSectLink(pSectionData->GetLinkFileName()); - while (3 < comphelper::string::getTokenCount(sSectLink, sfx2::cTokenSeperator)) + while (3 < comphelper::string::getTokenCount(sSectLink, sfx2::cTokenSeparator)) { - sSectLink += sfx2::cTokenSeperator; + sSectLink += sfx2::cTokenSeparator; } - sSectLink.SetToken(2, sfx2::cTokenSeperator, sLink); + sSectLink.SetToken(2, sfx2::cTokenSeparator, sLink); pSectionData->SetLinkFileName(sSectLink); if (sSectLink.Len() < 3) { @@ -1019,7 +1019,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } sal_Int32 nDummy(0); sRet = sRet.getToken(pEntry->nWID - WID_SECT_DDE_TYPE, - sfx2::cTokenSeperator, nDummy); + sfx2::cTokenSeparator, nDummy); pRet[nProperty] <<= sRet; } break; @@ -1050,9 +1050,9 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OUString sRet( pSect->GetLinkFileName() ); sal_Int32 nIndex(0); aLink.FileURL = - sRet.getToken(0, sfx2::cTokenSeperator, nIndex); + sRet.getToken(0, sfx2::cTokenSeparator, nIndex); aLink.FilterName = - sRet.getToken(0, sfx2::cTokenSeperator, nIndex); + sRet.getToken(0, sfx2::cTokenSeparator, nIndex); } pRet[nProperty] <<= aLink; } @@ -1067,7 +1067,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, else if (FILE_LINK_SECTION == pSect->GetType()) { sRet = pSect->GetLinkFileName().GetToken(2, - sfx2::cTokenSeperator); + sfx2::cTokenSeparator); } pRet[nProperty] <<= sRet; } diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 47426ef81804..b7fdd6f7d9e4 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -1770,7 +1770,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) sal_Unicode c = rURL.GetChar( --nPos ); switch( c ) { - case cMarkSeperator: + case cMarkSeparator: bFound = sal_True; break; case '%': @@ -1804,7 +1804,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) if( bEncoded ) { aURL.Erase( nPos, 2 ); - aURL.SetChar( nPos-1, cMarkSeperator ); + aURL.SetChar( nPos-1, cMarkSeparator ); } aImplicitMarks.insert( aURL ); } @@ -1827,7 +1827,7 @@ void SwHTMLWriter::AddLinkTarget( const String& rURL ) if( bEncoded ) { aURL.Erase( nPos, 2 ); - aURL.SetChar( nPos-1, cMarkSeperator ); + aURL.SetChar( nPos-1, cMarkSeparator ); } aOutlineMarks.insert( aOutlineMarks.begin()+nIns, new String( aURL ) ); } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 97caf18c790f..de89a5926d0c 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1118,7 +1118,7 @@ ANCHOR_SETEVENT: String sDecoded( INetURLObject::decode( aName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); - xub_StrLen nPos = sDecoded.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = sDecoded.SearchBackward( cMarkSeparator ); if( STRING_NOTFOUND != nPos ) { String sCmp(comphelper::string::remove(sDecoded.Copy(nPos+1), ' ')); diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 82a4b800ec4f..b9e76dac8df5 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -287,7 +287,7 @@ void SwHTMLParser::NewDivision( int nToken ) else { aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.Copy( 0, nPos ), Link(), false ); - aURL += sfx2::cTokenSeperator; + aURL += sfx2::cTokenSeparator; if( STRING_NOTFOUND == nPos2 ) { aURL += aHRef.Copy( nPos+1 ); @@ -295,7 +295,7 @@ void SwHTMLParser::NewDivision( int nToken ) else { aURL += aHRef.Copy( nPos+1, nPos2 - (nPos+1) ); - aURL += sfx2::cTokenSeperator; + aURL += sfx2::cTokenSeparator; aURL += String(rtl::Uri::decode( aHRef.Copy( nPos2+1 ), rtl_UriDecodeWithCharset, RTL_TEXTENCODING_ISO_8859_1 )); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 3f0f679aa3ee..a4c84813929e 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -370,7 +370,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, eJumpTo = JUMPTO_MARK; xub_StrLen nLastPos, nPos = 0; while( STRING_NOTFOUND != ( nLastPos = - sJmpMark.Search( cMarkSeperator, nPos + 1 )) ) + sJmpMark.Search( cMarkSeparator, nPos + 1 )) ) nPos = nLastPos; String sCmp; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 8042027d5086..58b747897507 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -548,9 +548,9 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, rHTMLWrt.Strm() << sOut.makeStringAndClear().getStr(); const String& aFName = rSection.GetLinkFileName(); - String aURL( aFName.GetToken(0,sfx2::cTokenSeperator) ); - String aFilter( aFName.GetToken(1,sfx2::cTokenSeperator) ); - String aSection( aFName.GetToken(2,sfx2::cTokenSeperator) ); + String aURL( aFName.GetToken(0,sfx2::cTokenSeparator) ); + String aFilter( aFName.GetToken(1,sfx2::cTokenSeparator) ); + String aSection( aFName.GetToken(2,sfx2::cTokenSeparator) ); String aEncURL( URIHelper::simpleNormalizedMakeRelative(rHTMLWrt.GetBaseURL(), aURL ) ); sal_Unicode cDelim = 255U; @@ -1076,7 +1076,7 @@ void SwHTMLWriter::OutImplicitMark( const String& rMark, if( rMark.Len() && !aImplicitMarks.empty() ) { String sMark( rMark ); - sMark.Append( cMarkSeperator ); + sMark.Append( cMarkSeparator ); sMark.AppendAscii( pMarkType ); if( 0 != aImplicitMarks.erase( sMark ) ) { @@ -1089,7 +1089,7 @@ void SwHTMLWriter::OutImplicitMark( const String& rMark, void SwHTMLWriter::OutHyperlinkHRefValue( const String& rURL ) { String sURL( rURL ); - xub_StrLen nPos = sURL.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = sURL.SearchBackward( cMarkSeparator ); if( STRING_NOTFOUND != nPos ) { String sCmp(comphelper::string::remove(sURL.Copy(nPos+1), ' ')); diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index dc9c1b627ca0..1b4cafd6b2fe 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -501,7 +501,7 @@ sal_Int32 RtfSdrExport::StartShape() /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 059299b66f3f..52bfba74b687 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -764,7 +764,7 @@ namespace sw Word has the simple concept of a drawing object either in the foreground and in the background. We have an additional complexity - that form components live in a seperate layer, which seems + that form components live in a separate layer, which seems unnecessarily complicated. So in the winword filter we set the object's layer through this class with either SendObjectToHell for the bottom layer and SendObjectToHeaven for the top and we don't diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 7d4444ebfeab..af662eda04e7 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -107,7 +107,7 @@ namespace myImplHelpers /* SwTxtFmtColl and SwCharFmt are quite distinct types and how they are gotten is also distinct, but the algorithm to match word's eqivalents into - them is the same, so we put the different stuff into two seperate helper + them is the same, so we put the different stuff into two separate helper implementations and a core template that uses the helpers that uses the same algorithm to do the work. We'll make the helpers specializations of a non existing template so I can let the compiler figure out the right one diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 6cbd5abf673f..5e7add30c33f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1097,7 +1097,7 @@ void WW8Export::WriteSdrTextObj(const SdrObject& rObj, sal_uInt8 nTyp) /* #i13885# When the object is actively being edited, that text is not set into - the objects normal text object, but lives in a seperate object. + the objects normal text object, but lives in a separate object. */ if (pTxtObj->IsTextEditActive()) { diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 182c51423410..83bd7943ce02 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -764,7 +764,7 @@ bool AttributeOutputBase::AnalyzeURL( const String& rUrl, const String& /*rTarge { sMark = BookmarkToWriter( rUrl.Copy(1) ); - xub_StrLen nPos = sMark.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = sMark.SearchBackward( cMarkSeparator ); String sRefType(comphelper::string::remove(sMark.Copy(nPos+1), ' ')); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index af5c55f63a2c..b3e652234e01 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2853,7 +2853,7 @@ void MSWordExportBase::AddLinkTarget(const String& rURL) return; String aURL( BookmarkToWriter( rURL.Copy( 1 ) ) ); - xub_StrLen nPos = aURL.SearchBackward( cMarkSeperator ); + xub_StrLen nPos = aURL.SearchBackward( cMarkSeparator ); if( nPos < 2 ) return; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index cc5d4026ec4c..d2dae7ce0599 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -3262,7 +3262,7 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) sal_Unicode cEnd = rTwoLines.GetEndBracket(); /* - As per usual we have problems. We can have seperate left and right brackets + As per usual we have problems. We can have separate left and right brackets in OOo, it doesn't appear that you can in word. Also in word there appear to only be a limited number of possibilities, we can use pretty much anything. @@ -4780,9 +4780,9 @@ void SwWW8WrTabu::Add(const SvxTabStop & rTS, long nAdjustment) break; case SVX_TAB_ADJUST_DECIMAL: /* - Theres nothing we can do btw the decimal seperator has been + Theres nothing we can do btw the decimal separator has been customized, but if you think different remember that different - locales have different seperators, i.e. german is a , while english + locales have different separators, i.e. german is a , while english is a . */ nPara = 3; diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index f1b7244531bb..3aebdf56ba85 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -603,7 +603,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, Save and create new plcxman for this drawing object, of the type that will include the para end mark inside a paragraph property range, as drawing boxes have real paragraph marks as part of their text, while - normal writer has seperate nodes for each paragraph and so has no actual + normal writer has separate nodes for each paragraph and so has no actual paragraph mark as part of the paragraph text. */ WW8ReaderSave aSave(this); @@ -1757,7 +1757,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, bool bBrushItemOk = false; sal_uInt8 nTrans = 0; - //Seperate transparency + //Separate transparency eState = rOldSet.GetItemState(XATTR_FILLTRANSPARENCE, true, &pItem); if (eState == SFX_ITEM_SET) { diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index 558a3dbc3ed1..fc3c8c9147e0 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -75,7 +75,7 @@ public: const SvxMSDffShapeOrders *pShapeOrders); void InsertTextLayerObject(SdrObject* pObject); /* - cmc: We should have have seperate ZOrder classes for 95- and 97+ and + cmc: We should have have separate ZOrder classes for 95- and 97+ and instantiate the appropriate one at run time. */ void InsertDrawingObject(SdrObject* pObj, short nWwHeight); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 97be94e3e607..4dd903e15087 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -720,7 +720,7 @@ public: bool IsNotProtected() const { return maSep.fUnlocked != 0; } bool IsVertical() const; sal_Int16 NoCols() const { return maSep.ccolM1 + 1; } - sal_Int32 StandardColSeperation() const { return maSep.dxaColumns; } + sal_Int32 StandardColSeparation() const { return maSep.dxaColumns; } bool HasTitlePage() const { return maSep.fTitlePage ? true : false; } sal_uInt16 PageStartAt() const { return maSep.pgnStart; } bool PageRestartNo() const { return maSep.fPgnRestart ? true : false; } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 6a8836bb5dd6..81841d556083 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -466,7 +466,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, /* #i1140# If I have a table and apply a style to one of its frames that should cause - a paragraph that its applied to it to only exist as a seperate floating + a paragraph that its applied to it to only exist as a separate floating frame, then the behavour depends on which cell that it has been applied to. If its the first cell of a row then the whole table row jumps into the new frame, if its not then then the paragraph attributes are applied diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 7650a0dd58d1..8cfdeed55d18 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -397,7 +397,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) } //e.g. inserting bookmark around field result, so we need to put - //it around the entire writer field, as we don't have the seperation + //it around the entire writer field, as we don't have the separation //of field and field result of word, see #i16941# SwPosition aStart(*pPaM->GetPoint()); if (!maFieldStack.empty()) @@ -2482,8 +2482,8 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, String& rStr { // Bereich aus Quelle ( kein Switch ) ? ConvertUFName(aBook); - aPara += sfx2::cTokenSeperator; - aPara += sfx2::cTokenSeperator; + aPara += sfx2::cTokenSeparator; + aPara += sfx2::cTokenSeparator; aPara += aBook; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 4b39be0a25e9..78733af81e0c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -335,7 +335,7 @@ bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection, SwFmtCol aCol; // Create SwFmtCol //sprmSDxaColumns - Default distance is 1.25 cm - sal_Int32 nColSpace = rSection.StandardColSeperation(); + sal_Int32 nColSpace = rSection.StandardColSeparation(); const SEPr& rSep = rSection.maSep; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 5afa08fc2c30..2c150cf7fd6d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4761,7 +4761,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) { /* For the case of a piece table we slave the piece table attribute iterator - to the piece table and access it through that only. They are two seperate + to the piece table and access it through that only. They are two separate structures, but act together as one logical one. The attributes only go to the next entry when the piece changes */ @@ -6427,9 +6427,9 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) /* cmc 23/02/2000: This dop.grpfIhdt has a bit set for each special - footnote *and endnote!!* seperator,continuation seperator, and + footnote *and endnote!!* separator,continuation separator, and continuation notice entry, the documentation does not mention the - endnote seperators, the documentation also gets the index numbers + endnote separators, the documentation also gets the index numbers backwards when specifiying which bits to test. The bottom six bits of this value must be tested and skipped over. Each section's grpfIhdt is then tested for the existence of the appropriate headers diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index a7bce2873a7f..0f0f012b9dbc 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -45,7 +45,7 @@ #include "swddetbl.hxx" #include <ndole.hxx> #include <xmloff/nmspmap.hxx> -#include <sfx2/linkmgr.hxx> // for cTokenSeperator +#include <sfx2/linkmgr.hxx> // for cTokenSeparator #include "unotbl.hxx" #include "xmltexte.hxx" #include "xmlexp.hxx" @@ -1136,11 +1136,11 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd ) // DDE command const String sCmd = pDDEFldType->GetCmd(); AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, - sCmd.GetToken(0, sfx2::cTokenSeperator) ); + sCmd.GetToken(0, sfx2::cTokenSeparator) ); AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_ITEM, - sCmd.GetToken(1, sfx2::cTokenSeperator) ); + sCmd.GetToken(1, sfx2::cTokenSeparator) ); AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_TOPIC, - sCmd.GetToken(2, sfx2::cTokenSeperator) ); + sCmd.GetToken(2, sfx2::cTokenSeparator) ); // auto update if (pDDEFldType->GetType() == sfx2::LINKUPDATE_ALWAYS) diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index d30cccf8e3e6..5a367cd49bd5 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1204,9 +1204,9 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, { // make command string String sCommand(pContext->GetDDEApplication()); - sCommand += sfx2::cTokenSeperator; + sCommand += sfx2::cTokenSeparator; sCommand += String(pContext->GetDDEItem()); - sCommand += sfx2::cTokenSeperator; + sCommand += sfx2::cTokenSeparator; sCommand += String(pContext->GetDDETopic()); sal_uInt16 nType = static_cast< sal_uInt16 >(pContext->GetIsAutomaticUpdate() ? sfx2::LINKUPDATE_ALWAYS diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 5972421d0321..ded62a81dc49 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -337,8 +337,8 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) SwSectionData aSect(FILE_LINK_SECTION, pSh->GetUniqueSectionName()); OUStringBuffer sLinkName; - sLinkName.append(sfx2::cTokenSeperator); - sLinkName.append(sfx2::cTokenSeperator); + sLinkName.append(sfx2::cTokenSeparator); + sLinkName.append(sfx2::cTokenSeparator); sLinkName.append(MASTER_LABEL); aSect.SetLinkFileName(sLinkName.makeStringAndClear()); aSect.SetProtectFlag(true); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index ebbd90dfd221..80aab9802306 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -209,7 +209,7 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); - officecfg::Office::Writer::WordCount::AdditionalSeperators::set(aWordCountED.GetText(), batch); + officecfg::Office::Writer::WordCount::AdditionalSeparators::set(aWordCountED.GetText(), batch); batch->commit(); bRet = sal_True; } @@ -310,7 +310,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) } aUseCharUnit.SaveValue(); - aWordCountED.SetText(officecfg::Office::Writer::WordCount::AdditionalSeperators::get()); + aWordCountED.SetText(officecfg::Office::Writer::WordCount::AdditionalSeparators::get()); aWordCountED.SaveValue(); } diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 790b5f512f36..678a8fadb508 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -158,13 +158,13 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) if(aFile.Len() || aSub.Len()) { - String sLinkFileName = OUString(sfx2::cTokenSeperator); - sLinkFileName += sfx2::cTokenSeperator; - sLinkFileName.SetToken(0, sfx2::cTokenSeperator,aFile); + String sLinkFileName = OUString(sfx2::cTokenSeparator); + sLinkFileName += sfx2::cTokenSeparator; + sLinkFileName.SetToken(0, sfx2::cTokenSeparator,aFile); if(SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_2, sal_True, &pItem)) - sLinkFileName.SetToken(1, sfx2::cTokenSeperator, + sLinkFileName.SetToken(1, sfx2::cTokenSeparator, ((const SfxStringItem *)pItem)->GetValue()); sLinkFileName += aSub; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index f04ef1e35d71..eb0117df9c15 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -215,15 +215,15 @@ void SectRepr::SetFile( const String& rFile ) INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 )); String sOldFileName( m_SectionData.GetLinkFileName() ); - String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeperator ) ); + String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeparator ) ); if( rFile.Len() || sSub.Len() ) { - sNewFile += sfx2::cTokenSeperator; + sNewFile += sfx2::cTokenSeparator; if( rFile.Len() ) // Filter only with FileName - sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeperator ); + sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeparator ); - sNewFile += sfx2::cTokenSeperator; + sNewFile += sfx2::cTokenSeparator; sNewFile += sSub; } @@ -244,14 +244,14 @@ void SectRepr::SetFilter( const String& rFilter ) { String sNewFile; String sOldFileName( m_SectionData.GetLinkFileName() ); - String sFile( sOldFileName.GetToken( 0, sfx2::cTokenSeperator ) ); - String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeperator ) ); + String sFile( sOldFileName.GetToken( 0, sfx2::cTokenSeparator ) ); + String sSub( sOldFileName.GetToken( 2, sfx2::cTokenSeparator ) ); if( sFile.Len() ) - (((( sNewFile = sFile ) += sfx2::cTokenSeperator ) += rFilter ) - += sfx2::cTokenSeperator ) += sSub; + (((( sNewFile = sFile ) += sfx2::cTokenSeparator ) += rFilter ) + += sfx2::cTokenSeparator ) += sSub; else if( sSub.Len() ) - (( sNewFile = sfx2::cTokenSeperator ) += sfx2::cTokenSeperator ) += sSub; + (( sNewFile = sfx2::cTokenSeparator ) += sfx2::cTokenSeparator ) += sSub; m_SectionData.SetLinkFileName( sNewFile ); @@ -265,12 +265,12 @@ void SectRepr::SetSubRegion(const String& rSubRegion) { String sNewFile; String sOldFileName( m_SectionData.GetLinkFileName() ); - String sFilter( sOldFileName.GetToken( 1, sfx2::cTokenSeperator ) ); - sOldFileName = sOldFileName.GetToken( 0, sfx2::cTokenSeperator ); + String sFilter( sOldFileName.GetToken( 1, sfx2::cTokenSeparator ) ); + sOldFileName = sOldFileName.GetToken( 0, sfx2::cTokenSeparator ); if( rSubRegion.Len() || sOldFileName.Len() ) - (((( sNewFile = sOldFileName ) += sfx2::cTokenSeperator ) += sFilter ) - += sfx2::cTokenSeperator ) += rSubRegion; + (((( sNewFile = sOldFileName ) += sfx2::cTokenSeparator ) += sFilter ) + += sfx2::cTokenSeparator ) += rSubRegion; m_SectionData.SetLinkFileName( sNewFile ); @@ -292,12 +292,12 @@ String SectRepr::GetFile() const { if (DDE_LINK_SECTION == m_SectionData.GetType()) { - sal_uInt16 n = sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); - sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ', n ); + sal_uInt16 n = sLinkFile.SearchAndReplace( sfx2::cTokenSeparator, ' ' ); + sLinkFile.SearchAndReplace( sfx2::cTokenSeparator, ' ', n ); } else sLinkFile = INetURLObject::decode( sLinkFile.GetToken( 0, - sfx2::cTokenSeperator ), + sfx2::cTokenSeparator ), INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ); @@ -310,7 +310,7 @@ String SectRepr::GetSubRegion() const { String sLinkFile( m_SectionData.GetLinkFileName() ); if( sLinkFile.Len() ) - sLinkFile = sLinkFile.GetToken( 2, sfx2::cTokenSeperator ); + sLinkFile = sLinkFile.GetToken( 2, sfx2::cTokenSeparator ); return sLinkFile; } @@ -1173,8 +1173,8 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) while( STRING_NOTFOUND != (nPos = sLink.SearchAscii( " ", nPos )) ) sLink.Erase( nPos--, 1 ); - nPos = sLink.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sLink.SearchAndReplace( ' ', sfx2::cTokenSeperator, nPos ); + nPos = sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos ); pSectRepr->GetSectionData().SetLinkFileName( sLink ); pSectRepr->GetSectionData().SetType( DDE_LINK_SECTION ); @@ -1526,9 +1526,9 @@ short SwInsertSectionTabDialog::Ok() m_pSectionData->IsEditInReadonlyFlag())); String sLinkFileName( m_pSectionData->GetLinkFileName() ); - aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.GetToken( 0, sfx2::cTokenSeperator ))); - aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.GetToken( 1, sfx2::cTokenSeperator ))); - aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, sfx2::cTokenSeperator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.GetToken( 0, sfx2::cTokenSeparator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.GetToken( 1, sfx2::cTokenSeparator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, sfx2::cTokenSeparator ))); aRequest.Done(); } return nRet; @@ -1652,8 +1652,8 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) while( STRING_NOTFOUND != (nPos = aLinkFile.SearchAscii( " ", nPos )) ) aLinkFile.Erase( nPos--, 1 ); - nPos = aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeperator, nPos ); + nPos = aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos ); } else { @@ -1668,9 +1668,9 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) aSection.SetLinkFilePassword( m_sFilePasswd ); } - aLinkFile += sfx2::cTokenSeperator; + aLinkFile += sfx2::cTokenSeparator; aLinkFile += m_sFilterName; - aLinkFile += sfx2::cTokenSeperator; + aLinkFile += sfx2::cTokenSeparator; aLinkFile += sSubRegion; } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 0cebc02b1702..39526b997a93 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2290,7 +2290,7 @@ KEYINPUT_CHECKTABLE_INSDEL: (m_aInBuffer.Len() || !rSh.IsSttPara() || !rSh.IsEndPara() )) { // insert a blank ahead of the character. this ends up - // between the expanded text and the new "non-word-seperator". + // between the expanded text and the new "non-word-separator". m_aInBuffer += ' '; } diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index db7a10e04f9a..2b028864b4d2 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -163,7 +163,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS); //#i63832# remove the link target type - xub_StrLen nFound = sTxt.Search(cMarkSeperator); + xub_StrLen nFound = sTxt.Search(cMarkSeparator); if( nFound != STRING_NOTFOUND && (++nFound) < sTxt.Len() ) { String sSuffix( sTxt.Copy(nFound) ); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 2934718a2158..439c36d98368 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -869,7 +869,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) return sal_False; switch(rData.nTypeId) - { // ATTENTION this field is inserted by a seperate dialog + { // ATTENTION this field is inserted by a separate dialog case TYP_POSTITFLD: { SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD); @@ -1027,8 +1027,8 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) //JP 28.08.95: DDE-Topics/-Items can have blanks in their names! // That's not yet considered here. String sCmd( rData.sPar2 ); - sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sCmd.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); SwDDEFieldType aType( rData.sPar1, sCmd, (sal_uInt16) nFormatId ); SwDDEFieldType* pTyp = (SwDDEFieldType*) pCurShell->InsertFldType( aType ); @@ -1457,8 +1457,8 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, { // DDE-Topics/-Items can have blanks in their names! // That's not yet considered here! - sal_uInt16 nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sPar2.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); break; } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 7ef720a8fdea..70f80d2175e6 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -439,8 +439,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) //JP 28.08.95: DDE-Topics/-Items can have blanks in their names! // That's not considered here yet String sCmd( pType->GetCmd() ); - sal_uInt16 nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); - sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeparator, ' ' ); + sCmd.SearchAndReplace( sfx2::cTokenSeparator, ' ', nTmpPos ); aValueED.SetText( sCmd ); aFormatLB.SelectEntryPos(pType->GetType()); @@ -1025,8 +1025,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { // DDE-Topics/-Items can have blanks in their names! // That's not being considered here yet. - sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); ((SwDDEFieldType*)pType)->SetCmd(sValue); ((SwDDEFieldType*)pType)->SetType((sal_uInt16)nFormat); } @@ -1063,8 +1063,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { // DDE-Topics/-Items can have blanks in their names! // That's not being considered here yet. - sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); - sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); + sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator ); + sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos ); SwDDEFieldType aType(sName, sValue, (sal_uInt16)nFormat); aSelectionLB.InsertEntry(sName); diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 4e009c3fa300..097067adcc08 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -355,7 +355,7 @@ void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ ) SetFillColor( aGrayColor ); - //column seperator? + //column separator? long nLength = aLogSize.Height() - 2 * aTL.Y(); Point aUp( aTL ); Point aDown( aTL.X(), nLength ); diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx index ec6d11e07857..9710f0e8ddd2 100644 --- a/sw/source/ui/frmdlg/colmgr.cxx +++ b/sw/source/ui/frmdlg/colmgr.cxx @@ -80,7 +80,7 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos ) } /*------------------------------------------------------------------------ - Description: height seperation line + Description: height separation line ------------------------------------------------------------------------*/ short SwColMgr::GetLineHeightPercent() const { diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index c7b2f0b75d9b..b7bb316fa2d8 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -99,7 +99,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : get(m_pFormatText, "numbering_label"); get(m_pFormatBox, "numbering"); get(m_pNumberingSeparatorFT, "num_separator"); - get(m_pNumberingSeparatorED, "num_seperator_edit"); + get(m_pNumberingSeparatorED, "num_separator_edit"); get(m_pSepText, "separator_label"); get(m_pSepEdit, "separator_edit"); get(m_pPosText, "position_label"); diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx index 9795648b1202..95ccf5cda737 100644 --- a/sw/source/ui/inc/hyp.hxx +++ b/sw/source/ui/inc/hyp.hxx @@ -34,8 +34,8 @@ private: Link aOldLnk; sal_uInt16 nPageCount; // page count for progress view sal_uInt16 nPageStart; // 1st checked page - sal_Bool bInSelection : 1; // seperating selected text - sal_Bool bAutomatic : 1; // insert seperators without further inquiry + sal_Bool bInSelection : 1; // separating selected text + sal_Bool bAutomatic : 1; // insert separators without further inquiry sal_Bool bInfoBox : 1; // display info-box when ending protected: diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 26876d6a0bb9..58aa46a96bf4 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1869,10 +1869,10 @@ bool SwView::JumpToSwMark( const String& rMark ) INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 )); - xub_StrLen nLastPos, nPos = sMark.Search( cMarkSeperator ); + xub_StrLen nLastPos, nPos = sMark.Search( cMarkSeparator ); if( STRING_NOTFOUND != nPos ) while( STRING_NOTFOUND != ( nLastPos = - sMark.Search( cMarkSeperator, nPos + 1 )) ) + sMark.Search( cMarkSeparator, nPos + 1 )) ) nPos = nLastPos; IDocumentMarkAccess::const_iterator_t ppMark; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 0d995dd55694..8b9a05358330 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -1639,7 +1639,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, sUrl += sEntry; if(rToken.Len()) { - sUrl += cMarkSeperator; + sUrl += cMarkSeparator; sUrl += rToken; } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 26dd383a071e..5bc1f08cc714 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -467,7 +467,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) if (pItem && SV_ITEM_ID_LBOXSTRING == pItem->GetType()) { const SwSection* pSect = pCont->GetSection(); - String sEntry = pSect->GetLinkFileName().GetToken(0, sfx2::cTokenSeperator); + String sEntry = pSect->GetLinkFileName().GetToken(0, sfx2::cTokenSeparator); if(!pSect->IsConnectFlag()) sEntry.Insert(aContextStrings[ST_BROKEN_LINK - ST_GLOBAL_CONTEXT_FIRST], 0 ); Point aEntryPos = GetEntryPosition( pEntry ); @@ -1157,7 +1157,7 @@ sal_Bool SwGlobalTree::Update(sal_Bool bHard) void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) { String sFileName(pCont->GetSection()->GetLinkFileName().GetToken(0, - sfx2::cTokenSeperator)); + sfx2::cTokenSeparator)); bool bFound = false; const SfxObjectShell* pCurr = SfxObjectShell::GetFirst(); while( !bFound && pCurr ) @@ -1299,7 +1299,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen aFileUrl.SetSmartURL( sFileName ); String sSectionName(String(aFileUrl.GetLastName( INetURLObject::DECODE_UNAMBIGUOUS)).GetToken(0, - sfx2::cTokenSeperator)); + sfx2::cTokenSeparator)); sal_uInt16 nSectCount = rSh.GetSectionFmtCount(); String sTempSectionName(sSectionName); sal_uInt16 nAddNumber = 0; @@ -1361,9 +1361,9 @@ IMPL_LINK( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) { SfxMedium* pMed = pMedList->at( i ); String sFileName = pMed->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); - sFileName += sfx2::cTokenSeperator; + sFileName += sfx2::cTokenSeparator; sFileName += pMed->GetFilter()->GetFilterName(); - sFileName += sfx2::cTokenSeperator; + sFileName += sfx2::cTokenSeparator; pFileNames[nPos++] = sFileName; } delete pMedList; diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 00c9d2dee7f0..f0d2855d9ed5 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -436,8 +436,8 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, { SwSectionData aSection( FILE_LINK_SECTION, GetUniqueSectionName( 0 ) ); String aLinkFile( rBkmk.GetURL().GetToken(0, '#') ); - aLinkFile += sfx2::cTokenSeperator; - aLinkFile += sfx2::cTokenSeperator; + aLinkFile += sfx2::cTokenSeparator; + aLinkFile += sfx2::cTokenSeparator; aLinkFile += rBkmk.GetURL().GetToken(1, '#'); aSection.SetLinkFileName( aLinkFile ); aSection.SetProtectFlag( true ); diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx index 26026e1ead10..6966e45c4fda 100644 --- a/sw/source/ui/wrtsh/wrtsh4.cxx +++ b/sw/source/ui/wrtsh/wrtsh4.cxx @@ -44,8 +44,8 @@ bool SwWrtShell::_SttWrd() return true; } -// The end of a word is the follow of seperator to nonseperator. -// The end of a word is also the sequence of wordseperators to +// The end of a word is the follow of separator to nonseparator. +// The end of a word is also the sequence of wordseparators to // punctuation marks. // The end of a paragraph is also the end of a word. diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui index 22ef9b9d8e16..a6e43b3af0ea 100644 --- a/sw/uiconfig/swriter/ui/insertcaption.ui +++ b/sw/uiconfig/swriter/ui/insertcaption.ui @@ -180,7 +180,7 @@ <property name="halign">start</property> <property name="label" translatable="yes">Numbering separator</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">num_seperator_edit</property> + <property name="mnemonic_widget">num_separator_edit</property> </object> <packing> <property name="left_attach">0</property> @@ -190,7 +190,7 @@ </packing> </child> <child> - <object class="GtkEntry" id="num_seperator_edit"> + <object class="GtkEntry" id="num_separator_edit"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> |