summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-02-25 16:08:57 +0000
committerKurt Zenker <kz@openoffice.org>2004-02-25 16:08:57 +0000
commit45c079e0ce137bdc5cc77c1d84799ccdc3e6b18c (patch)
treebed9d74e258364f3a04169deda6b917dcd5d8ab2 /embedserv
parentf1ac22b05e90c1f46a58647340f8c61e36197aac (diff)
INTEGRATION: CWS layoutmanager (1.11.30); FILE MERGED
2003/10/29 13:41:32 abi 1.11.30.1: inplace activation
Diffstat (limited to 'embedserv')
-rwxr-xr-xembedserv/source/embed/ed_ipersiststr.cxx16
1 files changed, 14 insertions, 2 deletions
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 1c90c3ed42cd..721b97f6caa7 100755
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ed_ipersiststr.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: rt $ $Date: 2003-04-24 13:54:31 $
+ * last change: $Author: kz $ $Date: 2004-02-25 17:08:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -363,6 +363,18 @@ STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv
*ppv = (IOleObject*) this;
return S_OK;
}
+ else if (IsEqualIID(riid, IID_IOleWindow))
+ {
+ AddRef();
+ *ppv = (IOleWindow*) this;
+ return S_OK;
+ }
+ else if (IsEqualIID(riid, IID_IOleInPlaceObject))
+ {
+ AddRef();
+ *ppv = (IOleInPlaceObject*) this;
+ return S_OK;
+ }
else if (IsEqualIID(riid, IID_IPersistFile))
{
AddRef();