basic/source/runtime/runtime.cxx | 2 +- i18npool/source/breakiterator/data/README | 4 ++-- lotuswordpro/inc/lwpobjhdr.hxx | 2 +- offapi/com/sun/star/drawing/XControlShape.idl | 2 +- offapi/com/sun/star/frame/XTitle.idl | 2 +- offapi/com/sun/star/text/WritingMode2.idl | 2 +- offapi/com/sun/star/ucb/XSourceInitialization.idl | 2 +- oox/source/crypto/AgileEngine.cxx | 2 +- qadevOOo/tests/java/ifc/view/_XPrintable.java | 2 +- sw/qa/extras/uiwriter/uiwriter.cxx | 2 +- sw/source/filter/ww8/wrtww8.hxx | 4 ++-- sw/source/ui/table/instable.cxx | 2 +- vbahelper/source/vbahelper/vbaapplicationbase.cxx | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit ea96a4815e456295ca7454475e54cd8b0ba5c388 Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Mon Jul 23 16:24:56 2018 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Mon Jul 23 23:40:22 2018 +0200 Fix typos Change-Id: If6e6df9ac592c77f19e381e50b7eb26fbf429f61 Reviewed-on: https://gerrit.libreoffice.org/57831 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Jenkins diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 9f242dab4ba8..99612cbee157 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1818,7 +1818,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b // LHS try determine if a default prop exists // again like in StepPUT (see there too ) we are tweaking the // heuristics again for when to assign an object reference or - // use default memebers if they exists + // use default members if they exist // #FIXME we really need to get to the bottom of this mess bool bObjAssign = false; if ( refVar->GetType() == SbxOBJECT ) diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README index 63f25a1ccd07..6246b80ae77f 100644 --- a/i18npool/source/breakiterator/data/README +++ b/i18npool/source/breakiterator/data/README @@ -441,7 +441,7 @@ Author: Oliver Bolte <o...@openoffice.org> Date: Tue Jan 11 10:18:37 2005 +0000 INTEGRATION: CWS i18n15 (1.16.4); FILE MERGED - 2004/10/07 18:19:11 khong 1.16.4.1: #i33756# update Hangarian breakiterator + 2004/10/07 18:19:11 khong 1.16.4.1: #i33756# update Hungarian breakiterator commit d2a6a31e6981800c2a920f8c6ff901c341a0466e Author: Kurt Zenker <k...@openoffice.org> @@ -509,7 +509,7 @@ Date: Wed Mar 17 08:02:01 2004 +0000 INTEGRATION: CWS i18n11 (1.12.14); FILE MERGED 2004/02/10 14:21:13 er 1.12.14.3: RESYNC: (1.12-1.13); FILE MERGED - 2004/02/05 16:45:30 khong 1.12.14.2: #i24850# fix the problem in previousCharBlock, when target char block is in poistion 1 + 2004/02/05 16:45:30 khong 1.12.14.2: #i24850# fix the problem in previousCharBlock, when target char block is in position 1 2004/02/04 02:13:48 khong 1.12.14.1: #i24098# check boundary condition for Sentence, Script, CharBlock breakiterator commit 4da98b648497af30de0fcf1a16e649ce18b0564f diff --git a/lotuswordpro/inc/lwpobjhdr.hxx b/lotuswordpro/inc/lwpobjhdr.hxx index 7c270aff5d34..12c4169bf8e8 100644 --- a/lotuswordpro/inc/lwpobjhdr.hxx +++ b/lotuswordpro/inc/lwpobjhdr.hxx @@ -76,7 +76,7 @@ private: sal_uInt32 m_nSize; //Data size bool m_bCompressed; - //localize the following memebers to save memory + //localize the following members to save memory //sal_uInt8 m_nFlagBits; //sal_uInt32 m_nVersionID; //sal_uInt32 m_nRefCount; diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index dbbacfa82639..6513d71bf006 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -6368,7 +6368,7 @@ void SwUiWriterTest::testFontEmbedding() xStorable->storeToURL(aTempFile.GetURL(), aDescriptor); CPPUNIT_ASSERT(aTempFile.IsValid()); - // Check setting - No font enbedding should be enabled + // Check setting - No font embedding should be enabled pXmlDoc = parseExportInternal(aTempFile.GetURL(),"settings.xml"); CPPUNIT_ASSERT(pXmlDoc); assertXPathContent(pXmlDoc, aSettingsBaseXpath + "/config:config-item[@config:name='EmbedFonts']", "false"); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index a60b21f12c86..df66ce5f37aa 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -708,7 +708,7 @@ public: /// Setter for pISet. void SetCurItemSet( const SfxItemSet* pS ) { m_pISet = pS; } - /// Remember some of the memebers so that we can recurse in WriteText(). + /// Remember some of the members so that we can recurse in WriteText(). virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ); /// Restore what was saved in SaveData(). @@ -1149,7 +1149,7 @@ public: SwWW8Writer& GetWriter() const { return *m_pWriter; } SvStream& Strm() const { return m_pWriter->Strm(); } - /// Remember some of the memebers so that we can recurse in WriteText(). + /// Remember some of the members so that we can recurse in WriteText(). virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) override; /// Restore what was saved in SaveData(). diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 82dff402d7dd..03935c050586 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -182,7 +182,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, SelFormatHdl, weld::TreeView&, void) lbIndex = static_cast<sal_uInt8>(m_xLbFormat->get_selected_index()); tbIndex = lbIndexToTableIndex( lbIndex ); - // To understand this index maping, look InitAutoTableFormat function to + // To understand this index mapping, look InitAutoTableFormat function to // see how listbox item is implemented. if( tbIndex < 255 ) m_aWndPreview.NotifyChange( (*pTableTable)[tbIndex] ); diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 84b193ee9c1f..c10ce37aef61 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -127,7 +127,7 @@ IMPL_LINK_NOARG(VbaTimer, MacroCallHdl, Timer *, void) {} } - // mast be the last call in the method since it deletes the timer + // must be the last call in the method since it deletes the timer try { m_xBase->OnTime( uno::makeAny( m_aTimerInfo.second.first ), m_aTimerInfo.first, uno::makeAny( m_aTimerInfo.second.second ), uno::makeAny( false ) ); commit 52f98086fd7f8eca8dbd104451a8cb9cb3de365f Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Mon Jul 23 16:32:29 2018 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Mon Jul 23 23:40:07 2018 +0200 Fix typos Change-Id: I22c02c9d4e121d3cb3b68be9a5c845e9e45cc123 Reviewed-on: https://gerrit.libreoffice.org/57603 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Jenkins diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl index 11d64077992b..cd59ed3f5764 100644 --- a/offapi/com/sun/star/drawing/XControlShape.idl +++ b/offapi/com/sun/star/drawing/XControlShape.idl @@ -40,7 +40,7 @@ published interface XControlShape: com::sun::star::drawing::XShape @return if there is already a control model assigned - to this ControlShape, than its returned. + to this ControlShape, then it's returned. Otherwise you get an empty reference. */ com::sun::star::awt::XControlModel getControl(); diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl index 26cc8ca6a642..54116b6ae162 100644 --- a/offapi/com/sun/star/frame/XTitle.idl +++ b/offapi/com/sun/star/frame/XTitle.idl @@ -25,7 +25,7 @@ module com { module sun { module star { module frame { -/** an interface representing an entity with a modifyable title. +/** an interface representing an entity with a modifiable title. */ interface XTitle : com::sun::star::uno::XInterface { diff --git a/offapi/com/sun/star/text/WritingMode2.idl b/offapi/com/sun/star/text/WritingMode2.idl index 98f58b4adfd4..4f1800b06a0d 100644 --- a/offapi/com/sun/star/text/WritingMode2.idl +++ b/offapi/com/sun/star/text/WritingMode2.idl @@ -26,7 +26,7 @@ /** this set of constants describes different writing directions - <p>In addition to numerous explicit writing directions, it allows allows to specify to take the writing + <p>In addition to numerous explicit writing directions, it allows to specify to take the writing direction from the object's context.</p> */ published constants WritingMode2 diff --git a/offapi/com/sun/star/ucb/XSourceInitialization.idl b/offapi/com/sun/star/ucb/XSourceInitialization.idl index 07a5a5841e19..c36794ab905b 100644 --- a/offapi/com/sun/star/ucb/XSourceInitialization.idl +++ b/offapi/com/sun/star/ucb/XSourceInitialization.idl @@ -38,7 +38,7 @@ published interface XSourceInitialization: com::sun::star::uno::XInterface <p>Hopefully you will only use this, when <var>Source</var> is an com::sun::star::lang::XComponent and this is an com::sun::star::lang::XEventListener. - Than you should call + Then you should call com::sun::star::lang::XComponent::addEventListener() from inside the implementation of this method. diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index 299ba2802bfe..80c233d95655 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -431,7 +431,7 @@ bool AgileEngine::decrypt(BinaryXInputStream& aInputStream, aCryptoHash.update(aSizeBytes); aInputStream.skip(4); // Reserved 4 Bytes - // accout for reserved 4 bytes (must be 0) + // account for reserved 4 bytes (must be 0) std::vector<sal_uInt8> aReserved{0,0,0,0}; aCryptoHash.update(aReserved); diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java index bea28547ded4..06515f66db39 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintable.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java @@ -164,7 +164,7 @@ public class _XPrintable extends MultiMethodTest { result &= fileExists ; } } catch (com.sun.star.uno.Exception e) { - log.println("Error while while checking file '" + + log.println("Error while checking file '" + fileURL + "': "); e.printStackTrace(log); result = false ; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits