Author: mseidel
Date: Thu Nov 8 15:58:53 2018
New Revision: 1846165
URL: http://svn.apache.org/viewvc?rev=1846165&view=rev
Log:
Cleaning up Document Converter wizard, moving graphics from bmp to png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_1.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_3.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_4.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-3.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-1.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-2.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-3.png
(with props)
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-4.png
(with props)
Removed:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_1.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_3.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_4.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp
Modified:
openoffice/trunk/main/wizards/source/importwizard/Main.xba
Added: openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_1.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_1.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_3.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_3.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_3.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_4.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_4.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/Import_4.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-1.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-2.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-3.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-3.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/MS-Import_2-3.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-1.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-1.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-2.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-2.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-2.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-3.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-3.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-3.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-4.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-4.png?rev=1846165&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/XML-Import_2-4.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/trunk/main/wizards/source/importwizard/Main.xba
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/importwizard/Main.xba?rev=1846165&r1=1846164&r2=1846165&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/importwizard/Main.xba (original)
+++ openoffice/trunk/main/wizards/source/importwizard/Main.xba Thu Nov 8
15:58:53 2018
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"module.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,20 +9,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<script:module xmlns:script="http://openoffice.org/2000/script";
script:name="Main" script:language="StarBasic">Option Explicit
+REM ***** BASIC *****
-' ***** BASIC *****
Public HeaderPreviews(4) as Object
Public ImportDialog as Object
Public ImportDialogArea as Object
@@ -50,8 +50,8 @@ Sub Main()
If GetImportWizardPaths() = False Then
Exit Sub
End If
- bCancelTask = False
- bDoKeepApplValues = False
+ bCancelTask = False
+ bDoKeepApplValues = False
CurOffice = 0
ImportDialogArea =
LoadDialog("ImportWizard","ImportDialog")
ImportDialog = ImportDialogArea.Model
@@ -60,12 +60,12 @@ Sub Main()
MaxApplCount = 4
FillStep_Welcome()
RepaintHeaderPreview()
- ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
+ ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
ImportDialog.cmdGoOn.DefaultButton = True
ImportDialogArea.GetControl("optSODocuments").SetFocus()
ToggleCheckboxesWithBoolean(False)
RetValue = ImportDialogArea.Execute()
- If bShowLogFile=TRUE Then
+ If bShowLogFile=TRUE Then
OpenDocument(sLogUrl, NoArgs())
End if
If RetValue = 0 Then
@@ -79,7 +79,6 @@ RTError:
End Sub
-
Sub NextStep()
Dim iCurStep as Integer
If Not bDebugWizard Then
@@ -116,15 +115,14 @@ Dim iCurStep as Integer
If ((ImportDialog.chkLogfile.State <> 1) OR (iCurStep <>
3)) Then
ImportDialog.cmdGoOn.DefaultButton = True
End If
-
- RepaintHeaderPreview()
+
+ RepaintHeaderPreview()
Exit Sub
RTError:
Msgbox sRTErrorDesc, 16, sRTErrorHeader
End Sub
-
Sub PrevStep()
Dim iCurStep as Integer
If Not bDebugWizard Then
@@ -149,14 +147,13 @@ Dim iCurStep as Integer
End If
End Select
ImportDialog.cmdGoOn.DefaultButton = True
- RepaintHeaderPreview()
+ RepaintHeaderPreview()
Exit Sub
RTError:
Msgbox sRTErrorDesc, 16, sRTErrorHeader
End Sub
-
Sub CancelTask()
If bConversionIsRunning Then
If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then
@@ -186,9 +183,9 @@ Dim LocPrefix as String
LocPrefix = WizardMode
LocPrefix = ReplaceString(LocPrefix,"XML", "SO")
If CurStep = 2 Then
- sBitmapPath = SOBitmapPath & LocPrefix &
"-Import_" & CurStep & "-" &
Applications(CurOffice,SBAPPLKEY) + 1 & ".bmp"
+ sBitmapPath = SOBitmapPath & LocPrefix &
"-Import_" & CurStep & "-" &
Applications(CurOffice,SBAPPLKEY) + 1 & ".png"
Else
- sBitmapPath = SOBitmapPath & "Import_" &
CurStep & ".bmp"
+ sBitmapPath = SOBitmapPath & "Import_" &
CurStep & ".png"
End If
ImportDialog.ImportPreview.ImageURL = sBitmapPath
End Sub
@@ -206,7 +203,7 @@ Function CheckInstalledModule(Index as I
Dim ModuleName as String
Dim NameList() as String
Dim MaxIndex as Integer
-Dim i as Integer
+Dim i as Integer
ModuleName = ModuleList(Index)
If Instr(1,ModuleName,"/") <> 0 Then
CheckInstalledModule() = False
@@ -263,9 +260,9 @@ Dim i as Integer
Case 1
With ImportDialog
If .optMSDocuments.State = 1 Then
- bDoEnable = .chkMSApplication1.State = 1 Or
.chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
+ bDoEnable = .chkMSApplication1.State =
1 Or .chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
Else
- bDoEnable = .chkSOApplication1.State = 1 Or
.chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or
.chkSOApplication4.State = 1
+ bDoEnable = .chkSOApplication1.State =
1 Or .chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or
.chkSOApplication4.State = 1
End If
End With
bDoKeepApplValues = False
@@ -277,14 +274,14 @@ Dim i as Integer
End Sub
-Sub TakeOverPathSettings()
+Sub TakeOverPathSettings()
'Takes over the Pathsettings from the first selected application to the
next applications
If Applications(CurOffice,SBDOCSOURCE) = "" Then
Applications(CurOffice,SBDOCSOURCE) =
Applications(0,SBDOCSOURCE)
Applications(CurOffice,SBDOCTARGET) =
Applications(0,SBDOCTARGET)
If WizardMode = SBXMLMODE AND Applications(CurOffice,SBAPPLKEY)
= 3 Then
Applications(CurOffice,SBTEMPLSOURCE) =
Applications(CurOffice,SBDOCSOURCE)
- Applications(CurOffice,SBTEMPLTARGET) =
Applications(CurOffice,SBDOCTARGET)
+ Applications(CurOffice,SBTEMPLTARGET) =
Applications(CurOffice,SBDOCTARGET)
Else
Applications(CurOffice,SBTEMPLSOURCE) =
Applications(0,SBTEMPLSOURCE)
Applications(CurOffice,SBTEMPLTARGET) =
Applications(0,SBTEMPLTARGET)
@@ -304,7 +301,7 @@ Function GetImportWizardPaths() as Boole
Exit Function
End If
End If
- End If
+ End If
GetImportWizardPaths() = False
End Function
</script:module>
