1 files changed, 26 insertions, 9 deletions

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index c542e225d901..f5cb6c933f63 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -430,6 +430,7 @@ Dim oWindow As Object, iWindowType As Integer
 Dim i As Integer, j As Integer, k As Integer, bFound As Boolean
 Dim sSupportedModules() As Variant, vModules() As Variant, oModuleUI As Object
 Dim oToolbar As Object, sToolbarName As String, vUIElements() As Variant, sToolbarFullName As String, iBuiltin As Integer
+Dim sFileSuffix As String
 
 Const cstCustom = "CUSTOM"
 
@@ -450,17 +451,33 @@ Const cstCustom = "CUSTOM"
 	
 	iWindowType = oWindow.WindowType
 	Select Case iWindowType			'	Supported window types only
-		Case	acForm
+		Case acForm
 			sSupportedModules = Array(	"com.sun.star.sdb.FormDesign"	)
-		Case	acBasicIDE _
-				, acDatabaseWindow _
-				, acReport _
-				, acDocument _
-				, acTable _
-				, acQuery _
-				, acDiagram
-			sSupportedModules = Array()
+		Case acBasicIDE
+			sSupportedModules = Array(	"com.sun.star.script.BasicIDE"	)
+		Case acDatabaseWindow
+			sSupportedModules = Array(	"com.sun.star.sdb.OfficeDatabaseDocument"	)
+		Case acReport
+			sSupportedModules = Array(	"com.sun.star.sdb.TextReportDesign"	)
+		Case acDocument
+			sFileSuffix = ""
+			If Len(oWindow._Name) > 4 Then sFileSuffix = LCase(Right(oWindow._Name, 4))
+			Select Case sFileSuffix
+				Case ".ods"				:	sSupportedModules = Array(	"com.sun.star.sheet.SpreadsheetDocument"	)
+				Case ".odt", ".odm"		:	sSupportedModules = Array(	"com.sun.star.text.TextDocument"	)
+				Case ".odp"				:	sSupportedModules = Array(	"com.sun.star.presentation.PresentationDocument"	)
+				Case ".odg"				:	sSupportedModules = Array(	"com.sun.star.drawing.DrawingDocument"	)
+				Case ".odf"				:	sSupportedModules = Array(	"com.sun.star.formula.FormulaProperties"	)
+				Case Else				:	sSupportedModules = Array()
+			End Select
+		Case acTable, acQuery
+			sSupportedModules = Array(	"com.sun.star.sdb.DataSourceBrowser" _
+										, "com.sun.star.sdb.TableDataView" _
+										)
+		Case acDiagram
+			sSupportedModules = Array(	"com.sun.star.sdb.RelationDesign"	)
 		Case Else
+			sSupportedModules = Array()
 	End Select
 
 	'	Find all standard and custom toolbars stored in LibO/AOO Base