[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/ios vcl/source

[Tor Lillqvist (via logerrit)]

 vcl/ios/DataFlavorMapping.cxx    |    2 +-
 vcl/source/treelist/transfer.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b05c1a717861c6f0353581dc6a0aa894693be538
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Dec 16 19:24:20 2021 +0200
Commit:     Tor Lillqvist <t...@iki.fi>
CommitDate: Wed Mar 9 12:21:53 2022 +0200

    Fix iOS compilation after recent changes to Sequence
    
    Change-Id: I73c519174029766a3a2f61f9ad93fd63589b8184
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126957
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <t...@collabora.com>

diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index 6a3815cf7eb3..05abf2b8a6f9 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -559,7 +559,7 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray* 
types) const
         if (isValidFlavor(oOOFlavor))
         {
             flavors.realloc(flavors.getLength() + 1);
-            flavors[flavors.getLength() - 1] = oOOFlavor;
+            flavors.getArray()[flavors.getLength() - 1] = oOOFlavor;
             SAL_INFO("vcl.ios.clipboard",
                      "Mapped " << [sysFormat UTF8String] << " to " << 
oOOFlavor.MimeType);
         }
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 81c99653578f..6875154d5ba3 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -666,7 +666,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& 
rBitmapEx, const DataFlavo
 #ifdef IOS
             // Use faster compression on slow devices
             aFilterData.realloc(aFilterData.getLength() + 1);
-            aFilterData[aFilterData.getLength() - 1].Name = "Compression";
+            aFilterData.getArray()[aFilterData.getLength() - 1].Name = 
"Compression";
 
             // We "know" that this gets passed to zlib's deflateInit2_(). 1 
means best speed. For a
             // typical 15 megapixel image from a DSLR, we are talking about a 
difference of 17 s for
@@ -675,7 +675,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& 
rBitmapEx, const DataFlavo
             // Sure, the best would be to not have to re-encode the image at 
all, but have access to
             // the original JPEG or PNG when there is a such.
 
-            aFilterData[aFilterData.getLength() - 1].Value <<= 1;
+            aFilterData.getArray()[aFilterData.getLength() - 1].Value <<= 1;
 #endif
             vcl::PNGWriter aPNGWriter(rBitmapEx, &aFilterData);