vcl/unx/gtk3/app/gtk3gtkinst.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit b678e62b36418aa8dcac8fd268a31441434ec116 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 27 11:06:57 2015 +0100 gtk3: paste special empty the paste special listener listens to owner changed, but expects the owner changed event to contain the new contents, while the original code expected getContents to be explicitly called to get the new contents. So on owner changed always return the up to date contents Change-Id: Iaa7df2c01d360c3c5831b2258b4c2d41740fdffc (cherry picked from commit 26786ae2e98cbe041766872e9aacce6d07e6a5c4) Reviewed-on: https://gerrit.libreoffice.org/18054 Reviewed-by: Michael Meeks <michael.me...@collabora.com> Tested-by: Michael Meeks <michael.me...@collabora.com> diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx index 76b44da..d8614df 100644 --- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx @@ -529,7 +529,6 @@ void VclGtkClipboard::setContents( std::list< Reference< datatransfer::clipboard::XClipboardListener > > xListeners( m_aListeners ); datatransfer::clipboard::ClipboardEvent aEv; - aEv.Contents = m_aContents; if (m_aContents.is()) { @@ -579,6 +578,8 @@ void VclGtkClipboard::setContents( m_aGtkTargets = aGtkTargets; } + aEv.Contents = getContents(); + aGuard.clear(); if( xOldOwner.is() && xOldOwner != xClipboardOwner )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits