summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/htmlfly.cxx6
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/htmlsect.cxx4
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/html/wrthtml.cxx10
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx6
-rw-r--r--sw/source/filter/xml/xmltble.cxx8
-rw-r--r--sw/source/filter/xml/xmltbli.cxx4
21 files changed, 39 insertions, 39 deletions
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