diff options
Diffstat (limited to 'sw/source/filter')
45 files changed, 105 insertions, 105 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index b5f7fc283b8d..1c506f186ec8 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -206,7 +206,7 @@ sal_uLong SwASCIIParser::CallParser() { // Using the pool defaults for the font causes significant // trouble for the HTML filter, because it is not able - // to export the pool defaults (or to be more precice: + // to export the pool defaults (or to be more precise: // the HTML filter is not able to detect whether a pool // default has changed or not. Even a comparison with the // HTMLi template does not work, because the defaults are diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index c205002aa4f2..f20152ebc69f 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -575,7 +575,7 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule ) nParaLeft -= nLeft; else //#83154#, Don't think any of the older #80856# bugfix code is - //relevent anymore. + //relevant anymore. nParaLeft = rLR.GetTxtLeft()+rLR.GetTxtFirstLineOfst(); aLR.SetTxtLeft( nParaLeft ); } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 18ef2465cdc6..d53fd631aa92 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2014,7 +2014,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem, } // the hint starts before the next script change and ends behind - // it, so we can insert a hint upto the next script change and + // it, so we can insert a hint up to the next script change and // continue with the rest of the hint. if( bDependsOnAnyScript || nScript == aScriptLst[i] ) InsertNoScript( rItem, nPos, nChgPos, rFmtInfos, bParaAttrs ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 74fe5b37ac8c..5ea1c18b39c7 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1297,7 +1297,7 @@ sal_Bool SwHTMLParser::HasCurrentParaBookmarks( sal_Bool bIgnoreStack ) const if( !bHasMarks ) { - // second step: when we didnt find a bookmark, check if there is one set already + // second step: when we didn't find a bookmark, check if there is one set already IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin(); ppMark != pMarkAccess->getAllMarksEnd(); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 7ee3f08c5fa1..6292eb3948dd 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -604,7 +604,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( pCol->GetNumCols() ); - // minumum gutter width + // minimum gutter width sal_uInt16 nGutter = pCol->GetGutterWidth( sal_True ); if( nGutter!=USHRT_MAX ) { @@ -678,7 +678,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) if( lcl_html_IsMultiColEnd( rHTMLWrt, nSectEndIdx-1 ) ) bEndTag = sal_False; - //.is there a columned section arround this one? + //.is there a columned section around this one? const SwStartNode *pSttNd = rSectNd.StartOfSectionNode(); if( pSttNd ) { @@ -700,7 +700,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) } // The surrounding section must be closed before the current one is - // opended, except that it start immediatly before the current one or + // opended, except that it start immediately before the current one or // another end immediately before the current one if( pSurrCol && nSectSttIdx - pSurrSectNd->GetIndex() > 1 && !lcl_html_IsMultiColEnd( rHTMLWrt, nSectSttIdx-1 ) ) diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 007e77f72694..91687f9f9685 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -199,7 +199,7 @@ namespace sw alternative name for one of them.. And it needs to report to the importer if the style being mapped to - was already in existance, for the cut and paste/insert file mode we + was already in existence, for the cut and paste/insert file mode we should not modify the returned style if it is already in use as it is does not belong to us to change. @@ -259,7 +259,7 @@ namespace sw alternative name for one of them.. And it needs to report to the importer if the style being mapped to - was already in existance, for the cut and paste/insert file mode we + was already in existence, for the cut and paste/insert file mode we should not modify the returned style if it is already in use as it is does not belong to us to change. @@ -495,7 +495,7 @@ namespace sw Word generally requires characters which share the same direction, the same script, and occasionally (depending on the format) the - same charset to be exported in independant chunks. + same charset to be exported in independent chunks. So this function finds these ranges and returns a STL container of CharRuns @@ -512,7 +512,7 @@ namespace sw RTF format, not necessary for a unicode aware format like WW8+ @return STL container of CharRuns which describe the shared - direction, script and optionally script of the contigious sequences + direction, script and optionally script of the contiguous sequences of characters @author diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx index 95f82db1d6f2..699c5a01a2fe 100644 --- a/sw/source/filter/inc/wwstyles.hxx +++ b/sw/source/filter/inc/wwstyles.hxx @@ -143,7 +143,7 @@ namespace ww /** Find the WinWord sti index of an english style name. - When importing a RTF document we would like to treat styles as similiar + When importing a RTF document we would like to treat styles as similar to how word does as possible, to this end word will treat some styles with special names as inbuilt styles, and some as user defined styles. @@ -169,7 +169,7 @@ namespace ww /** Find the WinWord sti index of an old <= Word2 stc (style code) When importing a Word 2 document we would like to treat styles as - similiar to how word 8 does as possible, to this end word will treat + similar to how word 8 does as possible, to this end word will treat some styles with special codes as inbuilt styles, and some as user defined styles. diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index b1f149f891be..f6802bca8d41 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -320,7 +320,7 @@ void SwRTFParser::SetFlysInDoc() { // Take care for table nodes pNd = pNd->GetNodes()[ pNd->GetIndex() - 2 ]->GetTableNode(); - if( pNd ) // if the table starts imediately before aRg -> expand aRg + if( pNd ) // if the table starts immediately before aRg -> expand aRg aRg.aStart = *pNd; if( bMakeEmptySection ) @@ -405,7 +405,7 @@ void SwRTFParser::SetFlysInDoc() // THIS >>>>> // if the section only contains one Node and this has a - // border or backgorund, then put it to the frame + // border or background, then put it to the frame // Not in our own RTF-Format! // <<<<< DOES NOT MAKE SENSE TO ME (flr) // #102781#. Added support for transparent frames. @@ -534,7 +534,7 @@ void SwRTFParser::SetFlysInDoc() aFlyArr.Remove(0, aFlyArr.Count()); } -// clips the text box to the min or max position if it is outside our min or max boundry +// clips the text box to the min or max position if it is outside our min or max boundary long SwRTFParser::GetSafePos(long nPos) { if(nPos > SHRT_MAX) diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index f63a4cc47c6b..cb2e0dbf104f 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -1032,7 +1032,7 @@ void rtfSections::InsertSegments(bool bNewDoc) aSectPaM.GetCntntNode(), 0); SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); - //The last section if continous is always unbalanced + //The last section if continuous is always unbalanced if (aNext == aEnd && pRet) pRet->SetFmtAttr(SwFmtNoBalancedColumns(true)); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1b8d5598c436..8b46e244b2fa 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1149,7 +1149,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point TableBackgrounds( pTableTextNodeInfoInner ); - // Cell prefered width + // Cell preferred width SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )[ pTableTextNodeInfoInner->getCell() ]; m_pSerializer->singleElementNS( XML_w, XML_tcW, FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nWidth ) ).getStr( ), @@ -1293,7 +1293,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // Create the SwWriteTable instance to use col spans (and maybe other infos) GetTablePageSize( pTableTextNodeInfoInner, nPageSize, bRelBoxSize ); - // Output the table prefered width + // Output the table preferred width if ( nPageSize != 0 ) m_pSerializer->singleElementNS( XML_w, XML_tblW, FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nPageSize ) ).getStr( ), diff --git a/sw/source/filter/ww8/dump/msvbasic.cxx b/sw/source/filter/ww8/dump/msvbasic.cxx index a4167beb9dc5..20f7462c3e9e 100644 --- a/sw/source/filter/ww8/dump/msvbasic.cxx +++ b/sw/source/filter/ww8/dump/msvbasic.cxx @@ -204,7 +204,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage) //most begin with */G , and sometimes with //*/C. Those with G always have a trailer of 12 bytes, those //with C come in pairs, the first with no trailer, and the - //second with one of 12 bytes. The following code attemts + //second with one of 12 bytes. The following code attempts //to read these strings and ends when it reaches a sequence of //bytes which fails a test to be a valid string. So this //while loop here is the particular piece of code which is diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx index f8370983fc77..72716d4b2e07 100644 --- a/sw/source/filter/ww8/dump/ww8scan.cxx +++ b/sw/source/filter/ww8/dump/ww8scan.cxx @@ -4554,7 +4554,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) settings its end to the current start, then store the starting position of the current range to clipstart. The pPcd sprms will end as normal (albeit earlier than originally expected), - and the existance of a clipstart will force the pPcd iterater + and the existence of a clipstart will force the pPcd iterater to reread the current set of sprms instead of advancing to its next set. Then the clipstart will be set as the starting position which will force them to be applied directly after @@ -4586,7 +4586,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 */ @@ -5793,7 +5793,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) break; nMax++; nLeft -= nNextSiz; - if( nLeft < 1 ) // can we read the given ammount of bytes ? + if( nLeft < 1 ) // can we read the given amount of bytes ? break; // increase p by nNextSiz Bytes p = (WW8_FFN *)( ( (sal_uInt8*)p ) + nNextSiz ); @@ -5922,9 +5922,9 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) footnote *and endnote!!* seperator,continuation seperator, and continuation notice entry, the documentation does not mention the endnote seperators, the documentation also gets the index numbers - backwards when specifiying which bits to test. The bottom six bits + backwards when specifying 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 appropiate headers + grpfIhdt is then tested for the existence of the appropriate headers and footers, at the end of each section the nIdxOffset must be updated to point to the beginning of the next section's group of headers and footers in this PLCF, UpdateIndex does that task. @@ -6574,7 +6574,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) nL = SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1; break; default: - ASSERT(!this, "Unknown sprm varient"); + ASSERT(!this, "Unknown sprm variant"); break; } break; diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx index a7261c1aeedb..6c1b0ec5de92 100644 --- a/sw/source/filter/ww8/dump/ww8scan.hxx +++ b/sw/source/filter/ww8/dump/ww8scan.hxx @@ -1314,15 +1314,15 @@ public: sal_uInt16 fWriteReservation : 1; sal_uInt16 fLockRev : 1; // when 1, the current revision marking state is locked sal_uInt16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts - // compatability options + // compatibility options sal_uInt16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent sal_uInt16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters - sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break + sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, suppress the paragraph Space Before and Space After options after a page break sal_uInt16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line sal_uInt16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers sal_uInt16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts sal_uInt16 copts_fConvMailMergeEsc : 1; - sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page + sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, suppress extra line spacing at top of page sal_uInt16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh sal_uInt16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures sal_uInt16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames @@ -1372,7 +1372,7 @@ public: /* bei nFib >= 103 gehts weiter: */ - sal_uInt32 fNoTabForInd :1; // see above in compatability options + sal_uInt32 fNoTabForInd :1; // see above in compatibility options sal_uInt32 fNoSpaceRaiseLower :1; // see above sal_uInt32 fSupressSpbfAfterPageBreak :1; // see above sal_uInt32 fWrapTrailSpaces :1; // see above diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx index 06bf9e1dc8dc..25082ef9875c 100644 --- a/sw/source/filter/ww8/dump/ww8struc.hxx +++ b/sw/source/filter/ww8/dump/ww8struc.hxx @@ -776,7 +776,7 @@ eigentlich muessten wir das jetzt in etwa *so* praezisieren: }; */ -// AnnoTation Refernce Descriptor (ATRD) +// AnnoTation References Descriptor (ATRD) struct WW8_ATRD // fuer die 8-Version { SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index 90c7d77cebf0..5d16e4d4d532 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.hxx @@ -44,7 +44,7 @@ namespace ww /* needed_cast is the same as static_cast except that there will be a compile time assert when NDEBUG is not defined and the in and out types are the - same. i.e. needed_cast catches unneccessary casts + same. i.e. needed_cast catches unnecessary casts */ template<typename Ret, typename Param> Ret needed_cast(Param in) { diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index c1dbeed5c5ed..c967ab8e72c6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -418,7 +418,7 @@ void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) OSL_TRACE("%s", OSL_THIS_FUNC); /* You would have thought that - m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficent here , + m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficient here , but looks like word needs to see the other directional token to be satisified that all is kosher, otherwise it seems in ver 2003 to go and semi-randomlyly stick strike through about the place. Perhaps diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 1f58cae435c3..f5e1404dc6ff 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -484,7 +484,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/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx index f5ed3fc0d466..ae793111be01 100644 --- a/sw/source/filter/ww8/staticassert.hxx +++ b/sw/source/filter/ww8/staticassert.hxx @@ -45,7 +45,7 @@ namespace ww } /* - Similiar to assert, StaticAssert is only in operation when NDEBUG is not + Similar to assert, StaticAssert is only in operation when NDEBUG is not defined. It will test its first argument at compile time and on failure report the error message of the second argument, which must be a valid c++ classname. i.e. no spaces, punctuation or reserved keywords. diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 8b5d6b9fff14..83b65f015718 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -636,7 +636,7 @@ namespace sw e.g. Page Anchored elements will not be. For the winword export we need them to have something to be anchored to. So this method returns all the floating elements in a document as a STL container - of sw::Frames which are guaranteed to have an appropiate anchor. + of sw::Frames which are guaranteed to have an appropriate anchor. @param rDoc The SwDoc document to get the styles from @@ -786,7 +786,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 3b34697ce3e1..0f04d9c761ba 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -67,7 +67,7 @@ namespace myImplHelpers /* #98506# The normal case for reexporting word docs is to have dynamic spacing, - as this is word's only setting, and the reason for the existance of the + as this is word's only setting, and the reason for the existence of the dynamic spacing features. If we have dynamic spacing active then we can add its spacing to the value height of the h/f and get the wanted total size for word. @@ -116,7 +116,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 @@ -615,7 +615,7 @@ namespace sw if (bSplitOnCharSet) { - //Split unicode text into plausable 8bit ranges for export to + //Split unicode text into plausible 8bit ranges for export to //older non unicode aware format xub_StrLen nLen = rTxt.Len(); xub_StrLen nPos = 0; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c371469cfe10..4dc807774f9c 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -783,7 +783,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const SwTwips nLeft = aRect.Left() + nThick; SwTwips nRight = aRect.Right() - nThick; - //Nasty swap for bidi if neccessary + //Nasty swap for bidi if necessary rWrt.MiserableRTLFrmFmtHack(nLeft, nRight, rFrmFmt); //xaLeft/yaTop/xaRight/yaBottom - rel. to anchor @@ -1337,7 +1337,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 540c15967cd2..bb8340ce2034 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -525,7 +525,7 @@ void WW8SwAttrIter::OutAttr( xub_StrLen nSwPos ) } /* - For #i24291# we need to explictly remove any properties from the + For #i24291# we need to explicitly remove any properties from the aExportSet which a SwCharFmt would override, we can't rely on word doing this for us like writer does */ diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index a8ce690b5228..0436779ec64b 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -402,7 +402,7 @@ void MSWordStyles::SetStyleDefaults( const SwFmt& rFmt, bool bPap ) { //If we are a character property then see if it is one of the //western/asian ones that must be collapsed together for export to - //word. If so default to the western varient. + //word. If so default to the western variant. if ( bPap || m_rExport.CollapseScriptsforWordOk( i18n::ScriptType::LATIN, n) ) { @@ -1582,7 +1582,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt AttrOutput().OutputStyleItemSet( aSet, true, bOutPgDscSet ); // <-- - //Cannot export as normal page framedir, as continous sections + //Cannot export as normal page framedir, as continuous sections //cannot contain any grid settings like proper sections AttrOutput().SectionBiDi( FRMDIR_HORI_RIGHT_TOP == TrueFrameDirection( *rSepInfo.pSectionFmt ) ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index f08b55cbcb0e..15c140ff0778 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -349,7 +349,7 @@ static void WriteDop( WW8Export& rWrt ) { WW8Dop& rDop = *rWrt.pDop; - // i#78951#, store the value of unknown compatability options + // i#78951#, store the value of unknown compatibility options rDop.SetCompatabilityOptions( rWrt.pDoc->Getn32DummyCompatabilityOptions1()); rDop.SetCompatabilityOptions2( rWrt.pDoc->Getn32DummyCompatabilityOptions2()); @@ -2868,7 +2868,7 @@ void WW8Export::WriteFkpPlcUsw() if (pEscher || pDoc->ContainsMSVBasic()) { /* - #82587# Everytime MS 2000 creates an escher stream there is always + #82587# Every time MS 2000 creates an escher stream there is always an ObjectPool dir (even if empty). It turns out that if a copy of MS 2000 is used to open a document that contains escher graphics exported from StarOffice without this empty dir then *if* that @@ -2884,7 +2884,7 @@ void WW8Export::WriteFkpPlcUsw() some magic. cmc */ /* - #10570# Similiarly having msvbasic storage seems to also trigger + #10570# Similarly having msvbasic storage seems to also trigger creating this stream */ GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool), diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index a62146fc17a3..a545e7cf0e75 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1106,7 +1106,7 @@ public: SwTwips CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const; - /// Nasty swap for bidi if neccessary + /// Nasty swap for bidi if necessary bool MiserableRTLFrmFmtHack(SwTwips &rLeft, SwTwips &rRight, const sw::Frame &rFrmFmt); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 2a18540387fa..deb3269a399a 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -124,7 +124,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, switch (pItem->Which()) { /* - For an inline object these properties are irrelevent because they + For an inline object these properties are irrelevant because they will be the same as the defaults that msword applies in their absence, so if that is all that there is for these inline objects then if there turns out to be enough information in the object diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 53e86032106d..bd228594fdc3 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1128,7 +1128,7 @@ void WW8AttributeOutput::CharFontCJK( const SvxFontItem& rFont ) void WW8AttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight ) { - //Can only export in 8+, in 7- export as normal varient and expect that + //Can only export in 8+, in 7- export as normal variant and expect that //upperlevel code has blocked exporting clobbering attributes if (m_rWW8Export.bWrtWW8) { @@ -1142,7 +1142,7 @@ void WW8AttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight ) void WW8AttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture ) { - // Can only export in 8+, in 7- export as normal varient and expect that + // Can only export in 8+, in 7- export as normal variant and expect that // upperlevel code has blocked exporting clobbering attributes if (m_rWW8Export.bWrtWW8) { @@ -3325,7 +3325,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. diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 3e1920156241..4adc469bf468 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -611,7 +611,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); @@ -1878,7 +1878,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) { @@ -2068,7 +2068,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, So given that the size of the values remains pretty much the same despite the size of the graphic, we can tell that the - polygon is measured in units that are independant of the + polygon is measured in units that are independent of the graphic. But why does the left corner move a different value to the left each time, and why does the bottom move upwards each time, when the right and top remain at the same value ? @@ -2110,7 +2110,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, aPoly.Scale(aMapPolyX, aMapPolyY); // --> OD 2005-05-19 #i47277# - contour is already in unit of the - // graphic prefered unit. Thus, call method <SetContour(..)> + // graphic preferred unit. Thus, call method <SetContour(..)> pNd->SetContour(&aPoly); // <-- } diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index dec60c9bc74e..792893c0f7ab 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -84,8 +84,8 @@ public: const SvxMSDffShapeOrders *pShapeOrders); void InsertTextLayerObject(SdrObject* pObject); /* - cmc: We should have have seperate ZOrder classes for 95- and 97+ and - instantiate the appropiate one at run time. + 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); // --> OD 2004-12-13 #117915# - new parameter <_bInHeaderFooter>, indicating diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index b98c8c1e3da5..66e94dfc9b8d 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -570,7 +570,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, ##835## Disable use of main stream as fallback stream for inline direct blips as it is known that they are directly after the record - header, testing for existance in main stream may lead to an + header, testing for existence in main stream may lead to an incorrect fallback graphic being found if other escher graphics have been inserted in the document */ diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index b215c722751a..690a06600f91 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1685,7 +1685,7 @@ void SwWW8ImplReader::ImportDop() // COMPATIBILITY FLAGS START // - // #i78951# - remember the unknown compatability options + // #i78951# - remember the unknown compatibility options // so as to export them out rDoc.Setn32DummyCompatabilityOptions1( pWDop->GetCompatabilityOptions()); rDoc.Setn32DummyCompatabilityOptions2( pWDop->GetCompatabilityOptions2()); @@ -3035,7 +3035,7 @@ bool SwWW8ImplReader::HandlePageBreakChar() /* If its a 0x0c without a paragraph end before it, act like a paragraph end, but nevertheless, numbering (and perhaps other - similiar constructs) do not exist on the para. + similar constructs) do not exist on the para. */ //xushanchuan add for issue106569 if (!bWasParaEnd && IsTemp) @@ -4108,10 +4108,10 @@ void wwSectionManager::InsertSegments() //End getting the bounds of this section, quite a job eh ? SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); - //The last section if continous is always unbalanced + //The last section if continuous is always unbalanced if (pRet) { - //Set the columns to be UnBalanced if that compatability option + //Set the columns to be UnBalanced if that compatibility option //is set if (mrReader.pWDop->fNoColumnBalance) pRet->SetFmtAttr(SwFmtNoBalancedColumns(true)); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 93bc4a7d2c49..bc04b2891d99 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -886,8 +886,8 @@ struct ApoTestResults struct ANLDRuleMap { - SwNumRule* mpOutlineNumRule; // WinWord 6 numbering, varient 1 - SwNumRule* mpNumberingNumRule; // WinWord 6 numbering, varient 2 + SwNumRule* mpOutlineNumRule; // WinWord 6 numbering, variant 1 + SwNumRule* mpNumberingNumRule; // WinWord 6 numbering, variant 2 SwNumRule* GetNumRule(sal_uInt8 nNumType); void SetNumRule(SwNumRule*, sal_uInt8 nNumType); ANLDRuleMap() : mpOutlineNumRule(0), mpNumberingNumRule(0) {} diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c25ec260c2a3..05e24e4e2142 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -402,7 +402,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn() bFtnEdn = bOld; ASSERT(sChar.Len()==1 && ((rDesc.mbAutoNum == (sChar.GetChar(0) == 2))), - "footnote autonumbering must be 0x02, and everthing else must not be"); + "footnote autonumbering must be 0x02, and everything else must not be"); // If no automatic numbering use the following char from the main text // as the footnote number @@ -540,7 +540,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 @@ -2088,7 +2088,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : ApoTestResults aApo = pIo->TestApo(pIo->nInTable + 1, false, pTabPos); /* - ##513##, #79474# If this is not sufficent, then we should look at + ##513##, #79474# If this is not sufficient, then we should look at sprmPD{y|x}aAbs as our indicator that the following set of rows is not part of this table, but instead is an absolutely positioned table outside of this one @@ -2266,7 +2266,7 @@ void WW8TabDesc::CalcDefaults() } } /* - Similiar to graphics and other elements word does not totally + Similar to graphics and other elements word does not totally factor the width of the border into its calculations of size, we do so we must adjust out widths and other dimensions to fit. It appears that what occurs is that the last cell's right margin if @@ -2336,7 +2336,7 @@ void WW8TabDesc::CalcDefaults() #96345# If the last cell was "false" then there is no valid cell following it, so the default mapping forward wont't work. So map it (and - contigious invalid cells backwards to the last valid cell instead. + contiguous invalid cells backwards to the last valid cell instead. */ if (i && pR->bExist[i-1] == false) { diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index afdc94032fc0..a7e0855f6aae 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -155,7 +155,7 @@ public: //been explicitly set, it's set to the value //of pFmt->GetItemState(RES_LR_SPACE, false) //if it was possible to get the ItemState - //for L of the LR space independantly + //for L of the LR space independently bool bParaAutoBefore; // For Auto spacing before a paragraph bool bParaAutoAfter; // For Auto Spacing after a paragraph diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 8f417a4a52c1..498be3cfe564 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1219,7 +1219,7 @@ WW8ListManager::WW8ListManager( i.e. create a simple list in 2000 and open it in 97 and 97 will claim (correctly) that it is an outline list. We can set our - continous flag in these lists to store this information. + continuous flag in these lists to store this information. */ SwNumRule* pMyNumRule = CreateNextRule( aLST.bSimpleList || (aBits1 & 0x10)); @@ -1639,7 +1639,7 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition, #i1869# If this list has had its bits set in word 2000 to pretend that it is a simple list from the point of view of the user, then it is almost - certainly a simple continous list, and we will try to keep it like that. + certainly a simple continuous list, and we will try to keep it like that. Otherwise when we save again it will be shown as the true outline list that it is, confusing the user that just wanted what they thought was a simple list. On the otherhand it is possible that some of the other levels diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index a67d92426f0f..60f01e021a22 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -507,7 +507,7 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType, #101578# It is possible to have a number of date stamps for the created time of the change, (possibly a word bug) so we must use the "get a full - list" varient of HasCharSprm and take the last one as the true one. + list" variant of HasCharSprm and take the last one as the true one. */ std::vector<const sal_uInt8 *> aResult; bool bIns = (nsRedlineType_t::REDLINE_INSERT == eType); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 9316895f7cd6..8bffc4b7089f 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -406,7 +406,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()) @@ -1271,7 +1271,7 @@ bookmarks were set with SET or ASK. (See SwWW8FltRefStack) The other piece of the puzzle is that refs that point to the "location" of the bookmark will in word actually point to the last location where the bookmark -was set with SET or ASK, not the actual bookmark. This is only noticable when +was set with SET or ASK, not the actual bookmark. This is only noticeable when a document sets the bookmark more than once. This is because word places the true bookmark at the location of the last set, but the refs will display the position of the first set before the ref. @@ -1298,7 +1298,7 @@ the field, which gives the same effect and meaning, to do so we must get any bookmarks in the field range, and begin them immediately before the set/ask field, and end them directly afterwards. MapBookmarkVariables returns an identifier of the bookmark attribute to close after inserting -the appropiate set/ask field. +the appropriate set/ask field. */ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF, String &rOrigName, const String &rData) @@ -3369,7 +3369,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { case TOX_CONTENT: { - //If we would be created from outlines, either explictly or by default + //If we would be created from outlines, either explicitly or by default //then see if we need extra styles added to the outlines sal_uInt16 eEffectivelyFrom = eCreateFrom ? eCreateFrom : nsSwTOXElement::TOX_OUTLINELEVEL; if (eEffectivelyFrom & nsSwTOXElement::TOX_OUTLINELEVEL) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 50073fbf2776..9ef115fd0be5 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1578,7 +1578,7 @@ bool SwWW8ImplReader::SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, nSetBorders has a bit set for each location that a sprm set a border, so with a sprm set, but no border, then disable the - appropiate border + appropriate border */ rBox.SetLine( 0, aIdArr[ i+1 ] ); } @@ -1955,7 +1955,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM, /* #95905#, #83307# seems to have gone away now, so reenable parallel wrapping support for frames in headers/footers. I don't know if we truly - have an explictly specified behaviour for these circumstances. + have an explicitly specified behaviour for these circumstances. */ nHeight = rWW.nSp45; @@ -2609,12 +2609,12 @@ void SwWW8ImplReader::StopApo() stack of attributes normally only places them into the document when the current insertion point has passed them by. Otherwise the end point of the attribute gets pushed along with the insertion point. The - insertion point is moved and the properties commited during + insertion point is moved and the properties committed during MoveOutsideFly. We also may want to remove the final paragraph in the frame, but we need to wait until the properties for that frame text - have been commited otherwise they will be lost. So we first get a + have been committed otherwise they will be lost. So we first get a handle to the last the filter inserted. After the attributes are - commited, if that paragraph exists we join it with the para after it + committed, if that paragraph exists we join it with the para after it that comes with the frame by default so that as normal we don't end up with one more paragraph than we wanted. */ @@ -2949,7 +2949,7 @@ void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, shor nI = nContigiousWestern; // The out of sequence western id else { - // The contigious western ids + // The contiguous western ids if (eVersion <= ww::eWW2) nI = static_cast< sal_uInt8 >(nId - 60); else if (eVersion < ww::eWW8) @@ -3440,7 +3440,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen ) { - //Has newer colour varient, ignore this old varient + //Has newer colour variant, ignore this old variant if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0x6870)) return; @@ -3946,7 +3946,7 @@ void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* , short nLen ) void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, short nLen ) { - //Has newer colour varient, ignore this old varient + //Has newer colour variant, ignore this old variant if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0xCA71)) return; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 12052d8bf316..72c77f0273a3 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -5001,7 +5001,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) settings its end to the current start, then store the starting position of the current range to clipstart. The pPcd sprms will end as normal (albeit earlier than originally expected), - and the existance of a clipstart will force the pPcd iterater + and the existence of a clipstart will force the pPcd iterater to reread the current set of sprms instead of advancing to its next set. Then the clipstart will be set as the starting position which will force them to be applied directly after @@ -5033,7 +5033,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 */ @@ -6457,7 +6457,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) break; nMax++; nLeft -= nNextSiz; - if( nLeft < 1 ) // can we read the given ammount of bytes ? + if( nLeft < 1 ) // can we read the given amount of bytes ? break; // increase p by nNextSiz Bytes p = (WW8_FFN *)( ( (sal_uInt8*)p ) + nNextSiz ); @@ -6626,9 +6626,9 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) footnote *and endnote!!* seperator,continuation seperator, and continuation notice entry, the documentation does not mention the endnote seperators, the documentation also gets the index numbers - backwards when specifiying which bits to test. The bottom six bits + backwards when specifying 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 appropiate headers + grpfIhdt is then tested for the existence of the appropriate headers and footers, at the end of each section the nIdxOffset must be updated to point to the beginning of the next section's group of headers and footers in this PLCF, UpdateIndex does that task. @@ -7461,7 +7461,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) nL = static_cast< sal_uInt16 >(SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1); break; default: - ASSERT(!this, "Unknown sprm varient"); + ASSERT(!this, "Unknown sprm variant"); break; } break; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 2ca49778aa62..23538d34e910 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -73,7 +73,7 @@ namespace SL } /** - winword strings are typically Belt and Braces strings preceeded with a + winword strings are typically Belt and Braces strings preceded with a pascal style count, and ending with a c style 0 terminator. 16bit chars and count for ww8+ and 8bit chars and count for ww7-. The count and 0 can be checked for integrity to catch errors (e.g. lotus created documents) @@ -483,7 +483,7 @@ public: sal_uInt8* mpData; sal_uInt16 mnLen; - sal_uInt16 mnIStd; // only for Fkp.Papx (actualy Style-Nr) + sal_uInt16 mnIStd; // only for Fkp.Papx (actually Style-Nr) bool mbMustDelete; explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0), @@ -1564,15 +1564,15 @@ public: sal_uInt16 fWriteReservation : 1; sal_uInt16 fLockRev : 1; // when 1, the current revision marking state is locked sal_uInt16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts - // compatability options + // compatibility options sal_uInt16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent sal_uInt16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters - sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break + sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, suppress the paragraph Space Before and Space After options after a page break sal_uInt16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line sal_uInt16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers sal_uInt16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts sal_uInt16 copts_fConvMailMergeEsc : 1; - sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page + sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, suppress extra line spacing at top of page sal_uInt16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh sal_uInt16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures sal_uInt16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames @@ -1625,7 +1625,7 @@ public: /* bei nFib >= 103 gehts weiter: */ - sal_uInt32 fNoTabForInd :1; // see above in compatability options + sal_uInt32 fNoTabForInd :1; // see above in compatibility options sal_uInt32 fNoSpaceRaiseLower :1; // see above sal_uInt32 fSupressSpbfAfterPageBreak :1; // see above sal_uInt32 fWrapTrailSpaces :1; // see above diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 0f3b5a11ab7c..743cc901bf1c 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -817,7 +817,7 @@ struct WW8_PCD // properties of the piece. }; -// AnnoTation Refernce Descriptor (ATRD) +// AnnoTation References Descriptor (ATRD) struct WW8_ATRD // fuer die 8-Version { SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 85a5352d438d..1f33ff7fe792 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -336,7 +336,7 @@ sal_Int32 ReadThroughComponent( if (!bContainsStream ) { // stream name not found! Then try the compatibility name. - // if no stream can be opened, return immediatly with OK signal + // if no stream can be opened, return immediately with OK signal // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 9f2982d682be..7ad8ea82756f 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1422,7 +1422,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC // SO8. Unfortunately, only part of it and by using the same compatibility option // like in SO8. Therefore documents generated with SO7pp4, containing // numbered paragraphs with first line indent differ between SO7pp4 and - // SO8. In order to fix this for SO8pp1, I introduce a new compatiblity + // SO8. In order to fix this for SO8pp1, I introduce a new compatibility // flag 'bIgnoreFirstLineIndentInNumbering'. This flag has to be set for all // documents < SO8, but not for SO8. So if the property is not present, the // flag will be set to 'true'. SO8 documents surely have the diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 843f8723cf0c..4bc737e11345 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -48,14 +48,14 @@ namespace rtl { class OUString; } struct SvXMLItemMapEntry { - sal_uInt16 nNameSpace; // declares the Namespace in wich this item + sal_uInt16 nNameSpace; // declares the Namespace in which this item // exists enum ::xmloff::token::XMLTokenEnum eLocalName; // the local name for the item inside // the Namespace (as an XMLTokenEnum) sal_uInt16 nWhichId; // the WichId to identify the item // in the pool - sal_uInt32 nMemberId; // the memberid specifies wich part + sal_uInt32 nMemberId; // the memberid specifies which part // of the item should be imported or // exported with this Namespace // and localName diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index c86b7cd66bc9..40f110f6847e 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2531,7 +2531,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) sal_Int32 nExtraRel = nRelWidth - (nRelCols * nMinRelColWidth); // The absolute space that may be distributed in addition to - // minumum widthed columns. + // minimum widthed columns. sal_Int32 nMinAbs = nRelCols * MINLAY; sal_Int32 nExtraAbs = nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L; |