summaryrefslogtreecommitdiffstats
path: root/sw
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-02-06 22:41:09 +0100
committerJulien Nabet <serval2412@yahoo.fr>2014-02-06 22:41:48 +0100
commit9bbb7ca9f730217f872462086493ba281ad399f8 (patch)
tree4ce7e5a9aca68b8f7de0b3401b8fc91f3bf1a991 /sw
parent-Typo: falback -> fallback (diff)
downloadcore-9bbb7ca9f730217f872462086493ba281ad399f8.tar.gz
core-9bbb7ca9f730217f872462086493ba281ad399f8.zip
Typo: formating -> formatting
Change-Id: If4aba89909a3ef049a756182c37d8a5d6812ae70
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/inc/expfld.hxx6
-rw-r--r--sw/inc/fesh.hxx2
-rw-r--r--sw/inc/fldbas.hxx2
-rw-r--r--sw/inc/paratr.hxx2
-rw-r--r--sw/inc/swtypes.hxx4
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/layout/dbg_lay.cxx6
-rw-r--r--sw/source/core/layout/layact.cxx2
-rw-r--r--sw/source/core/text/widorp.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx2
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx2
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx2
15 files changed, 20 insertions, 20 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b4915e5aa935..2450a811f620 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1292,7 +1292,7 @@ public:
SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
{ return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName ); }
- /// Table formating
+ /// Table formatting
const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; }
SwFrmFmts* GetTblFrmFmts() { return mpTblFrmFmtTbl; }
sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const;
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 65b9beb99120..af25a118ad99 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -103,14 +103,14 @@ public:
inline OUString GetExpStr() const;
inline void ChgExpStr(const OUString& rExpand);
- /// Called by formating.
+ /// Called by formatting.
inline bool IsInBodyTxt() const;
/// Set by UpdateExpFlds where node position is known.
inline void ChgBodyTxtFlag( bool bIsInBody );
/** For fields in header/footer/footnotes/flys:
- Only called by formating!! */
+ Only called by formatting!! */
void ChangeExpansion( const SwFrm&, const SwTxtFld& );
virtual OUString GetFieldName() const;
@@ -135,7 +135,7 @@ inline void SwGetExpField::ChgExpStr(const OUString& rExpand)
inline OUString SwGetExpField::GetExpStr() const
{ return sExpand; }
- /// Called by formating.
+ /// Called by formatting.
inline bool SwGetExpField::IsInBodyTxt() const
{ return bIsInBodyTxt; }
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 57b58baef5ef..6ca2008f6b3d 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -384,7 +384,7 @@ public:
SwFrmFmt* GetFlyFrmFmt();
/** OLE. Server requires new size. Desired values are adjusted as frame attributes.
- If the values are not allowed, the formating clips and determines scaling.
+ If the values are not allowed, the formatting clips and determines scaling.
See CalcAndSetScale().
The @return value is the applied size. */
Size RequestObjectResize( const SwRect &rRect, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 29dae274d1a1..f1c6ac9d93a1 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -200,7 +200,7 @@ namespace nsSwExtendedSubType
{
const SwExtendedSubType SUB_CMD = 0x0100; ///< Show command.
const SwExtendedSubType SUB_INVISIBLE = 0x0200; ///< Invisible.
- const SwExtendedSubType SUB_OWN_FMT = 0x0400; ///< SwDBField: Don't accept formating from database.
+ const SwExtendedSubType SUB_OWN_FMT = 0x0400; ///< SwDBField: Don't accept formatting from database.
}
enum SwInputFieldSubType
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 6bafd28f6501..01b06c1f831b 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -34,7 +34,7 @@ class IntlWrapper;
#define DROP_WHOLEWORD ((sal_uInt16)0x0001)
/** If SwFmtDrop is a Client, it is the CharFmt that describes the font for the
- DropCaps. If it is not a Client, formating uses the CharFmt of the paragraph.
+ DropCaps. If it is not a Client, formatting uses the CharFmt of the paragraph.
If the CharFmt is modified, this change is propagated to the paragraphs
via the Modify of SwFmtDrop. */
class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 8dec3ff60331..2c943b1f4b32 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -258,7 +258,7 @@ enum PrepareHint
PREP_WIDOWS_ORPHANS, // Only check for widows and orphans and split in case of need.
PREP_FIXSIZE_CHG, // FixSize has changed.
PREP_FOLLOW_FOLLOWS, // Follow is now possibly adjacent.
- PREP_ADJUST_FRM, // Adjust size via grow/shrink without formating.
+ PREP_ADJUST_FRM, // Adjust size via grow/shrink without formatting.
PREP_FLY_CHGD, // A FlyFrm has changed its size.
PREP_FLY_ATTR_CHG, // A FlyFrm hat has changed its attributes
// (e. g. wrap).
@@ -289,7 +289,7 @@ enum PrepareHint
PREP_REGISTER, // Invalidate frames with registers.
PREP_FTN_GONE, // A Follow loses its footnote, possibly its first line can move up.
PREP_MOVEFTN, // A footnote changes its page. Its contents receives at first a
- // height of zero in order to avoid too much noise. At formating
+ // height of zero in order to avoid too much noise. At formatting
// it checks whether it fits and if necessary changes its page again.
PREP_ERGOSUM, // Needed because of movement in FtnFrms. Check QuoVadis/ErgoSum.
PREP_END // END.
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index b53459e32427..2848948e7d2e 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -387,7 +387,7 @@ protected:
void MakePos();
// Format next frame of table frame to assure keeping attributes.
// In case of nested tables method <SwFrm::MakeAll()> is called to
- // avoid formating of superior table frame.
+ // avoid formatting of superior table frame.
friend SwFrm* sw_FormatNextCntntForKeep( SwTabFrm* pTabFrm );
virtual void MakeAll() = 0;
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 2d9803a1f7bc..901b843fe09a 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -182,7 +182,7 @@ class SwImplProtocol
sal_uInt16 nLineCount; // printed lines
sal_uInt16 nMaxLines; // max lines to be printed
sal_uInt8 nInitFile; // range (FrmId,FrmType,Record) during reading of the INI file
- sal_uInt8 nTestMode; // special for test formating, logging may only be done in test formating.
+ sal_uInt8 nTestMode; // special for test formatting, logging may only be done in test formatting.
void _Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam );
bool NewStream();
void CheckLine( OString& rLine );
@@ -374,7 +374,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
else if (aTmp == "[test")// section functions
{
nInitFile = 4; // default:
- nTestMode = 0; // log outside of test formating
+ nTestMode = 0; // log outside of test formatting
}
else if (aTmp == "[max")// Max number of lines
{
@@ -593,7 +593,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
return; // the type is unwanted
if( 1 == nTestMode && nFunction != PROT_TESTFORMAT )
- return; // we may only log inside a test formating
+ return; // we may only log inside a test formatting
sal_Bool bTmp = sal_False;
OStringBuffer aOut(aLayer);
aOut.append(static_cast<sal_Int64>(lcl_GetFrameId(pFrm)));
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index b9222fdf6ed5..7cd540034888 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1503,7 +1503,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
pLow = pLow->GetNext();
}
// OD 11.11.2002 #104414# - add complete frame area as paint area, if frame
- // area has been already added and after formating its lowers the frame area
+ // area has been already added and after formatting its lowers the frame area
// is enlarged.
SwRect aBoundRect(pLay->IsPageFrm() ? static_cast<SwPageFrm*>(pLay)->GetBoundRect() : pLay->Frm() );
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 190108246039..a62131878499 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -85,7 +85,7 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst )
/* BP 18.6.93: Widows.
* In contrast to the first implementation the Widows are not calculated
- * in advance but detected when formating the split Follow.
+ * in advance but detected when formatting the split Follow.
* In Master the Widows-calculation is dropped completely
* (nWidows is manipulated). If the Follow detects that the
* Widows rule applies it sends a Prepare to its predecessor.
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index c4425cc20819..57877bcdbcb1 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1767,7 +1767,7 @@ public: // eigentlich private, geht aber leider nur public
void Read_CFRMark(sal_uInt16 , const sal_uInt8* pData, short nLen);
// delete old content
void Read_CFRMarkDel(sal_uInt16 , const sal_uInt8* pData, short nLen);
- // change properties of content (e.g. char formating)
+ // change properties of content (e.g. char formatting)
void Read_CPropRMark(sal_uInt16 , const sal_uInt8* pData, short nLen); // complex!
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 2573a8fe58ed..0c8a59c0679e 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -535,7 +535,7 @@ void SwWW8ImplReader::Read_CFRMarkDel(sal_uInt16 , const sal_uInt8* pData, short
Read_CRevisionMark( nsRedlineType_t::REDLINE_DELETE, pData, nLen );
}
-// change properties of content ( == char formating)
+// change properties of content ( == char formatting)
void SwWW8ImplReader::Read_CPropRMark(sal_uInt16 , const sal_uInt8* pData, short nLen)
{
// complex (len is always 7)
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index a41cf73e9e6a..ecd296a3c3d7 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -326,7 +326,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
if (IsFldEdit())
{
// GetFormula leads to problems with date formats because
- // only the numeric value without formating is returned.
+ // only the numeric value without formatting is returned.
// It must be used though because otherwise in GetPar2 only
// the value calculated by Kalkulator would be displayed
// (instead of test2 = test + 1)
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index f383d23ca07b..2394de4a8a0e 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -532,7 +532,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
rWrtShell.SetAttrSet(*pTemplateItemSet);
// store the attributes in aItemVector in order not to apply them as
- // text automatic formating attributes later in the code
+ // text automatic formatting attributes later in the code
lcl_AppendSetItems( aItemVector, *pTemplateItemSet);
delete pTemplateItemSet;
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 249cfa6473ab..77c8a0a88af6 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2554,7 +2554,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
}
}
- // reformating the document for printing will show the changes in the view
+ // reformatting the document for printing will show the changes in the view
// which is likely to produce many unwanted and not nice to view actions.
// We don't want that! Thus we disable updating of the view.
pViewShell->StartAction();