[Libreoffice-commits] core.git: filter/qa filter/source framework/source package/source qadevOOo/runner qadevOOo/tests sc/source sd/source sw/source
Ilmari Lauhakangas
ilmari.lauhakangas at libreoffice.org
Mon Dec 11 21:53:30 UTC 2017
filter/qa/complex/filter/detection/typeDetection/TypeDetection.java | 26 +++++-----
filter/source/msfilter/msdffimp.cxx | 2
filter/source/xslt/import/wordml/wordml2ooo_draw.xsl | 2
framework/source/services/frame.cxx | 2
package/source/zippackage/ZipPackage.cxx | 2
qadevOOo/runner/lib/MultiMethodTest.java | 2
qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java | 2
qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java | 8 +--
sc/source/filter/excel/xiescher.cxx | 16 +++---
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx | 2
sw/source/core/docnode/nodes.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/layout/wsfrm.cxx | 2
14 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 7d202623b007979d9d0f93f6cd62c3c031d6d1d4
Author: Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
Date: Mon Dec 11 19:14:07 2017 +0200
Fix typos and grammar
Change-Id: I4143da3c5a809118d57849664f6ab1d2e775837f
Reviewed-on: https://gerrit.libreoffice.org/46253
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index c7def3cd16e8..44a5d2de9ad0 100644
--- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -60,8 +60,8 @@ import util.utils;
* of the <code>TypeDetection<code> must match with an expected type.
*
*
- * To get information which test file should support which type, filter and
- * document service, this information was collect from configuration files:
+ * To get information on which test file should support which type, filter and
+ * document service, this information was collected from configuration files:
* <UL>
* <LI><a href="#TypeDetection.props">TypeDetection.props</a></LI>
* <LI><a href="#files.csv">files.csv</a></LI>
@@ -72,7 +72,7 @@ import util.utils;
* <p>
* <h3><A name="TypeDetection.props"></A>
* <code>typeDetection.props</code></h3>
- * At fist there will be the <code>typeDetection.props</code>. Here the following
+ * At first there will be the <code>typeDetection.props</code>. Here the following
* properties should be set (with example values):
*
* TestDocumentPath=file:///path/to/my/testdocuments
@@ -100,7 +100,7 @@ import util.utils;
* this file
*
* The second example displays two document types for
- * <code>XInputStream</CODE> (<code>generic_Text</CODE>). This
+ * <code>XInputStream</CODE> (<code>generic_Text</CODE>). These
* two document types are listed by a colon ':' as separator.
* This is needed because XInputStream can detect a text file as
* generic_Text.
@@ -112,9 +112,9 @@ import util.utils;
* filter to detect the document. This make sense ie. for csv-files: You can
* open csv files as Writer or as Calc. To check this case you have to specify
* in <code>csv.files</code> a fileAlias like ?csv_writer? and ?csv_calc? with
- * the same fileURL and it's specific defaultFileType.
- * The returned file type by <code>TypeDetection</code> must equal to
- * correspond <code>defaultFileType</code> from <code>csv.files</code>
+ * the same fileURL and its specific defaultFileType.
+ * The returned file type by <code>TypeDetection</code> must be equal to the
+ * corresponding <code>defaultFileType</code> from <code>csv.files</code>
*
* Syntax: fileAlias;FilterName;FilterOptions;FilterData
* Example: Writer6_1;%SO6productname %SO6formatversion Textdocument;
@@ -125,18 +125,18 @@ import util.utils;
* name which should be used. Here we have a special: <code>%SO6productname
* %SO6formatversion</code> will be replaced by the equals of
* <code>typeDetection.props</code>. The filter names depends on the Office
- * name and version. So a future Office could called ?StarSuite 8?.
+ * name and version. So a future Office could be called ?StarSuite 8?.
* <code>FilterOptions</code> is not relevant for this filter. But ie. for csv
* filter this entry could be used to specify the separator of the csv file.
* <code>FilterData<code> if filter needs some FilterData arguments you can
- * specify it here
+ * specify them here
*
* <p>
* <H3><a name="preselectedType.csv"></A>
* <code>preselectedType.csv</code></H3>
* In this file you can preselect the type
* <code>TypeDetection</code> should use.
- * The returned file type by <code>TypeDetection</code> must equal to the
+ * The file type returned by <code>TypeDetection</code> must be equal to the
* preselected file type.
* Note: If you try to use invalid types you will get a failed test because
* <code>TypeDetection</code> tries to find out the type itself.
@@ -153,8 +153,8 @@ import util.utils;
* <p>
* <H3><a name="serviceName.csv"></A>
* <code>serviceName.csv</code></H3> In this file you can preselect a service name
- * to detect the file type. The returned file type by
- * <code>TypeDetection</code> must equal to correspond
+ * to detect the file type. The file type returned by
+ * <code>TypeDetection</code> must be equal to the corresponding
* <code>defaultFileType</code> from <code>csv.files</code>
*
* Syntax: fileAlias;serviceName
@@ -275,7 +275,7 @@ public class TypeDetection extends ComplexTestCase {
}
/** To check the <CODE>TypeDedection</CODE> by URL the <CODE>MediaDescriptor</CODE>
- * was filled at fist with the URL only, at second with <CODE>XInputStream</CODE>
+ * was filled at first with the URL only, at second with <CODE>XInputStream</CODE>
* only. The <CODE>TypeDetection</CODE> must return the expected value
* @param fileAlias the alias name of the test file
* @param fileURL the URL of the test file
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 48ab1aaebca6..5342110a30f2 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5624,7 +5624,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
m_pBLIPInfos( new SvxMSDffBLIPInfos ),
m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ),
nOffsDgg( nOffsDgg_ ),
- nBLIPCount( USHRT_MAX ), // initialize with error, since we fist check if the
+ nBLIPCount( USHRT_MAX ), // initialize with error, since we first check if the
nGroupShapeFlags(ShapeFlag::NONE), // ensure initialization here, as some corrupted
// files may yield to this being uninitialized
maBaseURL( rBaseURL ),
diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
index a2ba7fe34e03..6762333ee17b 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
@@ -1868,7 +1868,7 @@
<xsl:variable name="value2" select="substring-after($tmp,' ')"/>
<xsl:value-of select="concat( 'atan' , '( ' , $value2, '/' , $value1 , ')' )"/>
</xsl:when><- -->
- <!-- ellipse and sumangle are always used by arc commans like this
+ <!-- ellipse and sumangle are always used by arc command like this
eqn="ellipse @24 @4 height" ; and eqn="sumangle @2 360 0"
mod is always used too.-->
<!--mod =sqrt( v*v + P1×P1 + P2×P2). ( 3 parameters )-->
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index a1dacfb93ff9..29d9371ca185 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2044,7 +2044,7 @@ void Frame::implts_forgetSubFrames()
/*-****************************************************************************************************
@short destroy instance
- @descr The owner of this object calles the dispose method if the object
+ @descr The owner of this object calls the dispose method if the object
should be destroyed. All other objects and components, that are registered
as an EventListener are forced to release their references to this object.
Furthermore this frame is removed from its parent frame container to release
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 9a762d445092..c2ec7800d96e 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -428,7 +428,7 @@ void ZipPackage::parseContentType()
if ( aContentTypeInfo.getLength() != 2 )
throw io::IOException(THROW_WHERE );
- // set the implicit types fist
+ // set the implicit types first
for ( nInd = 0; nInd < aContentTypeInfo[0].getLength(); nInd++ )
m_xRootFolder->setChildStreamsTypeByExtension( aContentTypeInfo[0][nInd] );
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index 75c2a163c8a9..45ef58eb3054 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -114,7 +114,7 @@ public class MultiMethodTest
* Runs the interface test: its method tests. First, it initializes some
* of MultiMethodTest fields, like tRes, log, tEnv, etc. Then, it queries
* the tested interface and initializes 'oObj' field (defined in a
- * subclass). Before calling method tests, before() method calles to allow
+ * subclass). Before calling method tests, before() method is called to allow
* initialization of s stuff before testing. Then, the method tests are
* called. After them, after() method is called, to allow cleaning up the
* stuff initialized in before() and test methods.
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
index bd88640f72eb..b48d11ff8781 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
@@ -73,7 +73,7 @@ public class _XDispatchRecorder extends MultiMethodTest {
oObj.startRecording(xFrame);
- log.println("dispatch calles via API must be recorded");
+ log.println("dispatch calls via API must be recorded");
dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText");
PropertyValue prop = new PropertyValue();
diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
index 6eeee9ba990a..4dedd74cf6d9 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
@@ -93,9 +93,9 @@ public class _XTextRangeCompare extends MultiMethodTest {
/**
* One cursor is created and to its position a paragraph
- * inserted, then the fist five characters was selected.
+ * inserted, then the first five characters were selected.
* A second cursor was created and the last 7 characters
- * was selected.<p>
+ * were selected.<p>
*
* Has <b>OK</b> status if the compare returns 1, i.e.
* the second cursor end is before the first.
@@ -134,9 +134,9 @@ public class _XTextRangeCompare extends MultiMethodTest {
/**
* One cursor is created and to its position a paragraph
- * inserted, then the fist five characters was selected.
+ * inserted, then the first five characters were selected.
* A second cursor was created and the last 7 characters
- * was selected.<p>
+ * were selected.<p>
*
* Has <b>OK</b> status if the compare returns 1, i.e.
* the second cursor start is before the first.
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index e883101f20e2..fac3b9425865 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2147,7 +2147,7 @@ void XclImpCheckBoxObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sa
maTextData.maData.mnFlags = rStrm.ReaduInt16();
rStrm.Ignore( 20 );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
ReadCellLinkFormula( rStrm, true );
maTextData.maData.mnTextLen = rStrm.ReaduInt16();
maTextData.ReadByteString( rStrm );
@@ -2239,7 +2239,7 @@ void XclImpOptionButtonObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen
maTextData.maData.mnFlags = rStrm.ReaduInt16();
rStrm.Ignore( 32 );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
ReadCellLinkFormula( rStrm, true );
maTextData.maData.mnTextLen = rStrm.ReaduInt16();
maTextData.ReadByteString( rStrm );
@@ -2360,7 +2360,7 @@ void XclImpGroupBoxObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sa
maTextData.maData.mnFlags = rStrm.ReaduInt16();
rStrm.Ignore( 26 );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
maTextData.maData.mnTextLen = rStrm.ReaduInt16();
maTextData.ReadByteString( rStrm );
maTextData.maData.mnShortcut = rStrm.ReaduInt16();
@@ -2441,7 +2441,7 @@ void XclImpEditObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uI
maTextData.maData.mnFlags = rStrm.ReaduInt16();
rStrm.Ignore( 14 );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
maTextData.maData.mnTextLen = rStrm.ReaduInt16();
maTextData.ReadByteString( rStrm );
mnContentType = rStrm.ReaduInt16();
@@ -2549,7 +2549,7 @@ void XclImpSpinButtonObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen,
ReadFrameData( rStrm );
ReadSbs( rStrm );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
ReadCellLinkFormula( rStrm, true );
}
@@ -2586,7 +2586,7 @@ void XclImpScrollBarObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, s
ReadFrameData( rStrm );
ReadSbs( rStrm );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
ReadCellLinkFormula( rStrm, true );
}
@@ -2672,7 +2672,7 @@ void XclImpListBoxObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal
maTextData.maData.mnDefFontIdx = rStrm.ReaduInt16();
rStrm.Ignore( 4 );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
ReadCellLinkFormula( rStrm, true );
ReadFullLbsData( rStrm, rStrm.GetRecLeft() );
mbHasDefFontIdx = true;
@@ -2777,7 +2777,7 @@ void XclImpDropDownObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sa
mnBottom = rStrm.ReaduInt16();
rStrm.Ignore( 4 );
ReadName5( rStrm, nNameLen );
- ReadMacro5( rStrm, rStrm.ReaduInt16() ); // fist macro size invalid and unused
+ ReadMacro5( rStrm, rStrm.ReaduInt16() ); // first macro size invalid and unused
ReadCellLinkFormula( rStrm, true );
ReadFullLbsData( rStrm );
mbHasDefFontIdx = true;
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 008321e0b0ee..a6e35ef27be3 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -523,7 +523,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if ((dynamic_cast<const E3dObject* >(pObject) != nullptr) && (rMarkList.GetMarkCount() == 1))
{
mpWindow->SetPointer(Pointer(PointerStyle::Rotate));
- bDefPointer = false; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again
+ bDefPointer = false; // Otherwise it'll be called Joe's routine and the mousepointer will reconfigurate again
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
index 4da9ca05f92d..bccb196c2d78 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
@@ -75,7 +75,7 @@ protected:
virtual void Run() = 0;
private:
- /** This timer is used to collect calles to RequestCompaction() and
+ /** This timer is used to collect calls to RequestCompaction() and
eventually call Run().
*/
Timer maCompactionTimer;
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 4fb732b02da1..79c8076c11b1 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1250,7 +1250,7 @@ sal_uInt16 SwNodes::GetSectionLevel(const SwNodeIndex &rIdx)
{
// special treatment for 1st Node
if(rIdx == 0) return 1;
- // no recursion! This calles a SwNode::GetSectionLevel (missing "s")
+ // no recursion! This calls a SwNode::GetSectionLevel (missing "s")
return rIdx.GetNode().GetSectionLevel();
}
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 8320b6306373..fb86b9aa3455 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -60,7 +60,7 @@ static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size &rO
static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
{
- //call fist all not SwNoTextFrames, then the SwNoTextFrames.
+ //call first all not SwNoTextFrames, then the SwNoTextFrames.
// The reason is, that in the SwNoTextFrames the Graphic
// after a Paint will be swapped out! So all other "behind"
// them haven't a loaded Graphic.
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 1532dd99f61e..be7264c424e0 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1601,7 +1601,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
}
else
{
- //The page can shrink to 0. The fist page keeps the same size like
+ //The page can shrink to 0. The first page keeps the same size like
//VisArea.
nChg = nDiff;
long nInvaAdd = 0;
More information about the Libreoffice-commits
mailing list