[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/gtk/gtkinst.hxx |    3 +++
 vcl/unx/gtk3/gtkframe.cxx   |   11 ++---------
 vcl/unx/gtk3/gtkinst.cxx    |   22 +++++++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 1f8095ad5f073c14b9e604d02dda4435eb23fefa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 24 09:19:16 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 24 21:41:34 2021 +0200

    gtk4: merge some common dnd and cnp blocks
    
    Change-Id: I195eb7ae3fda492a36423f57139550cb7fef9b2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117765
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 4c9eea3b8d48..7203d4a0b131 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -65,6 +65,9 @@ struct read_transfer_result
     std::vector<sal_Int8> aVector;
 
     static void read_block_async_completed(GObject* source, GAsyncResult* res, gpointer user_data);
+
+    OUString get_as_string() const;
+    css::uno::Sequence<sal_Int8> get_as_sequence() const;
 };
 
 #endif
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 3f13023d76f4..529c39e7f0dc 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4417,16 +4417,9 @@ public:
             pInstance->DoYield(true, false);
 
         if (aFlavor.MimeType == "text/plain;charset=utf-8")
-        {
-            const char* pStr = reinterpret_cast<const char*>(aRes.aVector.data());
-            OUString aStr(pStr, aRes.aVector.size(), RTL_TEXTENCODING_UTF8);
-            aRet <<= aStr.replaceAll("\r\n", "\n");
-        }
+            aRet <<= aRes.get_as_string();
         else
-        {
-            auto aSeq = css::uno::Sequence<sal_Int8>(aRes.aVector.data(), aRes.aVector.size());
-            aRet <<= aSeq;
-        }
+            aRet <<= aRes.get_as_sequence();
 #endif
         return aRet;
     }
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f3f739454e3b..f062dc5c13a4 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -696,6 +696,17 @@ void read_transfer_result::read_block_async_completed(GObject* source, GAsyncRes
                               read_block_async_completed,
                               user_data);
 }
+
+OUString read_transfer_result::get_as_string() const
+{
+    const char* pStr = reinterpret_cast<const char*>(aVector.data());
+    return OUString(pStr, aVector.size(), RTL_TEXTENCODING_UTF8).replaceAll("\r\n", "\n");
+}
+
+css::uno::Sequence<sal_Int8> read_transfer_result::get_as_sequence() const
+{
+    return css::uno::Sequence<sal_Int8>(aVector.data(), aVector.size());
+}
 #endif
 
 namespace {
@@ -810,16 +821,9 @@ public:
             pInstance->DoYield(true, false);
 
         if (aFlavor.MimeType == "text/plain;charset=utf-8")
-        {
-            const char* pStr = reinterpret_cast<const char*>(aRes.aVector.data());
-            OUString aStr(pStr, aRes.aVector.size(), RTL_TEXTENCODING_UTF8);
-            aRet <<= aStr.replaceAll("\r\n", "\n");
-        }
+            aRet <<= aRes.get_as_string();
         else
-        {
-            auto aSeq = css::uno::Sequence<sal_Int8>(aRes.aVector.data(), aRes.aVector.size());
-            aRet <<= aSeq;
-        }
+            aRet <<= aRes.get_as_sequence();
 #endif
         return aRet;
     }