summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2015-07-07 23:14:45 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-08 12:21:19 +0200
commite544f449eded2738b45de4be13c72b128a16bafe (patch)
tree3e779fd42f9a17d2b2d62cd8fe43c6bf63d78953 /sw
parent307edd412e4fe3a74378959f5d93f5a2a44f1b60 (diff)
Fix typos
Change-Id: I020c7ce4d9aa93cb0292378a410cdb9f7788e920 Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/source/core/crsr/findtxt.cxx2
-rw-r--r--sw/source/core/doc/DocumentChartDataProviderManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx20
-rw-r--r--sw/source/core/text/inftxt.hxx2
-rw-r--r--sw/source/core/text/itrpaint.cxx2
-rw-r--r--sw/source/core/text/portxt.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
-rw-r--r--sw/source/core/view/viewsh.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx6
-rw-r--r--sw/source/filter/xml/swxml.cxx2
-rw-r--r--sw/source/ui/vba/vbaborders.cxx2
13 files changed, 25 insertions, 25 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e34a77dd732f..b5461ba5c4d9 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -871,7 +871,7 @@ public:
SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
/** Access to frames.
- Iterate over Flys - forr Basic-Collections. */
+ Iterate over Flys - for Basic-Collections. */
size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index fe9e746bcf68..042c58d01354 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -470,7 +470,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSText,
OUString sCleanStr;
std::vector<sal_Int32> aFltArr;
LanguageType eLastLang = 0;
- // if the search string contains a soft hypen,
+ // if the search string contains a soft hyphen,
// we don't strip them from the text:
bool bRemoveSoftHyphens = true;
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index a24cd7b22517..60835de873e1 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -98,7 +98,7 @@ DocumentChartDataProviderManager::~DocumentChartDataProviderManager()
// clean up chart related structures...
// Note: the chart data provider gets already disposed in ~SwDocShell
// since all UNO API related functionality requires an existing SwDocShell
- // this assures that dipose gets called if there is need for it.
+ // this assures that dispose gets called if there is need for it.
maChartDataProviderImplRef.clear();
delete mpChartControllerHelper;
}
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 3e312f10c82e..433c5303e7b1 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1418,11 +1418,11 @@ namespace //local functions originally from docfmt.cxx
if( pStt->nNode == pEnd->nNode )
{
//The data parameter flag: bExpandCharToPara, comes from the data member of SwDoc,
- //Which is set in SW MS word Binary filter WW8ImplRreader. With this flag on, means that
- //current setting attribute set is a character range properties set and comes from a MS word
- //binary file, And the setting range include a paragraph end position (0X0D);
- //More specifications, as such property inside the character range properties set recorded in
- //MS word binary file are dealed and inserted into data model (SwDoc) one by one, so we
+ //which is set in SW MS Word Binary filter WW8ImplRreader. With this flag on, means that
+ //current setting attribute set is a character range properties set and comes from a MS Word
+ //binary file, and the setting range include a paragraph end position (0X0D);
+ //more specifications, as such property inside the character range properties set recorded in
+ //MS Word binary file are dealed and inserted into data model (SwDoc) one by one, so we
//only dealing the scenario that the char properties set with 1 item inside;
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1 )
@@ -1536,11 +1536,11 @@ namespace //local functions originally from docfmt.cxx
}
//The data parameter flag: bExpandCharToPara, comes from the data member of SwDoc,
- //Which is set in SW MS word Binary filter WW8ImplRreader. With this flag on, means that
- //current setting attribute set is a character range properties set and comes from a MS word
- //binary file, And the setting range include a paragraph end position (0X0D);
- //More specifications, as such property inside the character range properties set recorded in
- //MS word binary file are dealed and inserted into data model (SwDoc) one by one, so we
+ //which is set in SW MS Word Binary filter WW8ImplRreader. With this flag on, means that
+ //current setting attribute set is a character range properties set and comes from a MS Word
+ //binary file, and the setting range include a paragraph end position (0X0D);
+ //more specifications, as such property inside the character range properties set recorded in
+ //MS Word binary file are dealed and inserted into data model (SwDoc) one by one, so we
//only dealing the scenario that the char properties set with 1 item inside;
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1)
{
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 107e6cbcf038..c6684f7301a7 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -513,7 +513,7 @@ class SwTextFormatInfo : public SwTextPaintInfo
SwTabPortion *pLastTab; // The _last_ TabPortion
- sal_Int32 nSoftHyphPos; // SoftHyphPos forr Hyphenation
+ sal_Int32 nSoftHyphPos; // SoftHyphPos for Hyphenation
sal_Int32 nLineStart; // Current line start in rText
sal_Int32 nUnderScorePos; // enlarge repaint if underscore has been found
// #i34348# Changed type from sal_uInt16 to SwTwips
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 1a6c3d0b58aa..e2e9b44df348 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -310,7 +310,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
SeekAndChg( GetInfo() );
else if ( !bFirst && pPor->IsBreakPortion() && GetInfo().GetOpt().IsParagraph() )
{
- // Paragraph symbols should have the same fon as the paragraph in fron of them,
+ // Paragraph symbols should have the same font as the paragraph in front of them,
// except for the case that there's redlining in the paragraph
if( GetRedln() )
SeekAndChg( GetInfo() );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 760a5a7fce96..9ab83c568509 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -279,7 +279,7 @@ static bool lcl_HasContent( const SwFieldPortion& rField, SwTextFormatInfo &rInf
bool SwTextPortion::_Format( SwTextFormatInfo &rInf )
{
- // 5744: If only the hypen does not fit anymore, we still need to wrap
+ // 5744: If only the hyphen does not fit anymore, we still need to wrap
// the word, or else return true!
if( rInf.IsUnderflow() && rInf.GetSoftHyphPos() )
{
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 24b33b6eacda..b5bbfeda70c1 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2008,7 +2008,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
throw lang::IllegalArgumentException();
OSL_ENSURE(COND_COMMAND_COUNT == 28,
- "invalid size of comman count?");
+ "invalid size of command count?");
const beans::NamedValue *pSeq = aSeq.getConstArray();
const sal_Int32 nLen = aSeq.getLength();
@@ -2452,7 +2452,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
case FN_UNO_PARA_STYLE_CONDITIONS:
{
OSL_ENSURE(COND_COMMAND_COUNT == 28,
- "invalid size of comman count?");
+ "invalid size of command count?");
uno::Sequence< beans::NamedValue > aSeq(COND_COMMAND_COUNT);
beans::NamedValue *pSeq = aSeq.getArray();
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 950bcac4893b..0f36e03830ac 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1839,7 +1839,7 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
mbInLibreOfficeKitCallback = true;
mpOut = &rDevice;
- // resizes the virtual device so to contain the entrie context
+ // resizes the virtual device so to contain the entries context
rDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
// setup the output device to draw the tile
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ea608781a3f4..7d4fc7382fdc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -670,7 +670,7 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32& nSdtPrToken,
m_rExport.SdrExporter().setParagraphSdtOpen(true);
}
else
- // Support multiple runs inside a run-evel SDT: don't close the SDT block yet.
+ // Support multiple runs inside a run-level SDT: don't close the SDT block yet.
m_bStartedCharSdt = true;
// clear sdt status
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 1cc28037c404..8b3adb4c5337 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -800,7 +800,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/,
/*
MS needs to know the name and size of the font used in the ruby item,
- but we coud have written it in a mixture of asian and western
+ but we could have written it in a mixture of asian and western
scripts, and each of these can be a different font and size than the
other, so we make a guess based upon the first character of the text,
defaulting to asian.
@@ -1976,7 +1976,7 @@ void MSWordExportBase::GetSortedAnnotationMarks( const SwTextNode& rNode, sal_In
{
IMark* pMark = (*it);
- // Remove the positions egals to the current pos
+ // Remove the positions equal to the current pos
const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex();
@@ -2012,7 +2012,7 @@ void MSWordExportBase::GetSortedBookmarks( const SwTextNode& rNode, sal_Int32 nA
{
IMark* pMark = (*it);
- // Remove the positions egals to the current pos
+ // Remove the positions equal to the current pos
const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex();
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index d2a2fa7b8c84..7e589defde89 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -934,7 +934,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
// #i44177# - assure that for documents in OpenOffice.org
// file format the relation between outline numbering rule and styles is
// filled-up accordingly.
- // Note: The OpenOffice.org file format, which has no content that applys
+ // Note: The OpenOffice.org file format, which has no content that applies
// a certain style, which is related to the outline numbering rule,
// has lost the information, that this certain style is related to
// the outline numbering rule.
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 72f5ae6ad893..292018648459 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -237,7 +237,7 @@ private:
VbaPalette m_Palette;
sal_Int32 getTableIndex( sal_Int32 nConst )
{
- // hokay return position of the index in the table
+ // okay return position of the index in the table
sal_Int32 nIndexes = getCount();
sal_Int32 realIndex = 0;
const sal_Int16* pTableEntry = supportedIndexTable;