summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-11-27 08:10:19 +0000
committerKurt Zenker <kz@openoffice.org>2004-11-27 08:10:19 +0000
commit5e19dd06a2aba25292f10bed98e2161f087dd2fe (patch)
tree72088e02c8ca5c5bf6ea0f57ef9c78d0d6f8d9f4
parent7cf1c01b270a22c68ff9aedc714b85174b16ba48 (diff)
INTEGRATION: CWS qwizardsbf1 (1.3.2); FILE MERGED
2004/11/22 14:02:59 bc 1.3.2.1: #i30234# path to share/config referenced Issue number: Submitted by: Reviewed by:
-rw-r--r--wizards/com/sun/star/wizards/web/WebWizardDialogResources.java3
-rw-r--r--wizards/com/sun/star/wizards/web/data/CGSettings.java5
2 files changed, 6 insertions, 2 deletions
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java
index ae0d1fa333f9..f93244672ccc 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialogResources.java
@@ -11,6 +11,7 @@ public class WebWizardDialogResources extends Resource {
String resSessionName;
String resSizeTemplate;
+ String resSpecifyNewFileLocation;
String resCreatedTemplate;
String resUpdatedTemplate;
String resSlides;
@@ -320,7 +321,7 @@ public class WebWizardDialogResources extends Resource {
resLocalTargetCouldNotCreate = getResText(RID_WEBWIZARDDIALOG_START + 149);
resLocalTargetCreate = getResText(RID_WEBWIZARDDIALOG_START + 150);
resSizeTemplate = getResText(RID_WEBWIZARDDIALOG_START + 151);
-
+ resSpecifyNewFileLocation = getResText(RID_WEBWIZARDDIALOG_START + 152);
resClose = getResText(RID_COMMON_START + 17);
resCancel = getResText(RID_COMMON_START + 11);
diff --git a/wizards/com/sun/star/wizards/web/data/CGSettings.java b/wizards/com/sun/star/wizards/web/data/CGSettings.java
index 324ff0441a24..880103ce55f5 100644
--- a/wizards/com/sun/star/wizards/web/data/CGSettings.java
+++ b/wizards/com/sun/star/wizards/web/data/CGSettings.java
@@ -68,7 +68,10 @@ public class CGSettings extends ConfigGroup {
public CGSettings(XMultiServiceFactory xmsf_, String[] resources_ , Object document) {
xmsf = xmsf_;
try {
- soTemplateDir = FileAccess.getOfficePath(xmsf, "Template","share");
+ soTemplateDir = FileAccess.getOfficePath(xmsf, "Config","");
+
+
+// soTemplateDir = FileAccess.getOfficePath(xmsf, "Template","share");
soGalleryDir = FileAccess.getOfficePath(xmsf,"Gallery","share");
root = this;
formatter = new Formatter(xmsf, document );