diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/qa/complex/extensions/makefile.mk | 8 | ||||
| -rw-r--r-- | extensions/qa/integration/extensions/makefile.mk | 2 | ||||
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk index ce3515100fe3..312a7caae482 100644 --- a/extensions/qa/complex/extensions/makefile.mk +++ b/extensions/qa/complex/extensions/makefile.mk @@ -38,9 +38,9 @@ EXTRAJARFILES = $(OOO_JUNIT_JAR) .IF "$(OS)"=="WNT" -command_seperator=&& +command_separator=&& .ELSE -command_seperator=; +command_separator=; .ENDIF @@ -81,8 +81,8 @@ RESLIB2SRSFILES=$(RES2FILELIST) ALLTAR : copy_resources javatest copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN) - $(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo - $(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo + $(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_separator)) echo + $(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_separator)) echo .END diff --git a/extensions/qa/integration/extensions/makefile.mk b/extensions/qa/integration/extensions/makefile.mk index de53c5e49ad9..6861d1b63f92 100644 --- a/extensions/qa/integration/extensions/makefile.mk +++ b/extensions/qa/integration/extensions/makefile.mk @@ -53,7 +53,7 @@ JARCOMPRESS = TRUE .ENDIF # classpath and argument list -RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar +RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPARATOR)$(CLASSPATH)$(PATH_SEPARATOR)$(SOLARBINDIR)$/ConnectivityTools.jar RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -cs $(RUNNER_CONNECTION_STRING) # --- Targets ------------------------------------------------------ diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 709e121f6846..d487a15aabed 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -149,7 +149,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t) return Any(); // XDirectInvocation seems to be an oracle replacement for XAutomationInvocation, however it is flawed esecially wrt. assumptions about whether to invoke a // Put or Get property, the implementation code has no business guessing that, it's up to the caller to decide that. Worse XDirectInvocation duplicates lots of code. - // XAutomationInvocation provides seperate calls for put& get + // XAutomationInvocation provides separate calls for put& get // properties. Note: Currently the basic runtime doesn't call put properties directly, it should... after all the basic runtime should know whether it is calling a put or get property. // For the moment for ease of merging we will let the XDirectInvoke and XAuthomationInvocation interfaces stay side by side ( and for the momemnt at least I would prefer the basic // runtime to call XAutomationInvocation instead of XDirectInvoke |