diff --git a/0001-Resolves-rhbz-998136-different-index-to-gWidgetData-.patch b/0001-Resolves-rhbz-998136-different-index-to-gWidgetData-.patch new file mode 100644 index 0000000..65d78b7 --- /dev/null +++ b/0001-Resolves-rhbz-998136-different-index-to-gWidgetData-.patch @@ -0,0 +1,29 @@ +From 0aa3a73c9463f4d1e8918383b21131352635fe75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 20 Aug 2013 14:25:22 +0100 +Subject: [PATCH] Resolves: rhbz#998136 different index to gWidgetData vs + NWEnsureGTKNotebook + +Change-Id: Ib3ebbfda09cd05477b65c1d81ac77e977b2a11e5 +--- + vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +index c88bc6f..e3bff2a 100644 +--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx ++++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +@@ -1607,8 +1607,8 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) + w = aAreaRect.GetWidth(); + h = aAreaRect.GetHeight(); + +- gint xthickness = gWidgetData[0].gNotebookWidget->style->xthickness; +- gint ythickness = gWidgetData[0].gNotebookWidget->style->ythickness; ++ gint xthickness = gWidgetData[nScreen].gNotebookWidget->style->xthickness; ++ gint ythickness = gWidgetData[nScreen].gNotebookWidget->style->ythickness; + + x -= xthickness; + y -= ythickness; +-- +1.8.3.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 4aaca2f..05a0901 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -258,6 +258,7 @@ Patch17: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch Patch18: 0001-Resolves-fdo-67743-user-autocorr-file-not-written.patch Patch19: 0001-only-use-the-SSPI-support-with-internal-neon.patch Patch20: 0001-Always-try-to-mount-in-gio-Content-getGFileInfo.patch +Patch21: 0001-Resolves-rhbz-998136-different-index-to-gWidgetData-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1010,6 +1011,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch18 -p1 -b .fdo-67743-user-autocorr-file-not-written.patch %patch19 -p1 -b .only-use-the-SSPI-support-with-internal-neon.patch %patch20 -p1 -b .Always-try-to-mount-in-gio-Content-getGFileInfo.patch +%patch21 -p1 -b .rhbz-998136-different-index-to-gWidgetData-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2103,6 +2105,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Tue Aug 20 2013 Stephan Bergmann - 1:4.1.1.1-3-UNBUILT - Related: rhbz#895690 Always try to do a mount when opening a file via GIO +- Resolves: rhbz#998136 wrong index to gWidgetData * Mon Aug 19 2013 Marek Kasik - 1:4.1.1.1-2 - Rebuild (poppler-0.24.0)