diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:08:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:08:21 +0000 |
| commit | b41671df73040ce7c532ad32c59a3ee8c9ff5717 (patch) | |
| tree | 197bf395712f8efbf12057342e9743f8d0109d06 /embeddedobj | |
| parent | 734cb6d07c47d81c13678d69db2a61a62c98a23a (diff) | |
INTEGRATION: CWS fwk88 (1.26.4); FILE MERGED
2008/05/27 15:30:34 mav 1.26.4.1: #i86367# integrate the patch
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olemisc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 3909f2bf1c35..a2f81dc47d2c 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -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() { |