[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/source

[Caolán McNamara]

 wizards/source/importwizard/Main.xba |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 13ba00aa224ed4fdf6b2acbda865a2d07a548369
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 8 12:38:10 2012 +0000

    Resolves: fdo#43644 survive registered but unavailable binfilter
    (cherry picked from commit f3e40273b699910108007faf8a7991fe0498ad97)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

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