summaryrefslogtreecommitdiff
path: root/wizards
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:43:02 +0000
commit13ba00aa224ed4fdf6b2acbda865a2d07a548369 (patch)
tree9ac9e573dc93de8e8ff33f7122dc40a7ccc3b0a5 /wizards
parent68e458cef973fcf568b8efa5614ee978e8ea9d55 (diff)
Resolves: fdo#43644 survive registered but unavailable binfilter
(cherry picked from commit f3e40273b699910108007faf8a7991fe0498ad97) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'wizards')
-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