INTEGRATION: CWS ooo20040509 (1.18.6); FILE MERGED

2004/05/03 21:05:01 cmc 1.18.6.1: someone put the #endif on the wrong line
This commit is contained in:
Rüdiger Timm 2004-06-16 08:54:27 +00:00
parent 6dd314c599
commit e0165dbb62

View file

@ -2,9 +2,9 @@
*
* $RCSfile: sjapplet_impl.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: obo $ $Date: 2004-06-01 09:13:40 $
* last change: $Author: rt $ $Date: 2004-06-16 09:54:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -278,8 +278,8 @@ SjApplet2_Impl::~SjApplet2_Impl() throw()
catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &)
{
}
#endif
}
#endif
}
void SjApplet2_Impl::init(Window * pParentWin,