[libreoffice/f20] fix patch for f20
Caolán McNamara
caolanm at fedoraproject.org
Mon Dec 8 10:47:36 UTC 2014
commit e3f8482bb337cbb368c9b43ca94c5fc3783d500a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 8 10:47:23 2014 +0000
fix patch for f20
...bz-1164614-xslt-dialog-crashes-if-there-a.patch | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/0001-Resolves-rhbz-1164614-xslt-dialog-crashes-if-there-a.patch b/0001-Resolves-rhbz-1164614-xslt-dialog-crashes-if-there-a.patch
index 476c5e0..186fcaa 100644
--- a/0001-Resolves-rhbz-1164614-xslt-dialog-crashes-if-there-a.patch
+++ b/0001-Resolves-rhbz-1164614-xslt-dialog-crashes-if-there-a.patch
@@ -1,4 +1,4 @@
-From aa99cd6187c29bd958d4effaafce4d3a12fa31c0 Mon Sep 17 00:00:00 2001
+From c8bc15772d69e60334b53aa73832d4a719676f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Mon, 8 Dec 2014 09:56:33 +0000
Subject: [PATCH] Resolves: rhbz#1164614 xslt dialog crashes if there are no
@@ -11,7 +11,7 @@ Change-Id: Id7d967389cbc9f8ae120749bbe1c79bbbe46b212
2 files changed, 16 insertions(+)
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
-index 8d85688..e698688 100644
+index 17095fa..62bf721 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1355,6 +1355,16 @@ SvxPathControl::SvxPathControl(Window* pParent)
@@ -44,15 +44,15 @@ index 8d85688..e698688 100644
m_pHeaderBar->SetItemSize(ITEMID_NAME, nFirstColumnWidth);
m_pHeaderBar->SetItemSize(ITEMID_TYPE, 0xFFFF);
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
-index 7fbd362..86828af 100644
+index 60b9983..c7630de 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -44,6 +44,7 @@ private:
HeaderBar* m_pHeaderBar;
XMLFilterListBox* m_pFocusCtrl;
protected:
-+ virtual Size GetOptimalSize() const SAL_OVERRIDE;
- virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
++ virtual Size GetOptimalSize() const;
+ virtual void setAllocation(const Size &rAllocation);
public:
SvxPathControl(Window* pParent);
--
More information about the scm-commits
mailing list