in master: failing tests / no matching locale

Lionel Elie Mamane lionel at mamane.lu
Thu Jul 23 04:52:19 PDT 2015


On Thu, Jul 23, 2015 at 12:57:53PM +0200, Eike Rathke wrote:
> On Wednesday, 2015-07-22 18:50:35 +0200, Lionel Elie Mamane wrote:

> > @@ -1483,14 +1483,15 @@ void BackendImpl::PackageImpl::scanBundle(
> >              subType.equalsIgnoreAsciiCase(
> > 	     "vnd.sun.star.package-bundle-description"))
> >          {
> >              // check locale:
> > -            param = params.find("locale");
> > -            if (param == 0) {
> > +            auto const iterLocale = params.find("locale");
> > +            if (iterLocale == params.end())
> > +            {
> >                  if (descrFile.isEmpty())
> >                      descrFile = url;
> >              }
> >              else {
> >                  // match best locale:
> > -                LanguageTag descrTag( param->m_sValue);
> > +                LanguageTag descrTag(iter->second.m_sValue);
> 
> From a quick glance this looks as if instead it should be
> 
>                    LanguageTag
>                    descrTag(iterLocale->second.m_sValue);

Something equivalent to this was done, fixes the tests and Michael
confirmed that this was not an intended change (in other words, the
old code was correct).

https://gerrit.libreoffice.org/17305

-- 
Lionel


More information about the LibreOffice mailing list