vcl/inc/unx/gtk/gtkinst.hxx | 2 +-
vcl/unx/gtk3/gtkframe.cxx | 4 ++--
vcl/unx/gtk3/gtkinst.cxx | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4bc36fd91b4d1fa933bdaf8b46a48f59a0d83c0a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun May 23 20:08:52 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon May 24 09:46:30 2021 +0200
rename m_aMimeTypeToAtom to m_aMimeTypeToGtkType
Change-Id: I91d1031ec2feb2c434bb7c2fa18e632738a315b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116024
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 7058c383c8a3..2b4bd05f62ad 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -73,7 +73,7 @@ class GtkTransferable : public
cppu::WeakImplHelper<css::datatransfer::XTransfer
{
protected:
#if !GTK_CHECK_VERSION(4, 0, 0)
- std::map<OUString, GdkAtom> m_aMimeTypeToAtom;
+ std::map<OUString, GdkAtom> m_aMimeTypeToGtkType;
#endif
#if GTK_CHECK_VERSION(4, 0, 0)
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 2ef7a8ffb02a..49921d966a53 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4260,8 +4260,8 @@ public:
if (aFlavor.MimeType == "text/plain;charset=utf-16")
aFlavor.MimeType = "text/plain;charset=utf-8";
- auto it = m_aMimeTypeToAtom.find(aFlavor.MimeType);
- if (it == m_aMimeTypeToAtom.end())
+ auto it = m_aMimeTypeToGtkType.find(aFlavor.MimeType);
+ if (it == m_aMimeTypeToGtkType.end())
return css::uno::Any();
/* like gtk_clipboard_wait_for_contents run a sub loop
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 5d991ccf840b..332f700237fd 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -604,7 +604,7 @@ std::vector<css::datatransfer::DataFlavor>
GtkTransferable::getTransferDataFlavo
RTL_TEXTENCODING_UTF8);
#if !GTK_CHECK_VERSION(4, 0, 0)
- m_aMimeTypeToAtom[aFlavor.MimeType] = targets[i];
+ m_aMimeTypeToGtkType[aFlavor.MimeType] = targets[i];
#endif
aFlavor.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
@@ -728,8 +728,8 @@ public:
}
#if !GTK_CHECK_VERSION(4, 0, 0)
- auto it = m_aMimeTypeToAtom.find(rFlavor.MimeType);
- if (it == m_aMimeTypeToAtom.end())
+ auto it = m_aMimeTypeToGtkType.find(rFlavor.MimeType);
+ if (it == m_aMimeTypeToGtkType.end())
return css::uno::Any();
GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
