[Libreoffice-commits] core.git: 2 commits - extras/source svtools/source

[Andrea Gelmini (via logerrit)]

 extras/source/templates/draw/bpmn/content.xml |    4 ++--
 svtools/source/misc/sampletext.cxx            |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 70eb16ed8781264ac883bc799459ada9545103c7
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Oct 23 17:32:18 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Oct 25 09:56:20 2020 +0100

    Fix typo
    
    It passed "make check" on Linux
    
    Change-Id: I52796ff1e64a125d84e83261d0193e9f37e76a15
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104738
    Tested-by: Jenkins
    Reviewed-by: Andreas Kainz <kainz.a at gmail.com>

diff --git a/extras/source/templates/draw/bpmn/content.xml b/extras/source/templates/draw/bpmn/content.xml
index 5bff85ecd219..7cf9fd2141ca 100644
--- a/extras/source/templates/draw/bpmn/content.xml
+++ b/extras/source/templates/draw/bpmn/content.xml
@@ -846,7 +846,7 @@
         <draw:frame draw:style-name="gr10" draw:text-style-name="P10" draw:layer="layout" svg:width="6.783cm" svg:height="2.188cm" svg:x="5.97cm" svg:y="10.75cm">
           <draw:text-box>
             <text:p>
-              <text:span text:style-name="T4">Direct formating </text:span>
+              <text:span text:style-name="T4">Direct formatting </text:span>
               <text:span text:style-name="T5">BPMN gallery items use 11px font size to fit well in writer and draw. Bold borders have 0,10 mm line width.</text:span>
             </text:p>
           </draw:text-box>
@@ -923,7 +923,7 @@
           <draw:text-box>
             <text:p>
               <text:span text:style-name="T4">BPMN gallery </text:span>
-              <text:span text:style-name="T5">gallery items store the styles as direct formating style, so when you move an gallery item into the page click Format → Clear Direct Formating and the gallery items use the defined styles. </text:span>
+              <text:span text:style-name="T5">gallery items store the styles as direct formatting style, so when you move an gallery item into the page click Format → Clear Direct Formatting and the gallery items use the defined styles. </text:span>
             </text:p>
           </draw:text-box>
         </draw:frame>
commit bb23417ce4d5e757f497c07ddc24f87d91f60310
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Oct 24 11:56:03 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Oct 25 09:56:06 2020 +0100

    Replace list by vector in svtools/sampletext
    
    Change-Id: I5ccff96e6369ff602e049dbaab1612574b729a4b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104750
    Tested-by: Jenkins
    Reviewed-by: DaeHyun Sung <sungdh86+git at gmail.com>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index bf3b128b68fe..1cd48482bc62 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -14,7 +14,7 @@
 #include <i18nutil/unicode.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <list>
+#include <vector>
 #include <map>
 
 // This should only be used when a commonly used font incorrectly declares its
@@ -1216,7 +1216,7 @@ namespace
     }
 }
 
-const std::map<UScriptCode, std::list<OUString>> distCjkMap =
+const std::map<UScriptCode, std::vector<OUString>> distCjkMap =
 {
     { USCRIPT_KOREAN,  { " KR", "Korean"} },   // Korean
     { USCRIPT_JAPANESE, {" JP", "Japanese"} } , // Japanese
@@ -1273,10 +1273,10 @@ namespace
 
             // for the last time, Check the ISO code strings or font specific strings
             const OUString &rName = rDevice.GetFont().GetFamilyName();
-            std::map<UScriptCode, std::list<OUString>>::const_iterator distCjkMapIt;
+            std::map<UScriptCode, std::vector<OUString>>::const_iterator distCjkMapIt;
             for (distCjkMapIt = distCjkMap.begin(); distCjkMapIt != distCjkMap.end(); ++distCjkMapIt) {
-                std::list<OUString> cjkCodeList = distCjkMapIt->second;
-                std::list<OUString>::const_iterator cjkPtr;
+                std::vector<OUString> cjkCodeList = distCjkMapIt->second;
+                std::vector<OUString>::const_iterator cjkPtr;
                 for (cjkPtr = cjkCodeList.begin(); cjkPtr != cjkCodeList.end(); ++cjkPtr) {
                     if (rName.indexOf(*cjkPtr) > 0) {
                         return distCjkMapIt->first;