diff options
| -rw-r--r-- | wizards/source/importwizard/DialogModul.xba | 19 | ||||
| -rw-r--r-- | wizards/source/importwizard/ImportDialog.xdl | 8 |
2 files changed, 6 insertions, 21 deletions
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index 0e49a160a3d1..4994c9596214 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -509,26 +509,11 @@ Sub InitializeProgressPage(oDialog as Object) End Sub -Sub GetFolderName(aEvent as Object) -Dim oFolderDialog -Dim iAccept as Integer -Dim sPath as String -Dim InitPath as String +Sub TakoverFolderName(aEvent as Object) Dim RefControlName as String Dim oRefControl - oFolderDialog = CreateUnoService("com.sun.star.ui.dialogs.FolderPicker") RefControlName = aEvent.Source.Model.Tag oRefControl = ImportDialogArea.GetControl(RefControlName) - InitPath = ConvertToUrl(oRefControl.Model.Text) - If oUcb.Exists(InitPath) Then - oFolderDialog.SetDisplayDirectory(InitPath) - End If - iAccept = oFolderDialog.Execute() - If iAccept = 1 Then - sPath = oFolderDialog.GetDisplayDirectory() - If oUcb.Exists(sPath) Then - oRefControl.Text = ConvertFromUrl(sPath) - End If - End If + GetFolderName(oRefControl.Model) End Sub </script:module>
\ No newline at end of file diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index f70a750e5ff8..c4266ec0df4a 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -40,16 +40,16 @@ <dlg:text dlg:id="WelcomeTextLabel" dlg:tab-index="21" dlg:left="6" dlg:top="38" dlg:width="258" dlg:height="20" dlg:page="1" dlg:value="WelcomeTextLabel" dlg:multiline="true"/> <dlg:text dlg:id="WelcomeTextLabel3" dlg:tab-index="22" dlg:left="6" dlg:top="58" dlg:width="258" dlg:height="12" dlg:page="1" dlg:value="WelcomeTextLabel3"/> <dlg:button dlg:id="Button1" dlg:tab-index="23" dlg:left="248" dlg:top="75" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="TemplateImportPath" dlg:value="..."> - <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/> + <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.TakoverFolderName"/> </dlg:button> <dlg:button dlg:id="Button2" dlg:tab-index="24" dlg:left="248" dlg:top="91" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="TemplateExportPath" dlg:value="..."> - <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/> + <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.TakoverFolderName"/> </dlg:button> <dlg:button dlg:id="Button3" dlg:tab-index="25" dlg:left="248" dlg:top="148" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="DocumentImportPath" dlg:value="..."> - <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/> + <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.TakoverFolderName"/> </dlg:button> <dlg:button dlg:id="Button4" dlg:tab-index="26" dlg:left="248" dlg:top="164" dlg:width="14" dlg:height="14" dlg:page="2" dlg:tag="DocumentExportPath" dlg:value="..."> - <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.GetFolderName"/> + <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="ImportWizard.DialogModul.TakoverFolderName"/> </dlg:button> <dlg:radiogroup> <dlg:radio dlg:id="OptSODocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="XML" dlg:value="OptSODocuments"> |