INTEGRATION: CWS mav09 (1.9.2); FILE MERGED

2004/09/03 11:38:49 mav 1.9.2.9: #i27773# if no server is installed a dummy one is created
2004/09/01 14:30:52 mav 1.9.2.8: #i27773# the object can not be set to running state on Unix
2004/08/27 12:40:08 mav 1.9.2.7: #i27773# container name for ole embedded object
2004/08/19 15:59:03 mav 1.9.2.6: #i27773# let the replacement be updated
2004/06/25 11:49:11 mav 1.9.2.5: #i27773# linkage support
2004/05/24 09:02:53 mba 1.9.2.4: #i27773#: some changes about MapUnit
2004/05/17 18:25:45 mav 1.9.2.3: RESYNC: (1.9-1.10); FILE MERGED
2004/05/12 16:23:35 mav 1.9.2.2: #i27773# send notifications from OLE objects
2004/05/12 10:12:29 mav 1.9.2.1: #i27773# graphical replacement and persistance setting related changes

1 files changed, 68 insertions, 30 deletions

diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index dd047b4e7f41..949c2e113b9b 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: oleembobj.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: hr $ $Date: 2004-05-10 17:53:05 $
+ *  last change: $Author: kz $ $Date: 2004-10-04 19:53:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,13 +116,8 @@ namespace cppu {
 class OleComponent;
 class OleEmbeddedObject : public ::cppu::WeakImplHelper3
                         < ::com::sun::star::embed::XEmbeddedObject
-                        // , ::com::sun::star::embed::XVisualObject
                         , ::com::sun::star::embed::XEmbedPersist
                         , ::com::sun::star::embed::XLinkageSupport >
-                        // , ::com::sun::star::embed::XClassifiedObject
-                        // , ::com::sun::star::embed::XComponentSupplier
-                        // , ::com::sun::star::util::XCloseable
-                        // , ::com::sun::star::document::XEventBroadcaster >
 {
     ::osl::Mutex    m_aMutex;
 
@@ -136,8 +131,6 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper3
     sal_Int32 m_nObjectState;
     sal_Int32 m_nUpdateMode;
 
-    sal_Bool m_bStoreVisRepl;
-
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
     ::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID;
@@ -150,13 +143,20 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper3
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > m_xClosePreventer;
 
     sal_Bool m_bWaitSaveCompleted;
-    sal_Bool m_bNewStoreVisRepl;
+    sal_Bool m_bNewVisReplInStream;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewCachedVisRepl;
     ::rtl::OUString m_aNewEntryName;
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewObjectStream;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCachedVisualRepresentation;
+    sal_Bool m_bVisReplInStream;
+    sal_Bool m_bStoreVisRepl;
+
     sal_Bool m_bIsLink;
 
+    ::com::sun::star::awt::Size m_aCachedSize;
+
     // embedded object related stuff
     ::rtl::OUString m_aEntryName;
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage;
@@ -167,6 +167,11 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper3
 
 protected:
 
+    void SwitchComponentToRunningState_Impl();
+
+    void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName );
+    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 );
@@ -188,6 +193,30 @@ protected:
 
     void GetRidOfComponent();
 
+    void StoreToLocation_Impl(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+                            const ::rtl::OUString& sEntName,
+                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
+                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs,
+                            sal_Bool bSaveAs )
+        throw ( ::com::sun::star::uno::Exception );
+
+    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 )
+        throw ( ::com::sun::star::uno::Exception );
+
+    void RemoveVisualCache_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
+        throw ( ::com::sun::star::uno::Exception );
+
+    ::com::sun::star::embed::VisualRepresentation GetVisualRepresentationInNativeFormat_Impl(
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xCachedVisRepr )
+        throw ( ::com::sun::star::uno::Exception );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > TryToRetrieveCachedVisualRepresentation_Impl(
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream )
+        throw ();
+
 public:
     // in case a new object must be created the class ID must be specified
     OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory,
@@ -209,6 +238,8 @@ public:
 
     void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; }
 
+    ::rtl::OUString GetContainerName_Impl() { return m_aContainerName; }
+
 // XEmbeddedObject
 
     virtual void SAL_CALL changeState( sal_Int32 nNewState )
@@ -276,7 +307,13 @@ public:
                 ::com::sun::star::uno::Exception,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual sal_Int32 SAL_CALL getMapMode( sal_Int64 nAspect )
+    virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
+        throw ( ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::embed::WrongStateException,
+                ::com::sun::star::uno::Exception,
+                ::com::sun::star::uno::RuntimeException );
+
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
         throw ( ::com::sun::star::uno::Exception,
                 ::com::sun::star::uno::RuntimeException);
 
@@ -295,12 +332,6 @@ public:
                 ::com::sun::star::uno::Exception,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL storeOwn()
-        throw ( ::com::sun::star::embed::WrongStateException,
-                ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::Exception,
-                ::com::sun::star::uno::RuntimeException );
-
     virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
         throw ( ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::embed::WrongStateException,
@@ -332,19 +363,6 @@ public:
         throw ( ::com::sun::star::embed::WrongStateException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual sal_Bool SAL_CALL isReadonly()
-        throw ( ::com::sun::star::embed::WrongStateException,
-                ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL reload(
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
-        throw ( ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::embed::WrongStateException,
-                ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::Exception,
-                ::com::sun::star::uno::RuntimeException );
-
 // XLinkageSupport
 
     virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -364,6 +382,26 @@ public:
                 ::com::sun::star::uno::Exception,
                 ::com::sun::star::uno::RuntimeException);
 
+// XCommonEmbedPersist
+    virtual void SAL_CALL storeOwn()
+        throw ( ::com::sun::star::embed::WrongStateException,
+                ::com::sun::star::io::IOException,
+                ::com::sun::star::uno::Exception,
+                ::com::sun::star::uno::RuntimeException );
+
+    virtual sal_Bool SAL_CALL isReadonly()
+        throw ( ::com::sun::star::embed::WrongStateException,
+                ::com::sun::star::uno::RuntimeException );
+
+    virtual void SAL_CALL reload(
+                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments,
+                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs )
+        throw ( ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::embed::WrongStateException,
+                ::com::sun::star::io::IOException,
+                ::com::sun::star::uno::Exception,
+                ::com::sun::star::uno::RuntimeException );
+
 // XClassifiedObject
 
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID()