INTEGRATION: CWS fwk88 (1.26.4); FILE MERGED

2008/05/27 15:30:34 mav 1.26.4.1: #i86367# integrate the patch
This commit is contained in:
Rüdiger Timm 2008-06-20 06:08:21 +00:00
parent 734cb6d07c
commit b41671df73

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: olemisc.cxx,v $
* $Revision: 1.26 $
* $Revision: 1.27 $
*
* This file is part of OpenOffice.org.
*
@ -110,7 +110,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_bFromClipboard( sal_False )
{
}
#ifdef WNT
//------------------------------------------------------
// this constructor let object be initialized from clipboard
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
@ -140,7 +140,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_bFromClipboard( sal_True )
{
}
#endif
//------------------------------------------------------
OleEmbeddedObject::~OleEmbeddedObject()
{
@ -185,7 +185,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const ::rtl::OUStrin
}
}
}
#ifdef WNT
//----------------------------------------------
void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
{
@ -226,7 +226,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
}
}
}
#endif
//------------------------------------------------------
void OleEmbeddedObject::GetRidOfComponent()
{