[Libreoffice-commits] core.git: sw/inc sw/qa
Andrea Gelmini
andrea.gelmini at gelma.net
Wed Sep 30 04:44:41 PDT 2015
sw/inc/IMark.hxx | 2 +-
sw/inc/fesh.hxx | 4 ++--
sw/inc/hintids.hxx | 2 +-
sw/inc/lineinfo.hxx | 14 +++++++-------
sw/inc/swtable.hxx | 2 +-
sw/inc/swunohelper.hxx | 2 +-
sw/inc/tox.hxx | 2 +-
sw/qa/extras/inc/swmodeltestbase.hxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 6 +++---
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 4 ++--
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 4 ++--
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 ++--
sw/qa/extras/rtfexport/rtfexport.cxx | 2 +-
sw/qa/extras/uiwriter/uiwriter.cxx | 6 +++---
15 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit cf2921ccae8531cf13921c67ad85c5aa0d924b08
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:11:00 2015 +0200
Fix typos
Change-Id: Iad3a3d77c5d4412a5c0e0b6adcb9bff3389f863c
Reviewed-on: https://gerrit.libreoffice.org/18983
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index b72ec6c..998039e 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -54,7 +54,7 @@ namespace sw { namespace mark
//setters
// not available in IMark
// inside core, you can cast to MarkBase and use its setters,
- // make sure to update the sortings in Markmanager in this case
+ // make sure to update the sorting in Markmanager in this case
//operators and comparisons (non-virtual)
bool operator<(const IMark& rOther) const
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 478d07a..cb6d9f4 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -578,7 +578,7 @@ public:
const Graphic* pGrf = 0 );
// --> #i972#
- /** for starmath formulas anchored 'as char' it alignes it baseline to baseline
+ /** for starmath formulas anchored 'as char' it aligns it baseline to baseline
changing the previous vertical orientation */
void AlignFormulaToBaseline( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 );
@@ -650,7 +650,7 @@ public:
void SetRowHeight( const SwFormatFrmSize &rSz );
- /// Pointer must be detroyed by caller != 0.
+ /// Pointer must be destroyed by caller != 0.
void GetRowHeight( SwFormatFrmSize *&rpSz ) const;
void SetRowSplit( const SwFormatRowSplit &rSz );
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 93af3fb..eccf6a4 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -437,7 +437,7 @@ SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript
// return for the given TextAttribute without an end the correct character.
// This function returns
// CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default)
-// CH_TXTATR_INWORD for Textattribute which dont breaks a word
+// CH_TXTATR_INWORD for Textattribute which doesn't breaks a word
class SwTextAttr;
sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr );
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index a1e2695..bbd7a5a 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -42,13 +42,13 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient /**< purpose of derivation
sal_uInt16 nPosFromLeft; ///< Position for paint
sal_uInt16 nCountBy; ///< Paint only for every n line
sal_uInt16 nDividerCountBy; /**< Interval for display of an user defined
- string every n lines */
- LineNumberPosition ePos; ///< Where should the display occur (number and divicer)
- bool bPaintLineNumbers; ///< Should anything be displayed?
- bool bCountBlankLines; ///< Count empty lines?
- bool bCountInFlys; ///< Count also within FlyFrames?
- bool bRestartEachPage; /**< Restart counting at the first paragraph of each page
- (even on follows when paragraphs are splitted) */
+ string every n lines */
+ LineNumberPosition ePos; ///< Where should the display occur (number and divider)
+ bool bPaintLineNumbers; ///< Should anything be displayed?
+ bool bCountBlankLines; ///< Count empty lines?
+ bool bCountInFlys; ///< Count also within FlyFrames?
+ bool bRestartEachPage; /**< Restart counting at the first paragraph of each page
+ (even on follows when paragraphs are splitted) */
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 784b398..821d7a7 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -209,7 +209,7 @@ public:
// When a table is splitted into two tables, the row spans which overlaps
// the split have to be corrected and stored for undo
// SwSavRowSpan is the structure needed by Undo to undo the split operation
- // CleanUpRowSpan corrects the (top of the) second table and delviers the structure
+ // CleanUpRowSpan corrects the (top of the) second table and delivers the structure
// for Undo
SwSaveRowSpan* CleanUpTopRowSpan( sal_uInt16 nSplitLine );
// RestoreRowSpan is called by Undo to restore the old row span values
diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx
index c00404c..40f8f88 100644
--- a/sw/inc/swunohelper.hxx
+++ b/sw/inc/swunohelper.hxx
@@ -52,7 +52,7 @@ SW_DLLPUBLIC bool UCB_DeleteFile( const OUString& rURL );
bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL,
bool bCopyIsMove = false );
- // is the URL on the current system case sentive?
+ // is the URL on the current system case sensitive?
SW_DLLPUBLIC bool UCB_IsCaseSensitiveFileName( const OUString& rURL );
// is the URL readonly?
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 22ad81e..439a540 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -422,7 +422,7 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient
protected:
// Add a data member, for record the TOC field expression of MS Word binary format
- // For keeping fedality and may giving a better exporting performance
+ // For keeping fidality and may giving a better exporting performance
OUString maMSTOCExpression;
bool mbKeepExpression;
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index c404e46..10d2b63 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -280,7 +280,7 @@ protected:
}
/**
- * Override this function if calcing layout is not needed
+ * Override this function if calc layout is not needed
*/
virtual bool mustCalcLayoutOf(const char* /*filename*/)
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 1359241..0e78cf9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -272,7 +272,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73556,"fdo73556.docx")
{
/*
* The file contains a table with 3 columns
- * the girdcols are as follows: {1210, 1331, 1210}
+ * the gridcols are as follows: {1210, 1331, 1210}
* whereas the individual cells have {1210, 400, 1210}
* The table column separators were taken from the Grid, while
* the table width was calculated as 2820 from cells instead
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 0d45a49..7fc7620 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -395,7 +395,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78469, "fdo78469.docx")
xmlDocPtr pXmlDoc = parseExport("word/header1.xml");
if (!pXmlDoc)
return;
- // make sure dataBinding & text tags not presernt in sdtcontent
+ // make sure dataBinding & text tags not present in sdtcontent
assertXPath(pXmlDoc, "/w:hdr[1]/w:tbl[1]/w:tr[1]/w:tc[2]/w:p[1]/w:sdt[2]/w:sdtPr[1]/w:dataBinding[1]",0);
assertXPath(pXmlDoc, "/w:hdr[1]/w:tbl[1]/w:tr[1]/w:tc[2]/w:p[1]/w:sdt[2]/w:sdtPr[1]/w:text[1]",0);
}
@@ -453,8 +453,8 @@ DECLARE_OOXMLEXPORT_TEST(testfdo76934, "fdo76934.docx")
DECLARE_OOXMLEXPORT_TEST(testfdo79540, "fdo79540.docx")
{
/* Issue was, <w:drawing> was getting written inside <w:drawing>.
- * So Postone the writing of Inner Drawing tag.
- * MS Office does not allow Nestimg of drawing tags.
+ * So postpone the writing of Inner Drawing tag.
+ * MS Office does not allow nesting of drawing tags.
*/
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 732d6d8..f4fd347 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -620,8 +620,8 @@ DECLARE_OOXMLEXPORT_TEST(testSmartArtAnchoredInline, "fdo73227.docx")
{
/* Given file conatins 3 DrawingML objects as 1Picture,1SmartArt and 1Shape.
* Check for SmartArt.
- * SmartArt shoould get written as "Floating Object" i.e. inside <wp:anchor> tag.
- * Also check for value of attribute "id" of <wp:docPr> . It should be unique for
+ * SmartArt should get written as "Floating Object" i.e. inside <wp:anchor> tag.
+ * Also check for value of attribute "id" of <wp:docPr>. It should be unique for
* all 3 DrawingML objects in a document.
*/
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 76ff02a..7a76674 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -370,7 +370,7 @@ DECLARE_OOXMLEXPORT_TEST(testShape3DEffectPreservation, "shape-3d-effect-preserv
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:sp3d/a:extrusionClr/a:schemeClr/a:lumOff",
"val", "60000");
- // third shape: colored countour and top and bottom bevel, plastic material
+ // third shape: colored contour and top and bottom bevel, plastic material
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:sp3d",
"contourW", "50800");
@@ -730,7 +730,7 @@ DECLARE_OOXMLEXPORT_TEST(testWordArtWithinDraingtool, "testWordArtWithinDraingto
* <p> <r> <ac> <drawing> <txbx> <txbxContent> .. <pict> </pict> </txbxContent></txbx> </drawing> </ac> </r> </p>
* After RT :
* <p> <r> <ac> <drawing> <txbx> <txbxContent> .. <drawing> <txbx> <txbxContent> .. </txbxContent></txbx> </drawing> .. </txbxContent></txbx> </drawing> </ac> </r> </p>
- * Expected : As there is nesting of a 2007 Word Art within a draing tool, then can be separated in two different runs.
+ * Expected : as there is nesting of a 2007 Word Art within a drawing tool, then can be separated in two different runs.
* */
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 20e7938..4f21820 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1253,7 +1253,7 @@ DECLARE_OOXMLIMPORT_TEST(testBnc865381, "bnc865381.docx")
DECLARE_OOXMLIMPORT_TEST(testFdo53985, "fdo53985.docx")
{
- // Unhandled excetion prevented import of the rest of the document.
+ // Unhandled exception prevented import of the rest of the document.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
@@ -2171,7 +2171,7 @@ DECLARE_OOXMLIMPORT_TEST(testLargeTwips, "large-twips.docx" )
DECLARE_OOXMLIMPORT_TEST(testNegativeCellMarginTwips, "negative-cell-margin-twips.docx" )
{
- // Sligtly related to cp#1000043, the twips value was negative, which wrapped around somewhere,
+ // Slightly related to cp#1000043, the twips value was negative, which wrapped around somewhere,
// while MSO seems to ignore that as well.
OUString width = parseDump( "/root/page/body/tab/row[1]/cell[1]/txt/infos/bounds", "width" );
CPPUNIT_ASSERT( width.toInt32() > 0 );
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 4371ef5..e63a05f 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -381,7 +381,7 @@ DECLARE_RTFEXPORT_TEST(testFdo77979, "fdo77979.odt")
DECLARE_RTFEXPORT_TEST(testFdo53113, "fdo53113.odt")
{
/*
- * The problem was that a custom shape was missings its second (and all the other remaining) coordinates.
+ * The problem was that a custom shape was missing its second (and all the other remaining) coordinates.
*
* oShape = ThisComponent.DrawPage(0)
* oPathPropVec = oShape.CustomShapeGeometry(1).Value
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 9188720..0240015 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1598,7 +1598,7 @@ void SwUiWriterTest::testTdf60967()
//moving cursor forward to check whether there is any node following the table, BTW there should not be any such node
pCrsr->Move(fnMoveForward);
SwPosition aPosMoveAfterDel(*(pCrsr->GetPoint()));
- //checking the positons to verify that the paragraph is actually deleted
+ //checking the positions to verify that the paragraph is actually deleted
CPPUNIT_ASSERT(aPosInTable == aPosAfterDel);
CPPUNIT_ASSERT(aPosInTable == aPosMoveAfterDel);
//Undo the changes
@@ -1621,7 +1621,7 @@ void SwUiWriterTest::testTdf60967()
SwPosition aPosAfterRedo(*(pCrsr->GetPoint()));
//position should be exactly same as it was after deletion of *text node*
CPPUNIT_ASSERT(aPosMoveAfterDel == aPosAfterRedo);
- //moving the cursor forward, but it should not actually move as there is no *text node* after the table due to this same postion is expected after move as it was before move
+ //moving the cursor forward, but it should not actually move as there is no *text node* after the table due to this same position is expected after move as it was before move
pCrsr->Move(fnMoveForward);
SwPosition aPosAfterUndoMove(*(pCrsr->GetPoint()));
CPPUNIT_ASSERT(aPosAfterUndoMove == aPosAfterRedo);
@@ -2054,7 +2054,7 @@ void SwUiWriterTest::testTdf57197()
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
- //Insering one row after the existing row
+ //Inserting one row after the existing row
pWrtShell->SttDoc(); //moves the cursor to the start of Doc
pWrtShell->InsertRow(1, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
More information about the Libreoffice-commits
mailing list