#90363# modified way of getting docinfo

1 files changed, 14 insertions, 8 deletions

diff --git a/wizards/source/webwizard/HtmlAutoPilotBasic.xba b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
index 7ecc43c02ee7..661313f02105 100644
--- a/wizards/source/webwizard/HtmlAutoPilotBasic.xba
+++ b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
@@ -127,7 +127,7 @@ End Sub
 Sub LoadWebPageStyles()
 Dim CurIndex as Integer
 	ToggleDialogControls(False)
-'	oBaseDocument.LockControllers
+	oBaseDocument.LockControllers
 	CurIndex = GetCurIndex(DialogModel.lbStyles, Style(), NumberofStyles%,8)
 	bWithBackGraphic = LoadNewStyles(oBaseDocument, DialogModel, CurIndex, FileStr, Style(), TextureDir)
 	CurrentBullet$ = BulletDir + Style(6, CurIndex)
@@ -144,7 +144,7 @@ Dim CurIndex as Integer
 	SetBulletAndGraphics()
 	CheckControls(oBaseDocument.DrawPage)
 	oViewCursor.GotoStart(False)
-'	oBaseDocument.UnlockControllers
+	oBaseDocument.UnlockControllers
 	ToggleDialogControls(True)
 End Sub
 
@@ -282,6 +282,7 @@ Dim DirContent() as String
 Dim FileName as String
 Dim TemplatePath as String
 Dim FilterLen as Integer
+Dim MyArray()
 Dim i as Integer
 Dim m as Integer
 Dim n as Integer
@@ -293,7 +294,6 @@ Dim FileProperties(0) as new com.sun.star.beans.PropertyValue
 	FileProperties(0).Name = "Hidden"
 	FileProperties(0).Value = True
 	oListboxControl = oDialog.GetControl(ListboxName)
-	oDocInfo = CreateUnoService("com.sun.star.document.DocumentProperties")
 	FilterLen = Len(sFileFilter)
 	bItemFound = False
 	TemplatePath = GetOfficeSubPath("Template", "wizard/web/")
@@ -301,14 +301,20 @@ Dim FileProperties(0) as new com.sun.star.beans.PropertyValue
 	
 	LocMaxIndex = Ubound(DirContent())
 	
+	oDocInfo = createUNOService("com.sun.star.document.DocumentProperties")
+	
 	Dim SortList(LocMaxIndex,2)
 	For i = 0 to LocMaxIndex
 		SortList(i,0) = DirContent(i)
-		oComp = StarDesktop.LoadComponentFromURL(DirContent(i),"_blank",0,FileProperties())
-		oRealDocInfo = oComp.getDocumentInfo()
-		oComp.dispose()
-		SortList(i,1) = oRealDocInfo.Title
-		SortList(i,2) = oRealDocInfo
+		oDocInfo.read(DirContent(i))
+		SortList(i,1) = oDocInfo.Title
+		If  Left(FileNameOutOfPath(DirContent(i),getPathSeparator()),3) = "stl" Then
+			oComp = StarDesktop.LoadComponentFromURL(DirContent(i),"_blank",0,FileProperties())
+			oRealDocInfo = oComp.getDocumentInfo()
+	   		SortList(i,2) = oRealDocInfo 
+	   		oComp.dispose()
+   		End If
+    	
 	Next i
 	SortList() = BubbleSortList(SortList(),True)