diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 14:33:05 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 14:33:05 +0200 |
commit | 52520fa07c635636b4a62abdc75266c7959eff0d (patch) | |
tree | 254a6d722a691aae98a50a43265e5a1528a4a3fe /wizards | |
parent | 722ba95a21703ea1b74cf04a0ead2fde094327db (diff) | |
parent | d0520c036f295a90d1877e285998a02d514f856a (diff) |
slidecopy: merged latest DEV300.m80 changes
Diffstat (limited to 'wizards')
-rw-r--r-- | wizards/com/sun/star/wizards/makefile.mk | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/data/makefile.mk | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/export/makefile.mk | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/makefile.mk | 2 | ||||
-rw-r--r-- | wizards/prj/build.lst | 2 | ||||
-rw-r--r-- | wizards/source/formwizard/dbwizres.src | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk index 50dc0713945c..fb9c3e18558d 100644 --- a/wizards/com/sun/star/wizards/makefile.mk +++ b/wizards/com/sun/star/wizards/makefile.mk @@ -37,7 +37,7 @@ PACKAGE = com$/sun$/star$/wizards JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge .IF "$(SYSTEM_SAXON)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) +EXTRAJARFILES = $(SAXON_JAR) .ELSE JARFILES += saxon9.jar .ENDIF diff --git a/wizards/com/sun/star/wizards/web/data/makefile.mk b/wizards/com/sun/star/wizards/web/data/makefile.mk index 89362269fadc..1bfc02cf8351 100644 --- a/wizards/com/sun/star/wizards/web/data/makefile.mk +++ b/wizards/com/sun/star/wizards/web/data/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/web$/data JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) +EXTRAJARFILES = $(SAXON_JAR) .ELSE JARFILES += saxon9.jar .ENDIF diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk index b123fdc6d255..46cd65044e81 100644 --- a/wizards/com/sun/star/wizards/web/export/makefile.mk +++ b/wizards/com/sun/star/wizards/web/export/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/web$/export JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) +EXTRAJARFILES = $(SAXON_JAR) .ELSE JARFILES += saxon9.jar .ENDIF diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk index a452e7683d21..9cc97e1b88ab 100644 --- a/wizards/com/sun/star/wizards/web/makefile.mk +++ b/wizards/com/sun/star/wizards/web/makefile.mk @@ -37,7 +37,7 @@ PACKAGE = com$/sun$/star$/wizards$/web JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) +EXTRAJARFILES = $(SAXON_JAR) .ELSE JARFILES += saxon9.jar .ENDIF diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst index c98f4561577c..c4d635a921a8 100644 --- a/wizards/prj/build.lst +++ b/wizards/prj/build.lst @@ -1,4 +1,4 @@ -wz wizards : l10n rsc javaunohelper unoil QADEVOOO:qadevOOo NULL +wz wizards : l10n rsc javaunohelper unoil NULL wz wizards\util nmake - all wz_util NULL wz wizards\source\config nmake - all wz_config NULL wz wizards\source\configshare nmake - all wz_configshare NULL diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index 065008c40cec..c04d77b9fcdd 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -2856,7 +2856,7 @@ String RID_WEBWIZARDDIALOG_START +110 String RID_WEBWIZARDDIALOG_START +111 { - Text [ en-US ] = "A security error acoccurred while exporting the document '%FILENAME'."; + Text [ en-US ] = "A security error occurred while exporting the document '%FILENAME'."; }; String RID_WEBWIZARDDIALOG_START +112 |