diff options
author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /extensions/test/ole/callUnoToJava.htm | |
parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'extensions/test/ole/callUnoToJava.htm')
-rw-r--r-- | extensions/test/ole/callUnoToJava.htm | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm index fdc690d7ebfb..481835e9897d 100644 --- a/extensions/test/ole/callUnoToJava.htm +++ b/extensions/test/ole/callUnoToJava.htm @@ -1,3 +1,20 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> <HTML> <HEAD> <META NAME="GENERATOR" Content="Microsoft Developer Studio"> @@ -8,11 +25,11 @@ <script language="JScript"> function callOleTest( id) -{ +{ var factory= new ActiveXObject("com.sun.star.ServiceManager"); var oletest= factory.createInstance("oletest.OleTest"); // alert(oletest); - + switch( id) { case 1: // Test simple call of JScript object function from UNO @@ -144,7 +161,6 @@ function callOleTest( id) function XCallback_Impl() { - // XCallback this._environment= "JScript"; @@ -246,7 +262,7 @@ function XCallback_Impl_outAny( outVal) function XCallback_Impl_outBool( outVal) { outVal[0]= true; -} +} function XCallback_Impl_outChar( outVal) { outVal[0]= "a"; @@ -534,5 +550,3 @@ Other tests with inout parameters <br> </body> </html> - - |