INTEGRATION: CWS jl3 (1.9.32); FILE MERGED
2004/02/10 16:48:12 jl 1.9.32.3: #111907# removed conflicts after merge 2004/02/09 13:42:22 jl 1.9.32.2: RESYNC: (1.9-1.10); FILE MERGED 2003/11/20 16:40:03 jl 1.9.32.1: #111907# replace TKTThreadAttach by jvmaccess::VirtualMachine, directory source/java is now empty
This commit is contained in:
parent
906ad9c2ac
commit
afec74c687
1 changed files with 4 additions and 9 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: sjapplet.cxx,v $
|
||||
*
|
||||
* $Revision: 1.10 $
|
||||
* $Revision: 1.11 $
|
||||
*
|
||||
* last change: $Author: vg $ $Date: 2003-12-17 20:36:51 $
|
||||
* last change: $Author: kz $ $Date: 2004-03-25 14:56:00 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -60,10 +60,6 @@
|
|||
************************************************************************/
|
||||
|
||||
#include <cstdarg>
|
||||
#ifdef SOLAR_JAVA
|
||||
#include <jnihelp.hxx>
|
||||
#endif // SOLAR_JAVA
|
||||
|
||||
#include <sjapplet.hxx>
|
||||
|
||||
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
||||
|
@ -81,16 +77,15 @@
|
|||
|
||||
using namespace ::rtl;
|
||||
using namespace ::utl;
|
||||
#ifdef SOLAR_JAVA
|
||||
using namespace ::sj2;
|
||||
#endif // SOLAR_JAVA
|
||||
|
||||
using namespace ::com::sun::star::lang;
|
||||
using namespace ::com::sun::star::uno;
|
||||
|
||||
#ifdef SOLAR_JAVA
|
||||
using namespace ::com::sun::star::java;
|
||||
#endif // SOLAR_JAVA
|
||||
|
||||
|
||||
SjApplet2::SjApplet2()
|
||||
: _pImpl(new SjApplet2_Impl())
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue