summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-09-04 12:04:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-04 12:04:31 +0100
commit39d440ed92457de8b2b03d9a39bc3ce872caf3ba (patch)
tree2a184b8974f61dbde8d9ef106881a998ebdd45f0 /wizards
parent8af09bf33291df2fb2bfbbd6e42f9bf074fcc4fc (diff)
drop rather useless filtertrace stuff from wizards
Change-Id: I6df855031f1941590472bf8901625fe8b2c22926
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/importwizard/DialogModul.xba48
-rw-r--r--wizards/source/importwizard/FilesModul.xba53
2 files changed, 2 insertions, 99 deletions
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index 379e20dece16..70f9a6b3df64 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -25,7 +25,6 @@ Public Const SBFIRSTAPPLCHECKED = 0
Public Const SBSECONDAPPLCHECKED = 1
Public Const SBTHIRDAPPLCHECKED = 2
Public Const SBFOURTHAPPLCHECKED = 3
-Public bFilterTracingAvailable as Boolean
Public WizardMode as String
Public Const SBMICROSOFTMODE = &quot;MS&quot;
Public Const SBXMLMODE = &quot;SO&quot;
@@ -49,10 +48,6 @@ Public sValueName(SBMAXAPPLCOUNT-1) as String
Public sCRLF as String
Public MSFilterName(5,4) as String
Public XMLFilterName(7,3) as String &apos;Number of different formats
-Public FilterTracingLogPath(2) as String
-Public bMSApplFilterTracingAvailable(2) as String
-Public bTakeOverTargetName(2) as Boolean
-Public bTakeOverPathName(2) as Boolean
&apos; e.g.:
&apos; XMLFilterName(x,0) = &quot;sdw&quot; &apos; in documents we take the extensions; in SO-templates the appropriate Filtername
@@ -272,7 +267,6 @@ Dim Index as Integer
Dim sAddText as String
For i = 0 To ApplCount -1
Index = Applications(i,SBAPPLKEY)
- GetFilterTracingLogPath(i, Index)
If Applications(i,SBTEMPLCONVERT) Then
&apos; Templates are to be converted
sAddText = &quot;&quot;
@@ -347,48 +341,6 @@ Sub FillStep_Progress()
End Sub
-Sub GetFilterTracingLogPath(i as Integer, Index as Integer)
-Dim aNodePath(0) as new com.sun.star.beans.PropertyValue
-Dim oMasterKey
-Dim oImportKey
-Dim oWordKey
-Dim oExcelkey
-Dim oPowerpointKey
-Dim oFilterService
- aNodePath(0).Name = &quot;nodepath&quot;
- aNodePath(0).Value = &quot;org.openoffice.Office.Tracing&quot;
- oFilterService = createUnoService(&quot;com.sun.star.util.FilterTracer&quot;)
- bFilterTracingAvailable = Not IsNull(oFilterService)
- If bFilterTracingAvailable Then
- oMasterkey = GetRegistryKeyContent(&quot;org.openoffice.Office.Tracing/&quot;)
- If oMasterKey.hasbyName(&quot;Import&quot;) Then
- oImportKey = GetRegistryKeyContent(&quot;org.openoffice.Office.Tracing/Import&quot;)
- bMSApplFilterTracingAvailable(i) = CheckMSImportAvailability(oImportkey, MSFiltername(Index, 4), FilterTracingLogPath(i), bTakeOverTargetName(i), bTakeOverPathName(i))
- End If
- End If
-End Sub
-
-
-Function CheckMSImportAvailability(oImportkey, MSApplName as String, MSLogPath as String, bTakeOverTargetname as String, bTakeOverpathName as String) as Boolean
-Dim bApplIsAvailable as Boolean
-Dim oApplKey
-Dim LocApplName as String
-Dim LocApplPath as String
- bApplIsAvailable = oImportKey.hasbyName(MSApplName)
- If bApplIsAvailable Then
- oApplKey = oImportKey.getByName(MSApplName)
- bApplIsAvailable = oApplKey.On
- LocApplName = oApplKey.Name
- LocApplPath = oApplKey.Path
- bTakeOverTargetName = (LocApplName = &quot;&quot;)
- bTakeOverPathName = (LocApplPath = &quot;&quot;)
- MSLogPath = LocApplPath &amp; &quot;/&quot; &amp; LocApplName &amp; &quot;.log&quot;
- End If
- CheckMSImportAvailability() = bApplIsAvailable
-End Function
-
-
-
Sub SetupMSConfiguration()
iApplSection = 0
Wizardmode = SBMICROSOFTMODE
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index 17b0f60b8a6e..710f46ba56bf 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -33,7 +33,6 @@ Public FileCount as Integer
Public XMLTemplateCount as Integer
Public PathCollection(7,3) as String
Public bIsFirstLogTable as Boolean
-Public bFilterTracerIsinsideTable as Boolean
Function ReadCollectionPaths(FilesList() as String, sFilterName() as String)
@@ -415,7 +414,7 @@ Dim sPrevMimeTypeorExtension as String
FileCount = FileCount + 1
End If
oDocument.Dispose()
- InsertTargetUrlToLogDocument(sTargetUrl, sComment, ApplIndex)
+ InsertTargetUrlToLogDocument(sTargetUrl, sComment)
Else
sCurcouldnotopenDocument = ReplaceString(scouldnotopenDocument, ConvertFromUrl(sSourceUrl), &quot;&lt;1&gt;&quot;)
sComment = ConcatComment(sComment, sCurCouldnotopenDocument)
@@ -537,7 +536,6 @@ Dim oCell
If Not bLogExists Then
Exit Sub
End If
- bFilterTracerIsinsideTable = False
FilterIndex = GetIndexForPartStringinMultiArray(sFilterName(), CurFileContent, 0)
sDocumentType = sFiltername(FilterIndex,3)
oLogCursor = oLogDocument.Text.createTextCursor()
@@ -552,36 +550,15 @@ Dim oCell
oLogCursor.HyperLinkTarget = &quot;&quot;
oLogCursor.ParaStyleName = &quot;Heading 1&quot;
oLogCursor.setString(sDocumentType)
- If WizardMode = SBMICROSOFTMODE Then
- If bFilterTracingAvailable Then
- If bMSApplFilterTracingAvailable(ApplIndex) Then
- Dim CurFilterTracingPath as String
- CurFilterTracingPath = FilterTracingLogPath(ApplIndex)
- bFilterTracerIsinsideTable = (bTakeOverTargetName(ApplIndex) Or bTakeOverPathName(ApplIndex))
- If Not bFilterTracerIsinsideTable Then
- oLogCursor.CollapseToEnd()
- oLogDocument.Text.insertControlCharacter(oLogCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, False)
- InsertCommandButtonatViewCursor(oLogDocument, oLogCursor, CurFilterTracingPath)
- End If
- End If
- End If
- End If
oLogCursor.CollapsetoEnd()
oLogDocument.Text.insertControlCharacter(oLogCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, False)
oLogTable = oLogDocument.CreateInstance(&quot;com.sun.star.text.TextTable&quot;)
oLogTable.RepeatHeadline = true
- If bFilterTracerIsinsideTable Then
- oLogTable.initialize(2,3)
- End If
oLogCursor.Text.InsertTextContent(oLogCursor, oLogTable, True)
oTextCursor = oLogTable.GetCellbyPosition(0,0).createTextCursor()
oTextCursor.SetString(sSourceDocuments)
oTextCursor = oLogTable.GetCellbyPosition(1,0).createTextCursor()
oTextCursor.SetString(sTargetDocuments)
- If bFilterTracerIsinsideTable Then
- oTextCursor = oLogTable.GetCellbyPosition(2,0).createTextCursor()
- oTextCursor.SetString(&quot;FilterTracer&quot;)
- End If
bInsertRow = False
End Sub
@@ -648,27 +625,7 @@ Dim bLogIsThere as Boolean
End Sub
-Function GetFilterTracingLogPath(sTargetUrl as String, ApplIndex) as String
-Dim TargetFileName as String
-Dim sTargetFolder as String
-Dim CurFilterTracingPath as String
-Dim CurFilterTracingname as String
-Dim CurFilterFolder as String
- CurFilterTracingPath = FilterTracingLogPath(ApplIndex)
- If bTakeOverTargetName(ApplIndex) Then
- TargetFilename = GetFileNameWithoutextension(sTargetUrl, &quot;/&quot;)
- CurFilterFolder = DirectoryNameoutofPath(FilterTracingLogPath(ApplIndex), &quot;/&quot;)
- CurFilterTracingpath = CurFilterFolder &amp; &quot;/&quot; &amp; TargetFilename &amp; &quot;.log&quot;
- End If
- If bTakeOverPathName(ApplIndex) Then &apos;Replace the Folder in the FilterTracerpath by the Folder of the targetUrl
- sTargetFolder = DirectoryNameoutofPath(sTargetUrl,&quot;/&quot;)
- CurFilterTracingPath = sTargetFolder &amp; &quot;/&quot; &amp; FileNameoutofPath(CurFilterTracingPath, &quot;/&quot;)
- End If
- GetFilterTracingLogPath() = CurFilterTracingPath
-End Function
-
-
-Sub InsertTargetUrlToLogDocument(sTargetUrl as String, sComment as String, ApplIndex as Integer)
+Sub InsertTargetUrlToLogDocument(sTargetUrl as String, sComment as String)
Dim oCell
Dim oTextCursor
Dim CurFilterTracingpath as String
@@ -677,12 +634,6 @@ Dim CurFilterTracingpath as String
oCell = oLogTable.GetCellbyPosition(1,oLogTable.Rows.Count-1)
InsertCommentToLogCell(sComment, oCell)
InsertHyperLinkToLogCell(sTargetUrl, oCell)
- If bFilterTracerIsinsideTable Then
- oCell = oLogTable.getCellByPosition(2, oLogTable.Rows.Count-1)
- oTextCursor = oCell.Text.CreateTextCursor()
- CurFilterTracingpath = GetFilterTracingLogPath(sTargetUrl, ApplIndex)
- InsertCommandButtonatViewCursor(oLogDocument, oTextCursor, CurFilterTracingPath)
- End If
oLogDocument.Store()
End If
End If