components/desktop/libreoffice/patches/16-std_string_poppler.patch

   1 --- libreoffice-7.5.1.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.~1~       2023-02-09 06:58:55.000000000 -0500
   2 +++ libreoffice-7.5.1.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx   2023-02-20 20:56:49.750790207 -0500
   3 @@ -145,7 +145,7 @@
   4      bool collectBytes = false;
   5      int startOfScan = 0;
   6      int b1 = -1;
   7 -    for (; ; )
   8 +    for ( ; ; )
   9      {
  10          const int b2 = b1;
  11          b1 = str->getChar();
  12 @@ -153,8 +153,8 @@
  13          if (b1 == -1)
  14              return false;
  15
  16 -        if (collectBytes)
  17 -        {
  18 +        if (collectBytes) {
  19 +
  20              outBuf.push_back(static_cast<Output_t>(b1));
  21
  22              bytesToMarker--;
  23 @@ -433,13 +433,13 @@
  24      int nSize = 0;
  25
  26  #if POPPLER_CHECK_VERSION(20, 12, 0)
  27 -    std::string familyName = gfxFont->getNameWithoutSubsetTag();
  28 +    std::string familyName( gfxFont->getNameWithoutSubsetTag() );
  29  #else
  30  #if POPPLER_CHECK_VERSION(0, 71, 0) // GooString::toStr()
  31 -    std::string familyName = gfxFont->getName()->toStr();
  32 +    std::string familyName( gfxFont->getName()->toStr() );
  33  #else
  34      const GooString* gooString = gfxFont->getName();
  35 -    std::string familyName = std::string(gooString->getCString(), gooString->getLength());
  36 +    std::string familyName( std::string(gooString->getCString(), gooString->getLength()) );
  37  #endif
  38      if (familyName.length() > 7 && familyName.at(6) == '+')
  39      {