diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 13:44:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 13:44:29 +0000 |
| commit | 2e7e9b0634ece2544475b3f194b158296f31e3a2 (patch) | |
| tree | dc1acd62f0cf57936285cafa294ead56a31a5f59 /embedserv | |
| parent | 4df8331a9d2d9de53c638f0024c902f5282245f7 (diff) | |
INTEGRATION: CWS mbapp3 (1.20.12); FILE MERGED
2006/04/24 10:34:46 mav 1.20.12.1: #i64599# NoAutoSave argument
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/embed/docholder.cxx | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 748e61c92974..531f4cd3b843 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docholder.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2006-05-05 09:55:27 $ + * last change: $Author: hr $ $Date: 2006-05-08 14:44:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -449,7 +449,7 @@ HRESULT DocumentHolder::InPlaceActivate( if(xComponentLoader.is()) { uno::Any aAny; - uno::Sequence<beans::PropertyValue> aSeq(3); + uno::Sequence<beans::PropertyValue> aSeq(4); aAny <<= uno::Reference<uno::XInterface>( GetDocument(),uno::UNO_QUERY); @@ -476,6 +476,14 @@ HRESULT DocumentHolder::InPlaceActivate( aAny, beans::PropertyState_DIRECT_VALUE); + aAny <<= (sal_Bool) sal_True; + aSeq[3] = beans::PropertyValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")), + -1, + aAny, + beans::PropertyState_DIRECT_VALUE); + xComponentLoader->loadComponentFromURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:object")), @@ -912,7 +920,7 @@ void DocumentHolder::show() if(xComponentLoader.is()) { - uno::Sequence<beans::PropertyValue> aSeq(2); + uno::Sequence<beans::PropertyValue> aSeq(3); uno::Any aAny; aAny <<= uno::Reference<uno::XInterface>( @@ -932,6 +940,15 @@ void DocumentHolder::show() aAny, beans::PropertyState_DIRECT_VALUE); + aAny <<= (sal_Bool) sal_True; + aSeq[2] = beans::PropertyValue( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")), + -1, + aAny, + beans::PropertyState_DIRECT_VALUE); + + xComponentLoader->loadComponentFromURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:object")), |