[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests stoc/source sw/qa sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Jan 18 09:02:47 UTC 2018
qadevOOo/runner/util/DBTools.java | 2 +-
qadevOOo/tests/java/ifc/awt/_XDialog.java | 2 +-
stoc/source/javaloader/javaloader.cxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlw14export.cxx | 2 +-
sw/source/core/draw/dflyobj.cxx | 2 +-
sw/source/core/inc/rowfrm.hxx | 2 +-
sw/source/core/text/txtfrm.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 2 +-
sw/source/filter/xml/xmltbli.cxx | 2 +-
sw/source/ui/vba/vbaparagraphformat.cxx | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 66d0e154dcf1fc1fe7b80dd4ac56fa90aa6cbe38
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Jan 18 09:43:12 2018 +0100
Fix typos
Change-Id: I7aa101a5e1e47118ab94527eb37269dd7e544cf4
Reviewed-on: https://gerrit.libreoffice.org/48093
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index 52fb344b1bf2..387ba57e8b57 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -225,7 +225,7 @@ public class DBTools {
* Convert system pathname to SOffice URL string
* (for example 'C:\Temp\DBDir\' -> 'file:///C|/Temp/DBDir/').
* (for example '\\server\Temp\DBDir\' -> 'file://server/Temp/DBDir/').
- * Already converted string retured unchanged.
+ * Already converted string returned unchanged.
*/
public static String dirToUrl(String dir) {
String retVal = null;
diff --git a/qadevOOo/tests/java/ifc/awt/_XDialog.java b/qadevOOo/tests/java/ifc/awt/_XDialog.java
index 8b9f6aa527b7..65b4f47ae234 100644
--- a/qadevOOo/tests/java/ifc/awt/_XDialog.java
+++ b/qadevOOo/tests/java/ifc/awt/_XDialog.java
@@ -109,7 +109,7 @@ public class _XDialog extends MultiMethodTest {
* finished. If <code>execute</code> method didn't return
* and still running then thread interrupted. <p>
* Has <b>OK</b> status if <code>execute</code> method
- * call successfully retured.
+ * call successfully returned.
* The following method tests are to be completed successfully before :
* <ul>
* <li> <code> execute </code> </li>
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 0636e97c2236..cc2b74aae0c7 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -88,7 +88,7 @@ class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServic
/** Do not use m_javaLoader directly. Instead use getJavaLoader.
*/
css::uno::Reference<XImplementationLoader> m_javaLoader;
- /** The retured Reference contains a null pointer if the office is not configured
+ /** The returned Reference contains a null pointer if the office is not configured
to run java.
@exception css::uno::RuntimeException
diff --git a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
index c9c0a0ab87fe..4633fdaf6300 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
@@ -226,7 +226,7 @@ DECLARE_OOXMLEXPORT_TEST(Test_TextEffects_Props3d_Ligatures_NumForm_NumSpacing,
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w14:ligatures", 1);
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w14:ligatures", "val", "standardContextual");
- // Paragraph 3 - w14:numFurm and w14:numSpacing
+ // Paragraph 3 - w14:numForm and w14:numSpacing
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numForm", 1);
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numForm", "val", "lining");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[2]/w:rPr/w14:numSpacing", 1);
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 607a8978bf1d..5153dd45e53f 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -1020,7 +1020,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const Fraction& xFact, const
ResizeRect( aOutRect, rRef, xFact, yFact );
}
- // Position may also change, remember old one. This ois now already
+ // Position may also change, remember old one. This is now already
// the one in the unrotated, old coordinate system
Point aOldPos(bUseRightEdge ? GetFlyFrame()->getFrameArea().TopRight() : GetFlyFrame()->getFrameArea().Pos());
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index 1444630b0778..9ff22cc0a125 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -113,7 +113,7 @@ public:
// should not consider the setting when the split is performed
// (we should be able to keep on first page as little as required).
// When IsInSplit is true, lcl_CalcMinRowHeight will ignore the
- // mininum height setting. It is set in lcl_RecalcSplitLine around
+ // minimum height setting. It is set in lcl_RecalcSplitLine around
// lcl_RecalcRow and SwRowFrame::Calc that decide if it's possible
// to keep part of row's content on first page, and update table's
// height to fit the rest of space.
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index b23817ad6f81..d06e3d595f9d 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2167,7 +2167,7 @@ SwTwips SwTextFrame::CalcFitToContent()
SwTextFormatter aLine( this, &aInf );
SwHookOut aHook( aInf );
- // i#54031 - assure mininum of MINLAY twips.
+ // i#54031 - assure minimum of MINLAY twips.
const SwTwips nMax = std::max( SwTwips(MINLAY), aLine.CalcFitToContent_() + 1 );
{
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 5257679489ed..ccfc366f7843 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1500,7 +1500,7 @@ void WW8Export::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
pSepx->OutHeaderFooter( *this, false, rFormat, nCpPos, nHeadFootFlags, WW8_FOOTER_ODD, nBreakCode );
//#i24344# Drawing objects cannot be directly shared between main hd/ft
- //and title hd/ft so we need to differenciate them
+ //and title hd/ft so we need to differentiate them
IncrementHdFtIndex();
pSepx->OutHeaderFooter( *this, true, rFirstPageFormat, nCpPos, nHeadFootFlags, WW8_HEADER_FIRST, nBreakCode );
pSepx->OutHeaderFooter( *this, false, rFirstPageFormat, nCpPos, nHeadFootFlags, WW8_FOOTER_FIRST, nBreakCode );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index bd6f50c6fc93..1ec745d907ce 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2432,7 +2432,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox )
sal_Int32 nExtraAbs =
nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : sal_Int32(0L);
- bool bMin = false; // Do all columns get the mininum width?
+ bool bMin = false; // Do all columns get the minimum width?
bool bMinExtra = false; // Do all columns get the minimum width plus
// some extra space?
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index dc8cdb200b9c..400488882b91 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -307,7 +307,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl()
sal_Int8 nOrphan = 0;
mxParaProps->getPropertyValue("ParaOrphans") >>= nOrphan;
// if the amount of single lines on one page > 1 and the same of start and end of the paragraph,
- // true is retured.
+ // true is returned.
bool bWidow = ( nWidow > 1 && nOrphan == nWidow );
return uno::makeAny( bWidow );
}
More information about the Libreoffice-commits
mailing list