[Libreoffice-commits] core.git: sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Oct 1 23:08:14 PDT 2015
sw/source/filter/basflt/fltini.cxx | 2 +-
sw/source/filter/html/css1atr.cxx | 2 +-
sw/source/filter/html/htmlsect.cxx | 2 +-
sw/source/filter/html/swhtml.cxx | 10 +++++-----
sw/source/filter/html/wrthtml.hxx | 2 +-
sw/source/filter/ww8/docxattributeoutput.cxx | 2 +-
sw/source/filter/ww8/docxattributeoutput.hxx | 2 +-
sw/source/filter/ww8/docxexport.cxx | 2 +-
sw/source/filter/ww8/docxexport.hxx | 2 +-
sw/source/filter/ww8/writerhelper.cxx | 2 +-
sw/source/filter/ww8/writerhelper.hxx | 2 +-
sw/source/filter/ww8/wrtw8nds.cxx | 4 ++--
sw/source/filter/ww8/wrtww8.cxx | 2 +-
sw/source/filter/ww8/wrtww8gr.cxx | 2 +-
sw/source/filter/ww8/ww8par3.cxx | 4 ++--
15 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 9c719b0391ba812145ee06e4eeb9ed98f3af1c35
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Oct 1 18:22:50 2015 +0200
Fix typos
Change-Id: I724f2b709f7bd417b5a522e063c0a2f2b5c3dad1
Reviewed-on: https://gerrit.libreoffice.org/18987
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index ebd691a..5aa4b74 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -347,7 +347,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
{
if( nMinFrm < MINLAY && pFirstTextNd )
{
- // if the first node dont contained any content, then
+ // if the first node don't contained any content, then
// insert one char in it calc again and delete once again
SwIndex aNdIdx( pFirstTextNd );
pFirstTextNd->InsertText(OUString("MM"), aNdIdx);
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index c630a76..ee400cb 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -857,7 +857,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat *pFormat, OString& rTok
rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak);
break;
case RES_POOLCOLL_HTML_HR:
- // do not exort HR !
+ // do not export HR !
bStop = (nDeep==0);
break;
case RES_POOLCOLL_FOOTNOTE:
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index a3789be..2754775 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -586,7 +586,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_MULTICOL_ON );
- //.is the multicol elememt contained in a container? That may be the
+ //.is the multicol element contained in a container? That may be the
// case for 5.0 documents.
bool bInCntnr = false;
auto i = aContexts.size();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4514f5c..23b8087 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2277,12 +2277,12 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum )
? pTextNd->GetSwpHints().Count() : 0;
if( nCntAttr )
{
- // These are the end position of all script depenent hints.
+ // These are the end position of all script dependent hints.
// If we find a hint that starts before the current end position,
// we have to set it. If we find a hint that start behind or at
- // that position, we have to take the hint's value into account.
- // If it is equal to the style, or in fact the paragarph's value
- // for that hint, the hint is removed. Otherwise it's end position
+ // that position, we have to take the hint value into account.
+ // If it is equal to the style, or in fact the paragarph value
+ // for that hint, the hint is removed. Otherwise its end position
// is remembered.
sal_Int32 aEndPos[15] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -5194,7 +5194,7 @@ void SwHTMLParser::InsertLineBreak()
// muss anschliessen ein neuer Absatz aufgemacht werden
// MIB 21.02.97: Eigentlich muesste man hier den unteren Absatz-
// Absatnd auf 0 drehen. Das geht aber bei sowas wie <BR ..><P>
- // schief (>Netacpe). Deshalb lassen wir das erstmal.
+ // schief (>Netscape). Deshalb lassen wir das erstmal.
AppendTextNode( AM_NOSPACE );
}
if( bBreakItem && SVX_BREAK_PAGE_BEFORE==aBreakItem.GetBreak() )
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index f032329..c6a4f2a 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -326,7 +326,7 @@ public:
sal_uInt16 nEndNote;
sal_uInt16 nFootNote;
sal_Int32 nLeftMargin; // linker Einzug (z.B. aus Listen)
- sal_Int32 nDfltLeftMargin; // die dafaults, der nicht geschrieben
+ sal_Int32 nDfltLeftMargin; // die defaults, der nicht geschrieben
sal_Int32 nDfltRightMargin; // werden muessen (aus der Vorlage)
short nFirstLineIndent; // Erstzeilen-Einzug (aus Listen)
short nDfltFirstLineIndent; // nicht zu schreibender default
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index f28b729..9aa2c0c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6463,7 +6463,7 @@ void DocxAttributeOutput::CharIdctHint( const SfxPoolItem& )
void DocxAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
{
- // Not rorated or we the rotation already handled?
+ // Not rotated or we the rotation already handled?
if ( !rRotate.GetValue() || m_bBtLr || m_rExport.SdrExporter().getFrameBtLr())
return;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 0bc904d..132f02f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -791,7 +791,7 @@ private:
/// names of these bookmarks for each sequence.
std::map<OUString, std::vector<OString> > m_aSeqBookmarksNames;
- /// GrabBag for text effexts like glow, shadow, ...
+ /// GrabBag for text effects like glow, shadow, ...
std::vector<css::beans::PropertyValue> m_aTextEffectsGrabBag;
/// The current table helper
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index e7fa769..4ed8ffd 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -650,7 +650,7 @@ void DocxExport::WriteNumbering()
::sax_fastparser::FSHelperPtr pNumberingFS = m_pFilter->openFragmentStreamWithSerializer( "word/numbering.xml",
"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml" );
- // switch the serializer to redirect the output to word/nubering.xml
+ // switch the serializer to redirect the output to word/numbering.xml
m_pAttrOutput->SetSerializer( pNumberingFS );
pNumberingFS->startElementNS( XML_w, XML_numbering,
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 7045c58..b88ba27 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -216,7 +216,7 @@ private:
/// Write the numbering table.
virtual void WriteNumbering() SAL_OVERRIDE;
- /// Write reference to a header/foorter + the actual xml containing the text.
+ /// Write reference to a header/footer + the actual xml containing the text.
void WriteHeaderFooter( const SwFormat& rFormat, bool bHeader, const char* pType );
/// Write word/fontTable.xml.
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index f7a48f0..7186b92 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -516,7 +516,7 @@ namespace sw
}
/*
- Utility to extract flyfmts from a document, potentially from a
+ Utility to extract FlyFormats from a document, potentially from a
selection.
*/
Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM /*, bool bAll*/)
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index c4c9c92..df39882 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -76,7 +76,7 @@ namespace sw
In word all frames are effectively anchored to character or as
character. This is nice and simple, writer is massively complex in this
- area, so this sw::Frame simplies matters by providing a single unified
+ area, so this sw::Frame simplifies matters by providing a single unified
view of the multitute of elements in writer and their differing quirks.
A sw::Frame wraps a writer frame and is guaranteed to have a suitable
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index cb2da65..b102818 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1093,7 +1093,7 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl, const OUString &rTarget
else if ( eProto != INetProtocol::NotValid )
{
// version 2 (simple url)
- // an write some data to the data stream, but dont ask
+ // an write some data to the data stream, but don't ask
// what the data mean, except for the URL.
// The First piece is the WW8_PIC structure.
static sal_uInt8 MAGIC_B[] = {
@@ -2848,7 +2848,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
&& rSection.GetType() != TOX_CONTENT_SECTION && rSection.GetType() != TOX_HEADER_SECTION) //No sections in table
{
// if the first Node inside the section has an own
- // PageDesc or PageBreak attribute, then dont write
+ // PageDesc or PageBreak attribute, then don't write
// here the section break
sal_uLong nRstLnNum = 0;
const SfxItemSet* pSet;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 7d69967..6aecff9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1183,7 +1183,7 @@ void WW8_WrFkp::MergeToNew( short& rVarLen, sal_uInt8 *& rpNewSprms )
rVarLen = rVarLen + nOldVarLen;
}
--nIMax;
- // if this sprms dont used from others, remove it
+ // if this sprms don't used from others, remove it
bool bFnd = false;
for (sal_uInt16 n = 0; n < nIMax; ++n)
{
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index f9c3582..c929a97 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -123,7 +123,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
/*
Now we must see if the object contains a preview itself which is equal to
the preview that we are currently using. If the graphics are equal then we
- dont need to store another preview
+ don't need to store another preview
*/
GDIMetaFile aWMF;
long nX=0,nY=0;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index e6c9928..a6d0fc5 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -911,7 +911,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, SfxItemSet*& rpItemSet,
eAdj = SVX_ADJUST_LEFT;
break;
default:
- // undefied value
+ // undefined value
OSL_ENSURE( false, "Value of aLVL.nAlign is not supported" );
// take default
eAdj = SVX_ADJUST_LEFT;
@@ -938,7 +938,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, SfxItemSet*& rpItemSet,
}
else
{
- // reminder: Garnix ist default Prefix
+ // reminder: Garnix is default Prefix
if( !sPrefix.isEmpty() )
rNumFormat.SetPrefix( sPrefix );
// reminder: Point is default Postfix
More information about the Libreoffice-commits
mailing list