diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 14:03:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 14:03:59 +0000 |
| commit | 20cea29aa241c198cfbd6cdda9f4cf198e6933bd (patch) | |
| tree | 16b877dc84dbf8eff62614606d8f145d8cc2e9d7 /wizards/source/tools | |
| parent | bbef3ea39fc3fe0bed5bc6307e396fd434e02296 (diff) | |
CWS-TOOLING: integrate CWS fwk99
2009-01-20 17:39:31 +0100 pb r266605 : fix: #i98280# new 'More templates'-URL
2009-01-15 20:17:58 +0100 mst r266391 : #i95702# convert wizards to DocumentProperties (partially based on patch by cmc)
2009-01-12 07:35:44 +0100 pb r266131 : fix: #i96851# HID_PASTE_DLG and HID_LINKDLG_TABLB added
2009-01-09 10:40:48 +0100 pb r266061 : fix: #i97386# Execute_Impl() while sub-dialog is open this could be deleted; #i68415# patch from cmc
2009-01-09 10:35:24 +0100 pb r266059 : fix: #i97386# struct Deleted added
2009-01-09 10:05:17 +0100 pb r266057 : fix: #i97365# ModalDialog RID_SVXPAGE_IMPROVEMENT removed
2009-01-09 10:02:39 +0100 pb r266056 : fix: #i97841# new: set InfoURL and HandleHyperLink()
2009-01-09 09:59:13 +0100 pb r266053 : fix: #i97391# MinWidth re-calculated; #i97365# SvxImprovementDialog2 removed
2009-01-09 09:55:00 +0100 pb r266051 : fix: #i97841# new: HandleHyperLink(); #i97365# SvxImprovementDialog2 removed
2009-01-06 14:24:24 +0100 cd r265921 : #i96831# Fix build problem with gcc 4.3.2 using the return value of link correctly.
2009-01-06 12:18:41 +0100 cd r265907 : #i96831# Fix build problem with gcc 4.3.2
2009-01-06 12:02:59 +0100 mst r265905 : fix #i97775#
- xmloff/source/core/nmspmap.cxx:
+ SvXMLNamespaceMap::GetQNameByKey does not handle default namespace
correctly
Diffstat (limited to 'wizards/source/tools')
| -rw-r--r-- | wizards/source/tools/UCB.xba | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/wizards/source/tools/UCB.xba b/wizards/source/tools/UCB.xba index 436fd551b944..524afe60c4d9 100644 --- a/wizards/source/tools/UCB.xba +++ b/wizards/source/tools/UCB.xba @@ -9,6 +9,7 @@ Dim sDirArray(SBMAXDIRCOUNT-1) as String Dim DirIndex As Integer Dim iDirCount as Integer Public bInterruptSearch as Boolean +Public NoArgs()as New com.sun.star.beans.PropertyValue Sub Main() Dim LocsfileContent(0) as String @@ -64,7 +65,7 @@ Dim sFileArray(StartUbound,1) as String End If Else If bcheckFileType Then - RealFileContent = GetRealFileContent(oDocInfo, FileName) + RealFileContent = GetRealFileContent(FileName) Else RealFileContent = GetFileNameExtension(FileName) End If @@ -143,14 +144,14 @@ Dim FileCount As Integer End Sub -Function RetrieveDocTitle(oDocInfo as Object, sFileName as String) As String +Function RetrieveDocTitle(oDocProps as Object, sFileName as String) As String Dim sDocTitle as String On Local Error Goto NOFILE - oDocInfo.Read(sFileName) - sDocTitle = oDocInfo.Title + oDocProps.loadFromMedium(sFileName, NoArgs()) + sDocTitle = oDocProps.Title NOFILE: If Err <> 0 Then - GetRealFileContent = "" + RetrieveDocTitle = "" RESUME CLR_ERROR End If CLR_ERROR: @@ -163,10 +164,10 @@ End Function ' Retrieves The Filecontent of a Document by extracting the content ' from the Header of the document -Function GetRealFileContent(oDocInfo as Object, FileName as String) As String +Function GetRealFileContent(FileName as String) As String On Local Error Goto NOFILE - oDocInfo.Read(FileName) - GetRealFileContent = oDocInfo.MIMEType + oTypeDetect = createUnoService("com.sun.star.document.TypeDetection") + GetRealFileContent = oTypeDetect.queryTypeByURL(FileName) NOFILE: If Err <> 0 Then GetRealFileContent = "" @@ -290,4 +291,4 @@ NOSPACEONDRIVE: End If GOON: End Function -</script:module>
\ No newline at end of file +</script:module> |