diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-20 06:07:43 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-20 06:07:43 +0000 |
commit | 11df898c75bc476bef70dbaa3c3bd8960235ee1f (patch) | |
tree | ac3d618944d0c30e807c133000bba129456a211b /embeddedobj | |
parent | 3e6d980c98a0188c249e91f96c38773fb5c82b66 (diff) |
INTEGRATION: CWS fwk88 (1.28.4); FILE MERGED
2008/05/27 15:30:34 mav 1.28.4.1: #i86367# integrate the patch
Diffstat (limited to 'embeddedobj')
-rw-r--r-- | embeddedobj/source/inc/oleembobj.hxx | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 34b017012a..22d2b45c92 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: oleembobj.hxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.29 $ * * This file is part of OpenOffice.org. * @@ -75,11 +75,11 @@ public: , m_bWasEverActive( sal_False ) , m_nNotificationLock( 0 ) {} - +#ifdef WNT void StartControlExecution(); sal_Bool EndControlExecution_WasModified(); void ModificationNotificationIsDone(); - +#endif void LockNotification(); void UnlockNotification(); @@ -200,18 +200,20 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetNewFilledTempStream_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ) throw( ::com::sun::star::io::IOException ); - +#ifdef WNT void SwitchComponentToRunningState_Impl(); - +#endif void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName ); +#ifdef WNT void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving(); + ::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState ); ::com::sun::star::uno::Sequence< sal_Int32 > GetReachableStatesList_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor >& aVerbList ); +#endif void CloseComponent(); void Dispose(); @@ -234,10 +236,10 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( ::com::sun::star::uno::Exception ); - +#ifdef WNT void StoreObjectToStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutStream ) throw ( ::com::sun::star::uno::Exception ); - +#endif void InsertVisualCache_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xCachedVisualRepresentation ) @@ -257,19 +259,19 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream, sal_Bool bAllowRepair50 = sal_False ) throw (); - +#ifdef WNT sal_Bool SaveObject_Impl(); sal_Bool OnShowWindow_Impl( sal_Bool bShow ); - void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL ); void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL ); void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL ); - +#endif void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; } +#ifdef WNT ::rtl::OUString CreateTempURLEmpty_Impl(); ::rtl::OUString GetTempURL_Impl(); - +#endif ::rtl::OUString GetContainerName_Impl() { return m_aContainerName; } public: @@ -282,15 +284,18 @@ public: // factory can do it for OOo objects, but for OLE objects OS dependent code is required OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, sal_Bool bLink ); - +#ifdef WNT // this constructor let object be initialized from clipboard OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); +#endif virtual ~OleEmbeddedObject(); +#ifdef WNT void OnIconChanged_Impl(); void OnViewChanged_Impl(); void OnClosed_Impl(); +#endif // XEmbeddedObject |