summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-02-08 12:38:10 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-02-08 12:38:37 +0000
commitf3e40273b699910108007faf8a7991fe0498ad97 (patch)
tree8867eef4728618a78e1a5674762bfd0e25556afc
parent37b5dce665a03d3404e6a710b82bef16d740d178 (diff)
Resolves: fdo#43644 survive registered but unavailable binfilter
-rw-r--r--wizards/source/importwizard/Main.xba13
1 files changed, 12 insertions, 1 deletions
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 8084fda702cb..7385c6bc8c96 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