diff options
| -rw-r--r-- | wizards/source/importwizard/DialogModul.xba | 4 | ||||
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 2 | ||||
| -rw-r--r-- | wizards/source/importwizard/Language.xba | 4 | ||||
| -rw-r--r-- | wizards/source/importwizard/Main.xba | 6 | ||||
| -rw-r--r-- | wizards/source/importwizard/importwi.src | 24 |
5 files changed, 20 insertions, 20 deletions
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index 1edc13d39cf7..2c8f9de50bbf 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -104,9 +104,9 @@ Dim Index as Integer SetupXMLConfiguration() End If ' TemplateCheckBox-Captions - GetApplResourceArray(1008 + iApplSection, ApplCount, sTemplateCheckBox()) + GetApplResourceArray(1009 + iApplSection, ApplCount, sTemplateCheckBox()) ' DocumentCheckbox- Captions - GetApplResourceArray(1012 + iApplSection, ApplCount, sDocumentCheckBox()) + GetApplResourceArray(1009 + iApplSection + ApplCount, ApplCount, sDocumentCheckBox()) AssignCheckboxObjects() diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index b6e36144e993..054fcc18b69a 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -175,7 +175,7 @@ Dim MaxFileIndex as Integer End Select End If If bDoSave Then - InsertDocNamesToLogDocument(i+1, sFullName, TargetFile + InsertDocNamesToLogDocument(i+1, sFullName, TargetFile) On Local Error Resume Next ' Note: Files are automatically stored in Default format ' FileProperties(0).Name = "FilterName" diff --git a/wizards/source/importwizard/Language.xba b/wizards/source/importwizard/Language.xba index 5343785ea4c5..188c44e3665f 100644 --- a/wizards/source/importwizard/Language.xba +++ b/wizards/source/importwizard/Language.xba @@ -60,10 +60,10 @@ Sub LoadLanguage() GetApplResourceArray(1012, 3, sMSDocumentCheckBox()) ' DocumentCheckbox- Captions - GetApplResourceArray(2012, 5, sSODocumentCheckBox()) + GetApplResourceArray(2013, 5, sSODocumentCheckBox()) 'StarOffice Applicationnames - GetApplResourceArray(2016,2, sSOHelperDocuments()) + GetApplResourceArray(2017,2, sSOHelperDocuments()) sContainerName(0) = GetResText(1030) diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index eb77d97de2fe..cf5856594135 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -37,7 +37,7 @@ Sub Main() FillStep_Welcome() RepaintHeaderPreview() SetStates() - ImportDialogArea.Execute() + ImportDialogArea.SetVisible(True) 'Execute() ImportDialog.cbGoOn.DefaultButton = True Exit Sub RTError: @@ -71,7 +71,6 @@ Dim iCurStep as Integer CurOffice = CurOffice + 1 TakeOverPathSettings() FillStep_InputPaths(CurOffice, False) - RepaintHeaderPreview() Else FillStep_Summary() End If @@ -87,6 +86,7 @@ Dim iCurStep as Integer Case 4 End Select ImportDialog.cbGoOn.DefaultButton = True + RepaintHeaderPreview() Exit Sub RTError: Msgbox sRTErrorDesc, 16, sRTErrorHeader @@ -112,7 +112,6 @@ Dim iCurStep as Integer If CurOffice > 0 Then CurOffice = CurOffice - 1 FillStep_InputPaths(CurOffice, False) - RepaintHeaderPreview() Else FillStep_Welcome() bDoKeepApplValues = True @@ -120,6 +119,7 @@ Dim iCurStep as Integer End If End Select ImportDialog.cbGoOn.DefaultButton = True + RepaintHeaderPreview() Exit Sub RTError: Msgbox sRTErrorDesc, 16, sRTErrorHeader diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src index 7cd762793982..bd1ce69287d0 100644 --- a/wizards/source/importwizard/importwi.src +++ b/wizards/source/importwizard/importwi.src @@ -2,9 +2,9 @@ * * $RCSfile: importwi.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2001-06-16 00:06:59 $ + * last change: $Author: bc $ $Date: 2001-06-27 14:44:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,16 +112,16 @@ #define sProgressFound 1093 #define sProgressPage5 1094 #define sReady 1100 -#define sXMLTemplateCheckbox_1_ 2008 -#define sXMLTemplateCheckbox_2_ 2009 -#define sXMLTemplateCheckbox_3_ 2010 -#define sXMLTemplateCheckbox_4_ 2011 -#define sXMLDocumentCheckbox_1_ 2012 -#define sXMLDocumentCheckbox_2_ 2013 -#define sXMLDocumentCheckbox_3_ 2014 -#define sXMLDocumentCheckbox_4_ 2015 -#define sXMLHelperApplications_1 2016 -#define sXMLHelperApplications_2 2017 +#define sXMLTemplateCheckbox_1_ 2009 +#define sXMLTemplateCheckbox_2_ 2010 +#define sXMLTemplateCheckbox_3_ 2011 +#define sXMLTemplateCheckbox_4_ 2012 +#define sXMLDocumentCheckbox_1_ 2013 +#define sXMLDocumentCheckbox_2_ 2014 +#define sXMLDocumentCheckbox_3_ 2015 +#define sXMLDocumentCheckbox_4_ 2016 +#define sXMLHelperApplications_1 2017 +#define sXMLHelperApplications_2 2018 #define sSourceDocuments 2030 #define sTargetDocuments 2031 |