oovbaapi/ooo/vba/excel/XLineObjects.idl | 2 +- oox/source/dump/xlsbdumper.ini | 2 +- sfx2/classification/xNL.xsd | 2 +- sw/uiconfig/swriter/ui/notebookbar_compact.ui | 2 +- vcl/source/font/fontcache.cxx | 2 +- vcl/win/app/salinst.cxx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit b5a2dbdb7dbe4f9286dee7b451e06e7f82e9e787 Author: Andrea Gelmini <andrea.gelm...@gelma.net> Date: Sun Apr 1 16:46:19 2018 +0200 Fix typos Change-Id: Ie6ce882d5d39cdd24d0647b9fdddabafeee1d25f Reviewed-on: https://gerrit.libreoffice.org/52277 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/oovbaapi/ooo/vba/excel/XLineObjects.idl b/oovbaapi/ooo/vba/excel/XLineObjects.idl index a361beb0d2e4..031108cb624c 100644 --- a/oovbaapi/ooo/vba/excel/XLineObjects.idl +++ b/oovbaapi/ooo/vba/excel/XLineObjects.idl @@ -30,7 +30,7 @@ module ooo { module vba { module excel { <p>The following sheet symbols represent collections of line objects, and therefore implement this interface:</p> <ul><li>Arcs: arc objects, and</li> - <li>Lines: straight line ojects.</li></ul> + <li>Lines: straight line objects.</li></ul> <p>This symbol is now deprecated in VBA but kept for compatibility with old VBA scripts.</p> diff --git a/oox/source/dump/xlsbdumper.ini b/oox/source/dump/xlsbdumper.ini index e4b5f920edc6..4dc5346e3165 100644 --- a/oox/source/dump/xlsbdumper.ini +++ b/oox/source/dump/xlsbdumper.ini @@ -934,7 +934,7 @@ end # PTFITEM -------------------------------------------------------------------- -shortlist=PTFITEM-TYPE,0,data,default,sum,count-all,average,max,min,product,count-mumbers,std-dev,std-dev-p,var,var-p,grand-total,blank +shortlist=PTFITEM-TYPE,0,data,default,sum,count-all,average,max,min,product,count-numbers,std-dev,std-dev-p,var,var-p,grand-total,blank flagslist=PTFITEM-FLAGS 0x0001=hidden diff --git a/sfx2/classification/xNL.xsd b/sfx2/classification/xNL.xsd index ce67d6367e26..1e5cafe16bc8 100644 --- a/sfx2/classification/xNL.xsd +++ b/sfx2/classification/xNL.xsd @@ -78,7 +78,7 @@ </xs:attribute> <xs:attribute name="Usage" type="PartyNameUsageList"> <xs:annotation> - <xs:documentation>Tye of use of this data. e.g. data exchange, contact, update, create</xs:documentation> + <xs:documentation>Type of use of this data. e.g. data exchange, contact, update, create</xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute name="Status" type="ct:StatusList"> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index ec1483fe1a04..018bf2abc7df 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -5454,7 +5454,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="svtlo-ManagedMenuButton" id="wrapp:MenuWrap"> + <object class="svtlo-ManagedMenuButton" id="wrap:MenuWrap"> <property name="label" translatable="yes" context="notebookbar_compact|wrapb">Wrap</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx index 011212fbdde3..f52eb6e30e16 100644 --- a/vcl/source/font/fontcache.cxx +++ b/vcl/source/font/fontcache.cxx @@ -217,7 +217,7 @@ LogicalFontInstance* ImplFontCache::GetGlyphFallbackFont( PhysicalFontCollection //fdo#33898 If someone has EUDC installed then they really want that to //be used as the first-choice glyph fallback seeing as it's filled with //private area codes with don't make any sense in any other font so - //prioritise it here if it's available. Ideally we would remove from + //prioritize it here if it's available. Ideally we would remove from //rMissingCodes all the glyphs which it is able to resolve as an //optimization, but that's tricky to achieve cross-platform without //sufficient heavy-weight code that's likely to undo the value of the diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 02b9e76d65c1..125d375096a9 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -284,7 +284,7 @@ SalData::SalData() mnCacheDCInUse = 0; // count of CacheDC in use mbObjClassInit = false; // is SALOBJECTCLASS initialised mbInPalChange = false; // is in WM_QUERYNEWPALETTE - mnAppThreadId = 0; // Id from Applikation-Thread + mnAppThreadId = 0; // Id from Application-Thread mbScrSvrEnabled = FALSE; // ScreenSaver enabled mpFirstIcon = nullptr; // icon cache, points to first icon, NULL if none mpTempFontItem = nullptr; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits