[Libreoffice-commits] core.git: sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Sep 29 15:21:16 PDT 2015
sw/source/filter/ww8/ww8par.cxx | 8 ++++----
sw/source/filter/ww8/ww8par5.cxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.hxx | 2 +-
sw/source/filter/xml/xmlbrsh.cxx | 2 +-
sw/source/filter/xml/xmltbli.cxx | 4 ++--
sw/source/uibase/app/applab.cxx | 2 +-
sw/source/uibase/app/swmodul1.cxx | 2 +-
sw/source/uibase/dbui/dbmgr.cxx | 2 +-
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 2 +-
sw/source/uibase/dochdl/swdtflvr.cxx | 6 +++---
sw/source/uibase/docvw/PostItMgr.cxx | 2 +-
sw/source/uibase/docvw/edtwin.cxx | 2 +-
sw/source/uibase/fldui/fldmgr.cxx | 2 +-
15 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit a936097614b5aaa51e123323da8f275575e165f8
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:12:08 2015 +0200
Fix typos
Change-Id: I2373a842818a5ac6ce5bd75205580f7cdc0212e4
Reviewed-on: https://gerrit.libreoffice.org/18988
Reviewed-by: Joren De Cuyper <jorendc at libreoffice.org>
Tested-by: Joren De Cuyper <jorendc at libreoffice.org>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e5645d0..ef9dd9b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1937,7 +1937,7 @@ void SwWW8ImplReader::ImportDop()
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_OBJECT_POS, false);
// #i27767# - set new compatibility option
- // 'Conder Wrapping mode when positioning object' to <true>
+ // 'Consider Wrapping mode when positioning object' to <true>
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION, true);
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::USE_FORMER_TEXT_WRAPPING, false); // #i13832#, #i24135#
@@ -3215,7 +3215,7 @@ namespace
// hack the word one onto the range we use. However it's unclear what word's
// categorization is. So we don't do that here yet.
-// Additional to the categorization, when word encounters weak text for ambiguos
+// Additional to the categorization, when word encounters weak text for ambiguous
// chars it uses idcthint to indicate which way to bias. We don't have a idcthint
// feature in writer.
@@ -3229,7 +3229,7 @@ namespace
// See https://bugs.libreoffice.org/show_bug.cgi?id=34319 for an example
//
// TO-DO: revisit this after the fix of #i119612# which retains the
-// idcthint feature on import from word and has it available for reexport
+// idcthint feature on import from word and has it available for re-export
// but we don't use it yet for the actual rendering and layout
void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString)
{
@@ -4928,7 +4928,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
/*
RefFieldStck: Keeps track of bookmarks which may be inserted as
- variables intstead.
+ variables instead.
*/
m_pReffedStck = new SwWW8ReferencedFltEndStack(&m_rDoc, m_nFieldFlags);
m_pReffingStck = new SwWW8FltRefStack(&m_rDoc, m_nFieldFlags);
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0b570d5..865cbc4 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1055,7 +1055,7 @@ void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const OUString& rTag
SwInsertFlags::NOHINTEXPAND);
}
else
- { // normal tagggen
+ { // normal taggen
SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType(
SwSetExpFieldType( &m_rDoc, aName, nsSwGetSetExpType::GSE_STRING ) );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3cea85a..4f82a46 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4488,10 +4488,10 @@ void SwWW8ImplReader::Read_TextAnim(sal_uInt16 /*nId*/, const sal_uInt8* pData,
bool bBlink;
// The 7 animated text effects available in word all get
- // mapped to a blinking text effect in StarOffice
+ // mapped to a blinking text effect in LibreOffice
// 0 no animation 1 Las Vegas lights
// 2 background blink 3 sparkle text
- // 4 marching ants 5 marchine red ants
+ // 4 marching ants 5 marching red ants
// 6 shimmer
if (*pData > 0 && *pData < 7 )
bBlink = true;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 35848d8..5df35f9 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2057,7 +2057,7 @@ WW8PLCF::WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct,
// Ctor *only* for Fkps
// The last 2 parameters are needed for PLCF.Chpx and PLCF.Papx.
-// If ncpN != 0, then an incomple PLCF will be completed. This is always required for WW6 with
+// If ncpN != 0, then an incomplete PLCF will be completed. This is always required for WW6 with
// lack of resources and for WordPad (W95).
// With nStartPos < 0, the first element of the PLCFs is taken.
WW8PLCF::WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct,
@@ -4926,7 +4926,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
settings its end to the current start, then store the starting
position of the current range to clipstart. The pPcd sprms
will end as normal (albeit earlier than originally expected),
- and the existence of a clipstart will force the pPcd iterater
+ and the existence of a clipstart will force the pPcd iterator
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
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 8dbed12..6426b0b 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1097,7 +1097,7 @@ public:
// to decide which table stream is valid.
bool fExtChar :1; // 1000 =1, when using extended character set in file
- bool fFarEast :1; // 4000 =1, probably, when far-East language vaiants of Word is used to create a file #i90932#
+ bool fFarEast :1; // 4000 =1, probably, when far-East language variants of Word is used to create a file #i90932#
bool fObfuscated :1; // 8000=1. specifies whether the document is obfuscated using XOR obfuscation. otherwise this bit MUST be ignored.
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index d49da54..4e07c24 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -165,7 +165,7 @@ SwXMLBrushItemImportContext::SwXMLBrushItemImportContext(
SvXMLImportContext( rImport, nPrfx, rLName ),
pItem( new SvxBrushItem( rItem ) )
{
- // delete any grephic that is existing
+ // delete any graphic that is existing
pItem->SetGraphicPos( GPOS_NONE );
ProcessAttrs( xAttrList, rUnitConv );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index c09ea95..dde95da 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2251,7 +2251,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
bHoriSplitPossible |= bHoriSplit;
// Could the current table fragment be splitted
- // horizontally behind the next collumn, too?
+ // horizontally behind the next column, too?
bHoriSplit &= (nCol+1UL < nRightCol &&
1UL == GetCell(nRow,nCol+1UL)->GetRowSpan());
bHoriSplitMayContinue |= bHoriSplit;
@@ -2513,7 +2513,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
else if( nAbsForRelWidth <= (nRelWidth * MINLAY) /
nMinRelColWidth )
{
- // If there is enougth space for all columns to get the
+ // If there is enough space for all columns to get the
// minimum width, but not to get a width that takes the
// relative width into account, each column gets the minimum
// width plus some extra space that is based on the additional
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 9a2dd2a..0eb0524 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -324,7 +324,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
if (rItem.bSynchron)
{
// if there is no content in the fly then
- // dont leave the fly!!!
+ // don't leave the fly!!!
pSh->Push();
pSh->SttDoc();
bool bInFly = 0 != pSh->WizardGetFly();
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 0dd1acc1..4033dc7 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -122,7 +122,7 @@ SwView* GetActiveView()
SwView* SwModule::GetFirstView()
{
- // returns only sivible SwView
+ // returns only visible SwView
const TypeId aTypeId = TYPE(SwView);
SwView* pView = static_cast<SwView*>(SfxViewShell::GetFirst(&aTypeId));
return pView;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index bfbb0af..6498827 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1452,7 +1452,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if ( xWorkDocSh.Is() && pWorkView->GetWrtShell().IsExpFieldsLocked() )
{
- // Unlock ducment fields after merge complete
+ // Unlock document fields after merge complete
pWorkView->GetWrtShell().UnlockExpFields();
}
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index f2c2c33..15cf4916 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -73,7 +73,7 @@ struct SpellState
sal_uInt16 m_SpellStartPosition;
bool m_bBodySpelled; // body already spelled
bool m_bOtherSpelled; // frames, footnotes, headers and footers spelled
- bool m_bStartedInOther; // started the spelling insided of the _other_ area
+ bool m_bStartedInOther; // started the spelling inside of the _other_ area
bool m_bStartedInSelection; // there was an initial text selection
SwPaM* pOtherCursor; // position where the spelling inside the _other_ area started
bool m_bDrawingsSpelled; // all drawings spelled
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 235b975..bff6887 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -405,7 +405,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
{
SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
- // we can only fullfil the request if
+ // we can only fulfil the request if
// 1) we have data for this format
// 2) we have either a clipboard document (pClpDocFac), or
// we have a SwWrtShell (so we can generate a new clipboard document)
@@ -417,7 +417,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
SelectionType nSelectionType = m_pWrtShell->GetSelectionType();
// when pending we will not get the correct type, but nsSelectionType::SEL_TXT
- // as fallback. This *happens* durning D&D, so we need to check if we are in
+ // as fallback. This *happens* during D&D, so we need to check if we are in
// the fallback and just try to get a graphic
const bool bPending(m_pWrtShell->BasicActionPend());
@@ -3240,7 +3240,7 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
bool bKillPaMs = false;
- //Delete selected content, not at table-selection and table in Clipboard, and dont delete hovering graphics.
+ //Delete selected content, not at table-selection and table in Clipboard, and don't delete hovering graphics.
if( rShell.HasSelection() && !( nSelection & nsSelectionType::SEL_TBL_CELLS) && !( nSelection & nsSelectionType::SEL_DRW))
{
bKillPaMs = true;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index c46f428..ca9f2bb 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -923,7 +923,7 @@ void SwPostItMgr::MakeVisible(const SwSidebarWin* pPostIt,long aPage )
{
if (aPage == -1)
{
- // we dont know the page yet, lets find it ourselves
+ // we don't know the page yet, lets find it ourselves
for (unsigned long n=0;n<mPages.size();n++)
{
if (mPages[n]->mList->size()>0)
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 49e5273..6ecbc32 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -801,7 +801,7 @@ static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView&
// English texts with a German keyboard).
// For non-latin keyboards overwriting the attribute is
- // still valid. We do this for kyrillic and greek ATM. In
+ // still valid. We do this for cyrillic and greek ATM. In
// future versions of OOo this should be replaced by a
// configuration switch that allows to give the preference
// to the OOo setting or the system setting explicitly
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 48c0ca8..5e66db7 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1069,7 +1069,7 @@ bool SwFieldMgr::InsertField(
#if HAVE_FEATURE_DBCONNECTIVITY
SwDBData aDBData;
- // excract DBName from rData.m_sPar1. Format: DBName.TableName.CommandType.ExpStrg
+ // extract DBName from rData.m_sPar1. Format: DBName.TableName.CommandType.ExpStrg
sal_Int32 nTablePos = rData.m_sPar1.indexOf(DB_DELIM);
sal_Int32 nCmdTypePos = -1;
sal_Int32 nExpPos = -1;
More information about the Libreoffice-commits
mailing list