You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2014/04/29 21:25:24 UTC
svn commit: r1591062 [9/15] - in /openoffice/trunk/main:
registry/inc/registry/ registry/tools/ rhino/
ridljar/com/sun/star/lib/util/ ridljar/com/sun/star/uno/ rsc/inc/
rsc/source/parser/ rsc/source/rscpp/ sal/inc/osl/ sal/inc/rtl/ sal/inc/sal/
sal/inc...
Modified: openoffice/trunk/main/sw/source/core/docnode/section.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/section.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/section.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/section.cxx Tue Apr 29 19:25:03 2014
@@ -1264,7 +1264,7 @@ void lcl_UpdateLinksInSect( SwBaseLink&
// Der Return-Wert gibt an, was mit der Shell zu geschehen hat:
// 0 - Fehler, konnte DocShell nicht finden
// 1 - DocShell ist ein existieren Document
-// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden ( will be assigned to xLockRef additionaly )
+// 2 - DocShell wurde neu angelegt, muss also wieder geschlossen werden ( will be assigned to xLockRef additionally )
int lcl_FindDocShell( SfxObjectShellRef& xDocSh,
SfxObjectShellLock& xLockRef,
Modified: openoffice/trunk/main/sw/source/core/draw/dcontact.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/draw/dcontact.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/draw/dcontact.cxx (original)
+++ openoffice/trunk/main/sw/source/core/draw/dcontact.cxx Tue Apr 29 19:25:03 2014
@@ -1152,7 +1152,7 @@ void SwDrawContact::Changed( const SdrOb
const Rectangle& rOldBoundRect )
{
// OD 2004-06-01 #i26791# - no event handling, if existing <ViewShell>
- // is in contruction
+ // is in construction
SwDoc* pDoc = GetFmt()->GetDoc();
if ( pDoc->GetCurrentViewShell() &&
pDoc->GetCurrentViewShell()->IsInConstructor() )
Modified: openoffice/trunk/main/sw/source/core/edit/edlingu.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/edit/edlingu.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/edit/edlingu.cxx (original)
+++ openoffice/trunk/main/sw/source/core/edit/edlingu.cxx Tue Apr 29 19:25:03 2014
@@ -1678,7 +1678,7 @@ bool SwSpellIter::SpellSentence(::svx::S
SetCurrX( new SwPosition( *pCrsr->GetMark() ));
//if an error has been found go back to the text
- //preceeding the error
+ //preceding the error
if(xSpellRet.is())
{
*pCrsr->GetPoint() = aSaveStartPos;
Modified: openoffice/trunk/main/sw/source/core/fields/authfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/fields/authfld.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/fields/authfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/fields/authfld.cxx Tue Apr 29 19:25:03 2014
@@ -352,7 +352,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequ
SwTOXSortTabBase* pOld = aSortArr[i];
if(*pOld == *pNew)
{
- //only the first occurence in the document
+ //only the first occurrence in the document
//has to be in the array
if(*pOld < *pNew)
DELETEZ(pNew);
Modified: openoffice/trunk/main/sw/source/core/inc/anchoredobjectposition.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/inc/anchoredobjectposition.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/inc/anchoredobjectposition.hxx (original)
+++ openoffice/trunk/main/sw/source/core/inc/anchoredobjectposition.hxx Tue Apr 29 19:25:03 2014
@@ -283,7 +283,7 @@ namespace objectpositioning
@author OD
@param _rPageAlignLayFrm
- input paramter - layout frame, which determines the 'page area'
+ input parameter - layout frame, which determines the 'page area'
the object has to be horizontal positioned in.
@param _nProposedRelPosX
@@ -332,7 +332,7 @@ namespace objectpositioning
is oriented at.
@param _rPageAlignLayFrm
- input paramter - layout frame, which determines the 'page area'
+ input parameter - layout frame, which determines the 'page area'
the object has to be horizontal positioned in.
@param _eRelOrient
Modified: openoffice/trunk/main/sw/source/core/layout/anchoreddrawobject.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/anchoreddrawobject.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/anchoreddrawobject.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/anchoreddrawobject.cxx Tue Apr 29 19:25:03 2014
@@ -201,7 +201,7 @@ bool SwObjPosOscillationControl::Oscilla
{
if ( *(pNewObjPos) == *(*aObjPosIter) )
{
- // position already occured -> oscillation
+ // position already occurred -> oscillation
bOscillationDetected = true;
delete pNewObjPos;
break;
Modified: openoffice/trunk/main/sw/source/core/layout/flycnt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/flycnt.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/flycnt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/flycnt.cxx Tue Apr 29 19:25:03 2014
@@ -341,7 +341,7 @@ bool SwOszControl::ChkOsz()
{
if ( *(pNewObjPos) == *(*aObjPosIter) )
{
- // position already occured -> oscillation
+ // position already occurred -> oscillation
bOscillationDetected = true;
delete pNewObjPos;
break;
Modified: openoffice/trunk/main/sw/source/core/layout/flylay.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/flylay.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/flylay.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/flylay.cxx Tue Apr 29 19:25:03 2014
@@ -1124,7 +1124,7 @@ sal_Bool CalcClipRect( const SdrObject *
: pClipFrm->Frm();
// --> OD 2004-10-14 #i26945# - consider that a table, during
// its format, can exceed its upper printing area bottom.
- // Thus, enlarge the clip rectangle, if such a case occured
+ // Thus, enlarge the clip rectangle, if such a case occurred
if ( pFly->GetAnchorFrm()->IsInTab() )
{
const SwTabFrm* pTabFrm = const_cast<SwFlyFrm*>(pFly)
Modified: openoffice/trunk/main/sw/source/core/layout/frmtool.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/frmtool.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/frmtool.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/frmtool.cxx Tue Apr 29 19:25:03 2014
@@ -913,7 +913,7 @@ SwCntntNotify::~SwCntntNotify()
// The layout is calculated _before_ calling PrtOLENotify,
// and the OLE objects are not invalidated during import.
// Therefore I added the condition !IsUpdateExpFld,
- // have a look at the occurence of CalcLayout in
+ // have a look at the occurrence of CalcLayout in
// uiview/view.cxx.
if ( !pNd->IsOLESizeInvalid() &&
!pSh->GetDoc()->IsUpdateExpFld() )
Modified: openoffice/trunk/main/sw/source/core/layout/objectformatterlayfrm.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/objectformatterlayfrm.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/objectformatterlayfrm.hxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/objectformatterlayfrm.hxx Tue Apr 29 19:25:03 2014
@@ -50,7 +50,7 @@ class SwObjectFormatterLayFrm : public S
@author OD
@return boolean
- indicates, if format was successfull
+ indicates, if format was successful
*/
bool _AdditionalFormatObjsOnPage();
Modified: openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx Tue Apr 29 19:25:03 2014
@@ -1420,7 +1420,7 @@ void MA_FASTCALL lcl_ExtendLeftAndRight(
// if ( pFly->IsBackgroundTransparent() )
// {
// // Background <pFly> is transparent drawn. Thus normally, its region
-// // have not to be substracted from given region.
+// // have not to be subtracted from given region.
// // But, if method is called for a fly frame and
// // <pFly> is a direct lower of this fly frame and
// // <pFly> inherites its transparent background brush from its parent,
@@ -1980,7 +1980,7 @@ void MA_FASTCALL DrawGraphic(
{
if ( !bGrfIsTransparent )
{
- /// substract area of background graphic from draw area
+ /// subtract area of background graphic from draw area
/// OD 08.10.2002 #103898# - consider only that part of the
/// graphic area that is overlapping with draw area.
SwRect aTmpGrf = aGrf;
@@ -4098,7 +4098,7 @@ void SwFrm::PaintShadow( const SwRect& r
// OD 30.09.2002 #103636# - no SwAlign of shadow rectangle
// no alignment necessary, because (1) <rRect> is already aligned
// and because (2) paint of border and background will occur later.
- // Thus, (1) assures that no conflicts with neighbour object will occure
+ // Thus, (1) assures that no conflicts with neighbour object will occur
// and (2) assures that border and background is not affected by the
// shadow paint.
/*
@@ -4181,20 +4181,20 @@ void MA_FASTCALL lcl_SubTopBottom( SwRec
( !bCnt || _rAttrs.GetTopLine( _rFrm ) )
)
{
- // substract distance between outer and inner line.
+ // subtract distance between outer and inner line.
SwTwips nDist = ::lcl_MinHeightDist( _rBox.GetTop()->GetDistance() );
// OD 19.05.2003 #109667# - non-overlapping border rectangles:
// adjust x-/y-position, if inner top line is a hair line (width = 1)
sal_Bool bIsInnerTopLineHairline = sal_False;
if ( !_bPrtOutputDev )
{
- // additionally substract width of top outer line
+ // additionally subtract width of top outer line
// --> left/right inner/outer line doesn't overlap top outer line.
nDist += ::lcl_AlignHeight( _rBox.GetTop()->GetOutWidth() );
}
else
{
- // OD 29.04.2003 #107169# - additionally substract width of top inner line
+ // OD 29.04.2003 #107169# - additionally subtract width of top inner line
// --> left/right inner/outer line doesn't overlap top inner line.
nDist += ::lcl_AlignHeight( _rBox.GetTop()->GetInWidth() );
bIsInnerTopLineHairline = _rBox.GetTop()->GetInWidth() == 1;
@@ -4231,20 +4231,20 @@ void MA_FASTCALL lcl_SubTopBottom( SwRec
( !bCnt || _rAttrs.GetBottomLine( _rFrm ) )
)
{
- // substract distance between outer and inner line.
+ // subtract distance between outer and inner line.
SwTwips nDist = ::lcl_MinHeightDist( _rBox.GetBottom()->GetDistance() );
// OD 19.05.2003 #109667# - non-overlapping border rectangles:
// adjust x-/y-position, if inner bottom line is a hair line (width = 1)
sal_Bool bIsInnerBottomLineHairline = sal_False;
if ( !_bPrtOutputDev )
{
- // additionally substract width of bottom outer line
+ // additionally subtract width of bottom outer line
// --> left/right inner/outer line doesn't overlap bottom outer line.
nDist += ::lcl_AlignHeight( _rBox.GetBottom()->GetOutWidth() );
}
else
{
- // OD 29.04.2003 #107169# - additionally substract width of bottom inner line
+ // OD 29.04.2003 #107169# - additionally subtract width of bottom inner line
// --> left/right inner/outer line doesn't overlap bottom inner line.
nDist += ::lcl_AlignHeight( _rBox.GetBottom()->GetInWidth() );
bIsInnerBottomLineHairline = _rBox.GetBottom()->GetInWidth() == 1;
@@ -4350,7 +4350,7 @@ void lcl_PaintLeftRightLine( const sal_B
// OD 06.05.2003 #107169# - adjustments for printer output device
if ( bPrtOutputDev )
{
- // substract width of outer top line.
+ // subtract width of outer top line.
if ( rBox.GetTop() && (!bCnt || _rAttrs.GetTopLine( _rFrm )) )
{
long nDist = ::lcl_AlignHeight( rBox.GetTop()->GetOutWidth() );
@@ -4381,7 +4381,7 @@ void lcl_PaintLeftRightLine( const sal_B
}
}
}
- // substract width of outer bottom line.
+ // subtract width of outer bottom line.
if ( rBox.GetBottom() && (!bCnt || _rAttrs.GetBottomLine( _rFrm )) )
{
long nDist = ::lcl_AlignHeight( rBox.GetBottom()->GetOutWidth());
Modified: openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx Tue Apr 29 19:25:03 2014
@@ -1908,7 +1908,7 @@ void SwTabFrm::MakeAll()
LockJoin(); //Ich lass mich nicht unterwegs vernichten.
SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung
// If pos is invalid, we have to call a SetInvaKeep at aNotify.
- // Otherwise the keep atribute would not work in front of a table.
+ // Otherwise the keep attribute would not work in front of a table.
const sal_Bool bOldValidPos = GetValidPosFlag();
//Wenn mein direkter Nachbar gleichzeitig mein Follow ist
@@ -2527,7 +2527,7 @@ void SwTabFrm::MakeAll()
}
// --> FME 2004-06-09 #i29771# Two tries to split the table:
- // If an error occured during splitting. We start a second
+ // If an error occurred during splitting. We start a second
// try, this time without splitting of table rows.
if ( bSplitError )
{
@@ -2536,7 +2536,7 @@ void SwTabFrm::MakeAll()
}
// --> FME 2005-02-10 #119477#
- // If splitting the table was successfull or not,
+ // If splitting the table was successful or not,
// we do not want to have 'empty' follow tables.
if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() )
Join();
Modified: openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/trvlfrm.cxx Tue Apr 29 19:25:03 2014
@@ -306,7 +306,7 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosit
Point aOldPoint = rPoint;
// PAGES01
- // search for page containing rPoint. The borders around the pages are considerd
+ // search for page containing rPoint. The borders around the pages are considered
const SwPageFrm* pPage = GetPageAtPos( rPoint, 0, true );
// --> OD 2008-12-23 #i95626#
Modified: openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx Tue Apr 29 19:25:03 2014
@@ -2887,7 +2887,7 @@ void SwLayoutFrm::ChgLowersProp( const S
}
else
{
- // variable size of body|section frame has shrinked. Thus,
+ // variable size of body|section frame has shrunk. Thus,
// invalidate all lowers not matching the new body|section size
// and the dedicated new last lower.
if( bVert )
Modified: openoffice/trunk/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/ole/ndole.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/ole/ndole.cxx (original)
+++ openoffice/trunk/main/sw/source/core/ole/ndole.cxx Tue Apr 29 19:25:03 2014
@@ -907,7 +907,7 @@ sal_Bool SwOLEObj::UnloadObject( uno::Re
if ( xPers.is() )
xPers->storeOwn();
else {
- DBG_ERROR("Modified object without persistance in cache!");
+ DBG_ERROR("Modified object without persistence in cache!");
}
}
Modified: openoffice/trunk/main/sw/source/core/table/swnewtable.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/table/swnewtable.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/table/swnewtable.cxx (original)
+++ openoffice/trunk/main/sw/source/core/table/swnewtable.cxx Tue Apr 29 19:25:03 2014
@@ -837,7 +837,7 @@ bool SwTable::PrepareMerge( const SwPaM&
// box, the left and right border does not need to be changed.
// The right and bottom border instead has to be derived from the right-
// bottom box of the selection. If this is a overlapped cell,
- // the appropiate master box.
+ // the appropriate master box.
SwTableBox* pLastBox = 0; // the right-bottom (master) cell
SwDoc* pDoc = GetFrmFmt()->GetDoc();
SwPosition aInsPos( *pMergeBox->GetSttNd()->EndOfSectionNode() );
Modified: openoffice/trunk/main/sw/source/core/text/atrstck.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/atrstck.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/atrstck.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/atrstck.cxx Tue Apr 29 19:25:03 2014
@@ -214,7 +214,7 @@ sal_Bool IsItemIncluded( const sal_uInt1
* depending on its 'visited' state. There are actually two cases, which
* should override the colors from the character attribute:
* 1. We never take the 'visited' color during printing/pdf export/preview
- * 2. The user has choosen to override these colors in the view options
+ * 2. The user has chosen to override these colors in the view options
*************************************************************************/
bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
Modified: openoffice/trunk/main/sw/source/core/text/guess.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/guess.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/guess.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/guess.cxx Tue Apr 29 19:25:03 2014
@@ -378,7 +378,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtP
// if we are formatting multi portions we want to allow line breaks
// at the border between single line and multi line portion
- // we have to be carefull with footnote portions, they always come in
+ // we have to be careful with footnote portions, they always come in
// with an index 0
if ( nBreakPos < rInf.GetLineStart() && rInf.IsFirstMulti() &&
! rInf.IsFtnInside() )
Modified: openoffice/trunk/main/sw/source/core/text/inftxt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/inftxt.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/inftxt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/inftxt.cxx Tue Apr 29 19:25:03 2014
@@ -464,7 +464,7 @@ SwPosSize SwTxtSizeInfo::GetTxtSize() co
const SwScriptInfo& rSI =
( (SwParaPortion*)GetParaPortion() )->GetScriptInfo();
- // in some cases, compression is not allowed or surpressed for
+ // in some cases, compression is not allowed or suppressed for
// performance reasons
sal_uInt16 nComp =( SW_CJK == GetFont()->GetActual() &&
rSI.CountCompChg() &&
@@ -690,7 +690,7 @@ void SwTxtPaintInfo::_DrawText( const Xu
if ( ! rPor.InFldGrp() )
pSI = &GetParaPortion()->GetScriptInfo();
- // in some cases, kana compression is not allowed or surpressed for
+ // in some cases, kana compression is not allowed or suppressed for
// performance reasons
sal_uInt16 nComp = 0;
if ( ! IsMulti() )
@@ -1177,7 +1177,7 @@ void SwTxtPaintInfo::DrawCheckBox( const
*************************************************************************/
void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
{
- ASSERT( OnWin(), "SwTxtPaintInfo::DrawBackground: printer polution ?" );
+ ASSERT( OnWin(), "SwTxtPaintInfo::DrawBackground: printer pollution ?" );
SwRect aIntersect;
CalcRect( rPor, 0, &aIntersect );
Modified: openoffice/trunk/main/sw/source/core/text/itratr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/itratr.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/itratr.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/itratr.cxx Tue Apr 29 19:25:03 2014
@@ -816,7 +816,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong
* SwTxtNode::GetScalingOfSelectedText()
*
* Calculates the width of the text part specified by nStt and nEnd,
- * the height of the line containing nStt is devided by this width,
+ * the height of the line containing nStt is divided by this width,
* indicating the scaling factor, if the text part is rotated.
* Having CH_BREAKs in the text part, this method returns the scaling
* factor for the longest of the text parts separated by the CH_BREAKs.
Modified: openoffice/trunk/main/sw/source/core/text/itrform2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/itrform2.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/itrform2.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/itrform2.cxx Tue Apr 29 19:25:03 2014
@@ -215,7 +215,7 @@ SwLinePortion *SwTxtFormatter::UnderFlow
pTmpPrev->Move( rInf );
rInf.SetLast( pTmpPrev );
pTmpPrev = pTmpPrev->GetPortion();
- ASSERT( pTmpPrev, "UnderFlow: Loosing control!" );
+ ASSERT( pTmpPrev, "UnderFlow: Losing control!" );
};
}
pPor = pPor->GetPortion();
Modified: openoffice/trunk/main/sw/source/core/text/itrform2.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/itrform2.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/itrform2.hxx (original)
+++ openoffice/trunk/main/sw/source/core/text/itrform2.hxx Tue Apr 29 19:25:03 2014
@@ -81,7 +81,7 @@ class SwTxtFormatter : public SwTxtPaint
// wird von SwTxtFormatter wegen UpdatePos ueberladen
void CalcAdjustLine( SwLineLayout *pCurr );
- // consideres line spacing attributes
+ // considers line spacing attributes
void CalcRealHeight( sal_Bool bNewLine = sal_False );
// uebertraegt die Daten nach rInf
Modified: openoffice/trunk/main/sw/source/core/text/porfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/porfld.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/porfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/porfld.cxx Tue Apr 29 19:25:03 2014
@@ -437,7 +437,7 @@ void SwFldPortion::Paint( const SwTxtPai
{
SwFontSave aSave( rInf, pFnt );
- ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
+ ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion pollution?" );
if( Width() && ( !bPlaceHolder || rInf.GetOpt().IsShowPlaceHolderFields() ) )
{
// Dies ist eine freizuegige Auslegung der Hintergrundbelegung ...
@@ -1144,7 +1144,7 @@ SwCombinedPortion::SwCombinedPortion( co
void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
- ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
+ ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion pollution?" );
if( Width() )
{
rInf.DrawBackBrush( *this );
Modified: openoffice/trunk/main/sw/source/core/text/pormulti.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/pormulti.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/pormulti.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/pormulti.cxx Tue Apr 29 19:25:03 2014
@@ -1063,7 +1063,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiC
{
// If bOn is sal_False and the next attribute starts later than rPos
// the winner attribute is interrupted at rPos.
- // If the start of the next atribute is behind the end of
+ // If the start of the next attribute is behind the end of
// the last attribute on the aEnd-stack, this is the endposition
// on the stack is the end of the 2-line portion.
if( !bOn || aEnd.back() < *pTmp->GetStart() )
Modified: openoffice/trunk/main/sw/source/core/text/txtdrop.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/txtdrop.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/txtdrop.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/txtdrop.cxx Tue Apr 29 19:25:03 2014
@@ -814,7 +814,7 @@ void SwDropCapCache::CalcFontSize( SwDro
sal_Bool bGrow = ( pDrop->GetLen() != 0 );
- // for growing controll
+ // for growing control
long nMax = KSHRT_MAX;
long nMin = nFactor / 2;
#if OSL_DEBUG_LEVEL > 1
Modified: openoffice/trunk/main/sw/source/core/text/txtfly.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/txtfly.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/txtfly.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/txtfly.cxx Tue Apr 29 19:25:03 2014
@@ -1676,7 +1676,7 @@ SwContourCache::~SwContourCache()
void SwContourCache::ClrObject( MSHORT nPos )
{
- ASSERT( pTextRanger[ nPos ], "ClrObject: Allready cleared. Good Bye!" );
+ ASSERT( pTextRanger[ nPos ], "ClrObject: Already cleared. Good Bye!" );
nPntCnt -= pTextRanger[ nPos ]->GetPointCount();
delete pTextRanger[ nPos ];
--nObjCnt;
Modified: openoffice/trunk/main/sw/source/core/txtnode/fntcache.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/fntcache.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/txtnode/fntcache.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/fntcache.cxx Tue Apr 29 19:25:03 2014
@@ -2701,13 +2701,13 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor(
if( GetShell() && GetShell()->GetWin() )
{
- // here we determine the prefered window text color for painting
+ // here we determine the preferred window text color for painting
const SwViewOption* pViewOption = GetShell()->GetViewOptions();
if(pViewOption->IsPagePreview() &&
!SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews())
nNewColor = COL_BLACK;
else
- // we take the font color from the appearence page
+ // we take the font color from the appearance page
nNewColor = SwViewOption::GetFontColor().GetColor();
}
Modified: openoffice/trunk/main/sw/source/core/txtnode/thints.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/thints.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/txtnode/thints.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/thints.cxx Tue Apr 29 19:25:03 2014
@@ -1253,7 +1253,7 @@ SwTxtAttr* SwTxtNode::InsertItem(
{
const bool bSuccess( InsertHint( pNew, nMode ) );
// N.B.: also check that the hint is actually in the hints array,
- // because hints of certain types may be merged after succesful
+ // because hints of certain types may be merged after successful
// insertion, and thus destroyed!
if (!bSuccess || ( USHRT_MAX == m_pSwpHints->GetPos( pNew ) ))
{
@@ -2195,7 +2195,7 @@ sal_Bool SwTxtNode::GetAttr( SfxItemSet&
{
const sal_uInt16 nHintWhich = pItem->Which();
ASSERT(!isUNKNOWNATR(nHintWhich),
- "SwTxtNode::GetAttr(): unkonwn attribute?");
+ "SwTxtNode::GetAttr(): unknown attribute?");
if ( !pAttrArr.get() )
{
Modified: openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/txtedt.cxx Tue Apr 29 19:25:03 2014
@@ -1983,17 +1983,17 @@ void SwTxtNode::CountWords( SwDocStat& r
// Asian languages count words as characters
if ( nCurrScript == ::com::sun::star::i18n::ScriptType::ASIAN )
{
- // substract white spaces
+ // subtract white spaces
sal_Int32 nSpaceCount = 0;
sal_Int32 nSpacePos = 0;
- // substract normal white spaces
+ // subtract normal white spaces
nSpacePos = -1;
while ( ( nSpacePos = aScriptText.indexOf( ' ', nSpacePos + 1 ) ) != -1 )
{
nSpaceCount++;
}
- // substract Asian full-width white spaces
+ // subtract Asian full-width white spaces
nSpacePos = -1;
while ( ( nSpacePos = aScriptText.indexOf( 12288, nSpacePos + 1 ) ) != -1 )
{
Modified: openoffice/trunk/main/sw/source/core/undo/unattr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/undo/unattr.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/undo/unattr.cxx (original)
+++ openoffice/trunk/main/sw/source/core/undo/unattr.cxx Tue Apr 29 19:25:03 2014
@@ -201,7 +201,7 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoR
if ( !m_pOldSet.get() || !m_pFmt || !IsFmtInDoc( &rContext.GetDoc() ))
return;
- // --> OD 2004-10-26 #i35443# - If anchor attribute has been successfull
+ // --> OD 2004-10-26 #i35443# - If anchor attribute has been successful
// restored, all other attributes are also restored.
// Thus, keep track of its restoration
bool bAnchorAttrRestored( false );
@@ -210,7 +210,7 @@ void SwUndoFmtAttr::UndoImpl(::sw::UndoR
bAnchorAttrRestored = RestoreFlyAnchor(rContext);
if ( bAnchorAttrRestored )
{
- // Anchor attribute successfull restored.
+ // Anchor attribute successful restored.
// Thus, keep anchor position for redo
SaveFlyAnchor();
}
Modified: openoffice/trunk/main/sw/source/core/undo/untbl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/undo/untbl.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/undo/untbl.cxx (original)
+++ openoffice/trunk/main/sw/source/core/undo/untbl.cxx Tue Apr 29 19:25:03 2014
@@ -1737,7 +1737,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( cons
// then pBox received nodes from elsewhere.
// If bNodesMoved is set for pBox the undo must move the
// boxes back, otherwise it must delete them.
- // The bNodesMoved flag is stored in a seperate array
+ // The bNodesMoved flag is stored in a separate array
// which mirrors Ptrs.pNewSttNds, i.e. Ptrs.pNewSttNds[i]
// and aMvBoxes[i] belong together.
sal_Bool bNodesMoved =
Modified: openoffice/trunk/main/sw/source/core/unocore/XMLRangeHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/XMLRangeHelper.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/unocore/XMLRangeHelper.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/XMLRangeHelper.cxx Tue Apr 29 19:25:03 2014
@@ -347,7 +347,7 @@ CellRange getCellRangeFromXMLString( con
nStartPos, nEndPos - 1,
aResult ))
{
- // if an error occured, bail out
+ // if an error occurred, bail out
return CellRange();
}
}
Modified: openoffice/trunk/main/sw/source/core/unocore/unochart.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unochart.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/unocore/unochart.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unochart.cxx Tue Apr 29 19:25:03 2014
@@ -697,12 +697,12 @@ uno::Reference< chart2::data::XDataSourc
//Therefore we need to shift the range one row up
SwRangeDescriptor aDesc;
if (aRangeRepresentation.getLength() == 0)
- return xRes; // we cant handle this thus returning an empty references
+ return xRes; // we can't handle this thus returning an empty references
aRangeRepresentation = aRangeRepresentation.copy( 1 ); // get rid of '.' to have only the cell range left
FillRangeDescriptor( aDesc, aRangeRepresentation );
aDesc.Normalize();
if (aDesc.nTop <= 0) // no chance to shift the range one row up?
- return xRes; // we cant handle this thus returning an empty references
+ return xRes; // we can't handle this thus returning an empty references
aDesc.nTop -= 1;
aDesc.nBottom -= 1;
@@ -743,7 +743,7 @@ uno::Reference< chart2::data::XDataSourc
{
SwTable* pTable = SwTable::FindTable( pTblFmt );
if(pTable->IsTblComplex())
- return xRes; // we cant handle this thus returning an empty references
+ return xRes; // we can't handle this thus returning an empty references
else
{
// get a character map in the size of the table to mark
@@ -833,7 +833,7 @@ uno::Reference< chart2::data::XDataSourc
}
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)
{
Modified: openoffice/trunk/main/sw/source/core/unocore/unotext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unotext.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/unocore/unotext.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unotext.cxx Tue Apr 29 19:25:03 2014
@@ -1685,7 +1685,7 @@ throw (lang::IllegalArgumentException, u
{
// todo: if the start/end is in a table then insert a paragraph
// before/after, move the start/end nodes, then convert and
- // remove the addtional paragraphs in the end
+ // remove the additional paragraphs in the end
if (pStartStartNode->GetStartNodeType() == SwTableBoxStartNode)
{
SwTableNode *const pSartTableNode(pStartStartNode->FindTableNode());
Modified: openoffice/trunk/main/sw/source/core/view/vdraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/view/vdraw.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/view/vdraw.cxx (original)
+++ openoffice/trunk/main/sw/source/core/view/vdraw.cxx Tue Apr 29 19:25:03 2014
@@ -168,7 +168,7 @@ void SwViewImp::UnlockPaint()
|*
|*************************************************************************/
// OD 29.08.2002 #102450#
-// add 3rd paramter <const Color* pPageBackgrdColor> for setting this
+// add 3rd parameter <const Color* pPageBackgrdColor> for setting this
// color as the background color at the outliner of the draw view.
// OD 09.12.2002 #103045# - add 4th parameter for the horizontal text direction
// of the page in order to set the default horizontal text direction at the
Modified: openoffice/trunk/main/sw/source/core/view/vnew.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/view/vnew.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/view/vnew.cxx (original)
+++ openoffice/trunk/main/sw/source/core/view/vnew.cxx Tue Apr 29 19:25:03 2014
@@ -199,7 +199,7 @@ ViewShell::ViewShell( SwDoc& rDocument,
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::SwViewShell" );
// OD 2004-06-01 #i26791# - in order to suppress event handling in
- // <SwDrawContact::Changed> during contruction of <ViewShell> instance
+ // <SwDrawContact::Changed> during construction of <ViewShell> instance
mbInConstructor = true;
bPaintInProgress = bViewLocked = bInEndAction = bFrameView =
@@ -278,7 +278,7 @@ ViewShell::ViewShell( ViewShell& rShell,
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::SwViewShell" );
// OD 2004-06-01 #i26791# - in order to suppress event handling in
- // <SwDrawContact::Changed> during contruction of <ViewShell> instance
+ // <SwDrawContact::Changed> during construction of <ViewShell> instance
mbInConstructor = true;
bPaintWorks = bEnableSmooth = sal_True;
Modified: openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ascii/parasc.cxx Tue Apr 29 19:25:03 2014
@@ -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
Modified: openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/basflt/fltini.cxx Tue Apr 29 19:25:03 2014
@@ -575,7 +575,7 @@ void SwRelNumRuleSpaces::SetNumLSpace( S
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 );
}
Modified: openoffice/trunk/main/sw/source/filter/html/htmlatr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/htmlatr.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/htmlatr.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/htmlatr.cxx Tue Apr 29 19:25:03 2014
@@ -2014,7 +2014,7 @@ void HTMLEndPosLst::Insert( const SfxPoo
}
// 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 );
Modified: openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/htmlgrin.cxx Tue Apr 29 19:25:03 2014
@@ -1297,7 +1297,7 @@ sal_Bool SwHTMLParser::HasCurrentParaBoo
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();
Modified: openoffice/trunk/main/sw/source/filter/html/wrthtml.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/html/wrthtml.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/html/wrthtml.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/html/wrthtml.cxx Tue Apr 29 19:25:03 2014
@@ -604,7 +604,7 @@ void lcl_html_OutSectionStartTag( SwHTML
(((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&
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&
}
// 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 ) )
Modified: openoffice/trunk/main/sw/source/filter/inc/msfilter.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/inc/msfilter.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/inc/msfilter.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/inc/msfilter.hxx Tue Apr 29 19:25:03 2014
@@ -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
Modified: openoffice/trunk/main/sw/source/filter/inc/wwstyles.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/inc/wwstyles.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/inc/wwstyles.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/inc/wwstyles.hxx Tue Apr 29 19:25:03 2014
@@ -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.
Modified: openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/rtffly.cxx Tue Apr 29 19:25:03 2014
@@ -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)
Modified: openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx Tue Apr 29 19:25:03 2014
@@ -1032,7 +1032,7 @@ void rtfSections::InsertSegments(bool bN
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));
}
Modified: openoffice/trunk/main/sw/source/filter/ww8/docxattributeoutput.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/docxattributeoutput.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/docxattributeoutput.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/docxattributeoutput.cxx Tue Apr 29 19:25:03 2014
@@ -1149,7 +1149,7 @@ void DocxAttributeOutput::TableCellPrope
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::TableDefinitio
// 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( ),
Modified: openoffice/trunk/main/sw/source/filter/ww8/dump/msvbasic.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/dump/msvbasic.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/dump/msvbasic.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/dump/msvbasic.cxx Tue Apr 29 19:25:03 2014
@@ -204,7 +204,7 @@ int VBA_Impl::ReadVBAProject(const SvSto
//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
Modified: openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.cxx Tue Apr 29 19:25:03 2014
@@ -4554,7 +4554,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, boo
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, b
{
/*
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, WW8Fi
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* pS
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(
nL = SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1;
break;
default:
- ASSERT(!this, "Unknown sprm varient");
+ ASSERT(!this, "Unknown sprm variant");
break;
}
break;
Modified: openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/dump/ww8scan.hxx Tue Apr 29 19:25:03 2014
@@ -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
Modified: openoffice/trunk/main/sw/source/filter/ww8/dump/ww8struc.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/dump/ww8struc.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/dump/ww8struc.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/dump/ww8struc.hxx Tue Apr 29 19:25:03 2014
@@ -776,7 +776,7 @@ eigentlich muessten wir das jetzt in etw
};
*/
-// AnnoTation Refernce Descriptor (ATRD)
+// AnnoTation References Descriptor (ATRD)
struct WW8_ATRD // fuer die 8-Version
{
SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials
Modified: openoffice/trunk/main/sw/source/filter/ww8/needed_cast.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/needed_cast.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/needed_cast.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/needed_cast.hxx Tue Apr 29 19:25:03 2014
@@ -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)
{
Modified: openoffice/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx Tue Apr 29 19:25:03 2014
@@ -418,7 +418,7 @@ void RtfAttributeOutput::RTLAndCJKState(
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
Modified: openoffice/trunk/main/sw/source/filter/ww8/rtfsdrexport.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/rtfsdrexport.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/rtfsdrexport.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/rtfsdrexport.cxx Tue Apr 29 19:25:03 2014
@@ -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())
{
Modified: openoffice/trunk/main/sw/source/filter/ww8/staticassert.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/staticassert.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/staticassert.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/staticassert.hxx Tue Apr 29 19:25:03 2014
@@ -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.
Modified: openoffice/trunk/main/sw/source/filter/ww8/writerhelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/writerhelper.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/writerhelper.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/writerhelper.hxx Tue Apr 29 19:25:03 2014
@@ -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
Modified: openoffice/trunk/main/sw/source/filter/ww8/writerwordglue.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/writerwordglue.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/writerwordglue.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/writerwordglue.cxx Tue Apr 29 19:25:03 2014
@@ -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;
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx Tue Apr 29 19:25:03 2014
@@ -783,7 +783,7 @@ void PlcDrawObj::WritePlc( WW8Export& rW
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 Sd
/*
#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())
{
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx Tue Apr 29 19:25:03 2014
@@ -525,7 +525,7 @@ void WW8SwAttrIter::OutAttr( xub_StrLen
}
/*
- 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
*/
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx Tue Apr 29 19:25:03 2014
@@ -402,7 +402,7 @@ void MSWordStyles::SetStyleDefaults( con
{
//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
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 ) );
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx Tue Apr 29 19:25:03 2014
@@ -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),
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8.hxx Tue Apr 29 19:25:03 2014
@@ -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);
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx Tue Apr 29 19:25:03 2014
@@ -124,7 +124,7 @@ bool WW8Export::TestOleNeedsGraphic(cons
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
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx Tue Apr 29 19:25:03 2014
@@ -1128,7 +1128,7 @@ void WW8AttributeOutput::CharFontCJK( co
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(
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( c
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.
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx Tue Apr 29 19:25:03 2014
@@ -611,7 +611,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawi
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::MatchSdrItemsIntoF
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(
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(
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);
// <--
}
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf.hxx Tue Apr 29 19:25:03 2014
@@ -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
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx Tue Apr 29 19:25:03 2014
@@ -570,7 +570,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(Sd
##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
*/
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Tue Apr 29 19:25:03 2014
@@ -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::HandlePageBreakCha
/*
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));
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.hxx Tue Apr 29 19:25:03 2014
@@ -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) {}
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx Tue Apr 29 19:25:03 2014
@@ -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(
/*
#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*
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)
{
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par2.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par2.hxx?rev=1591062&r1=1591061&r2=1591062&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par2.hxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par2.hxx Tue Apr 29 19:25:03 2014
@@ -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