rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

with split binfilter we need fix for fdo#43644

Browse Source
This commit is contained in:
Caolán McNamara 2012-02-08 12:39:56 +00:00
parent d103f37c48
commit c2dca9b975
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch Normal file
View File

@ -0,0 +1,44 @@
From 62bd29f398c11956983288ae6dd109147cc2c094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 8 Feb 2012 12:38:10 +0000
Subject: [PATCH] Resolves: fdo#43644 survive registered but unavailable
binfilter
---
wizards/source/importwizard/Main.xba | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 8084fda..7385c6b 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -44,7 +44,7 @@ Sub Main()
ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
ImportDialog.cmdGoOn.DefaultButton = True
ImportDialogArea.GetControl(&quot;optMSDocuments&quot;).SetFocus()
- oBinFilterComp = createUnoService( &quot;com.sun.star.comp.office.BF_MigrateFilter&quot; )
+ oBinFilterComp = createBF_MigrateFilterIfPossible()
ToggleCheckboxesWithBoolean(True)
RetValue = ImportDialogArea.Execute()
@@ -186,6 +186,17 @@ Dim i as Integer
End Sub
+Function createBF_MigrateFilterIfPossible()
+Dim oService
+ On Error Goto RTError
+ oService = createUnoService(&quot;com.sun.star.comp.office.BF_MigrateFilter&quot;)
+ getBinFilterCompIfItExists = oService
+ Exit Function
+RTError:
+ createBF_MigrateFilterIfPossible = Nothing
+End Function
+
+
Function CheckInstalledModule(Index as Integer) as Boolean
Dim ModuleName as String
Dim NameList() as String
--
1.7.7.6

3
libreoffice.spec
View File

@ -121,6 +121,7 @@ Patch12: libreoffice-rhel6poppler.patch
Patch13: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch Patch13: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
%endif %endif
Patch14: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch Patch14: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
Patch15: 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -814,6 +815,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch13 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch %patch13 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch
%endif %endif
%patch14 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch %patch14 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch
%patch15 -p1 -b .fdo43644-survive-registered-but-unavailabl.patch
# TODO: check this # TODO: check this
# these are horribly incomplete--empty translations and copied english # these are horribly incomplete--empty translations and copied english
@ -2114,6 +2116,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
* Tue Feb 07 2012 Stephan Bergmann <sbergman@redhat.com> - 3.5.0.3-2 * Tue Feb 07 2012 Stephan Bergmann <sbergman@redhat.com> - 3.5.0.3-2
- junit4 -> junit - junit4 -> junit
- Resolves: rhbz#788042 skip splashscreen with quickstarter - Resolves: rhbz#788042 skip splashscreen with quickstarter
- with split binfilter we need fix for fdo#43644
* Thu Feb 02 2012 David Tardon <dtardon@redhat.com> - 3.5.0.3-1 * Thu Feb 02 2012 David Tardon <dtardon@redhat.com> - 3.5.0.3-1
- 3.5.0 rc3 - 3.5.0 rc3