[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
Caolán McNamara
caolanm at redhat.com
Wed Jun 24 06:06:06 PDT 2015
vcl/unx/gtk/window/gtksalframe.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 36fa465ac4b2c0deb7c1e1a15454fe598e815ac0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 24 14:00:40 2015 +0100
X11SalInstance->SalGenericInstance
Change-Id: I6805178d2a344243d487ace3331ca71b667cd819
(cherry picked from commit 87d359295199dbf0c851eee47e1d38f6664f270a)
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 4f0ab1f..31027fa 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3571,8 +3571,8 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f
{
GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
- X11SalInstance *pSalInstance =
- static_cast< X11SalInstance* >(GetSalData()->m_pInstance);
+ SalGenericInstance *pSalInstance =
+ static_cast< SalGenericInstance* >(GetSalData()->m_pInstance);
// check if printers have changed (analogous to salframe focus handler)
pSalInstance->updatePrinterUpdate();
More information about the Libreoffice-commits
mailing list