diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-11-27 08:09:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-11-27 08:09:32 +0000 |
| commit | 0473d1c2d98a8440addfcb775031b4fd3d37d8e6 (patch) | |
| tree | 991122e87a334522d786a373c85cab17137228ef /wizards | |
| parent | 738e537ba1aef97660ce246143018a75bcfc9f9d (diff) | |
INTEGRATION: CWS qwizardsbf1 (1.3.2); FILE MERGED
2004/11/22 14:02:58 bc 1.3.2.3: #i30234# path to share/config referenced
Issue number:
Submitted by:
Reviewed by:
2004/09/30 11:40:19 rpiterman 1.3.2.2: changes due to changes in OfficeDocument.createNewFrame method
2004/09/17 16:02:39 rpiterman 1.3.2.1: reinserted code for relocated missing documents
Issue number: i33212
Submitted by:
Reviewed by:
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/web/WWD_Startup.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java index 7c0d2d795292..fe71eaccf4ab 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Startup.java +++ b/wizards/com/sun/star/wizards/web/WWD_Startup.java @@ -2,9 +2,9 @@ * * $RCSfile: WWD_Startup.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-09-08 14:16:38 $ + * last change: $Author: kz $ $Date: 2004-11-27 09:09:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -285,7 +285,8 @@ public abstract class WWD_Startup extends WWD_General { proxies = getOOProxies(); - String soTemplateDir = FileAccess.getOfficePath(xmsf, "Template","share"); + String soTemplateDir = FileAccess.getOfficePath(xmsf, "Template", "share"); + String exclamationURL = FileAccess.connectURLs( soTemplateDir, "wizard/bitmap/caution_16.png"); this.drawNaviBar(); this.buildStep1(); @@ -300,7 +301,7 @@ public abstract class WWD_Startup extends WWD_General { desktopFrame = Desktop.getActiveFrame(xMSF); - myFrame = OfficeDocument.createNewFrame(xMSF); + myFrame = OfficeDocument.createNewFrame(xMSF, this); desktopFrame = Desktop.findAFrame(xMSF, myFrame, desktopFrame); @@ -778,9 +779,8 @@ public abstract class WWD_Startup extends WWD_General { return true; } catch (FileNotFoundException ex) { - //int relocate = SystemDialog.showMessageBox(xMSF, xC.getPeer() - // , "warningbox", VclWindowPeerAttribute.YES_NO + VclWindowPeerAttribute.DEF_NO, getFileAccess().getPath(doc.cp_URL,"") + "\n \n File not found. Would you like to specify a new file location?"); - int relocate = 1; + int relocate = SystemDialog.showMessageBox(xMSF, xC.getPeer() + , "WarningBox", VclWindowPeerAttribute.YES_NO + VclWindowPeerAttribute.DEF_NO, getFileAccess().getPath(doc.cp_URL,"") + "\n\n" + resources.resSpecifyNewFileLocation); if (relocate == 2) { String[] file = getDocAddDialog().callOpenDialog(false, FileAccess.getParentDir(doc.cp_URL)); |